From ed32b4831acf1612d23015d85ff4a14db7f9f77d Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期三, 16 七月 2025 15:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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 424cb23..2109987 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: 6099
+  port: 9999
   tomcat:
     max-swallow-size: -1
   error:
@@ -132,9 +132,9 @@
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:sqlserver://localhost:1433;databasename=LXZN_TEST_COMMON
+          url: jdbc:sqlserver://192.168.4.21:1433;databasename=LXZN_MDC_WK
           username: sa
-          password: 123
+          password: Lxzn1688
           driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
   #redis 閰嶇疆
   redis:
@@ -142,6 +142,11 @@
     host: 127.0.0.1
     port: 6379
     password:
+flowable:
+  enable: false
+  #鍏抽棴瀹氭椂浠诲姟JOB
+  async-executor-activate: false
+  database-schema-update: true
 #mybatis plus 璁剧疆
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
@@ -291,4 +296,9 @@
       client-id: ??
       # appSecret
       client-secret: ??
-      agent-id: ??
\ No newline at end of file
+      agent-id: ??
+fileHomePath: ${UPLOAD_FOLDER:d://lxzn_storage}
+fileNCPath: ${NC_FOLDER:D://NC} # NC鏂囦欢浣嶇疆
+ncSend:
+  addOrDelete: false  #//鏄惁鍒犻櫎seed 涓殑涔嬪墠鏂囦欢
+#staticAccessPath: /api/ffile/** # 褰撳墠椤圭洰鐨勯潤鎬佽祫婧愯闂厤缃湪nginx涓�

--
Gitblit v1.9.3