From bb6bb3e166385332f00e55d0d0e2daafc5dbc717 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期五, 11 七月 2025 10:15:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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..bf453ac 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:
@@ -126,7 +125,7 @@
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
username: sa
password: 123
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -135,7 +134,7 @@
database: 0
host: 127.0.0.1
port: 6379
- password: 123456
+ password: ''
flowable:
enable: true
#鍏抽棴瀹氭椂浠诲姟JOB
@@ -254,10 +253,10 @@
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
DINGTALK:
client-id: ??
client-secret: ??
@@ -272,19 +271,19 @@
timeout: 1h
#绗笁鏂笰PP瀵规帴
third-app:
- enabled: false
+ enabled: true
type:
#浼佷笟寰俊
WECHAT_ENTERPRISE:
- enabled: false
+ enabled: true
#CORP_ID
- client-id: ??
+ client-id: ww5999b2643c95fa75
#SECRET
- client-secret: ??
+ client-secret: 86jN7TtWMxjiFoWPgMQYBCu46bOoEkpfscvuyvsS31Y
#鑷缓搴旂敤id
- agent-id: ??
+ agent-id: 1000002
#鑷缓搴旂敤绉橀挜锛堟柊鐗堜紒寰渶瑕侀厤缃級
- # agent-app-secret: ??
+ agent-app-secret: 86jN7TtWMxjiFoWPgMQYBCu46bOoEkpfscvuyvsS31Y
#閽夐拤
DINGTALK:
enabled: false
@@ -336,3 +335,6 @@
ncSend:
addOrDelete: false #//鏄惁鍒犻櫎seed 涓殑涔嬪墠鏂囦欢
#staticAccessPath: /api/ffile/** # 褰撳墠椤圭洰鐨勯潤鎬佽祫婧愯闂厤缃湪nginx涓�
+# 浼佷笟寰俊妯℃澘鍗＄墖娑堟伅鐐瑰嚮鍚庤烦杞殑 url
+wechatEnterprise:
+ cardActionUrl: https://houjie.xalxzn.com:8866/h5
--
Gitblit v1.9.3