Merge remote-tracking branch 'origin/dev_鹤壁_善鼎通讯_pro' into dev_pro_河南鹤壁

# Conflicts:
# src/main/resources/application-sdtx.yml
已重命名1个文件
已修改1个文件
7 ■■■■■ 文件已修改
src/main/resources/application-sdtx.yml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-sdtx.yml
ÎļþÃû´Ó src/main/resources/application-qxy.yml ÐÞ¸Ä
@@ -78,9 +78,9 @@
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://36.134.154.10:9002/product-inventory-management-qxy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://172.17.0.1:9002/product-inventory-management-sdtx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: qxy@123456..
        password: sdtx@123456..
      # ä»Žåº“数据源
      slave:
        # ä»Žæ•°æ®æºå¼€å…³/默认关闭
@@ -272,3 +272,4 @@
  compressQuality: 0.5 # åŽ‹ç¼©è´¨é‡(0.0-1.0)
knowledge:
  one: D:\新疆大罗素企业产品体系说明文档.md
src/main/resources/application.yml
@@ -3,7 +3,7 @@
  main:
    allow-circular-references: true
  profiles:
    active: qxy
    active: sdtx
langchain4j:
  mcp:
    # MCP æœåŠ¡ç«¯åœ°å€ï¼ˆæ ¹æ®å®žé™…éƒ¨ç½²çš„ MCP æœåŠ¡è°ƒæ•´ï¼‰