From 77e54aec65693683bc2b9ac50e08df6a06c53493 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期三, 22 四月 2026 17:03:38 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/common/web/AuthController.java | 254 ++++++++++++++++++++++++++++++--------------------
1 files changed, 154 insertions(+), 100 deletions(-)
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 0195788..6302db4 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -1,27 +1,24 @@
package com.zy.common.web;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.core.annotations.ManagerAuth;
-import com.core.common.Cools;
-import com.core.common.R;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.common.CodeRes;
import com.zy.common.entity.Parameter;
import com.zy.common.model.PowerDto;
import com.zy.common.utils.RandomValidateCodeUtil;
import com.zy.system.entity.*;
+import com.zy.system.entity.license.LicenseVerify;
import com.zy.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
/**
@@ -49,31 +46,38 @@
@RequestMapping("/login.action")
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
- public R loginAction(String mobile, String password){
- if (mobile.equals("super") && password.equals(Cools.md5(superPwd))) {
+ public R loginAction(String username, String password){
+ //楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
+ 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", mobile);
- res.put("token", Cools.enToken(System.currentTimeMillis() + mobile, superPwd));
+ res.put("username", username);
+ res.put("token", Cools.enToken(System.currentTimeMillis() + username, superPwd));
return R.ok(res);
}
- EntityWrapper<User> userWrapper = new EntityWrapper<>();
- userWrapper.eq("mobile", mobile);
- User user = userService.selectOne(userWrapper);
+ QueryWrapper<User> userWrapper = new QueryWrapper<>();
+ userWrapper.eq("username", username);
+ User user = userService.getOne(userWrapper);
if (Cools.isEmpty(user)){
return R.parse(CodeRes.USER_10001);
}
if (user.getStatus()!=1){
return R.parse(CodeRes.USER_10002);
}
- if (!Cools.md5(user.getPassword()).equals(password)){
+ if (!user.getPassword().equals(password)){
return R.parse(CodeRes.USER_10003);
}
- String token = Cools.enToken(System.currentTimeMillis() + mobile, user.getPassword());
- userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));
+ String token = Cools.enToken(System.currentTimeMillis() + username, user.getPassword());
+ userLoginService.remove(new QueryWrapper<UserLogin>().eq("user_id", user.getId()));
UserLogin userLogin = new UserLogin();
userLogin.setUserId(user.getId());
userLogin.setToken(token);
- userLoginService.insert(userLogin);
+ userLogin.setCreateTime(new Date());
+ userLoginService.save(userLogin);
Map<String, Object> res = new HashMap<>();
res.put("username", user.getUsername());
res.put("token", token);
@@ -110,72 +114,79 @@
@RequestMapping("/user/detail/auth")
@ManagerAuth
public R userDetail(){
- return R.ok(userService.selectById(getUserId()));
+ return R.ok(userService.getById(getUserId()));
}
- @RequestMapping("/menu/auth")
- @ManagerAuth(memo = "棣栭〉鑿滃崟")
- public R menu(){
- // 鑾峰彇鎵�鏈変竴绾ц彍鍗�
- List<Resource> oneLevel = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
- User user = null;
- Wrapper<Resource> resourceWrapper;
- if (getUserId() == 9527) {
- resourceWrapper = new EntityWrapper<Resource>().eq("level", 2).eq("status", 1).orderBy("sort");
- } else {
- // 鑾峰彇褰撳墠鐢ㄦ埛鐨勬墍鏈変簩绾ц彍鍗�
- user = userService.selectById(getUserId());
- List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", user.getRoleId()));
- List<Long> resourceIds = new ArrayList<>();
- roleResources.forEach(roleResource -> resourceIds.add(roleResource.getResourceId()));
- if (resourceIds.isEmpty()){
- return R.ok();
- }
- resourceWrapper = new EntityWrapper<Resource>().in("id", resourceIds).eq("level", 2).eq("status", 1).orderBy("sort");
- }
- List<Resource> twoLevel = resourceService.selectList(resourceWrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (Resource menu : oneLevel) {
- Map<String, Object> map = new HashMap<>();
- List<Resource> subMenu = new ArrayList<>();
- Iterator<Resource> iterator = twoLevel.iterator();
- while (iterator.hasNext()) {
- Resource resource = iterator.next();
- if (resource.getResourceId() != null && resource.getResourceId().equals(menu.getId())) {
-
- // 鏄惁鎷ユ湁鏌ョ湅鏉冮檺
- if (getUserId() != 9527) {
- Resource view = resourceService.selectOne(new EntityWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "view"));
- if (!Cools.isEmpty(view)){
- RoleResource param = new RoleResource();
- param.setResourceId(view.getId());
- param.setRoleId(user.getRoleId());
- if (null == roleResourceService.selectOne(new EntityWrapper<>(param))){
- continue;
- }
- }
- }
-
- subMenu.add(resource);
- iterator.remove();
- }
- }
- if (subMenu.isEmpty()) {
- continue;
- }
- map.put("menuId", menu.getId());
- map.put("menuCode", menu.getCode());
- map.put("menu", menu.getName());
- map.put("subMenu", subMenu);
- result.add(map);
- }
- return R.ok(result);
- }
+// @RequestMapping("/menu/auth")
+// @ManagerAuth
+// public R menu(){
+// // 鑾峰彇鎵�鏈変竴绾ц彍鍗�
+// List<Resource> oneLevel;
+// User user = null;
+// Wrapper<Resource> resourceWrapper;
+// if (getUserId() == 9527) {
+// oneLevel = resourceService.list(new QueryWrapper<Resource>().eq("level", 1).orderBy("sort"));
+// resourceWrapper = new QueryWrapper<Resource>().eq("level", 2).eq("status", 1).orderBy("sort");
+// } else {
+// // 婵�娲荤爜楠岃瘉
+// if (!SystemProperties.SYSTEM_ACTIVATION) {
+// return R.ok();
+// }
+// oneLevel = resourceService.list(new QueryWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
+// // 鑾峰彇褰撳墠鐢ㄦ埛鐨勬墍鏈変簩绾ц彍鍗�
+// user = userService.getById(getUserId());
+// List<RoleResource> roleResources = roleResourceService.list(new QueryWrapper<RoleResource>().eq("role_id", user.getRoleId()));
+// List<Long> resourceIds = new ArrayList<>();
+// roleResources.forEach(roleResource -> resourceIds.add(roleResource.getResourceId()));
+// if (resourceIds.isEmpty()){
+// return R.ok();
+// }
+// resourceWrapper = new QueryWrapper<Resource>().in("id", resourceIds).eq("level", 2).eq("status", 1).orderBy("sort");
+// }
+// List<Resource> twoLevel = resourceService.list(resourceWrapper);
+// List<Map<String, Object>> result = new ArrayList<>();
+// for (Resource menu : oneLevel) {
+// Map<String, Object> map = new HashMap<>();
+// List<Resource> subMenu = new ArrayList<>();
+// Iterator<Resource> iterator = twoLevel.iterator();
+// while (iterator.hasNext()) {
+// Resource resource = iterator.next();
+// if (resource.getResourceId() != null && resource.getResourceId().equals(menu.getId())) {
+//
+// // 鏄惁鎷ユ湁鏌ョ湅鏉冮檺
+// if (getUserId() != 9527) {
+// Resource view = resourceService.getOne(new QueryWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "#view"));
+// if (!Cools.isEmpty(view)){
+// RoleResource param = new RoleResource();
+// param.setResourceId(view.getId());
+// param.setRoleId(user.getRoleId());
+// if (null == roleResourceService.getOne(new QueryWrapper<>(param))){
+// continue;
+// }
+// }
+// }
+//
+// subMenu.add(resource);
+// iterator.remove();
+// }
+// }
+// if (subMenu.isEmpty()) {
+// continue;
+// }
+// map.put("menuId", menu.getId());
+// map.put("menuCode", menu.getCode());
+// map.put("menuIcon", HtmlNavIconType.get(menu.getCode()));
+// map.put("menu", menu.getName());
+// map.put("subMenu", subMenu);
+// result.add(map);
+// }
+// return R.ok(result);
+// }
@RequestMapping("/power/list/auth")
@ManagerAuth
public R powerList(){
- List<Resource> oneLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
+ List<Resource> oneLevels = resourceService.list(new QueryWrapper<Resource>().eq("level", 1).eq("status", 1).orderByAsc("sort"));
List<Map> result = new ArrayList<>();
// 涓�绾�
for (Resource oneLevel : oneLevels){
@@ -185,7 +196,7 @@
oneLevelMap.put("id", oneLevel.getId());
oneLevelMap.put("spread", true);
oneLevelMap.put("children", twoLevelsList);
- List<Resource> twoLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", oneLevel.getId()).eq("level", 2).eq("status", 1).orderBy("sort"));
+ List<Resource> twoLevels = resourceService.list(new QueryWrapper<Resource>().eq("resource_id", oneLevel.getId()).eq("level", 2).eq("status", 1).orderByAsc("sort"));
// 浜岀骇
for (Resource twoLevel : twoLevels){
Map<String, Object> twoLevelMap = new HashMap<>();
@@ -196,7 +207,7 @@
List<Map> threeLevelsList = new ArrayList<>();
twoLevelMap.put("children", threeLevelsList);
// 涓夌骇
- List<Resource> threeLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderBy("sort"));
+ List<Resource> threeLevels = resourceService.list(new QueryWrapper<Resource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderByAsc("sort"));
for (Resource threeLevel : threeLevels){
Map<String, Object> threeLevelMap = new HashMap<>();
threeLevelMap.put("title", threeLevel.getName());
@@ -217,7 +228,7 @@
functions.put("spread", true);
List<Map> funcs = new ArrayList<>();
functions.put("children", funcs);
- List<Permission> permissions = permissionService.selectList(new EntityWrapper<Permission>().eq("status", 1));
+ List<Permission> permissions = permissionService.list(new QueryWrapper<Permission>().eq("status", 1));
for (Permission permission : permissions) {
Map<String, Object> func = new HashMap<>();
func.put("title", permission.getName());
@@ -235,9 +246,9 @@
public R get(@PathVariable("roleId") Long roleId) {
List<Object> result = new ArrayList<>();
// 鑿滃崟
- List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", roleId));
+ List<RoleResource> roleResources = roleResourceService.list(new QueryWrapper<RoleResource>().eq("role_id", roleId));
for (RoleResource roleResource : roleResources){
- Resource resource = resourceService.selectById(roleResource.getResourceId());
+ Resource resource = resourceService.getById(roleResource.getResourceId());
if (!Cools.isEmpty(resource)){
if (resource.getLevel() == 3){
result.add(resource.getId());
@@ -245,9 +256,9 @@
}
}
// 鍔熻兘
- List<RolePermission> rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+ List<RolePermission> rolePermissions = rolePermissionService.list(new QueryWrapper<RolePermission>().eq("role_id", roleId));
for (RolePermission rolePermission : rolePermissions){
- Permission permission = permissionService.selectById(rolePermission.getPermissionId());
+ Permission permission = permissionService.getById(rolePermission.getPermissionId());
if (!Cools.isEmpty(permission)){
result.add(permission.getAction());
}
@@ -259,18 +270,18 @@
@ManagerAuth(memo = "鎺堟潈")
@Transactional
public R power(Long roleId, String powers){
- Role role = roleService.selectById(roleId);
+ Role role = roleService.getById(roleId);
Long leaderId = role.getLeader();
- roleResourceService.delete(new EntityWrapper<RoleResource>().eq("role_id", roleId));
- rolePermissionService.delete(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+ roleResourceService.remove(new QueryWrapper<RoleResource>().eq("role_id", roleId));
+ rolePermissionService.remove(new QueryWrapper<RolePermission>().eq("role_id", roleId));
if (!Cools.isEmpty(powers)){
List<PowerDto> dtos = JSON.parseArray(powers, PowerDto.class);
for (PowerDto dto : dtos) {
- Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
+ Resource resource = resourceService.getOne(new QueryWrapper<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()));
+ RoleResource roleResource = roleResourceService.getOne(new QueryWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
if (null == roleResource) {
throw new CoolException(resource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
}
@@ -278,22 +289,22 @@
RoleResource roleResource = new RoleResource();
roleResource.setRoleId(roleId);
roleResource.setResourceId(resource.getId());
- roleResourceService.insert(roleResource);
+ roleResourceService.save(roleResource);
} else {
- Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
+ Permission permission = permissionService.getOne(new QueryWrapper<Permission>().eq("action", dto.getTwo()));
if (!Cools.isEmpty(permission)){
RolePermission rolePermission = new RolePermission();
rolePermission.setRoleId(roleId);
rolePermission.setPermissionId(permission.getId());
- rolePermissionService.insert(rolePermission);
+ rolePermissionService.save(rolePermission);
}
}
for (String three : dto.getThree()){
- Resource resource1 = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", three).eq("level", 3));
+ Resource resource1 = resourceService.getOne(new QueryWrapper<Resource>().eq("id", three).eq("level", 3));
if (!Cools.isEmpty(resource1)) {
// 鏍￠獙涓婄骇鏉冮檺
if (leaderId != null) {
- RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
+ RoleResource roleResource = roleResourceService.getOne(new QueryWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
if (null == roleResource) {
throw new CoolException(resource.getName().concat("鐨�").concat(resource1.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName())));
}
@@ -301,7 +312,7 @@
RoleResource roleResource = new RoleResource();
roleResource.setRoleId(roleId);
roleResource.setResourceId(resource1.getId());
- roleResourceService.insert(roleResource);
+ roleResourceService.save(roleResource);
}
}
}
@@ -314,7 +325,7 @@
public R buttonResource(@PathVariable("resourceId") Long resourceId) {
List<Resource> resources;
if (getUserId() == 9527) {
- resources = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 3).eq("resource_id", resourceId));
+ resources = resourceService.list(new QueryWrapper<Resource>().eq("level", 3).eq("resource_id", resourceId));
} else {
resources = roleResourceService.getMenuButtomResource(resourceId, getUserId());
}
@@ -323,6 +334,49 @@
}
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();
+// }
+// }
+//
+// @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