From 1f075ff6fdf2cdd4d15532b408ceb3420bcc1004 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 23 四月 2025 00:00:20 +0800
Subject: [PATCH] 耐丝调整
---
ruoyi-admin/src/main/resources/application-test.yml | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java | 2
ruoyi-admin/src/main/resources/application-ztns.yml | 8 +-
cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java | 8 +-
ruoyi-common/src/main/java/com/ruoyi/common/utils/WxCpUtils.java | 13 +-
cnas-process/src/main/java/com/ruoyi/process/schedule/ProcessTotaldealSchedule.java | 2
/dev/null | 158 ---------------------------------------
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/service/impl/InsReportServiceImpl.java | 6
inspect-server/src/main/resources/static/report-template.docx | 0
cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 6
13 files changed, 27 insertions(+), 184 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 b721c1d..abead17 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
@@ -86,7 +86,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();
// 鏍规嵁鏃堕棿闄嶅簭锛岃幏鍙栧埌鏈�鏂扮殑涓�鏉℃暟鎹�
@@ -183,7 +183,7 @@
* 鑾峰彇娓╁害婀垮害
*/
// @Scheduled(cron = "0/5 * * * * *")
- @Scheduled(cron = "0 0 14 * * 1-5") // 姣忓ぉ14鐐规墽琛屼竴娆� 闄や簡鏄熸湡鍏拰鏄熸湡澶�
+// @Scheduled(cron = "0 0 14 * * 1-5") // 姣忓ぉ14鐐规墽琛屼竴娆� 闄や簡鏄熸湡鍏拰鏄熸湡澶�
public void task2() {
// 妫�鏌ュ疄楠屽鏄惁鏈変换鍔� 濡傛灉娌℃湁鏂板浠诲姟
@@ -295,7 +295,7 @@
* 鑾峰彇娓╁害婀垮害
*/
// @Scheduled(cron = "0/5 * * * * *")
- @Scheduled(cron = "0 0 9 * * 7") //
+// @Scheduled(cron = "0 0 9 * * 7") //
public void task3() {
checkLaboratoriesSchedule();
@@ -338,7 +338,7 @@
*
*/
// @Scheduled(cron = "0/5 * * * * *")
- @Scheduled(cron = "0 0 16 * * 1-6") // 姣忓ぉ15鐐规墽琛屼竴娆� 闄や簡鏄熸湡澶�
+// @Scheduled(cron = "0 0 16 * * 1-6") // 姣忓ぉ15鐐规墽琛屼竴娆� 闄や簡鏄熸湡澶�
public void affirmTempHum() {
// 鏌ヨ鏈夋棩鏈熶絾鏄湭濉啓鍚嶅瓧鐨�
List<FeTempHumRecordDto> feTempHumRecordList = feTempHumRecordMapper.selectNoaffirm(LocalDate.now());
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index c6f3e6b..848f1da 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -911,7 +911,7 @@
.last("limit 1"));
threadPoolTaskExecutor.execute(() -> {
String message = "";
- message += "妫�楠屼换鍔″鏍搁�氱煡";
+ message += "鑰愪笣绯荤粺妫�楠屼换鍔″鏍搁�氱煡";
message += "\n鎻愪氦浜�: " + userName;
message += "\n濮旀墭缂栧彿: " + order.getEntrustCode();
message += "\n鏍峰搧鍚嶇О: " + insSample.getModel();
@@ -1172,7 +1172,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
String message = "";
- message += "鎶ュ憡缂栧埗瀹℃壒閫氱煡";
+ message += "鑰愪笣绯荤粺鎶ュ憡缂栧埗瀹℃壒閫氱煡";
message += "\n妫�楠屼汉: " + userName;
message += "\n澶嶆牳浜�: " + chenkUserName;
message += "\n濮旀墭缂栧彿: " + order.getEntrustCode();
@@ -1214,7 +1214,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
String message = "";
- message += "妫�楠屼换鍔″鏍搁��鍥為�氱煡";
+ message += "鑰愪笣绯荤粺妫�楠屼换鍔″鏍搁��鍥為�氱煡";
message += "\n澶嶆牳浜�: " + userName;
message += "\n濮旀墭缂栧彿: " + order.getEntrustCode();
message += "\n鏍峰搧鍚嶇О: " + insSample.getModel();
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
index 8df0b56..62012d3 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
@@ -262,7 +262,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
String message = "";
- message += "鎶ュ憡缂栧埗瀹℃牳閫�鍥為�氱煡";
+ message += "鑰愪笣绯荤粺鎶ュ憡缂栧埗瀹℃牳閫�鍥為�氱煡";
message += "\n瀹℃牳浜�: " + checkUserName;
message += "\n濮旀墭缂栧彿: " + order.getEntrustCode();
message += "\n鏍峰搧鍚嶇О: " + insSample.getModel();
@@ -337,7 +337,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
String message = "";
- message += "鎶ュ憡缂栧埗鎵瑰噯閫氱煡";
+ message += "鑰愪笣绯荤粺鎶ュ憡缂栧埗鎵瑰噯閫氱煡";
message += "\n妫�楠屼汉: " + userName;
message += "\n澶嶆牳浜�: " + checkUserName;
message += "\n濮旀墭缂栧彿: " + order.getEntrustCode();
@@ -399,7 +399,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
String message = "";
- message += "鎶ュ憡缂栧埗鎵瑰噯閫�鍥為�氱煡";
+ message += "鑰愪笣绯荤粺鎶ュ憡缂栧埗鎵瑰噯閫�鍥為�氱煡";
message += "\n鎵瑰噯浜�: " + ratifyUserName;
message += "\n濮旀墭缂栧彿: " + order.getEntrustCode();
message += "\n鏍峰搧鍚嶇О: " + insSample.getModel();
diff --git a/inspect-server/src/main/resources/static/report-template.docx b/inspect-server/src/main/resources/static/report-template.docx
index 0502472..8b2b220 100644
--- a/inspect-server/src/main/resources/static/report-template.docx
+++ b/inspect-server/src/main/resources/static/report-template.docx
Binary files differ
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 f7d121e..d0c8576 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -151,7 +151,7 @@
examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964
ifs:
- contract: ZTZB
+ contract: ZTNS
contract-key-get: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=
contract-key-post: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=
custorder: http://192.168.20.47/PurchService.ashx?
diff --git a/ruoyi-admin/src/main/resources/application-ztns.yml b/ruoyi-admin/src/main/resources/application-ztns.yml
index 5ce799e..18806c7 100644
--- a/ruoyi-admin/src/main/resources/application-ztns.yml
+++ b/ruoyi-admin/src/main/resources/application-ztns.yml
@@ -113,7 +113,7 @@
# minio瀹瑰櫒绠＄悊
minio:
- endpoint: http://114.132.189.42/
+ endpoint: http://localhost/
port: 7019
secure: false
accessKey: admin
@@ -154,9 +154,9 @@
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=
+ contract: ZTNS
+ contract-key-get: NmAkSXwoAeRF2NWF6dnsVc2O+kH2X3XuNVFbfDtnaFU=
+ contract-key-post: NmAkSXwoAeRF2NWF6dnsVc2O+kH2X3XuNVFbfDtnaFU=
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
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..a235e25 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
@@ -93,18 +93,19 @@
}
/**
- * 鎺ㄩ�佺兢娑堟伅
+ * todo:鎺ㄩ�佺兢娑堟伅
*
* @param webHook 浼佷笟寰俊鏈哄櫒浜哄湴鍧�
* @param content 鏁版嵁
* @throws Exception
*/
public static String informWebHook(String webHook, String content) {
- JSONObject jsonObject = new JSONObject()
- .accumulate("msgtype", "text")
- .accumulate("text", new JSONObject()
- .accumulate("content", content));
- return HttpRequest.post(webHook).header("Content-Type", "application/json").body(jsonObject.toString()).execute().body();
+// JSONObject jsonObject = new JSONObject()
+// .accumulate("msgtype", "text")
+// .accumulate("text", new JSONObject()
+// .accumulate("content", content));
+// return HttpRequest.post(webHook).header("Content-Type", "application/json").body(jsonObject.toString()).execute().body();
+ return null;
}
public static String getMd5(File file) {
--
Gitblit v1.9.3