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-dev.yml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
index 8e154cd..98fee06 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 9999
tomcat:
max-swallow-size: -1
error:
@@ -132,11 +132,10 @@
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://30036q420j.yicp.fun:11047;databasename=LXZN_TEST_430
+ url: jdbc:sqlserver://192.168.0.118: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
@@ -153,7 +152,7 @@
database: 0
host: 127.0.0.1
port: 6379
- password:
+ password: 123456
#mybatis plus 璁剧疆
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
@@ -188,9 +187,9 @@
app: http://localhost:8051
path:
#鏂囦欢涓婁紶鏍圭洰褰� 璁剧疆
- upload: /opt/upFiles
+ upload: C://opt//upFiles
#webapp鏂囦欢璺緞
- webapp: /opt/webapp
+ webapp: C://opt//upFiles
shiro:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
#闃块噷浜憃ss瀛樺偍鍜屽ぇ楸肩煭淇＄閽ラ厤缃�
--
Gitblit v1.9.3