Merge remote-tracking branch 'origin/20221201' into 20221201

.drone.yml

@@ -39,16 +39,17 @@ steps:
   #      - ${DRONE_COMMIT}
   #      - v1
   #      - latest
+  
   - name: scp_files
     image: appleboy/drone-scp
     settings:
-      host: 172.17.0.1
+      host: 172.16.0.28
       username: root
-      password: $jgkj001
+      password: $Jgkj1234
       debug: true
       target:
-        - /www/wwwroot/railway.iamsee.com/release
-        - /www/wwwroot/railway.iamsee.com/release
+        - /www/wwwroot/railway.ninecase.top/release
+        - /www/wwwroot/railway.ninecase.top/release
       source:
         - railway-admin/target/railway-admin.jar
         - Dockerfile
@@ -56,25 +57,25 @@ steps:
   - name: deploy
     image:  appleboy/drone-ssh
     settings:
-      host: drone.iamsee.com
+      host: 172.16.0.28
       username: root
-      password: $jgkj001
+      password: $Jgkj1234
       debug: true
       script:
         - export PATH=/usr/local/bin:$PATH
         - echo $PATH
         - export LANG="en_US.UTF-8"
         - pkill -9 java
-        - nohup java -jar /www/wwwroot/railway.iamsee.com/release/railway-admin/target/railway-admin.jar --spring.profiles.active=dev -Ddruid.mysql.usePingMethod=false > /www/wwwroot/railway.iamsee.com/out.log 2>&1 &
+        - nohup java -jar /www/wwwroot/railway.ninecase.top/release/railway-admin/target/railway-admin.jar --spring.profiles.active=dev -Ddruid.mysql.usePingMethod=false > /www/wwwroot/railway.ninecase.top/out.log 2>&1 &
   - name: deploy-build-image
     image: appleboy/drone-ssh
     settings:
-      host: gdsc.ninecase.top
+      host: 172.16.0.28
       username: root
-      password: $jgkj001
+      password: $Jgkj1234
       debug: true
       script:
-        - cd /www/wwwroot/railway.iamsee.com/release
+        - cd /www/wwwroot/railway.ninecase.top/release
         - docker build -t iamsee/railway-admin:1.0.0 .
         - docker save -o railway-admin@1.0.0.tar iamsee/railway-admin:1.0.0
 trigger:

railway-admin/src/main/resources/application-dev.yml

@@ -56,13 +56,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 39.105.100.218
+    host: 172.16.0.28
     # 端口，默认为6379
     port: 6380
     # 数据库索引
     database: 0
     # 密码
-    password: '$jgkj001'
+    password: 'railway1208'
     # 连接超时时间
     timeout: 100s
     lettuce:
@@ -82,9 +82,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://39.105.100.218:3306/railway_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://172.16.0.28:3306/railway_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: railway
-        password: '$jgkj001'
+        password: 'railway1208'
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

railway-admin/src/main/resources/application-docker.yml

@@ -62,7 +62,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: '$jgkj001'
+    password: 'railway1208'
     # 连接超时时间
     timeout: 100s
     lettuce:
@@ -84,7 +84,7 @@ spring:
       master:
         url: jdbc:mysql://mysql:3306/railway_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: railway
-        password: '$jgkj001'
+        password: 'railway1208'
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

railway-admin/src/main/resources/application-prod.yml

@@ -62,7 +62,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: '$jgkj001'
+    password: 'railway1208'
     # 连接超时时间
     timeout: 100s
     lettuce: