From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
index bf9bf19..2a44c8b 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 9999
tomcat:
max-swallow-size: -1
error:
@@ -132,11 +132,21 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:sqlserver://192.168.0.29:1433;databasename=LXZN_TEST_430
+ url: jdbc:sqlserver://166.0.1.10:1433;databasename=LXZN_TEST_430
username: sa
- password: LXZN@1688
+ password: 123
#password: 123
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ #url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ #username: root
+ #password: root
+ #driver-class-name: com.mysql.cj.jdbc.Driver
+ # 澶氭暟鎹簮閰嶇疆
+ #multi-datasource1:
+ # url: jdbc:sqlserver://192.168.0.118:1433;databasename=lxzn_test
+ # username: sa
+ # password: 123
+ # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
#redis 閰嶇疆
redis:
database: 0
@@ -169,7 +179,7 @@
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
# 绛惧悕鎷︽埅鎺ュ彛
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
- #local\minio\alioss
+ #local銆乵inio銆乤lioss
uploadType: local
# 鍓嶇璁块棶鍦板潃
domainUrl:
@@ -177,9 +187,9 @@
app: http://localhost:8051
path:
#鏂囦欢涓婁紶鏍圭洰褰� 璁剧疆
- upload: /opt/jeecg-boot/upload
+ upload: /opt/upFiles
#webapp鏂囦欢璺緞
- webapp: /opt/jeecg-boot/webapp
+ webapp: /opt/webapp
shiro:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
#闃块噷浜憃ss瀛樺偍鍜屽ぇ楸肩煭淇＄閽ラ厤缃�
--
Gitblit v1.9.3