From 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 14:15:07 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/common/web/AuthController.java | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 3c67ff7..9c2bffa 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -22,6 +22,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2019-07-30
@@ -75,7 +76,7 @@
userLogin.setCreateTime(new Date());
userLoginService.insert(userLogin);
Map<String, Object> res = new HashMap<>();
- res.put("username", user.getNickname());
+ res.put("username", user.getUsername());
res.put("token", token);
return R.ok(res);
}
@@ -273,19 +274,21 @@
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));
- 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 (isNumber(dto.getTwo())) {
+ 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()));
+ }
}
+ RoleResource roleResource = new RoleResource();
+ roleResource.setRoleId(roleId);
+ roleResource.setResourceId(resource.getId());
+ roleResourceService.insert(roleResource);
}
- RoleResource roleResource = new RoleResource();
- roleResource.setRoleId(roleId);
- roleResource.setResourceId(resource.getId());
- roleResourceService.insert(roleResource);
} else {
Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
if (!Cools.isEmpty(permission)){
@@ -302,7 +305,7 @@
if (leaderId != null) {
RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<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())));
+ throw new CoolException(resource1.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
}
}
RoleResource roleResource = new RoleResource();
@@ -352,14 +355,14 @@
}
}
- @PostMapping(value = "/system/secret/auth")
+ @PostMapping(value = "/system/license/auth")
@ManagerAuth
- public R systemSecret(@RequestParam(value = "secret") String secret) {
- if (Cools.isEmpty(secret)) {
+ public R systemSecret(@RequestParam(value = "license") String license) {
+ if (Cools.isEmpty(license)) {
return R.error("璇疯緭鍏ユ縺娲荤爜");
}
// 楠岃瘉婵�娲荤爜
- String timeStr = AesUtils.decrypt(secret, SystemProperties.SALT);
+ String timeStr = AesUtils.decrypt(license, SystemProperties.SALT);
if (null == timeStr) {
return R.error("婵�娲荤爜閿欒");
}
@@ -367,7 +370,7 @@
if (new Date().getTime() >= exprTime.getTime()) {
return R.error("婵�娲荤爜宸插け鏁�");
}
- boolean result = SystemProperties.saveActivationCode(OSinfo.getOSname().getActivationCodePath(), secret);
+ boolean result = SystemProperties.saveActivationCode(OSinfo.getOSname().getActivationCodePath(), license);
if (!result) {
return R.error("婵�娲诲け璐�");
}
@@ -375,4 +378,23 @@
return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦"+DateUtils.convert(exprTime));
}
+ @RequestMapping("/menu/pda/auth")
+ @ManagerAuth
+ public R menuPda(){
+ Long userId = getUserId();
+ List<RolePermission> rolePermissions;
+ if (userId == 9527L) {
+ rolePermissions = rolePermissionService.selectList(new EntityWrapper<>());
+ } else {
+ Long roleId = getUser().getRoleId();
+ rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+ }
+ if (Cools.isEmpty(rolePermissions)) {
+ return R.ok();
+ }
+ List<Long> collect = rolePermissions.stream().map(RolePermission::getPermissionId).distinct().collect(Collectors.toList());
+ List<Permission> permissions = permissionService.selectBatchIds(collect);
+ return R.ok().add(permissions);
+ }
+
}
--
Gitblit v1.9.1