From deb25b1c56eafc4a8a9fc293b7807baad99e216c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 03 四月 2025 15:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency
---
ruoyi-admin/src/main/resources/application-druid.yml | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 719bc31..6ef6596 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -1,4 +1,4 @@
-# 瑁呭姝ｅ紡搴�
+# 鏈湴
# 鏁版嵁婧愰厤缃�
spring:
@@ -8,9 +8,13 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://10.16.173.59:3306/lims-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# url: jdbc:mysql://127.0.0.1:3306/lims-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: root
+# password: zttZTT123!
+ # 宸ユ椂鏁版嵁搴�
+ url: jdbc:mysql://114.132.189.42:9004/zt_radio_requency?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: zttZTT123!
+ password: 123456
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -135,14 +139,14 @@
# 浜轰簨绯荤粺
personnel:
- code:
- appId:
- appSecret:
- companies:
- simple:
- password:
- department:
- person:
+ code: https://ztt-sso.ztt.cn/oauth2/token
+ appId: f6f3d70f-3666-4d3d-b9c5-430de3f6007c
+ appSecret: a18923496542302066b0a7bec993a4e2
+ companies: https://ztt-connector.ztt.cn/api/org/v1/companies
+ simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId=
+ password: https://ztt-connector.ztt.cn/api/org/v1/employees/original_pwd/
+ department: https://ztt-connector.ztt.cn/api/org/v1/companies/companyId/departments
+ person: https://ztt-connector.ztt.cn/api/org/v1/employees/simple/
# 浼佷笟寰俊閫氱煡
wechat:
--
Gitblit v1.9.3