From fb3099e90f9249590020661f41b1905d41a8d8eb Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Thu, 21 May 2026 10:34:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=9Adev=E4=B8=BA=E7=BA=BF=E4=B8=8A=E5=8F=91?= =?UTF-8?q?=E7=89=88=EF=BC=8Clocal=E4=B8=BA=E6=9C=AC=E5=9C=B0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?url=E5=9C=B0=E5=9D=80=EF=BC=8C=E5=8C=B9=E9=85=8D=E5=86=85?= =?UTF-8?q?=E7=BD=91=EF=BC=8C=E5=A4=96=E7=BD=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 28 ++- .../src/main/resources/application-local.yml | 238 ++++++++++-------- .../src/main/resources/application.yml | 37 --- 3 files changed, 159 insertions(+), 144 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 80de356..d902801 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -1,3 +1,18 @@ +# 项目相关配置 +ruoyi: + # 名称 + name: RuoYi + # 版本 + version: 3.8.8 + # 版权年份 + copyrightYear: 2024 + # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + profile: /home/ruoyi/uploadPath + # 获取ip地址开关 + addressEnabled: false + # 验证码类型 math 数字计算 char 字符验证 + captchaType: math + # 数据源配置 spring: datasource: @@ -112,4 +127,15 @@ chat: audioText: asr: http://127.0.0.1:8000/asr/file - tts: http://127.0.0.1:19527/synthesize \ No newline at end of file + tts: http://127.0.0.1:19527/synthesize + +#浪潮单点登录相关 +lc_web_auth: + appId: cloud-out-2fb6330e9c0843e1a1424efda5d604c0 + appSecret: x14lueHbtLQL7Pz2G7gE4wcGCV6TDblO5xfeu9V2wGk= + getTokenUrl: http://100.128.128.6:9081/prod-psout-api/auth/token + getUserInfoUrl: http://100.128.128.6:9081/prod-psout-api/system/app/authorize/user/info + +lc_cms_auth: + appId: cloud-9793ee8a8c3d47b8871007ffc4128502 + appSecret: Yi+NACK70UPg8rFvsnnfBUq1wcLD4nm6ilC4II/4C4k= diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-admin/src/main/resources/application-local.yml index a1b2844..e58d146 100644 --- a/ruoyi-admin/src/main/resources/application-local.yml +++ b/ruoyi-admin/src/main/resources/application-local.yml @@ -1,116 +1,142 @@ +# 项目相关配置 +ruoyi: + # 名称 + name: RuoYi + # 版本 + version: 3.8.8 + # 版权年份 + copyrightYear: 2024 + # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + profile: /Users/chenyanchang/logs/ruoyi/uploadPath + # 获取ip地址开关 + addressEnabled: false + # 验证码类型 math 数字计算 char 字符验证 + captchaType: math + # 数据源配置 spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.highgo.jdbc.Driver - druid: - # 主库数据源 - master: - url: jdbc:highgo://39.98.44.136:6023/highgo?useUnicode=true&characterEncoding=utf8¤tSchema=shz&stringtype=unspecified - #username: syssso - username: sysdba - password: Hello@2026 + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.highgo.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:highgo://39.98.44.136:6023/highgo?useUnicode=true&characterEncoding=utf8¤tSchema=shz&stringtype=unspecified + #username: syssso + username: sysdba + password: Hello@2026 - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - # 初始连接数 - initialSize: 10 - # 最小连接池数量 - minIdle: 30 - # 最大连接池数量 - maxActive: 50 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置连接超时时间 - connectTimeout: 30000 - # 配置网络超时时间 - socketTimeout: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间，单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT version() - 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 - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true - redis: - # 地址 - host: 127.0.0.1 - # 端口，默认为6379 - port: 6379 - # 数据库索引 - database: 0 - # 密码 - password: SHZ2026@@.com - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 0 - # 连接池中的最大空闲连接 - max-idle: 8 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 10 + # 最小连接池数量 + minIdle: 30 + # 最大连接池数量 + maxActive: 50 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT version() + 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 + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true + redis: + # 地址 + host: 124.243.245.42 + # 端口，默认为6379 + port: 5379 + # 数据库索引 + database: 0 + # 密码 + password: ZKR2024@@.com + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms # easy-es -easy-es: - enable: true - banner: false - address: 127.0.0.1:9200 - global-config: - process-index-mode: manual - db-config: - refresh-policy: immediate - username: elastic - password: SHZ2026@@.com +#easy-es: +# enable: true +# banner: false +# address: 39.98.44.136:9200 +# global-config: +# process-index-mode: manual +# db-config: +# refresh-policy: immediate +# username: elastic +# password: SHZ2026@@.com #ai chat: - baseUrl: http://39.98.44.136:8082 - chatUrl: /v1/chat/completions - chatDetailUrl: /core/chat/getPaginationRecords - chatHistoryUrl: /core/chat/getHistories - updateNameUrl: /core/chat/updateHistory - stickChatUrl: /core/chat/updateHistory - delChatUrl: /core/chat/delHistory - delAllChatUrl: /core/chat/clearHistories - guestUrl: /v1/chat/completions - praiseUrl: /core/chat/feedback/updateUserFeedback - appId: 67cd49095e947ae0ca7fadd8 - apiKey: fastgpt-qMl63276wPZvKAxEkW77bur0sSJpmuC6Ngg9lzyEjufLhsBAurjT55j - model: qd-job-turbo + baseUrl: http://39.98.44.136:8082 + chatUrl: /v1/chat/completions + chatDetailUrl: /core/chat/getPaginationRecords + chatHistoryUrl: /core/chat/getHistories + updateNameUrl: /core/chat/updateHistory + stickChatUrl: /core/chat/updateHistory + delChatUrl: /core/chat/delHistory + delAllChatUrl: /core/chat/clearHistories + guestUrl: /v1/chat/completions + praiseUrl: /core/chat/feedback/updateUserFeedback + appId: 67cd49095e947ae0ca7fadd8 + apiKey: fastgpt-qMl63276wPZvKAxEkW77bur0sSJpmuC6Ngg9lzyEjufLhsBAurjT55j + model: qd-job-turbo audioText: - asr: http://127.0.0.1:8000/asr/file - tts: http://127.0.0.1:19527/synthesize \ No newline at end of file + asr: http://127.0.0.1:8000/asr/file + tts: http://127.0.0.1:19527/synthesize + +#浪潮单点登录相关 +lc_web_auth: + appId: cloud-out-2fb6330e9c0843e1a1424efda5d604c0 + appSecret: x14lueHbtLQL7Pz2G7gE4wcGCV6TDblO5xfeu9V2wGk= + getTokenUrl: http://218.31.252.15:9081/prod-psout-api/auth/token + getUserInfoUrl: http://218.31.252.15:9081/prod-psout-api/system/app/authorize/user/info + +lc_cms_auth: + appId: cloud-9793ee8a8c3d47b8871007ffc4128502 + appSecret: Yi+NACK70UPg8rFvsnnfBUq1wcLD4nm6ilC4II/4C4k= diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index c9d5e93..ebf2574 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -1,19 +1,3 @@ -# 项目相关配置 -ruoyi: - # 名称 - name: RuoYi - # 版本 - version: 3.8.8 - # 版权年份 - copyrightYear: 2024 - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: /home/ruoyi/uploadPath -# profile: /Users/chenyanchang/logs/ruoyi/uploadPath - # 获取ip地址开关 - addressEnabled: false - # 验证码类型 math 数字计算 char 字符验证 - captchaType: math - # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 @@ -76,15 +60,6 @@ token: # 令牌有效期（默认30分钟） expireTime: 30 -## MyBatis配置 -#mybatis: -# # 搜索指定包别名 -# typeAliasesPackage: com.ruoyi.**.domain -# # 配置mapper的扫描，找到所有的mapper.xml映射文件 -# mapperLocations: classpath*:mapper/**/*Mapper.xml -# # 加载全局的配置文件 -# configLocation: classpath:mybatis/mybatis-config.xml - # PageHelper分页插件 pagehelper: helperDialect: oracle @@ -193,15 +168,3 @@ oauth: connect-timeout: 10 read-timeout: 30 write-timeout: 30 -#浪潮单点登录相关 -lc_web_auth: - appId: cloud-out-2fb6330e9c0843e1a1424efda5d604c0 - appSecret: x14lueHbtLQL7Pz2G7gE4wcGCV6TDblO5xfeu9V2wGk= - getTokenUrl: http://100.128.128.6:9081/prod-psout-api/auth/token - getUserInfoUrl: http://100.128.128.6:9081/prod-psout-api/system/app/authorize/user/info - -lc_cms_auth: - appId: cloud-9793ee8a8c3d47b8871007ffc4128502 - appSecret: Yi+NACK70UPg8rFvsnnfBUq1wcLD4nm6ilC4II/4C4k= - -