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-dev.yml | 64 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 15 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 eab0127..d6da6ac 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
@@ -7,12 +7,11 @@
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
- context-path:
+ context-path: /jeecg-boot
compression:
enabled: true
min-response-size: 1024
mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
-
management:
endpoints:
web:
@@ -37,6 +36,8 @@
required: true
## quartz瀹氭椂浠诲姟,閲囩敤鏁版嵁搴撴柟寮�
quartz:
+ jdbc:
+ initialize-schema: never
job-store-type: jdbc
initialize-schema: embedded
#瀹氭椂浠诲姟鍚姩寮�鍏筹紝true-寮� false-鍏�
@@ -126,16 +127,27 @@
connectProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_HANGYU
+ # url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_WK
+ # url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_WK_WX
+ # url: jdbc:sqlserver://i300r36420.vicp.fun:22327;databasename=LXZN_TEST_WK_WX
+ # 娌冨厠鐜板満
+ url: jdbc:sqlserver://192.168.4.21:1433;databasename=LXZN_MDC_WK_WX
username: sa
- password: 123
+# password: 123
+ password: Lxzn1688
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ # 娌冨厠鐜板満
+# mesSoAdb:
+# url: jdbc:mysql://127.0.0.1:3306/basic_data?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+# username: root
+# password: 123456
+# driver-class-name: com.mysql.cj.jdbc.Driver
#redis 閰嶇疆
redis:
database: 0
host: 127.0.0.1
port: 6379
- password: 123456
+ password: ''
flowable:
enable: true
#鍏抽棴瀹氭椂浠诲姟JOB
@@ -254,10 +266,16 @@
client-secret: ??
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
WECHAT_ENTERPRISE:
- client-id: ??
- client-secret: ??
- redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
- agent-id: ??
+ # 鐏电浼佷笟寰俊娴嬭瘯鍐呭缓搴旂敤
+# client-id: ww5999b2643c95fa75
+# client-secret: 86jN7TtWMxjiFoWPgMQYBCu46bOoEkpfscvuyvsS31Y
+# redirect-uri: http://houjie.xalxzn.com:8866/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
+# agent-id: 1000002
+ # 娌冨厠鐜板満搴旂敤
+ client-id: ww86725cd81a15d1de
+ client-secret: y5jKrgtcuWR0t2EfHgdOmiSXvAQU28PztgBuPdPmFCU
+ redirect-uri: https://fastwoke.cn:8087/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
+ agent-id: 1000014
DINGTALK:
client-id: ??
client-secret: ??
@@ -272,19 +290,29 @@
timeout: 1h
#绗笁鏂笰PP瀵规帴
third-app:
- enabled: false
+ enabled: true
type:
#浼佷笟寰俊
WECHAT_ENTERPRISE:
- enabled: false
+ enabled: true
+ # 鐏电浼佷笟寰俊娴嬭瘯鍐呭缓搴旂敤
+# #CORP_ID
+# client-id: ww5999b2643c95fa75
+# #SECRET
+# client-secret: 86jN7TtWMxjiFoWPgMQYBCu46bOoEkpfscvuyvsS31Y
+# #鑷缓搴旂敤id
+# agent-id: 1000002
+# #鑷缓搴旂敤绉橀挜锛堟柊鐗堜紒寰渶瑕侀厤缃級
+# agent-app-secret: 86jN7TtWMxjiFoWPgMQYBCu46bOoEkpfscvuyvsS31Y
+ # 娌冨厠鐜板満搴旂敤
#CORP_ID
- client-id: ??
+ client-id: ww86725cd81a15d1de
#SECRET
- client-secret: ??
+ client-secret: y5jKrgtcuWR0t2EfHgdOmiSXvAQU28PztgBuPdPmFCU
#鑷缓搴旂敤id
- agent-id: ??
+ agent-id: 1000014
#鑷缓搴旂敤绉橀挜锛堟柊鐗堜紒寰渶瑕侀厤缃級
- # agent-app-secret: ??
+ agent-app-secret: y5jKrgtcuWR0t2EfHgdOmiSXvAQU28PztgBuPdPmFCU
#閽夐拤
DINGTALK:
enabled: false
@@ -336,3 +364,9 @@
ncSend:
addOrDelete: false #//鏄惁鍒犻櫎seed 涓殑涔嬪墠鏂囦欢
#staticAccessPath: /api/ffile/** # 褰撳墠椤圭洰鐨勯潤鎬佽祫婧愯闂厤缃湪nginx涓�
+# 浼佷笟寰俊妯℃澘鍗＄墖娑堟伅鐐瑰嚮鍚庤烦杞殑 url
+wechatEnterprise:
+ # 鐏电浼佷笟寰俊娴嬭瘯鍐呭缓搴旂敤
+# cardActionUrl: https://houjie.xalxzn.com:8866/h5
+ # 娌冨厠鐜板満搴旂敤
+ cardActionUrl: https://fastwoke.cn:8087/h5/#
--
Gitblit v1.9.3