From 43026feb786493c98e57cf06d9d6e7be58688c88 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 14:48:49 +0800
Subject: [PATCH] 配置文件修改
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/WxCpUtils.java | 6
cnas-process/src/main/java/com/ruoyi/process/schedule/ProcessTotaldealSchedule.java | 2
/dev/null | 175 -----------------------------------
ruoyi-admin/src/main/resources/application-test.yml | 70 +++++++------
cnas-device/src/main/java/com/ruoyi/device/task/DeviceRecordSchedule.java | 2
cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/task/RawMaterIalSchedule.java | 2
ruoyi-admin/src/main/resources/application-druid.yml | 10 +
cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java | 2
ruoyi-admin/src/main/resources/application.yml | 10 +-
cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java | 2
cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java | 4
12 files changed, 60 insertions(+), 227 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/task/DeviceRecordSchedule.java b/cnas-device/src/main/java/com/ruoyi/device/task/DeviceRecordSchedule.java
index 7ead8cb..c3597a5 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/task/DeviceRecordSchedule.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/task/DeviceRecordSchedule.java
@@ -31,7 +31,7 @@
* 鎻愰啋濉啓璁惧浣跨敤璁板綍
*/
// @Scheduled(cron = "0/5 * * * * *")
- @Scheduled(cron = "0 0 9 * * 6") // 姣忓懆鍏墽琛屼竴娆�
+// @Scheduled(cron = "0 0 9 * * 6") // 姣忓懆鍏墽琛屼竴娆�
public void task1() {
// 鏌ヨ鏈～鍐欑殑璁惧浣跨敤璁板綍
List<DeviceRecordDto> deviceRecords = deviceRecordMapper.selectNotFilled();
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java b/cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java
index 6cd870e..040406a 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java
@@ -20,7 +20,7 @@
@Resource
private ManageRecordIntervalsTotalService manageRecordIntervalsTotalService;
- @Scheduled(cron = "0 0 2 1 1 ?") //姣忓勾1鏈�1鍙�2鐐�
+// @Scheduled(cron = "0 0 2 1 1 ?") //姣忓勾1鏈�1鍙�2鐐�
public void manageRecordTotal() {
ManageRecordTotal manageRecordTotal = new ManageRecordTotal();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java
index 4e87b34..1144e06 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java
@@ -31,7 +31,7 @@
* 鎻愰啋濉啓璁惧浣跨敤璁板綍
*/
// @Scheduled(cron = "0/5 * * * * *")
- @Scheduled(cron = "0 0 9 1 * *") // 姣忔湀涓�鍙锋墽琛�
+// @Scheduled(cron = "0 0 9 1 * *") // 姣忔湀涓�鍙锋墽琛�
public void task1() {
// 鏌ヨ褰撴湀鍩硅璁″垝
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.M");
diff --git a/cnas-process/src/main/java/com/ruoyi/process/schedule/ProcessTotaldealSchedule.java b/cnas-process/src/main/java/com/ruoyi/process/schedule/ProcessTotaldealSchedule.java
index a99b6df..50965c7 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/schedule/ProcessTotaldealSchedule.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/schedule/ProcessTotaldealSchedule.java
@@ -21,7 +21,7 @@
@Resource
private ProcessTotalSampleService processTotalSampleService;
- @Scheduled(cron = "0 0 2 1 * ?") //姣忔湀1鍙�2鐐�
+// @Scheduled(cron = "0 0 2 1 * ?") //姣忔湀1鍙�2鐐�
public void processTotaldeal() {
ProcessTotaldeal processTotaldeal = new ProcessTotaldeal();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
diff --git a/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java b/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java
index 0c35317..30c545a 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java
@@ -32,7 +32,7 @@
* 鎻愰啋濉啓璁惧浣跨敤璁板綍
*/
// @Scheduled(cron = "0/5 * * * * *")
- @Scheduled(cron = "0 0 9 1 * *") // 姣忔湀1鍙锋墽琛�
+// @Scheduled(cron = "0 0 9 1 * *") // 姣忔湀1鍙锋墽琛�
public void task1() {
// 鏌ヨ褰撴湀鐩戠潱璁″垝
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.M");
diff --git a/cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java b/cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java
index 5f32fd2..85b1939 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java
@@ -69,7 +69,7 @@
* 鑾峰彇娓╁害婀垮害
*/
// @Scheduled(cron = "0/5 * * * * *")
- @Scheduled(cron = "0 0 9 * * 1-6") // 姣忓ぉ9鐐规墽琛屼竴娆� 闄や簡鏄熸湡澶�
+// @Scheduled(cron = "0 0 9 * * 1-6") // 姣忓ぉ9鐐规墽琛屼竴娆� 闄や簡鏄熸湡澶�
public void task1() {
checkLaboratoriesSchedule();
// 鏍规嵁鏃堕棿闄嶅簭锛岃幏鍙栧埌鏈�鏂扮殑涓�鏉℃暟鎹�
@@ -138,7 +138,7 @@
* 鑾峰彇娓╁害婀垮害
*/
// @Scheduled(cron = "0/5 * * * * *")
- @Scheduled(cron = "0 0 14 * * 1-5") // 姣忓ぉ14鐐规墽琛屼竴娆� 闄や簡鏄熸湡鍏拰鏄熸湡澶�
+// @Scheduled(cron = "0 0 14 * * 1-5") // 姣忓ぉ14鐐规墽琛屼竴娆� 闄や簡鏄熸湡鍏拰鏄熸湡澶�
public void task2() {
// 妫�鏌ュ疄楠屽鏄惁鏈変换鍔� 濡傛灉娌℃湁鏂板浠诲姟
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/task/RawMaterIalSchedule.java b/inspect-server/src/main/java/com/ruoyi/inspect/task/RawMaterIalSchedule.java
index c15200c..bb79245 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/task/RawMaterIalSchedule.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/task/RawMaterIalSchedule.java
@@ -19,7 +19,7 @@
/**
* 瀹氭椂浠诲姟鑾峰彇閲囪喘璁㈠崟
*/
- @Scheduled(fixedDelay = 1200000)
+// @Scheduled(fixedDelay = 1200000)
public void getIfsOrderTiming() {
insOrderService.getIfsOrder();
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index ade7e87..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:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
deleted file mode 100644
index 8830a70..0000000
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-# 鍏徃娴嬭瘯搴�
-
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://114.132.189.42:9004/lims-ruoyi-test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- slave:
- # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
- enabled: false
- url:
- username:
- password:
- # 鍒濆杩炴帴鏁�
- initialSize: 5
- # 鏈�灏忚繛鎺ユ睜鏁伴噺
- minIdle: 10
- # 鏈�澶ц繛鎺ユ睜鏁伴噺
- maxActive: 20
- # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- maxWait: 60000
- # 閰嶇疆杩炴帴瓒呮椂鏃堕棿
- connectTimeout: 30000
- # 閰嶇疆缃戠粶瓒呮椂鏃堕棿
- socketTimeout: 60000
- # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
- timeBetweenEvictionRunsMillis: 60000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- minEvictableIdleTimeMillis: 300000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- maxEvictableIdleTimeMillis: 900000
- # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- enabled: true
- # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
- allow:
- url-pattern: /druid/*
- # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
- login-username: ruoyi
- login-password: 123456
- filter:
- stat:
- enabled: true
- # 鎱QL璁板綍
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
-
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: localhost
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 1
- # 瀵嗙爜
- 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
-
-# 鏃ュ織閰嶇疆
-logging:
- file-location: /javaWork/lims-ruoyi
- level:
- com.ruoyi: info
- org.springframework: warn
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
-
-# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
-file:
- path: /javaWork/lims-ruoyi/file/img
- # 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
- allowed: png,jpg,jpeg,gif
-
-wordUrl: /javaWork/lims-ruoyi/file/word
-
-
-#oa:
-# oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
-# prodIp: http://192.168.21.53:8081
-# unqualifiedProcessId: 41974
-
-wechat:
- # 璐ㄩ噺鎶ユ閫氱煡
- examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964
-
-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
-
-# 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@
-mqtt:
- url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p
- username: forwarder # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
- password: ZTlink12345 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
- timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
- keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
- qos: 1 # 蹇冭烦鍖呯骇鍒�
- completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
- clientId: javaPublish # clientId
- subscribe: /ztt/v3/2443521/publish # 璁㈤槄涓婚
- client: false # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index 824eb9f..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://127.0.0.1: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:
diff --git a/ruoyi-admin/src/main/resources/application-ztzb.yml b/ruoyi-admin/src/main/resources/application-ztzb.yml
deleted file mode 100644
index bc4dc4a..0000000
--- a/ruoyi-admin/src/main/resources/application-ztzb.yml
+++ /dev/null
@@ -1,175 +0,0 @@
-# 瑁呭姝ｅ紡搴�
-
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://127.0.0.1:3306/ztzb-lims?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: zttZTT123!
-
- # 浠庡簱鏁版嵁婧�
- slave:
- # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
- enabled: false
- url:
- username:
- password:
- # 鍒濆杩炴帴鏁�
- initialSize: 5
- # 鏈�灏忚繛鎺ユ睜鏁伴噺
- minIdle: 10
- # 鏈�澶ц繛鎺ユ睜鏁伴噺
- maxActive: 20
- # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- maxWait: 60000
- # 閰嶇疆杩炴帴瓒呮椂鏃堕棿
- connectTimeout: 30000
- # 閰嶇疆缃戠粶瓒呮椂鏃堕棿
- socketTimeout: 60000
- # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
- timeBetweenEvictionRunsMillis: 60000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- minEvictableIdleTimeMillis: 300000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- maxEvictableIdleTimeMillis: 900000
- # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- enabled: true
- # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
- allow:
- url-pattern: /druid/*
- # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
- login-username: ruoyi
- login-password: 123456
- filter:
- stat:
- enabled: true
- # 鎱QL璁板綍
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
-
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: localhost
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # # 瀵嗙爜
- password: zttZTT123!
- # 杩炴帴瓒呮椂鏃堕棿
- 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
-
-# 鏃ュ織閰嶇疆
-logging:
- file-location: /center-lims/after
- level:
- com.ruoyi: info
- org.springframework: warn
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: false
-
-# minio瀹瑰櫒绠＄悊
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
-
-# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
-file:
- path: /center-lims/after/file/img
- # 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
- allowed: png,jpg,jpeg,gif
-# 鎶ュ憡鍦板潃
-wordUrl: /center-lims/after/file/word
-
-# oa娴佺▼
-oa:
- oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
- prodIp: http://192.168.21.53:8001/lims
- unqualifiedProcessId: 41974
-
-# 浼佷笟寰俊鎺ㄩ��
-wechat:
- # 璐ㄩ噺鎶ユ閫氱煡
- examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=6e1d2d18-0c60-4889-a05f-b1b5479c9188
-
-# 浜轰簨绯荤粺
-personnel:
- # 姝ｅ紡鍦板潃
- code: https://ztt-sso.ztt.cn/oauth2/token
- # 瑁呭浜轰簨姝ｅ紡搴�
- 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=
- # 浜哄憳瀵嗙爜鑾峰彇
- 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/
-
-ifs:
- contract: ZTZB
- contract-key-get: x%2bvbGReagnsK%2fDr45xkVcGLOh%2fWWGODQ2inBGeNwbZw%3d
- contract-key-post: x+vbGReagnsK/Dr45xkVcGLOh/WWGODQ2inBGeNwbZw=
- custorder: http://192.168.20.50/PurchService.ashx?
- custorder-port: http://192.168.20.50:8008/PurchService.ashx?
- erp-services: http://192.168.20.50:8081
-
-# 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@
-mqtt:
- url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p
- username: forwarder # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
- password: ZTlink12345 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
- timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
- keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
- qos: 1 # 蹇冭烦鍖呯骇鍒�
- completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
- clientId: javaPublish # clientId
- subscribe: /ztt/v3/2443521/publish # 璁㈤槄涓婚
- client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 690f2d7..5cc4f11 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -16,7 +16,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛
- port: 8001
+ port: 7002
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path:
@@ -46,7 +46,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: druid
+ active: test
# 鍏ㄥ眬鏃堕棿澶勭悊 LocalDateTime鏃堕棿搴忓垪鍙�
jackson:
date-format: yyyy-MM-dd HH:mm:ss
@@ -91,8 +91,8 @@
#闆嗗洟缁熶竴鐧诲綍
sso:
url: https://ztt-sso.asuncloud.net
- clientId: 47ded514-f447-43b4-afdf-181c10e2222d
- clientSecret: appSecret:ea93d26a68863da5d71a6e3355ec22df
- callbackUrl: https://ztzb-lims.ztt.cn/thirdpartylogin
+ clientId:
+ clientSecret:
+ callbackUrl:
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/WxCpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/WxCpUtils.java
index 32266bf..92cbff7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/WxCpUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/WxCpUtils.java
@@ -22,9 +22,9 @@
*/
public class WxCpUtils {
- public static final String CORP_ID = "wwa423654b975441ac";
- public static final String CORP_SECRET = "snXq8qwA5tGu0YN1PlSDQqr6u9x3A0c_jQDmt8CN8Vs";
- public static final Integer AGENT_ID = 1000515;
+ public static final String CORP_ID = "";
+ public static final String CORP_SECRET = "";
+ public static final Integer AGENT_ID = null;
/**
* @param user 渚嬶細ZT-033268|ZT-028629锛屽涓腑闂寸敤|闅斿紑
--
Gitblit v1.9.3