浏览代码

feat: 参数替换

xdd 1 周之前
父节点
当前提交
1f381be9ff

+ 6 - 3
deploy.sh

@@ -2,13 +2,14 @@
 
 # 设置远程服务器信息
 REMOTE_USER="root"  # 远程服务器用户名,根据你的实际情况修改
-REMOTE_HOST="111.230.193.88" # 远程服务器地址
+REMOTE_HOST="175.178.171.148" # 远程服务器地址
 REMOTE_BASE_DIR="/home/software"  # 远程服务器上的部署目录,根据你的目录结构修改
 
 # 本地 JAR 包路径  -- 根据你提供的目录结构修改
 LOCAL_FS_ADMIN_JAR="./fs-admin/target/fs-admin.jar" # 假设target目录和你提供的 tree 命令显示的目录同级
 LOCAL_FS_COMPANY_JAR="./fs-company/target/fs-company.jar"
 LOCAL_FS_USER_APP_JAR="./fs-user-app/target/fs-user-app.jar"
+LOCAL_FS_API_APP_JAR="./fs-api/target/fs-api.jar"
 
 # 函数:检查本地文件是否存在
 check_local_file() {
@@ -22,6 +23,7 @@ check_local_file() {
 check_local_file "$LOCAL_FS_ADMIN_JAR"
 check_local_file "$LOCAL_FS_COMPANY_JAR"
 check_local_file "$LOCAL_FS_USER_APP_JAR"
+check_local_file "$LOCAL_FS_API_APP_JAR"
 # 停止远程服务器上可能正在运行的旧版本(假设进程名与 JAR 包名相同)
 stop_remote_app() {
   local app_name=$1
@@ -53,10 +55,11 @@ deploy_jar() {
 deploy_jar "$LOCAL_FS_ADMIN_JAR" "fs-admin"
 
 # 部署 fs-company
-#deploy_jar "$LOCAL_FS_COMPANY_JAR" "fs-company"
+deploy_jar "$LOCAL_FS_COMPANY_JAR" "fs-company"
 
 # 部署 fs-user-app
-#deploy_jar "$LOCAL_FS_USER_APP_JAR" "fs-user-app"
+deploy_jar "$LOCAL_FS_USER_APP_JAR" "fs-user-app"
+deploy_jar "$LOCAL_FS_API_APP_JAR" "fs-api"
 
 echo "Deployment completed."
 

+ 6 - 6
fs-admin/src/main/resources/application-dev.yml

@@ -5,13 +5,13 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: 127.0.0.1
+        host: 172.16.0.13
         # 端口,默认为6379
         port: 6379
         # 密码
-        password:
+        password: Yzx19860213
         # 连接超时时间
-        timeout: 30s
+        timeout: 10s
         lettuce:
             pool:
                 # 连接池中的最小空闲连接
@@ -22,16 +22,16 @@ spring:
                 max-active: 8
                 # #连接池最大阻塞等待时间(使用负值表示没有限制)
                 max-wait: -1ms
-        database: 0
+        database: 3
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://gz-cdb-of55khc9.sql.tencentcdb.com:23620/fs_hospital?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://172.16.0.31:3306/fs_ffhx_hospital?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Rtyy_2023
+                password: Ylrz_1q2w3e4r5t6y
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 5 - 5
fs-api/src/main/resources/application-dev.yml

@@ -3,11 +3,11 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: localhost
+        host: 172.16.0.13
         # 端口,默认为6379
         port: 6379
         # 密码
-        password:
+        password: Yzx19860213
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -20,16 +20,16 @@ spring:
                 max-active: 8
                 # #连接池最大阻塞等待时间(使用负值表示没有限制)
                 max-wait: -1ms
-        database: 0
+        database: 3
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://gz-cdb-of55khc9.sql.tencentcdb.com:23620/fs_hospital?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://172.16.0.31:3306/fs_ffhx_hospital?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Rtyy_2023
+                password: Ylrz_1q2w3e4r5t6y
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 5 - 5
fs-company/src/main/resources/application-dev.yml

@@ -3,13 +3,13 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: localhost
+        host: 172.16.0.13
         # 端口,默认为6379
         port: 6379
         # 数据库索引
-        database: 0
+        database: 3
         # 密码
-        password:
+        password: Yzx19860213
         # 连接超时时间
         timeout: 20s
         lettuce:
@@ -40,9 +40,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://gz-cdb-of55khc9.sql.tencentcdb.com:23620/fs_hospital?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://172.16.0.31:3306/fs_ffhx_hospital?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Rtyy_2023
+                password: Ylrz_1q2w3e4r5t6y
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 6 - 6
fs-service-system/src/main/resources/application-config.yml

@@ -2,12 +2,12 @@
 fsConfig:
   omsCode: "wjdh.SF.0235493583"
   #快递鸟
-  kdnId: 1881217
-  kdnKeyId: a43fee18-3ea9-4eff-99c0-7e94618d7a57
+  kdnId: 1892129
+  kdnKeyId: 8436cfe3-f241-434b-ac31-c3b70099028e
   kdnUrl: http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
   kdnSubscribeUrl: https://api.kdniao.com/api/dist
   kdnAddressUrl: https://api.kdniao.com/api/dist
-  notifyUrl: http://111.230.193.88/app/common/expressNotify
+  notifyUrl: http://admin.fhhx.runtzh.com/notify/expressNotify
   #ERP配置
   erpOpen: 1
   erpAppKey: 108123
@@ -72,14 +72,14 @@ wx:
     configs:
 #      - appid: wx36b87a0820734de8
 #        secret: 52700f5c811ed902a53ee3a358b29135
-      - appid: wx19c8813ffc33d1cb
-        secret: 38caf1e4f67c1d65061176d6157522a9
+      - appid: wx503cf8ab31f83dd4
+        secret: 1ba1972363889dcb4a37ecb685744435
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON
         account: 37519015371852
   pay:
-    appId: wx19c8813ffc33d1cb #微信公众号或者小程序等的appid
+    appId: wx503cf8ab31f83dd4 #微信公众号或者小程序等的appid
     mchId: 1560230251 #微信支付商户号
     mchKey: dltcx057ngdbukiuwn83621khh07ewmn #微信支付商户密钥
     subAppId:  #服务商模式下的子商户公众账号ID

+ 5 - 5
fs-user-app/src/main/resources/application-dev.yml

@@ -3,11 +3,11 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: localhost
+        host: 172.16.0.13
         # 端口,默认为6379
         port: 6379
         # 密码
-        password:
+        password: Yzx19860213
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -20,16 +20,16 @@ spring:
                 max-active: 8
                 # #连接池最大阻塞等待时间(使用负值表示没有限制)
                 max-wait: -1ms
-        database: 0
+        database: 3
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://gz-cdb-of55khc9.sql.tencentcdb.com:23620/fs_hospital?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://172.16.0.31:3306/fs_ffhx_hospital?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Rtyy_2023
+                password: Ylrz_1q2w3e4r5t6y
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