🙈 发布 3.0.0

fzshuai · May 3, 2024 · 92f3a07 · 92f3a07
1 parent cdfee2c
commit 92f3a07
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 10 deletions.
diff --git a/.run/fzshuai-monitor-admin.run.xml b/.run/fzshuai-monitor-admin.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="fzshuai-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="fzshuai/fzshuai-monitor-admin:2.1.0" />
+        <option name="imageTag" value="fzshuai/fzshuai-monitor-admin:3.0.0" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="fzshuai-extend/fzshuai-monitor-admin/Dockerfile" />
       </settings>

diff --git a/.run/fzshuai-server.run.xml b/.run/fzshuai-server.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="fzshuai-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="fzshuai/fzshuai-server:2.1.0" />
+        <option name="imageTag" value="fzshuai/fzshuai-server:3.0.0" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="fzshuai-admin/Dockerfile" />
       </settings>

diff --git a/.run/fzshuai-xxl-job-admin.run.xml b/.run/fzshuai-xxl-job-admin.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="fzshuai-xxl-job-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="fzshuai/fzshuai-xxl-job-admin:2.1.0" />
+        <option name="imageTag" value="fzshuai/fzshuai-xxl-job-admin:3.0.0" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="fzshuai-extend/fzshuai-xxl-job-admin/Dockerfile" />
       </settings>

diff --git 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
@@ -13,7 +13,7 @@
     <description>Fzshuai-Weblog 博客系统</description>
 
     <properties>
-        <revision>2.1.0</revision>
+        <revision>3.0.0</revision>
         <spring-boot.version>2.7.18</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

diff --git a/script/bin/fzshuai-blog.bat → script/bin/fzshuai-weblog.bat b/script/bin/fzshuai-blog.bat → script/bin/fzshuai-weblog.bat
diff --git a/script/bin/fzshuai-blog.sh → script/bin/fzshuai-weblog.sh b/script/bin/fzshuai-blog.sh → 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
@@ -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:
       # 时区上海