Merge remote-tracking branch 'origin/dev_鹤壁_强信宇_pro' into dev_pro_河南鹤壁

yuan

2026-05-14 86089ed4cb7c294cda676947f5fc672c9561e4b3

Merge remote-tracking branch 'origin/dev_鹤壁_强信宇_pro' into dev_pro_河南鹤壁

# Conflicts:
#	src/main/resources/application-qxy.yml

 src/main/resources/application-dev-pro.yml

ÎļþÒÑɾ³ý

 src/main/resources/application-qxy.yml

ÎļþÃû´Ó src/main/resources/application-dev.yml ÐÞ¸Ä
@@ -1,3 +1,4 @@

# é¡¹ç›®ç›¸å…³é…ç½®
ruoyi:
  # åç§°
@@ -7,7 +8,7 @@
  # ç‰ˆæƒå¹´ä»½
  copyrightYear: 2025
  # æ–‡ä»¶è·¯å¾„ ç¤ºä¾‹ï¼ˆ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
  profile: D:/ruoyi/uploadPath
  profile: /home/ruoyi/uploadPath

  # èŽ·å–ip地址开关
  addressEnabled: false
@@ -28,7 +29,7 @@
# å¼€å‘环境配置
server:
  # æœåŠ¡å™¨çš„HTTP端口，默认为8080
  port: 7006
  port: 7003
  servlet:
    # åº”用的访问路径
    context-path: /
@@ -37,6 +38,9 @@
    uri-encoding: UTF-8
    # è¿žæŽ¥æ•°æ»¡åŽçš„排队数，默认为100
    accept-count: 1000
    max-swallow-size: -1          # -1 è¡¨ç¤ºä¸é™åˆ¶
    max-http-form-post-size: -1   # POST è¯·æ±‚体不限制
    connection-timeout: 60000     # è¿žæŽ¥è¶…时时间(毫秒)
    threads:
      # tomcat最大线程数，默认为200
      max: 800
@@ -74,9 +78,9 @@
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://localhost:3306/product-inventory-management-new-pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://36.134.154.10:9002/product-inventory-management-qxy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: 123456
        password: qxy@123456..
      # ä»Žåº“数据源
      slave:
        # ä»Žæ•°æ®æºå¼€å…³/默认关闭
@@ -149,8 +153,8 @@
    # redis é…ç½®
    redis:
      # åœ°å€
      host: 127.0.0.1
      #    host: 172.17.0.1
      #    host: 127.0.0.1
      host: 172.17.0.1
      # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
      port: 6379
      # æ•°æ®åº“索引
@@ -256,11 +260,11 @@

# æ–‡ä»¶ä¸Šä¼ é…ç½®
file:
  temp-dir: D:/ruoyi/temp/uploads   # ä¸´æ—¶ç›®å½• åŽæœŸåˆ é™¤
  upload-dir: D:/ruoyi/prod/uploads # æ­£å¼ç›®å½• åŽæœŸåˆ é™¤
  path: D:/ruoyi/prod/uploads # ä¸Šä¼ ç›®å½•
  temp-dir: /javaWork/product-inventory-management/file/temp/uploads   # ä¸´æ—¶ç›®å½• åŽæœŸåˆ é™¤
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads # æ­£å¼ç›®å½• åŽæœŸåˆ é™¤
  path: /javaWork/product-inventory-management/file/path/uploads # ä¸Šä¼ ç›®å½•
  urlPrefix: /common # é“¾æŽ¥å‰ç¼€
  domain: http://127.0.0.1:7005 # åŸŸåå‰ç¼€
  domain: http://127.0.0.1:7003 # åŸŸåå‰ç¼€
  expired: 120 # è¿‡æœŸæ—¶é—´(单位:分钟)
  useLimit: 10 # ä½¿ç”¨æ¬¡æ•°
  compress: true # æ˜¯å¦åŽ‹ç¼©
@@ -268,4 +272,3 @@
  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: dev
    active: qxy
langchain4j:
  mcp:
    # MCP æœåŠ¡ç«¯åœ°å€ï¼ˆæ ¹æ®å®žé™…部署的 MCP æœåŠ¡è°ƒæ•´ï¼‰