diff --git a/ccag-boot-base-core/src/main/java/com/ccag/common/util/DateUtils.java b/ccag-boot-base-core/src/main/java/com/ccag/common/util/DateUtils.java index 21301c4..9c85da8 100644 --- a/ccag-boot-base-core/src/main/java/com/ccag/common/util/DateUtils.java +++ b/ccag-boot-base-core/src/main/java/com/ccag/common/util/DateUtils.java @@ -105,7 +105,6 @@ public class DateUtils extends PropertyEditorSupport { */ public static Calendar getCalendar(long millis) { Calendar cal = Calendar.getInstance(); - // --------------------cal.setTimeInMillis(millis); cal.setTime(new Date(millis)); return cal; } diff --git a/ccag-boot-base-core/src/main/java/com/ccag/common/util/DySmsHelper.java b/ccag-boot-base-core/src/main/java/com/ccag/common/util/DySmsHelper.java index 2d6f2cd..e614137 100644 --- a/ccag-boot-base-core/src/main/java/com/ccag/common/util/DySmsHelper.java +++ b/ccag-boot-base-core/src/main/java/com/ccag/common/util/DySmsHelper.java @@ -118,9 +118,4 @@ public class DySmsHelper { } -// public static void main(String[] args) throws ClientException, InterruptedException { -// JSONObject obj = new JSONObject(); -// obj.put("code", "1234"); -// sendSms("13800138000", obj, DySmsEnum.FORGET_PASSWORD_TEMPLATE_CODE); -// } } diff --git a/ccag-boot-base-core/src/main/java/com/ccag/common/util/DySmsLimit.java b/ccag-boot-base-core/src/main/java/com/ccag/common/util/DySmsLimit.java index 7171310..f2a8271 100644 --- a/ccag-boot-base-core/src/main/java/com/ccag/common/util/DySmsLimit.java +++ b/ccag-boot-base-core/src/main/java/com/ccag/common/util/DySmsLimit.java @@ -78,19 +78,5 @@ public class DySmsLimit { ipRequestCount.put(ip, 0); ipLastRequestTime.put(ip, currentTime); } - -// public static void main(String[] args) { -// String ip = "192.168.1.1"; -// for (int i = 1; i < 50; i++) { -// if (canSendSms(ip)) { -// System.out.println("Send SMS successfully"); -// } else { -// //System.out.println("Exceed SMS limit for IP " + ip); -// } -// } -// -// System.out.println(ipLastRequestTime); -// System.out.println(ipRequestCount); -// System.out.println(ipBlacklist); -// } + } diff --git a/ccag-module-system/ccag-system-biz/src/main/java/com/ccag/modules/system/util/AESUtil.java b/ccag-module-system/ccag-system-biz/src/main/java/com/ccag/modules/system/util/AESUtil.java index 5227e5c..e639fa5 100644 --- a/ccag-module-system/ccag-system-biz/src/main/java/com/ccag/modules/system/util/AESUtil.java +++ b/ccag-module-system/ccag-system-biz/src/main/java/com/ccag/modules/system/util/AESUtil.java @@ -27,8 +27,6 @@ public class AESUtil { */ private static final String AES_GCM_NOPADDING = "AES/GCM/NoPadding"; -// private static final int GCM_IV_LENGTH = 12; -// private static final int GCM_TAG_LENGTH = 16; /** * 加密字符串 diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/ApprovePostProcessor.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/ApprovePostProcessor.java index 6809531..6c57757 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/ApprovePostProcessor.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/ApprovePostProcessor.java @@ -145,16 +145,14 @@ public class ApprovePostProcessor implements Callable { default -> { } } - if (status == 3 || status == 4) { - if (status == 3) { - //清理该评审相关的通知 - // 1：项目指派通知 2：学科指派通知 3：loadcase指派通知 4：评审指派通知 5：评审完成通知 6：评审撤销通知 7：评审发布通知 - // 8：新建学科通知 9：删除项目通知 10：删除学科通知 11：阶段更新通知 12：删除学科负责人通知 - systemMapper.delSystemNoticeByTargetId(4, approveId); - systemMapper.delSystemNoticeByTargetId(5, approveId); - systemMapper.delSystemNoticeByTargetId(6, approveId); - systemMapper.delSystemNoticeByTargetId(7, approveId); - } + if (status == 3) { + //清理该评审相关的通知 + // 1：项目指派通知 2：学科指派通知 3：loadcase指派通知 4：评审指派通知 5：评审完成通知 6：评审撤销通知 7：评审发布通知 + // 8：新建学科通知 9：删除项目通知 10：删除学科通知 11：阶段更新通知 12：删除学科负责人通知 + systemMapper.delSystemNoticeByTargetId(4, approveId); + systemMapper.delSystemNoticeByTargetId(5, approveId); + systemMapper.delSystemNoticeByTargetId(6, approveId); + systemMapper.delSystemNoticeByTargetId(7, approveId); } return result; } diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/HttpUtil.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/HttpUtil.java index fbd3fa8..ae421b2 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/HttpUtil.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/HttpUtil.java @@ -116,12 +116,6 @@ public class HttpUtil { .build(); //返回连接 -// return HttpClients.custom() -// .setConnectionManager(connManager) -// .setConnectionManagerShared(true) -// .setDefaultRequestConfig(defaultRequestConfig) -// .setSSLSocketFactory(sslsf) -// .build(); return HttpClients.custom() .setConnectionManager(connManager) .setConnectionManagerShared(true) @@ -146,7 +140,6 @@ public class HttpUtil { try { HttpGet httpGet = new HttpGet(url); //设置header -// httpGet.setHeader("Content-Type", "application/json"); if (headers.size() > 0) { for (String key : headers.keySet()) { httpGet.addHeader(key, headers.get(key)); diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/lock/LockService.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/lock/LockService.java index ca9ed52..0ab1826 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/lock/LockService.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/lock/LockService.java @@ -116,7 +116,7 @@ public class LockService { while (redisTemplate.hasKey(lock.getKey())); } catch (InterruptedException e) { log.error(e.getMessage()); - return false; + Thread.currentThread().interrupt(); } return false; }