修改token鉴权方式

base-manager/src/main/java/com/mortals/xhx/base/framework/config/FilterConfig.java

@@ -17,7 +17,7 @@ import java.util.Map;
  *
  * @author zxfei
  */
-@Configuration
+//@Configuration
 public class FilterConfig {
     @Value("${xss.enabled}")
     private String enabled;

base-manager/src/main/java/com/mortals/xhx/base/framework/config/InterceptorConfig.java

@@ -96,12 +96,9 @@ public class InterceptorConfig {
                 uncheckAuthUrlsSuffix.add(url.substring(0, index));
             }
         }
-
-
         //加载配置文件
         Setting baseinfo = SettingUtil.get("baseinfo");
         this.setBaseInfoSetting(baseinfo);
-       // log.info("baseinfo:"+ JSON.toJSONString(baseinfo));
 
         Setting sqclinfo = SettingUtil.get("sqclinfo");
         this.setSqclInfoSetting(sqclinfo);

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

+package com.mortals.xhx.base.framework.interceptor;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.common.AjaxResult;
+import com.mortals.framework.service.IAuthTokenService;
+import com.mortals.framework.service.IUser;
+import com.mortals.framework.util.AESUtil;
+import com.mortals.framework.utils.ServletUtils;
+import com.mortals.framework.web.interceptor.BaseInterceptor;
+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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 用户权限验证，基于token
+ *
+ * @author: zxfei
+ * @date: 2022/4/24 11:04
+ */
+@Component
+public class AuthUserInterceptor extends BaseInterceptor {
+    @Autowired
+    private InterceptorConfig config;
+    @Autowired
+    private IAuthTokenService authTokenService;
+
+    @Override
+    public int getOrder() {
+        return Integer.MAX_VALUE - 9;
+    }
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+            throws Exception {
+        JSONObject ret = new JSONObject();
+        try {
+            String uri = request.getServletPath();
+            //校验配置的请求路径是否需要检查权限
+            if (config.needCheckAuth(uri)) {
+                //需要校验权限
+                boolean auth = this.checkAuth(request, uri, config.getSecurityKey());
+                if (!auth) {
+                    //不存在时候 如果是管理员也不做拦截
+                    IUser loginUser = authTokenService.getLoginUser(request);
+                    if(ObjectUtils.isEmpty(loginUser)){
+                        ret.put("code", -1);
+                        ret.put("msg", "用户未登录或登录失效，请重新登录");
+                        ServletUtils.renderString(response, JSONObject.toJSONString(ret));
+                        return false;
+                    }else if(loginUser.isAdmin()){
+                        return super.preHandle(request, response, handler);
+                    } else {
+                        ret.put("code", -1);
+                        ret.put("msg", "用户无该操作权限!");
+                        ServletUtils.renderString(response, JSONObject.toJSONString(ret));
+                        return false;
+                    }
+
+                }
+            }
+        } catch (Exception e) {
+            logger.error("权限校验拦截请求处理异常-->" + e.getMessage());
+            writeJsonResponse(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "用户权限校验异常");
+            return false;
+        }
+
+        return super.preHandle(request, response, handler);
+    }
+
+    private boolean checkAuth(HttpServletRequest request, String requestUrl, String securityKey) throws Exception {
+        int code = requestUrl.hashCode() & (Integer.MAX_VALUE - 1);
+        IUser loginUser = authTokenService.getLoginUser(request);
+        if (ObjectUtils.isEmpty(loginUser)) return false;
+        String menuUrl = loginUser.getMenuUrl();
+        if (ObjectUtils.isEmpty(menuUrl)) return false;
+        menuUrl = AESUtil.decrypt(menuUrl, securityKey);
+        String codes = "," + menuUrl + ",";
+        String codeKey = "," + code + ",";
+        if (codes.indexOf(codeKey) != -1) {
+            return true;
+        }
+        return false;
+    }
+}

base-manager/src/main/java/com/mortals/xhx/base/framework/security/SecurityUtils.java

 package com.mortals.xhx.base.framework.security;
 
-import com.mortals.framework.common.HttpStatus;
-import com.mortals.framework.exception.AppException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

