diff --git a/.run/fzshuai-monitor-admin.run.xml b/.run/fzshuai-monitor-admin.run.xml index 6e9ceab..8809aa0 100644 --- a/.run/fzshuai-monitor-admin.run.xml +++ b/.run/fzshuai-monitor-admin.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/fzshuai-server.run.xml b/.run/fzshuai-server.run.xml index 18a68a4..fd69aa1 100644 --- a/.run/fzshuai-server.run.xml +++ b/.run/fzshuai-server.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/fzshuai-xxl-job-admin.run.xml b/.run/fzshuai-xxl-job-admin.run.xml index ba79a10..8f6fd94 100644 --- a/.run/fzshuai-xxl-job-admin.run.xml +++ b/.run/fzshuai-xxl-job-admin.run.xml @@ -2,7 +2,7 @@ - diff --git a/fzshuai-admin/src/main/resources/application.yml b/fzshuai-admin/src/main/resources/application.yml index 85edf5c..ec8c212 100644 --- a/fzshuai-admin/src/main/resources/application.yml +++ b/fzshuai-admin/src/main/resources/application.yml @@ -5,7 +5,7 @@ ruoyi: # 版本 version: ${revision} # 版权年份 - copyrightYear: 2024 + copyrightYear: 2023 # 缓存懒加载 cacheLazy: false diff --git a/pom.xml b/pom.xml index 99df5f6..c901952 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ Fzshuai-Weblog 博客系统 - 2.1.0 + 3.0.0 2.7.18 UTF-8 UTF-8 diff --git a/script/bin/fzshuai-blog.bat b/script/bin/fzshuai-weblog.bat similarity index 100% rename from script/bin/fzshuai-blog.bat rename to script/bin/fzshuai-weblog.bat diff --git a/script/bin/fzshuai-blog.sh b/script/bin/fzshuai-weblog.sh similarity index 95% rename from script/bin/fzshuai-blog.sh rename to script/bin/fzshuai-weblog.sh index abea614..49cee9f 100644 --- a/script/bin/fzshuai-blog.sh +++ b/script/bin/fzshuai-weblog.sh @@ -1,5 +1,5 @@ #!/bin/sh -# ./fzshuai-blog.sh start 启动 stop 停止 restart 重启 status 状态 +# ./fzshuai-weblog.sh start 启动 stop 停止 restart 重启 status 状态 AppName=fzshuai-admin.jar # JVM参数 diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 151fb97..8bd85b0 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -18,6 +18,8 @@ services: - /docker/mysql/data/:/var/lib/mysql/ # 配置挂载 - /docker/mysql/conf/:/etc/mysql/conf.d/ + # 日志文件 + - /docker/mysql/log:/var/log/ # 让容器的时钟与宿主机时钟同步,避免时区的问题,ro是read only的意思,就是只读 - /etc/localtime:/etc/localtime:ro command: @@ -27,6 +29,7 @@ services: --collation-server=utf8mb4_general_ci --explicit_defaults_for_timestamp=true --lower_case_table_names=1 + --default-time-zone='Asia/Shanghai' deploy: resources: limits: @@ -134,7 +137,7 @@ services: fzshuai-server1: - image: fzshuai/fzshuai-server:2.1.0 + image: fzshuai/fzshuai-server:3.0.0 container_name: fzshuai-server1 environment: # 时区上海 @@ -151,7 +154,7 @@ services: network_mode: "host" fzshuai-server2: - image: fzshuai/fzshuai-server:2.1.0 + image: fzshuai/fzshuai-server:3.0.0 container_name: fzshuai-server2 environment: # 时区上海 @@ -168,7 +171,7 @@ services: network_mode: "host" fzshuai-monitor-admin: - image: fzshuai/fzshuai-monitor-admin:2.1.0 + image: fzshuai/fzshuai-monitor-admin:3.0.0 container_name: fzshuai-monitor-admin environment: # 时区上海 @@ -182,7 +185,7 @@ services: network_mode: "host" fzshuai-xxl-job-admin: - image: fzshuai/fzshuai-xxl-job-admin:2.1.0 + image: fzshuai/fzshuai-xxl-job-admin:3.0.0 container_name: fzshuai-xxl-job-admin environment: # 时区上海