Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan

zouyu

8 天以前 09394848ce262aff81897503d32ec334fd3f2b6f

 src/main/resources/application-ccwlxt.yml

copy from src/main/resources/application-dhdc.yml
copy to src/main/resources/application-ccwlxt.yml
Îļþ´Ó src/main/resources/application-dhdc.yml ¸´ÖÆ
@@ -1,4 +1,7 @@
# é¡¹ç›®ç›¸å…³é…ç½®
# èŠ¯å¯¼-仓储物流系统项目相关配置
inspur:
  appId: 1205971611543404544
  appSecret: VkyDMDYwMTIwMjYxNzQxNDM2OTItrv
ruoyi:
  # åç§°
  name: RuoYi
@@ -7,7 +10,7 @@
  # ç‰ˆæƒå¹´ä»½
  copyrightYear: 2025
  # æ–‡ä»¶è·¯å¾„ ç¤ºä¾‹ï¼ˆ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
  profile: /javaWork/product-inventory-management/file
  profile: /center-lims/mis/file

  # èŽ·å–ip地址开关
  addressEnabled: false
@@ -17,7 +20,7 @@
# å¼€å‘环境配置
server:
  # æœåŠ¡å™¨çš„HTTP端口，默认为8080
  port: 9032
  port: 7003
  servlet:
    # åº”用的访问路径
    context-path: /
@@ -62,9 +65,9 @@
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://192.168.1.8:3306/product-inventory-management-dhdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://172.17.0.1:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: 123456
        password: zttZTT123!
      # ä»Žåº“数据源
      slave:
        # ä»Žæ•°æ®æºå¼€å…³/默认关闭
@@ -135,14 +138,14 @@
  redis:
    # åœ°å€
#    host: 127.0.0.1
    host: 192.168.1.8
    host: 172.17.0.1
    # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
    port: 6379
    # æ•°æ®åº“索引
    database: 1
    database: 0
    # å¯†ç 
#    password: root2022!
    password:
    password: zttZTT123!
#    password: 123456

    # è¿žæŽ¥è¶…时时间
    timeout: 10s
@@ -188,7 +191,7 @@
# Swagger配置
swagger:
  # æ˜¯å¦å¼€å¯swagger
  enabled: true
  enabled: false
  # è¯·æ±‚前缀
  pathMapping: /dev-api

@@ -215,5 +218,5 @@
  allowOverwrite: false

file:
  temp-dir: /javaWork/product-inventory-management/file/temp/uploads
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads
  temp-dir: /center-lims/mis/file/temp/uploads
  upload-dir: /center-lims/mis/file/prod/uploads