From dd5a31d7eb01fa754a37f5cdcc7f7d2ba7397600 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 31 十二月 2024 09:25:53 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/web/AuthController.java | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java index b85c56a..5fb3b5f 100644 --- a/src/main/java/com/zy/common/web/AuthController.java +++ b/src/main/java/com/zy/common/web/AuthController.java @@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.core.annotations.ManagerAuth; -import com.core.common.*; +import com.core.common.AesUtils; +import com.core.common.Cools; +import com.core.common.DateUtils; +import com.core.common.R; import com.core.exception.CoolException; import com.zy.common.CodeRes; import com.zy.common.entity.Parameter; @@ -14,8 +17,8 @@ import com.zy.common.properties.SystemProperties; import com.zy.common.utils.RandomValidateCodeUtil; import com.zy.system.entity.*; -import com.zy.system.entity.license.LicenseVerify; import com.zy.system.service.*; +import com.zy.system.timer.LicenseTimer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; @@ -46,14 +49,14 @@ private PermissionService permissionService; @Autowired private RolePermissionService rolePermissionService; + @Autowired + private LicenseTimer licenseTimer; @RequestMapping("/login.action") @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍") public R loginAction(String username, String password){ //楠岃瘉璁稿彲璇佹槸鍚︽湁鏁� - LicenseVerify licenseVerify = new LicenseVerify(); - boolean verify = licenseVerify.verify(); - if (!verify) {//璁稿彲璇佸凡澶辨晥 + if (!licenseTimer.getSystemSupport()){ return R.parse(CodeRes.SYSTEM_20001); } if (username.equals("super") && password.equals(Cools.md5(superPwd))) { @@ -284,12 +287,12 @@ Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2)); if (!Cools.isEmpty(resource)) { // 鏍¢獙涓婄骇鏉冮檺 - if (leaderId != null) { - RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId())); - if (null == roleResource) { - throw new CoolException(resource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName())); - } - } +// if (leaderId != null) { +// RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId())); +// if (null == roleResource) { +// throw new CoolException(resource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName())); +// } +// } RoleResource roleResource = new RoleResource(); roleResource.setRoleId(roleId); roleResource.setResourceId(resource.getId()); -- Gitblit v1.9.1