修改普通列表

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinCategoryServiceImpl.java

@@ -46,7 +46,7 @@ public class SkinCategoryServiceImpl extends AbstractCRUDServiceImpl<SkinCategor
     @Override
     protected void findAfter(SkinCategoryEntity entity, PageInfo pageInfo, Context context, List<SkinCategoryEntity> list) throws AppException {
         list.stream().forEach(item -> {
-            List<SkinBaseEntity> skinBaseEntities = skinBaseService.find(new SkinBaseQuery().categoryId(entity.getId()));
+            List<SkinBaseEntity> skinBaseEntities = skinBaseService.find(new SkinBaseQuery().categoryId(item.getId()));
             item.setSkinBaseList(skinBaseEntities);
         });
         super.findAfter(entity, pageInfo, context, list);

portal-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthUserInterceptor.java

 package com.mortals.xhx.base.framework.interceptor;
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.service.IAuthTokenService;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.util.AESUtil;
@@ -10,9 +11,11 @@ import com.mortals.xhx.base.framework.config.InterceptorConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.method.HandlerMethod;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
 
 /**
  * 用户权限验证，基于token
@@ -37,6 +40,13 @@ public class AuthUserInterceptor extends BaseInterceptor {
             throws Exception {
         JSONObject ret = new JSONObject();
         try {
+            HandlerMethod handlerMethod = (HandlerMethod) handler;
+            Method method = handlerMethod.getMethod();
+            UnAuth annotation = method.getAnnotation(UnAuth.class);
+            if (annotation != null) {
+                //取消校验
+                return true;
+            }
             String uri = request.getServletPath();
             //校验配置的请求路径是否需要检查权限
             if (config.needCheckAuth(uri)) {
@@ -45,7 +55,6 @@ public class AuthUserInterceptor extends BaseInterceptor {
                 if (!auth) {
                     //不存在时候 如果是管理员也不做拦截
                     IUser loginUser = authTokenService.getLoginUser(request);
-                    //loginUser.isManager()
                     if(ObjectUtils.isEmpty(loginUser)){
                         ret.put("code", -1);
                         ret.put("msg", "用户未登录或登录失效，请重新登录");
@@ -59,7 +68,6 @@ public class AuthUserInterceptor extends BaseInterceptor {
                         ServletUtils.renderString(response, JSONObject.toJSONString(ret));
                         return false;
                     }
-
                 }
             }
         } catch (Exception e) {

portal-manager/src/main/java/com/mortals/xhx/base/framework/security/filter/DeviceSubmitInterceptor.java

-//package com.mortals.xhx.base.framework.security.filter;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.mortals.framework.util.StringUtils;
-//import com.mortals.framework.web.interceptor.BaseInterceptor;
-//import com.mortals.xhx.base.DeviceAuth;
-//import com.mortals.xhx.busiz.security.SecurityUtils;
-//import com.mortals.xhx.busiz.security.DeviceTokenService;
-//import com.mortals.xhx.common.code.ApiRespCodeEnum;
-//import com.mortals.xhx.module.device.model.DeviceEntity;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.method.HandlerMethod;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.lang.reflect.Method;
-//
-///**
-// * 设备上报验证
-// *
-// * @author: zxfei
-// * @date: 2022/4/11 15:50
-// */
-//@Component
-//public class DeviceSubmitInterceptor extends BaseInterceptor {
-//
-//    @Autowired
-//    private DeviceTokenService deviceTokenService;
-//
-//    @Override
-//    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-//        if (handler instanceof HandlerMethod) {
-//            HandlerMethod handlerMethod = (HandlerMethod) handler;
-//            Method method = handlerMethod.getMethod();
-//            DeviceAuth annotation = method.getAnnotation(DeviceAuth.class);
-//            if (annotation != null) {
-//                //校验
-//                if (this.verifyDevice(request)) {
-//                    JSONObject ret = new JSONObject();
-//                    ret.put("code", ApiRespCodeEnum.TOKEN_FAILED.getValue());
-//                    ret.put("msg", ApiRespCodeEnum.TOKEN_FAILED.getLabel());
-//                    super.writeJsonResponse(response, 200, JSONObject.toJSONString(ret));
-//                    return false;
-//                }
-//            }
-//            return true;
-//        } else {
-//            return super.preHandle(request, response, handler);
-//        }
-//    }
-//
-//    public boolean verifyDevice(HttpServletRequest request) {
-//        DeviceEntity device = deviceTokenService.getLoginDevice(request);
-//        if (StringUtils.isNotNull(device) && StringUtils.isNull(SecurityUtils.getAuthentication())) {
-//            deviceTokenService.verifyToken(device);
-//            return true;
-//        }
-//        return false;
-//
-//    }
-//
-//
-//}