From 86089ed4cb7c294cda676947f5fc672c9561e4b3 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 14 五月 2026 10:58:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_鹤壁_强信宇_pro' into dev_pro_河南鹤壁
---
/dev/null | 266 -----------------------------------------------------
src/main/resources/application-qxy.yml | 25 ++--
src/main/resources/application.yml | 2
3 files changed, 15 insertions(+), 278 deletions(-)
diff --git a/src/main/resources/application-dev-pro.yml b/src/main/resources/application-dev-pro.yml
deleted file mode 100644
index abb1950..0000000
--- a/src/main/resources/application-dev-pro.yml
+++ /dev/null
@@ -1,266 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: D:/ruoyi/uploadPath
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
- # 鍗忓悓瀹℃壒缂栧彿鍓嶇紑(閰嶇疆鏂囦欢鍚庣紑鍛藉悕)
- approvalNumberPrefix: DEV
-
- # 涓帹 Unipush 閰嶇疆
- getui:
- appId: PfjyAAE0FK64FaO1w2CMb1
- appKey: zTMb831OEL6J4GK1uE3Ob4
- masterSecret: K1GFtsv42v61tXGnF7SGE5
- domain: https://restapi.getui.cn/v2/
- # 绂荤嚎鎺ㄩ�佷娇鐢ㄧ殑鍖呭悕/缁勪欢鍚�
- intentComponent: uni.app.UNI099A590/io.dcloud.PandoraEntry
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 7003
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- 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
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- org.quartz: DEBUG
- com.ruoyi: warn
- org.springframework: warn
-
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- main:
- allow-circular-references: true # 鍏佽寰幆渚濊禆
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://localhost:3306/product-inventory-management-new-pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- slave:
- # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
- enabled: false
- url:
- username:
- password:
- # 鍒濆杩炴帴鏁�
- initialSize: 5
- # 鏈�灏忚繛鎺ユ睜鏁伴噺
- minIdle: 10
- # 鏈�澶ц繛鎺ユ睜鏁伴噺
- maxActive: 20
- # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- maxWait: 60000
- # 閰嶇疆杩炴帴瓒呮椂鏃堕棿
- connectTimeout: 30000
- # 閰嶇疆缃戠粶瓒呮椂鏃堕棿
- socketTimeout: 60000
- # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
- timeBetweenEvictionRunsMillis: 60000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- minEvictableIdleTimeMillis: 300000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- maxEvictableIdleTimeMillis: 900000
- # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- enabled: true
- # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
- allow:
- url-pattern: /druid/*
- # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
- login-username: ruoyi
- login-password: 123456
- filter:
- stat:
- enabled: true
- # 鎱QL璁板綍
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- data:
- mongodb:
- uri: mongodb://114.132.189.42:9028/chat_memory_db
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: 127.0.0.1
- # host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
- # password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
- # Quartz瀹氭椂浠诲姟閰嶇疆锛堟柊澧為儴鍒嗭級
- quartz:
- job-store-type: jdbc # 浣跨敤鏁版嵁搴撳瓨鍌�
- jdbc:
- initialize-schema: never # 棣栨杩愯鏃惰嚜鍔ㄥ垱寤鸿〃缁撴瀯锛屾垚鍔熷悗鏀逛负never
- schema: classpath:org/quartz/impl/jdbcjobstore/tables_mysql_innodb.sql # MySQL琛ㄧ粨鏋勮剼鏈�
- properties:
- org:
- quartz:
- scheduler:
- instanceName: RuoYiScheduler
- instanceId: AUTO
- jobStore:
- class: org.quartz.impl.jdbcjobstore.JobStoreTX
- driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate # MySQL閫傞厤
- tablePrefix: qrtz_ # 琛ㄥ悕鍓嶇紑锛屼笌鑴氭湰涓�鑷�
- isClustered: false # 鍗曡妭鐐规ā寮忥紙闆嗙兢闇�鏀逛负true锛�
- clusterCheckinInterval: 10000
- txIsolationLevelSerializable: true
- threadPool:
- class: org.quartz.simpl.SimpleThreadPool
- threadCount: 10 # 绾跨▼姹犲ぇ灏�
- threadPriority: 5
- makeThreadsDaemons: true
- updateCheck: false # 鍏抽棴鐗堟湰妫�鏌�
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜 鏂扮増jwt瀵嗛挜闀垮害蹇呴』64浣嶄互涓�
- secret: xpAVjhCjQDaDB7mjPAzMDSbQWXNu2zYkTdDNUsPMS5Xx8QMmQVYN7n74eZrYJxDJ
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-# 鏂囦欢涓婁紶閰嶇疆
-file:
- temp-dir: D:/ruoyi/temp/uploads # 涓存椂鐩綍 鍚庢湡鍒犻櫎
- upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍 鍚庢湡鍒犻櫎
- path: C:/Users/12631/Desktop/download/uploads # 涓婁紶鐩綍
- urlPrefix: /common # 閾炬帴鍓嶇紑
- domain: http://127.0.0.1:7003 # 鍩熷悕鍓嶇紑
- expired: 120 # 杩囨湡鏃堕棿(鍗曚綅:鍒嗛挓)
- useLimit: 10 # 浣跨敤娆℃暟
- compress: true # 鏄惁鍘嬬缉
- needCompressSize: 10MB # 鍘嬬缉闃堝��
- compressQuality: 0.5 # 鍘嬬缉璐ㄩ噺(0.0-1.0)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-qxy.yml
similarity index 90%
rename from src/main/resources/application-dev.yml
rename to src/main/resources/application-qxy.yml
index bda6bcf..a8e48d5 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-qxy.yml
@@ -1,3 +1,4 @@
+锘�
# 椤圭洰鐩稿叧閰嶇疆
ruoyi:
# 鍚嶇О
@@ -7,7 +8,7 @@
# 鐗堟潈骞翠唤
copyrightYear: 2025
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /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
-
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 70324c6..5f36149 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,7 +3,7 @@
main:
allow-circular-references: true
profiles:
- active: dev
+ active: qxy
langchain4j:
mcp:
# MCP 鏈嶅姟绔湴鍧�锛堟牴鎹疄闄呴儴缃茬殑 MCP 鏈嶅姟璋冩暣锛�
--
Gitblit v1.9.3