From 311d0b94fe67a711d3f382ff02c69b49069c2da3 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 13 一月 2026 08:49:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 70 +++++++++++++++++-----------------
src/main/java/com/zy/common/web/AuthController.java | 16 ++++---
src/main/resources/license.lic | 0
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 2
4 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index 1e89dee..2ba70a1 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -157,7 +157,7 @@
case "PUR_RECEIVEBIll": //宸插鏍告敹鏂欏崟鏌ヨ
jsonObject.put("start_biztime", latestUpdateTime);//涓氬姟璧峰鏃ユ湡
jsonObject.put("end_biztime", sdf1.format(now));//涓氬姟缁撴潫鏃ユ湡
- jsonObject.put("billno", "CGSL-260106-000001");
+ jsonObject.put("billno", null);
jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
jsonObject.put("start_auditdate", latestUpdateTime);
jsonObject.put("end_auditdate", sdf1.format(now));
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 01906c1..ca84908 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -54,19 +54,21 @@
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
public R loginAction(String username, String password){
//楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
- if (!licenseTimer.getSystemSupport()){
+ LicenseVerify licenseVerify = new LicenseVerify();
+ boolean verify = licenseVerify.verify();
+ if (!verify) {//璁稿彲璇佸凡澶辨晥
return R.parse(CodeRes.SYSTEM_20001);
+ }
+ if (username.equals("super") && password.equals(Cools.md5(superPwd))) {
+ Map<String, Object> res = new HashMap<>();
+ res.put("username", username);
+ res.put("token", Cools.enToken(System.currentTimeMillis() + username, superPwd));
+ return R.ok(res);
}
EntityWrapper<User> userWrapper = new EntityWrapper<>();
userWrapper.eq("username", username);
User user = userService.selectOne(userWrapper);
if (Cools.isEmpty(user)){
- if (username.equals("super") && password.equals(Cools.md5(superPwd))) {
- Map<String, Object> res = new HashMap<>();
- res.put("username", username);
- res.put("token", Cools.enToken(System.currentTimeMillis() + username, superPwd));
- return R.ok(res);
- }
return R.parse(CodeRes.USER_10001);
}
if (user.getStatus()!=1){
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index 61fef73..a5f7d0b 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -72,48 +72,48 @@
if(!Cools.isEmpty(licensePath)){
logger.info("++++++++ 寮�濮嬪姞杞借鍙瘉 ++++++++");
-// try {
-// licenseTimer.getRemoteLicense();
-// } catch (Exception e) {
-// }
+ try {
+ licenseTimer.getRemoteLicense();
+ } catch (Exception e) {
+ }
try {
-// LicenseVerifyParam param = new LicenseVerifyParam();
-// param.s etSubject(subject);
-// param.setPublicAlias(publicAlias);
-// param.setStorePass(storePass);
-// param.setLicensePath(licensePath);
-// param.setPublicKeysStorePath(publicKeysStorePath);
-//
- LicenseVerify licenseVerify = new LicenseVerify();
-//
-// LicenseInfos latestLicense = licenseInfosService.getLatestLicense();
-// if (latestLicense == null) {
-// logger.info("璁稿彲璇佷笉瀛樺湪");
-// return false;
-// }
+ LicenseVerifyParam param = new LicenseVerifyParam();
+ param.setSubject(subject);
+ param.setPublicAlias(publicAlias);
+ param.setStorePass(storePass);
+ param.setLicensePath(licensePath);
+ param.setPublicKeysStorePath(publicKeysStorePath);
- //瀹夎璇佷功
-// LicenseContent install = licenseVerify.install(param, latestLicense.getLicense());
+ LicenseVerify licenseVerify = new LicenseVerify();
+
+ LicenseInfos latestLicense = licenseInfosService.getLatestLicense();
+ if (latestLicense == null) {
+ logger.info("璁稿彲璇佷笉瀛樺湪");
+ return false;
+ }
+
+// 瀹夎璇佷功
+ LicenseContent install = licenseVerify.install(param, latestLicense.getLicense());
logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
- licenseTimer.setSystemSupport(true);
- licenseTimer.setLicenseDays(11);
- return true;
+// licenseTimer.setSystemSupport(true);
+// licenseTimer.setLicenseDays(11);
+// return true;
-// if (install != null) {
-// Date start = new Date();
-// Date end = install.getNotAfter();
-// Long starTime = start.getTime();
-// Long endTime = end.getTime();
-// Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
-// int day = (int) (num / 24 / 60 / 60 / 1000);
-// licenseTimer.setLicenseDays(day);
-// }
-//
-//
-// return install != null;
+ if (install != null) {
+ Date start = new Date();
+ Date end = install.getNotAfter();
+ Long starTime = start.getTime();
+ Long endTime = end.getTime();
+ Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
+ int day = (int) (num / 24 / 60 / 60 / 1000);
+ licenseTimer.setLicenseDays(day);
+ }
+
+
+ return install != null;
} catch (Exception e) {
e.printStackTrace();
return false;
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index d74cdb5..df0c814 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1