From 509c0c56420cf9383abb578de1b3ac7c0ad6ba49 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 22 Oct 2025 14:25:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E5=B1=A5=E8=81=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ldlz-admin/pom.xml | 10 +- .../src/main/resources/application-druid.yml | 28 +++--- .../src/main/resources/application-prod.yml | 91 +++++-------------- ldlz-admin/src/main/resources/application.yml | 14 ++- 4 files changed, 48 insertions(+), 95 deletions(-) diff --git a/ldlz-admin/pom.xml b/ldlz-admin/pom.xml index cdae688..b4302b5 100644 --- a/ldlz-admin/pom.xml +++ b/ldlz-admin/pom.xml @@ -24,11 +24,11 @@ 2.1.0.RELEASE - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - 2021.1 - + + + + + diff --git a/ldlz-admin/src/main/resources/application-druid.yml b/ldlz-admin/src/main/resources/application-druid.yml index 6b4b10f..6e159cd 100644 --- a/ldlz-admin/src/main/resources/application-druid.yml +++ b/ldlz-admin/src/main/resources/application-druid.yml @@ -9,11 +9,11 @@ spring: password: nacos discovery: # nacos地址 - server-addr: 127.0.0.1:8848 - namespace: 289db019-a290-4903-ac1a-5d341af8b272 - config: - server-addr: 127.0.0.1:8848 - namespace: 289db019-a290-4903-ac1a-5d341af8b272 + server-addr: 192.168.0.31:30012 + namespace: 2dff7ae9-6569-4edc-a86f-f4255ad16cd4 +# config: +# server-addr: 192.168.0.14:18848 +# namespace: e0337b55-080d-456e-8449-46d68dceee5b datasource: type: com.alibaba.druid.pool.DruidDataSource @@ -21,16 +21,16 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://127.0.0.1:3306/ldlz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: mroot - password: bonus@admin123 + url: jdbc:mysql://192.168.0.31:30937/gold-pm-v2.0-hn-xssz-bns-ldlz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: 5168cpT# # 从库数据源 slave: - # 从数据源开关/默认关闭 - enabled: false - url: jdbc:mysql://120.48.23.33:3307/zyry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: ldlz - password: E2GWTDG45FRRBSBt +# # 从数据源开关/默认关闭 +# enabled: false +# url: jdbc:mysql://120.48.23.33:3307/zyry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: ldlz +# password: E2GWTDG45FRRBSBt # 初始连接数 initialSize: 5 # 最小连接池数量 @@ -54,7 +54,7 @@ spring: testWhileIdle: true testOnBorrow: false testOnReturn: false - webStatFilter: + webStatFilter: enabled: true statViewServlet: enabled: true diff --git a/ldlz-admin/src/main/resources/application-prod.yml b/ldlz-admin/src/main/resources/application-prod.yml index b19061c..f0b149e 100644 --- a/ldlz-admin/src/main/resources/application-prod.yml +++ b/ldlz-admin/src/main/resources/application-prod.yml @@ -1,56 +1,36 @@ -# 项目相关配置 -ldlz: - # 名称 - name: Ldlz - # 版本 - version: 3.8.7 - # 版权年份 - copyrightYear: 2023 - # 文件路径 示例（ Windows配置 D:/ldlz/uploadPath，Linux配置 /home/ldlz/uploadPath） - # profile: E:/ldlz/uploadPath - profile: /home/ldlz/uploadPath - # 获取ip地址开关 - addressEnabled: false - # 验证码类型 math 数字计算 char 字符验证 - captchaType: math - -# 开发环境配置 -server: - # 服务器的HTTP端口，默认为8080 - port: 9001 - # port: 8080 - servlet: - # 应用的访问路径 - context-path: / - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # 连接数满后的排队数，默认为100 - accept-count: 1000 - threads: - # tomcat最大线程数，默认为200 - max: 800 - # Tomcat启动初始化的线程数，默认值10 - min-spare: 100 - # 数据源配置 spring: + application: + name: bonus-ldlz + cloud: + nacos: + # nacos.core.auth.enabled=true 开启权限验证 + username: nacos + password: nacos + discovery: + # nacos地址 + server-addr: 192.168.0.14:18848 + namespace: e0337b55-080d-456e-8449-46d68dceee5b + # config: + # server-addr: 192.168.0.14:18848 + # namespace: e0337b55-080d-456e-8449-46d68dceee5b + datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver druid: # 主库数据源 master: - url: jdbc:mysql://192.168.0.70:2000/ldlz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.0.14:2009/ldlz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: Bonus@admin123! # 从库数据源 slave: - # 从数据源开关/默认关闭 - enabled: true - url: jdbc:mysql://192.168.0.70:2000/zyry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: Bonus@admin123! +# # 从数据源开关/默认关闭 +# enabled: false +# url: jdbc:mysql://120.48.23.33:3307/zyry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: ldlz +# password: E2GWTDG45FRRBSBt # 初始连接数 initialSize: 5 # 最小连接池数量 @@ -74,7 +54,7 @@ spring: testWhileIdle: true testOnBorrow: false testOnReturn: false - webStatFilter: + webStatFilter: enabled: true statViewServlet: enabled: true @@ -93,29 +73,4 @@ spring: merge-sql: true wall: config: - multi-statement-allow: true - # redis 配置 - redis: - # 地址 - host: 192.168.0.70 - # 端口，默认为6379 - port: 6379 - # 数据库索引 - database: 13 - # 密码 - password: Hnsmz@070redis! - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 0 - # 连接池中的最大空闲连接 - max-idle: 8 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms - -index: - url: https://www.hnsbd.com.cn/h5/index.html#/pages/loginToken + multi-statement-allow: true \ No newline at end of file diff --git a/ldlz-admin/src/main/resources/application.yml b/ldlz-admin/src/main/resources/application.yml index 92e71ab..74ef14b 100644 --- a/ldlz-admin/src/main/resources/application.yml +++ b/ldlz-admin/src/main/resources/application.yml @@ -7,8 +7,8 @@ ldlz: # 版权年份 copyrightYear: 2023 # 文件路径 示例（ Windows配置 D:/ldlz/uploadPath，Linux配置 /home/ldlz/uploadPath） - profile: E:/ldlz/uploadPath -# profile: /home/ldlz/uploadPath + # profile: E:/ldlz/uploadPath + profile: /home/ldlz/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 @@ -18,7 +18,7 @@ ldlz: server: # 服务器的HTTP端口，默认为8080 # port: 9001 - port: 38080 + port: 48181 servlet: # 应用的访问路径 context-path: / @@ -54,8 +54,8 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: @profile.active@ -# active: prod + # active: @profile.active@ + active: druid # 文件上传 servlet: multipart: @@ -72,12 +72,10 @@ spring: redis: # 地址 host: 127.0.0.1 - # 端口，默认为6379 port: 6379 - # 数据库索引 + # password: Fyzbns@Redis123! database: 13 # 密码 - password: # 连接超时时间 timeout: 10s lettuce: