diff --git a/deploy.sh b/deploy.sh
old mode 100644
new mode 100755
index 18e97ba..4ece7be
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,11 +1,25 @@
#!/bin/sh
# 发包脚本
set -e
-echo "发布开始,当前时间是:$current_time"
-#mvn clean install
-scp ./play-admin/target/play-admin-1.0.jar root@122.51.20.105:/www/wwwroot/july.hucs.top
-ssh root@122.51.20.105 "source /etc/profile;cd /www/wwwroot/july.hucs.top;sh start.sh restart"
+
# 获取当前时间并格式化为指定格式
current_time=$(date +"%Y-%m-%d %H:%M:%S")
+echo "发布开始,当前时间是:$current_time"
+# 构建项目
+echo "开始构建项目..."
+mvn clean install
+
+echo "项目构建成功,继续部署..."
+# 部署到服务器
+echo "开始部署到服务器..."
+scp ./play-admin/target/play-admin-1.0.jar root@122.51.20.105:/www/wwwroot/july.hucs.top
+ssh root@122.51.20.105 "source /etc/profile;cd /www/wwwroot/july.hucs.top;sh start.sh restart"
+
+# 备用服务器部署 (已注释)
+# scp ./play-admin/target/play-admin-1.0.jar root@122.51.20.105:/www/wwwroot/julyharbor.com
+# ssh root@122.51.20.105 "source /etc/profile;cd /www/wwwroot/julyharbor.com;sh start.sh restart"
+
+# 获取结束时间
+current_time=$(date +"%Y-%m-%d %H:%M:%S")
echo "发布完成,当前时间是:$current_time"
\ No newline at end of file
diff --git a/play-admin/src/main/resources/logback-spring.xml b/play-admin/src/main/resources/logback-spring.xml
index a5ec30d..55d5721 100755
--- a/play-admin/src/main/resources/logback-spring.xml
+++ b/play-admin/src/main/resources/logback-spring.xml
@@ -12,9 +12,9 @@
converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-
+
+ value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr([%X{correlationId:--}]){yellow} %clr([%X{userId:--}]){green} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
@@ -40,7 +40,7 @@
7
- %d{MM/dd/yyyy HH:mm:ss} %-5level [%thread]%logger{16} - %msg%n
+ %d{MM/dd/yyyy HH:mm:ss} %-5level [%thread] [%X{correlationId:--}] [%X{userId:--}] %logger{16} - %msg%n
UTF-8
@@ -51,7 +51,7 @@
${log.path}/error.log
- %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{correlationId:--}] [%X{userId:--}] %-5level %logger{50} - %msg%n
UTF-8