Merge branch 'test' into release

docker-compose-dev.yml

 version: '3'
 services:
-  dev-api-jiedao:
-    image: harbor.jiedao.com/dev-api-jiedao:latest
-    container_name: dev-api-jiedao
+  api-jd-dev:
+    image: harbor.com/api-jd-dev:latest
+    container_name: api-jd-dev
     ports:
       - "8001:9001"
     environment:
       env: dev
     volumes:
       - '/etc/localtime:/etc/localtime'
-      - '/data/docker/apps/jiedao/dev/api/logs/operator:/logs'
-      - '/data/docker/apps/jiedao/dev/static:/app/static'
-      - '/data/docker/apps/jiedao/dev/fonts/zh:/usr/share/fonts/zh'
+      - '/data/apps/jd/dev/api/logs/operator:/logs'
+      - '/data/apps/jd/dev/static:/app/static'
+      - '/data/apps/jd/dev/fonts/zh:/usr/share/fonts/zh'
     restart: always
     ulimits:
       nproc: 65535
@@ -24,9 +24,9 @@ services:
           cpus: '4'
           memory: 4G
     networks:
-      app-net:
+      net:
         ipv4_address: 10.10.0.60
 
 networks:
-  app-net:
+  net:
     external: true

sql/v2.1/20240826.sql

-
+-- 这里是补充脚本，生产环境已存在
 -- 添加新字段
 alter table `ecw_customer` add column `no_consignee` bit(1) NOT NULL DEFAULT b'0' COMMENT '控货无收货人';
 alter table `ecw_customer` add column `default_pay` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否默认付款';
 
-
-
 -- 添加新字段
-
 alter table `ecw_warehouse` add column `rent_free_days` int DEFAULT NULL COMMENT '仓库免租期';
 alter table `ecw_warehouse` add column `lock_recipient_days` int DEFAULT NULL COMMENT '锁定收货人天数';

yudao-server/src/main/resources/application-dev.yaml

@@ -49,18 +49,18 @@ spring:
           url: jdbc:mysql://172.16.0.3:3306/${spring.datasource.dynamic.datasource.master.name}?useUnicode=true&useSSL=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&autoReconnect=true&rewriteBatchedStatements=TRUE&connectTimeout=60000
           driver-class-name: com.mysql.cj.jdbc.Driver
           username: jiedao
-          password: JIedao2024
+          password: Jiedao2024
         slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
           name: jiedao
           url: jdbc:mysql://172.16.0.3:3306/${spring.datasource.dynamic.datasource.slave.name}?useUnicode=true&useSSL=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&autoReconnect=true&rewriteBatchedStatements=TRUE&connectTimeout=60000
           driver-class-name: com.mysql.cj.jdbc.Driver
           username: jiedao
-          password: JIedao2024
+          password: Jiedao2024
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
     host: 172.16.0.3 # 地址
-    port: 2291 # 端口
+    port: 6379 # 端口
     database: 0 # 数据库索引
     password: Redis2024
     timeout: 60s
@@ -68,8 +68,8 @@ spring:
 
   redis-limiter:
     redis-host: 172.16.0.3           # redis server IP                  默认值：127.0.0.1
-    redis-port: 2291                # redis service 端口               默认值：6379
-    redis-db: 0                    # redis service 数据库             默认值：6379
+    redis-port: 6379                # redis service 端口               默认值：6379
+    redis-db: 4                    # redis service 数据库             默认值：6379
     redis-password: Redis2024    # redis 访问密码                   默认值：null
     redis-connection-timeout: 2000  # redis 连接超时时间               默认值：2000
     redis-pool-max-idle: 50         # redis 连接池最大空闲连接数        默认值：50

yudao-server/src/main/resources/application-local.yaml

@@ -47,32 +47,32 @@ spring:
         master:
           name: jiedao
 #          name: ruoyi-vue-pro-flowable
-          url: jdbc:mysql://localhost:3306/${spring.datasource.dynamic.datasource.master.name}?useUnicode=true&useSSL=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&autoReconnect=true&rewriteBatchedStatements=TRUE
+          url: jdbc:mysql://117.72.42.41:2290/${spring.datasource.dynamic.datasource.master.name}?useUnicode=true&useSSL=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&autoReconnect=true&rewriteBatchedStatements=TRUE
           driver-class-name: com.mysql.cj.jdbc.Driver
-          username: root
-          password: 123456
+          username: jiedao
+          password: Jiedao2024
         slave: # 模拟从库，可根据自己需要修改
           name: jiedao
 #          name: ruoyi-vue-pro-flowable
-          url: jdbc:mysql://localhost:3306/${spring.datasource.dynamic.datasource.slave.name}?useUnicode=true&useSSL=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&autoReconnect=true&rewriteBatchedStatements=TRUE
+          url: jdbc:mysql://117.72.42.41:2290/${spring.datasource.dynamic.datasource.slave.name}?useUnicode=true&useSSL=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&autoReconnect=true&rewriteBatchedStatements=TRUE
           driver-class-name: com.mysql.cj.jdbc.Driver
-          username: root
-          password: 123456
+          username: jiedao
+          password: Jiedao2024
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
-    host: localhost # 地址
-    port: 6379 # 端口
-    #password: mmc@gogo123
+    host: 117.72.42.41 # 地址
+    port: 2291 # 端口
+    password: Redis2024
     database: 0 # 数据库索引
     timeout: 60s
     connect-timeout: 60s
 
   redis-limiter:
-    redis-host: 127.0.0.1           # redis server IP                  默认值：127.0.0.1
-    redis-port: 6379                # redis service 端口               默认值：6379
+    redis-host: 117.72.42.41           # redis server IP                  默认值：127.0.0.1
+    redis-port: 2291                # redis service 端口               默认值：6379
     redis-db: 4                     # redis service 数据库             默认值：6379
-    redis-password: mmc@gogo123    # redis 访问密码                   默认值：null
+    redis-password: Redis2024    # redis 访问密码                   默认值：null
     redis-connection-timeout: 2000  # redis 连接超时时间               默认值：2000
     redis-pool-max-idle: 50         # redis 连接池最大空闲连接数        默认值：50
     redis-pool-min-idle: 10         # redis 连接池最小空闲连接数        默认值： 10

yudao-server/src/main/resources/application-test.yaml

@@ -66,7 +66,7 @@ spring:
   redis-limiter:
     redis-host: 172.16.0.3          # redis server IP                  默认值：127.0.0.1
     redis-port: 6379                # redis service 端口               默认值：6379
-    redis-db: 1                     # redis service 数据库             默认值：6379
+    redis-db: 5                     # redis service 数据库             默认值：6379
     redis-password: Redis2024      # redis 访问密码                   默认值：null
     redis-connection-timeout: 2000  # redis 连接超时时间               默认值：2000
     redis-pool-max-idle: 50         # redis 连接池最大空闲连接数        默认值：50

yudao-server/src/main/resources/application.yaml

@@ -2,7 +2,7 @@ spring:
   application:
     name: yudao-admin-server
   profiles:
-    active: dev
+    active: local
   mvc:
     static-path-pattern: /**
   web: