From 2ff08d144935938b91af4e725577882976ef4627 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期四, 01 八月 2024 08:52:39 +0800 Subject: [PATCH] # --- zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java | 48 ------------------------------------------------ 1 files changed, 0 insertions(+), 48 deletions(-) diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java index 80c67e9..adc8247 100644 --- a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java @@ -7,15 +7,11 @@ import com.zy.asrs.common.domain.entity.Parameter; import com.zy.asrs.common.domain.enums.HtmlNavIconType; import com.zy.asrs.common.domain.enums.LoginSystemType; -import com.zy.asrs.common.properties.OSinfo; -import com.zy.asrs.common.properties.SystemProperties; import com.zy.asrs.common.sys.entity.*; import com.zy.asrs.common.sys.service.*; import com.zy.asrs.common.utils.RandomValidateCodeUtil; import com.zy.asrs.framework.annotations.ManagerAuth; -import com.zy.asrs.framework.common.AesUtils; import com.zy.asrs.framework.common.Cools; -import com.zy.asrs.framework.common.DateUtils; import com.zy.asrs.framework.common.R; import com.zy.asrs.framework.exception.CoolException; import org.springframework.beans.factory.annotation.Autowired; @@ -339,27 +335,6 @@ return R.ok(resources); } - @GetMapping(value = "/system/activation/auth") - public R activation() { - if (SystemProperties.SYSTEM_ACTIVATION) { - String activationCode = SystemProperties.getActivationCode(OSinfo.getOSname().getActivationCodePath()); - String timeStr = AesUtils.decrypt(activationCode, SystemProperties.SALT); - if (null == timeStr) { - SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE; - return R.error(); - } - Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss); - if (new Date().getTime() < exprTime.getTime()) { - return R.ok().add(DateUtils.convert(exprTime)); - } else { - SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE; - return R.error(); - } - } else { - return R.error(); - } - } - @RequestMapping("/loginInformation") public R getLoginPageInformation() { Config loginLogo = configService.selectByCode("loginLogo"); @@ -372,29 +347,6 @@ map.put("loginCopyrightImg1", loginCopyrightImg1.getStatus() == 1 ? loginCopyrightImg1.getValue() : ""); return R.ok().add(map); - } - - @PostMapping(value = "/system/secret/auth") - @ManagerAuth - public R systemSecret(@RequestParam(value = "secret") String secret) { - if (Cools.isEmpty(secret)) { - return R.error("璇疯緭鍏ユ縺娲荤爜"); - } - // 楠岃瘉婵�娲荤爜 - String timeStr = AesUtils.decrypt(secret, SystemProperties.SALT); - if (null == timeStr) { - return R.error("婵�娲荤爜閿欒"); - } - Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss); - if (new Date().getTime() >= exprTime.getTime()) { - return R.error("婵�娲荤爜宸插け鏁�"); - } - boolean result = SystemProperties.saveActivationCode(OSinfo.getOSname().getActivationCodePath(), secret); - if (!result) { - return R.error("婵�娲诲け璐�"); - } - SystemProperties.SYSTEM_ACTIVATION = Boolean.TRUE; - return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦"+DateUtils.convert(exprTime)); } } -- Gitblit v1.9.1