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-test.yml | 70 ++++++++++++++++++----------------
1 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index 868108e..72465d6 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -1,4 +1,4 @@
-# 瑁呭娴嬭瘯搴撻厤缃�
+# 灏勯娴嬭瘯搴�
# 鏁版嵁婧愰厤缃�
spring:
@@ -8,9 +8,9 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://10.16.173.59:3306/center-lims-dz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.18.50:3306/center-lims?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: zttZTT123!
+ password: zttZTT123$%^
# 浠庡簱鏁版嵁婧�
slave:
@@ -66,13 +66,13 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: localhost
+ host: 192.168.18.50
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
database: 0
# # 瀵嗙爜
- password: zttZTT123!
+ password: Ztl123$%^
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -101,7 +101,7 @@
# 鏃ュ織閰嶇疆
logging:
- file-location: /center-lims/Java
+ file-location: /center-lims/after
level:
com.ruoyi: info
org.springframework: warn
@@ -109,54 +109,58 @@
# Swagger閰嶇疆
swagger:
# 鏄惁寮�鍚痵wagger
- enabled: true
+ enabled: false
+# minio瀹瑰櫒绠＄悊
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: /center-lims/Work/img
+ path: /center-lims/after/file/img
# 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
allowed: png,jpg,jpeg,gif
# 鎶ュ憡鍦板潃
-wordUrl: /center-lims/Work/word
+wordUrl: /center-lims/after/file/word
-#oa:
-# oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
-# prodIp: http://192.168.21.53:8081
-# unqualifiedProcessId: 41974
+# oa娴佺▼
+oa:
+ oaHost:
+ prodIp:
+ unqualifiedProcessId:
+
+# 浼佷笟寰俊鎺ㄩ��
+wechat:
+ # 璐ㄩ噺鎶ユ閫氱煡
+ examiningUrl:
# 浜轰簨绯荤粺
personnel:
# 姝ｅ紡鍦板潃
- code: https://ztt-sso.ztt.cn/oauth2/token
+ code:
# 瑁呭浜轰簨姝ｅ紡搴�
- appId: 6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044
- appSecret: 9b9c4735b1e5ee9d6a8544b9b38bb03
- companies: https://ztt-connector.ztt.cn/api/org/v1/companies
- simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId=
+ appId:
+ appSecret:
+ companies:
+ simple:
# 浜哄憳瀵嗙爜鑾峰彇
- 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
+ password:
+ department:
+ person:
ifs:
- contract: ZTZB
- contract-key-get: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=
- contract-key-post: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=
- custorder: http://192.168.20.47/PurchService.ashx?
- custorder-port: http://192.168.20.47:8008/PurchService.ashx?
- erp-services: http://192.168.20.47:8081
+ contract:
+ contract-key-get:
+ contract-key-post:
+ custorder:
+ custorder-port:
+ erp-services:
# 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@
mqtt:
--
Gitblit v1.9.3