Merge remote-tracking branch 'origin/master'

ws

2024-10-31 5408346178dd12b7ab78fb51c76f59c300a7e153

 src/main/resources/application-pro.yml

@@ -1,4 +1,4 @@
##########################  广东惠州仲恺   ##########################
##########################  广东潮阳   ##########################
server:
  port: 8090
  jetty:
@@ -11,13 +11,13 @@
    primary:
      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
      username: root
      password: Fzzy@#$%5432..K
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
    #次数据源
    secondary:
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_master_v40?useUnicode=true&characterEncoding=utf-8
      username: root
      password: Fzzy@#$%5432..K
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
  jpa:
    #主jpa配置
@@ -41,7 +41,7 @@
    database: 1
    host: 127.0.0.1
    port: 6379
    password: Redispwd..
    password: Abc123..
    # 连接池最大连接数（使用负值表示没有限制）
    pool:
      max-active: 200
@@ -51,7 +51,7 @@
      timeout: 6000
igds:
  default:
    companyId: 5326
    companyId: 5317

  file-path: D:/IGDS-API/FILE/
  img-path: D:/IGDS/FILE/