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 | 76 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 33a491d..6ef6596 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -1,3 +1,5 @@
+# 鏈湴
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -6,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
# 浠庡簱鏁版嵁婧�
@@ -60,26 +66,70 @@
config:
multi-statement-allow: true
+ # redis 閰嶇疆
+ redis:
+ # 鍦板潃
+ host: localhost
+ # 绔彛锛岄粯璁や负6379
+ port: 6379
+ # 鏁版嵁搴撶储寮�
+ database: 0
+ # # 瀵嗙爜
+ # password: root2022!
+ # 杩炴帴瓒呮椂鏃堕棿
+ timeout: 10s
+ lettuce:
+ pool:
+ # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ min-idle: 0
+ # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ max-idle: 8
+ # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ max-active: 8
+ # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1ms
+
+# mybatis-plus閰嶇疆
+mybatis-plus:
+ mapper-locations: classpath*:mapper/**/*Mapper.xml
+ type-aliases-package: com.ruoyi.**.domain
+ global-config:
+ banner: off
+ db-config:
+ id-type: auto
+ configuration:
+ map-underscore-to-camel-case: true
+ cache-enabled: false
+ 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:
path: D:\椤圭洰鏂囦欢瀛樺偍\image
- # 杞琾df鏂囦欢璺緞
- licenseUrl: D:\20892\Desktop\lims\code\center-lims-after\inspect-server\src\main\resources\lib\license.xml
# 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
allowed: png,jpg,jpeg,gif
wordUrl: D:\椤圭洰鏂囦欢瀛樺偍\word
-twoCode: D:\椤圭洰鏂囦欢瀛樺偍\two_code
-outPath: D:\椤圭洰鏂囦欢瀛樺偍\image
#oa:
@@ -87,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