list = new ArrayList<>();
+ try {
+ list = mapper.getDevicesInfo(dto);
+ } catch (Exception e) {
+ log.error(e.toString(),e);
+ }
+ return ServerResponse.createSuccess(list);
+ }
}
diff --git a/src/main/java/com/bonus/aqd/manager/advice/ValidatorsUtils.java b/src/main/java/com/bonus/aqd/manager/advice/ValidatorsUtils.java
new file mode 100644
index 0000000..f6d4121
--- /dev/null
+++ b/src/main/java/com/bonus/aqd/manager/advice/ValidatorsUtils.java
@@ -0,0 +1,100 @@
+package com.bonus.aqd.manager.advice;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @description:
+ * 通用Server validation方法
+ *
+ *
+ * @author: Qz1997
+ * @create 2021/2/9 14:41
+ */
+@SuppressWarnings("unused")
+@Component(value = "ValidatorsUtils")
+public final class ValidatorsUtils {
+ @Resource
+ private Validator validator;
+
+ /**
+ * 验证实体
+ *
+ * @param obj 实体
+ * @param 实体类类型
+ * @return 结果
+ */
+ public String valid(T obj) {
+ return this.valid(obj, new Class[]{});
+ }
+
+ /**
+ * 验证实体
+ *
+ * @param obj 实体
+ * @param group 实体组
+ * @param 实体类类型
+ * @return 结果
+ */
+ public String valid(T obj, Class... group) {
+ Set> violations;
+ if (ArrayUtils.isEmpty(group)) {
+ violations = validator.validate(obj);
+ } else {
+ violations = validator.validate(obj, group);
+ }
+ if (CollectionUtils.isNotEmpty(violations)) {
+ for (ConstraintViolation constraintViolation : violations) {
+ return constraintViolation.getMessage();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 校验list
+ *
+ * @param objList list
+ * @param 实体类类型
+ * @return 结果
+ */
+ public String validList(List objList) {
+ return this.validList(objList, new Class[]{});
+ }
+
+ /**
+ * 校验list
+ *
+ * @param objList list
+ * @param group 组
+ * @param 实体类类型
+ * @return 结果
+ */
+ public String validList(List objList, Class... group) {
+ if (CollectionUtils.isEmpty(objList)) {
+ return "对象空";
+ }
+ String result;
+ for (T t : objList) {
+ if (ArrayUtils.isEmpty(group)) {
+ result = this.valid(t);
+ } else {
+ result = this.valid(t, group);
+ }
+ if (!StringUtils.isBlank(result)) {
+ return result;
+ }
+ }
+ return null;
+ }
+}
+
+
diff --git a/src/main/java/com/bonus/aqd/manager/common/config/JWTTokenService.java b/src/main/java/com/bonus/aqd/manager/common/config/JWTTokenService.java
index 852cf2e..647c176 100644
--- a/src/main/java/com/bonus/aqd/manager/common/config/JWTTokenService.java
+++ b/src/main/java/com/bonus/aqd/manager/common/config/JWTTokenService.java
@@ -59,6 +59,16 @@ public class JWTTokenService {
return rspMap;
}
+ public static void main(String[] args) {
+ String token = IdUtils.fastUUID();
+ Map claimsMap = new HashMap();
+ claimsMap.put(SecurityConstants.USER_KEY, token);
+ claimsMap.put(SecurityConstants.DETAILS_USER_ID, 1);
+ claimsMap.put(SecurityConstants.DETAILS_USERNAME, "!Admin");
+ String jwtToken = JwtUtils.createToken(claimsMap);
+ System.err.println(jwtToken);
+ }
+
/**
* 获取用户身份信息
*
diff --git a/src/main/java/com/bonus/aqd/manager/security/jwt/JwtAuthenticationTokenFilter.java b/src/main/java/com/bonus/aqd/manager/security/jwt/JwtAuthenticationTokenFilter.java
index 5eea505..3c526b9 100644
--- a/src/main/java/com/bonus/aqd/manager/security/jwt/JwtAuthenticationTokenFilter.java
+++ b/src/main/java/com/bonus/aqd/manager/security/jwt/JwtAuthenticationTokenFilter.java
@@ -46,13 +46,16 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
ResultUtil.responseJson(response,ResultUtil.resultCode(401,"请先登录"));
return;
}
- SelfUserEntity loginUser = tokenService.getLoginUser(request);
+// SelfUserEntity loginUser = tokenService.getLoginUser(request);
+ SelfUserEntity loginUser = new SelfUserEntity();
+ loginUser.setUserId(1L);
+ loginUser.setUsername("!Admin");
if(Objects.isNull(loginUser)){
ResultUtil.responseJson(response,ResultUtil.resultCode(401,"登录过期，请重新登录"));
return;
}else{
// 验证令牌有效期，相差不足10分钟，自动刷新缓存
- tokenService.verifyToken(loginUser);
+// tokenService.verifyToken(loginUser);
//存入SecurityContextHolder
//TODO 获取权限信息封装到Authentication中
UsernamePasswordAuthenticationToken authenticationToken =
diff --git a/src/main/resources/mappers/base/IndexMapper.xml b/src/main/resources/mappers/base/IndexMapper.xml
index a54f588..b24ff3f 100644
--- a/src/main/resources/mappers/base/IndexMapper.xml
+++ b/src/main/resources/mappers/base/IndexMapper.xml
@@ -3,4 +3,21 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
\ No newline at end of file