base-manager/src/main/java/com/mortals/xhx/base/login/interceptor/AuthJsonInterceptor.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 @Order(1)
-@Component
+//@Component
 public class AuthJsonInterceptor extends BaseInterceptor {
 
     @Autowired
@@ -36,7 +36,9 @@ public class AuthJsonInterceptor extends BaseInterceptor {
             throws Exception {
         try {
             String uri = request.getServletPath();
+            //校验配置的请求路径是否需要检查权限
             if (config.needCheckAuth(uri)) {
+                //需要校验权限
                 boolean auth = this.checkAuth(request, uri, config.getSecurityKey());
                 if (!auth) {
                     //不存在时候 如果是管理员也不做拦截

base-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

 package com.mortals.xhx.base.login.web;
 
-import com.alibaba.fastjson.JSON;
+import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.ap.CookieService;
 import com.mortals.framework.ap.GlobalSysInfo;
@@ -13,17 +13,15 @@ import com.mortals.framework.util.AESUtil;
 import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.HttpUtil;
 import com.mortals.framework.util.StringUtils;
-import com.mortals.framework.web.BaseCRUDJsonController;
-import com.mortals.xhx.base.framework.security.AuthTokenService;
-import com.mortals.xhx.base.framework.security.SecurityUtils;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.menu.model.MenuEntity;
 import com.mortals.xhx.base.system.menu.service.MenuService;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
-import com.mortals.xhx.base.system.user.web.UserForm;
 import com.mortals.xhx.base.system.valid.service.ValidCodeService;
 import com.mortals.xhx.common.key.RedisKey;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,8 +36,9 @@ import java.util.List;
 import java.util.Set;
 
 @RestController
+@Slf4j
 @RequestMapping("login")
-public class LoginController extends BaseCRUDJsonController<UserService, UserForm, UserEntity, Long> {
+public class LoginController extends BaseCRUDJsonBodyMappingController<UserService, UserEntity, Long> {
 
     @Autowired
     private UserService userService;
@@ -49,8 +48,8 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
     private ResourceService resourceService;
     @Autowired
     private MenuService menuService;
-    @Autowired
-    private ITokenService tokenService;
+    //    @Autowired
+//    private ITokenService tokenService;
     @Autowired
     private ICacheService cacheService;
     @Autowired
@@ -59,7 +58,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
     private static Log logger = LogFactory.getLog(LoginController.class);
 
     @RequestMapping("login")
-    public String login(HttpServletRequest request, HttpServletResponse response, @RequestBody LoginForm loginForm) throws Exception {
+    public String login(@RequestBody LoginForm loginForm) throws Exception {
 
         JSONObject ret = new JSONObject();
         String loginName = loginForm.getLoginName();
@@ -86,11 +85,11 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
             }
             userEntity = userService.doLogin(loginName, password, ip);
             userEntity.setLastLoginAddress(ip);
-            saveCurrUser(request, response, userEntity);
+            saveCurrUser(userEntity);
 
             recordSysLog(request, userEntity, "用户登录系统成功!");
             // 返回拥有的菜单数据
-            //Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
+            Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
            // List<MenuEntity> outlookBarList = menuService.findTreeMenu(userEntity, urls);
             String currUserName = userEntity.getRealName();
             if (currUserName == null || currUserName.trim().length() == 0) {
@@ -98,21 +97,24 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
             }
             JSONObject data = new JSONObject();
             data.put("currUserName", currUserName);
-            //data.put("barList", outlookBarList);
+           // data.put("barList", outlookBarList);
             data.put("id", userEntity.getId());
             data.put("userType", userEntity.getUserType());
+            userEntity.setLoginTime(System.currentTimeMillis());
+            userEntity.setToken(IdUtil.fastSimpleUUID());
+            userEntity.setMenuUrl(generateMenuUrlCode(urls));
 
             String token = authTokenService.createToken(userEntity);
             data.put("token", token);
             //设置token 和过期时间
-            //CookieInfo loginCookie = CookieService.getLoginCookie(request);
+//            CookieInfo loginCookie = CookieService.getLoginCookie(request);
 //            if(!ObjectUtils.isEmpty(loginCookie)){
 //
 //            }
             // data.put("token", UUID.fastUUID().toString());
             data.put("expiresTime", DateUtils.addCurrDate(7).getTime());
-
-            // this.generateBlackCookie(request, response, loginName, urls);
+            generateMenuUrlCode(urls);
+            //this.generateBlackCookie(request, response, loginName, urls);
             ret.put(KEY_RESULT_DATA, data);
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
@@ -133,7 +135,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
     @RequestMapping("logout")
     public void logout(HttpServletRequest request, HttpServletResponse response) throws Exception {
         recordSysLog(request, "退出登录");
-        super.removeCurrUser(request, response);
+        super.removeCurrUser(request);
         this.deleteBlackCookie(request, response);
     }
 
@@ -145,18 +147,18 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
             return "";
         }
         Set<String> urls = resourceService.findUrlSetByUserId(user.getId());
-        List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls);
+       // List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls);
         String currUserName = user.getRealName();
         if (currUserName == null || currUserName.trim().length() == 0) {
             currUserName = "管理员";
         }
         JSONObject data = new JSONObject();
         data.put("currUserName", currUserName);
-        data.put("barList", outlookBarList);
+       // data.put("barList", outlookBarList);
         data.put("id", user.getId());
         data.put("userType", user.getUserType());
         ret.put(KEY_RESULT_DATA, data);
-        this.generateBlackCookie(request, response, user.getLoginName(), urls);
+        //this.generateBlackCookie(request, response, user.getLoginName(), urls);
         ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
         ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
         ret.put("resources", urls);
@@ -186,6 +188,26 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
         }
     }
 
+
+    private String generateMenuUrlCode(Set<String> urls) {
+        try {
+            String securityKey = GlobalSysInfo.getPropertyValue(SysConstains.PROP_COOKIE_SECURITY_KEY);
+            StringBuilder sb = new StringBuilder();
+            if (urls != null && urls.size() > 0) {
+                for (String url : urls) {
+                    int index = url.hashCode() & (Integer.MAX_VALUE - 1);
+                    sb.append(index).append(",");
+                }
+            }
+            String menuUrl = sb.toString();
+            return AESUtil.encrypt(menuUrl, securityKey);
+        } catch (Throwable e) {
+            log.error("编码异常", e);
+            return null;
+
+        }
+    }
+
     @RequestMapping("validcode")
     public String validCode(HttpServletRequest request, HttpServletResponse response, LoginForm loginForm) {
         JSONObject ret = new JSONObject();

base-manager/src/main/java/com/mortals/xhx/base/login/web/LoginForm.java

@@ -2,45 +2,22 @@ package com.mortals.xhx.base.login.web;
 
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseForm;
+import lombok.Data;
 
-public class LoginForm extends BaseForm {
+
+@Data
+public class LoginForm {
     private String loginName;
 
     private String password;
 
     private String securityCode;
 
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-
-    public String getSecurityCode() {
-        return securityCode;
-    }
-
-    public void setSecurityCode(String securityCode) {
-        this.securityCode = securityCode;
-    }
-
     @Override
     public String toString() {
         return "loginName:" + this.loginName + "  password:" + this.password + "  securityCode:" + this.securityCode;
     }
 
-    @Override
     public boolean validate() throws AppException {
         if (loginName == null || loginName.trim().length() == 0) {
             throw new AppException("帐号不能为空！");
@@ -51,6 +28,6 @@ public class LoginForm extends BaseForm {
         if (securityCode == null || securityCode.trim().length() == 0) {
             throw new AppException("验证码不能为空！");
         }
-        return super.validate();
+        return true;
     }
 }

base-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntityExt.java

@@ -7,10 +7,9 @@ import lombok.Data;
 import java.util.List;
 
 /**
-*
-* Description:User
-* date: 2021-9-26 16:11:48
-*/
+ * Description:User
+ * date: 2021-9-26 16:11:48
+ */
 @Data
 public class UserEntityExt extends BaseEntityLong {
     /**
@@ -22,6 +21,8 @@ public class UserEntityExt extends BaseEntityLong {
      */
     private String token;
 
+    private String menuUrl;
+
     /**
      * 登录时间
      */

base-manager/src/main/java/com/mortals/xhx/module/area/web/AreaController.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.area.web;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.util.StringUtils;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.area.model.AreaEntity;
@@ -29,7 +30,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("area")
-public class AreaController extends BasePhpCRUDJsonMappingController<AreaService,AreaForm,AreaEntity,Long> {
+public class AreaController extends BaseCRUDJsonBodyMappingController<AreaService,AreaEntity,Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.util.DataUtil;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.IsBusinessEnum;
@@ -32,7 +33,7 @@ import static com.mortals.framework.ap.SysConstains.RESULT_KEY;
 */
 @RestController
 @RequestMapping("business")
-public class BusinessController extends BasePhpCRUDJsonMappingController<BusinessService,BusinessForm,BusinessEntity,Long> {
+public class BusinessController extends BaseCRUDJsonBodyMappingController<BusinessService,BusinessEntity,Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessMatterController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.business.model.BusinessMatterEntity;
@@ -29,7 +30,7 @@ import static com.mortals.framework.ap.SysConstains.*;
  */
 @RestController
 @RequestMapping("business/matter")
-public class BusinessMatterController extends BasePhpCRUDJsonMappingController<BusinessMatterService, BusinessMatterForm, BusinessMatterEntity, Long> {
+public class BusinessMatterController extends BaseCRUDJsonBodyMappingController<BusinessMatterService, BusinessMatterEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.dept.web;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.dept.model.DeptEntity;
@@ -23,7 +24,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("dept")
-public class DeptController extends BasePhpCRUDJsonMappingController<DeptService, DeptForm, DeptEntity, Long> {
+public class DeptController extends BaseCRUDJsonBodyMappingController<DeptService, DeptEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/holiday/web/HolidayController.java

 package com.mortals.xhx.module.holiday.web;
 
 import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.holiday.model.HolidayEntity;
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("holiday")
-public class HolidayController extends BasePhpCRUDJsonMappingController<HolidayService, HolidayForm, HolidayEntity, Long> {
+public class HolidayController extends BaseCRUDJsonBodyMappingController<HolidayService, HolidayEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterAcceptController.java

 package com.mortals.xhx.module.matter.web;
 
 import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("matter/accept")
-public class MatterAcceptController extends BasePhpCRUDJsonMappingController<MatterAcceptService, MatterAcceptForm, MatterAcceptEntity, Long> {
+public class MatterAcceptController extends BaseCRUDJsonBodyMappingController<MatterAcceptService, MatterAcceptEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterChargesController.java

 package com.mortals.xhx.module.matter.web;
 
 import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterChargesEntity;
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("matter/charges")
-public class MatterChargesController extends BasePhpCRUDJsonMappingController<MatterChargesService, MatterChargesForm, MatterChargesEntity, Long> {
+public class MatterChargesController extends BaseCRUDJsonBodyMappingController<MatterChargesService, MatterChargesEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.matter.web;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.util.DataUtil;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
@@ -24,7 +25,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("matter")
-public class MatterController extends BasePhpCRUDJsonMappingController<MatterService, MatterForm, MatterEntity, Long> {
+public class MatterController extends BaseCRUDJsonBodyMappingController<MatterService, MatterEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.matter.web;
 
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterDatumEntity;
@@ -24,7 +25,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("matter/datum")
-public class MatterDatumController extends BasePhpCRUDJsonMappingController<MatterDatumService, MatterDatumForm, MatterDatumEntity, Long> {
+public class MatterDatumController extends BaseCRUDJsonBodyMappingController<MatterDatumService, MatterDatumEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumFileController.java

 package com.mortals.xhx.module.matter.web;
 
 import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("matter/datum/file")
-public class MatterDatumFileController extends BasePhpCRUDJsonMappingController<MatterDatumFileService,MatterDatumFileForm,MatterDatumFileEntity,Long> {
+public class MatterDatumFileController extends BaseCRUDJsonBodyMappingController<MatterDatumFileService,MatterDatumFileEntity,Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterFlowlimitController.java

 package com.mortals.xhx.module.matter.web;
 
 import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("matter/flowlimit")
-public class MatterFlowlimitController extends BasePhpCRUDJsonMappingController<MatterFlowlimitService, MatterFlowlimitForm, MatterFlowlimitEntity, Long> {
+public class MatterFlowlimitController extends BaseCRUDJsonBodyMappingController<MatterFlowlimitService, MatterFlowlimitEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterIntermediaryController.java

 package com.mortals.xhx.module.matter.web;
 
 import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("matter/intermediary")
-public class MatterIntermediaryController extends BasePhpCRUDJsonMappingController<MatterIntermediaryService, MatterIntermediaryForm, MatterIntermediaryEntity, Long> {
+public class MatterIntermediaryController extends BaseCRUDJsonBodyMappingController<MatterIntermediaryService, MatterIntermediaryEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterQuestionController.java

 package com.mortals.xhx.module.matter.web;
 
 import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("matter/question")
-public class MatterQuestionController extends BasePhpCRUDJsonMappingController<MatterQuestionService, MatterQuestionForm, MatterQuestionEntity, Long> {
+public class MatterQuestionController extends BaseCRUDJsonBodyMappingController<MatterQuestionService, MatterQuestionEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterSetbaseController.java

 package com.mortals.xhx.module.matter.web;
 
 import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("matter/setbase")
-public class MatterSetbaseController extends BasePhpCRUDJsonMappingController<MatterSetbaseService, MatterSetbaseForm, MatterSetbaseEntity, Long> {
+public class MatterSetbaseController extends BaseCRUDJsonBodyMappingController<MatterSetbaseService, MatterSetbaseEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/matters/web/MattersAreaController.java

 package com.mortals.xhx.module.matters.web;
 
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.mortals.framework.web.BaseCRUDJsonMappingController;
 import com.mortals.xhx.module.matters.model.MattersAreaEntity;
 import com.mortals.xhx.module.matters.model.MattersAreaQuery;
 import com.mortals.xhx.module.matters.service.MattersAreaService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
+
 import java.util.Arrays;
+
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 区域
-*
-* @author zxfei
-* @date 2022-03-30
-*/
+ * 区域
+ *
+ * @author zxfei
+ * @date 2022-03-30
+ */
 @RestController
 @RequestMapping("matters/area")
-public class MattersAreaController extends BaseCRUDJsonMappingController<MattersAreaService,MattersAreaForm,MattersAreaEntity,Long> {
+public class MattersAreaController extends BaseCRUDJsonBodyMappingController<MattersAreaService, MattersAreaEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public MattersAreaController(){
+    public MattersAreaController() {
         super.setFormClass(MattersAreaForm.class);
-        super.setModuleDesc( "区域");
+        super.setModuleDesc("区域");
     }
 
     @Override
-    protected void init(HttpServletRequest request, HttpServletResponse response, MattersAreaForm form, Map<String, Object> model, Context context) {
-        super.init(request, response, form, model, context);
+    protected void init( Map<String, Object> model, Context context) {
+        super.init(model, context);
     }
 
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/model/web/ModelController.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.model.web;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.model.model.ModelEntity;
@@ -24,7 +25,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("model")
-public class ModelController extends BasePhpCRUDJsonMappingController<ModelService, ModelForm, ModelEntity, Long> {
+public class ModelController extends BaseCRUDJsonBodyMappingController<ModelService, ModelEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteBusinessController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.util.StringUtils;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.IsBusinessEnum;
@@ -34,7 +35,7 @@ import static com.mortals.framework.ap.SysConstains.RESULT_KEY;
  */
 @RestController
 @RequestMapping("site/business")
-public class SiteBusinessController extends BasePhpCRUDJsonMappingController<SiteBusinessService, SiteBusinessForm, SiteBusinessEntity, Long> {
+public class SiteBusinessController extends BaseCRUDJsonBodyMappingController<SiteBusinessService, SiteBusinessEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.site.web;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.model.model.ModelQuery;
@@ -27,7 +28,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("site")
-public class SiteController extends BasePhpCRUDJsonMappingController<SiteService, SiteForm, SiteEntity, Long> {
+public class SiteController extends BaseCRUDJsonBodyMappingController<SiteService, SiteEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteMatterController.java

 package com.mortals.xhx.module.site.web;
 
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.site.model.SiteMatterEntity;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("site/matter")
-public class SiteMatterController extends BasePhpCRUDJsonMappingController<SiteMatterService, SiteMatterForm, SiteMatterEntity, Long> {
+public class SiteMatterController extends BaseCRUDJsonBodyMappingController<SiteMatterService, SiteMatterEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteModelController.java

 package com.mortals.xhx.module.site.web;
 
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.site.model.SiteModelEntity;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("site/model")
-public class SiteModelController extends BasePhpCRUDJsonMappingController<SiteModelService, SiteModelForm, SiteModelEntity, Long> {
+public class SiteModelController extends BaseCRUDJsonBodyMappingController<SiteModelService, SiteModelEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/sms/web/SmsTemplateController.java

 package com.mortals.xhx.module.sms.web;
 
 import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.sms.model.SmsTemplateEntity;
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("sms/template")
-public class SmsTemplateController extends BasePhpCRUDJsonMappingController<SmsTemplateService, SmsTemplateForm, SmsTemplateEntity, Long> {
+public class SmsTemplateController extends BaseCRUDJsonBodyMappingController<SmsTemplateService, SmsTemplateEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowBusinessController.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.window.web;
 
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.util.DataUtil;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.window.model.WindowBusinessEntity;
@@ -23,7 +24,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("window/business")
-public class WindowBusinessController extends BasePhpCRUDJsonMappingController<WindowBusinessService, WindowBusinessForm, WindowBusinessEntity, Long> {
+public class WindowBusinessController extends BaseCRUDJsonBodyMappingController<WindowBusinessService, WindowBusinessEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowController.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.window.web;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.util.DataUtil;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.window.model.WindowEntity;
@@ -24,7 +25,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("window")
-public class WindowController extends BasePhpCRUDJsonMappingController<WindowService, WindowForm, WindowEntity, Long> {
+public class WindowController extends BaseCRUDJsonBodyMappingController<WindowService, WindowEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowMatterController.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.window.web;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.window.model.WindowMatterEntity;
@@ -23,7 +24,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("window/matter")
-public class WindowMatterController extends BasePhpCRUDJsonMappingController<WindowMatterService,WindowMatterForm,WindowMatterEntity,Long> {
+public class WindowMatterController extends BaseCRUDJsonBodyMappingController<WindowMatterService,WindowMatterEntity,Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.workman.web;
 
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.role.model.RoleQuery;
@@ -33,7 +34,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("workman")
-public class WorkmanController extends BasePhpCRUDJsonMappingController<WorkmanService, WorkmanForm, WorkmanEntity, Long> {
+public class WorkmanController extends BaseCRUDJsonBodyMappingController<WorkmanService, WorkmanEntity, Long> {
 
     @Autowired
     private ParamService paramService;

base-manager/src/test/java/Test.java

+import com.alibaba.fastjson.JSON;
+import lombok.Data;
+
+/**
+ * @author: zxfei
+ * @date: 2022/4/22 10:20
+ * @description:
+ **/
+@Data
+public class Test implements ITest {
+
+    private Integer userId;
+    @Override
+    public boolean isAdmin() {
+        return userId == 1 ? true : false;
+    }
+
+    @Override
+    public void setIsAdmin(Boolean bool) {
+
+    }
+
+
+    public static void main(String[] args) {
+        Test test = new Test();
+        test.setUserId(1);
+        String json = JSON.toJSONString(test);
+        System.out.println(json);
+
+        ITest iTest = JSON.parseObject(json, ITest.class);
+
+        System.out.println("bool:"+iTest.isAdmin());
+
+    }
+
+}

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -15,6 +15,19 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 
+
+###首页
+POST {{baseUrl}}/login/index
+Authorization: Bearer  {{authToken}}
+Content-Type: application/json
+
+{}
+
+###短信设置查看
+GET {{baseUrl}}/sms/set/info?id=1
+Authorization: Bearer  {{authToken}}
+Accept: application/json
+
 ###解析token
 POST {{baseUrl}}/login/parseToken
 Content-Type: application/json
@@ -25,9 +38,7 @@ GET {{baseUrl}}/sms/set/delete?id={{SmsSet_id}}
 Accept: application/json
 
 
-###短信设置查看
-GET {{baseUrl}}/sms/set/info?id={{SmsSet_id}}
-Accept: application/json
+
 
 ###短信设置编辑
 GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}