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 | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 722d41f..6ef6596 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,11 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://114.132.189.42:9004/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: 123456
# 浠庡簱鏁版嵁婧�
@@ -96,15 +100,28 @@
configuration:
map-underscore-to-camel-case: true
cache-enabled: false
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ log-impl: # org.apache.ibatis.logging.stdout.StdOutImpl
+
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: true
+
+# 鏃ュ織閰嶇疆
+logging:
+ file-location: /javaWork/lims-ruoyi
+ level:
+ com.ruoyi: info
+ org.springframework: warn
minio:
- endpoint: http://114.132.189.42/
- port: 7019
+ endpoint: http://114.132.189.42:7019
secure: false
accessKey: admin
secretKey: 12345678
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
+ bucketName: radio-frequency
+ publicUrl:
# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
file:
@@ -113,7 +130,6 @@
allowed: png,jpg,jpeg,gif
wordUrl: D:\椤圭洰鏂囦欢瀛樺偍\word
-twoCode: D:\椤圭洰鏂囦欢瀛樺偍\two_code
#oa:
@@ -121,6 +137,18 @@
# prodIp: http://192.168.21.53:8081
# unqualifiedProcessId: 41974
+# 浜轰簨绯荤粺
+personnel:
+ 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:
# 璐ㄩ噺鎶ユ閫氱煡
examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964
--
Gitblit v1.9.3