aop

src/main/java/org/rcisoft/common/controller/PaginationController.java

@@ -19,6 +19,10 @@ public class PaginationController<T> extends ResponseController {
 
     protected static final String PAGINATIONKEY = "pagination";
 
+    protected static final int INIT_PAGE = 1;
+
+    protected static final int INIT_ROWS = 10;
+
     public PaginationController() {
     }
 
@@ -32,10 +36,9 @@ public class PaginationController<T> extends ResponseController {
     }
 
     @ModelAttribute
-    private void setPagnationAttribute(HttpServletRequest request, Integer rows, Integer page, String sort, String order) {
-        PageUtil _paginationUtility;
+    private void setPagnationAttribute(HttpServletRequest request, Integer rows, Integer page, String sort) {
+        PageUtil _paginationUtility = new PageUtil();
         if(rows != null && page != null && sort != null ) {
-            _paginationUtility = new PageUtil();
             _paginationUtility.setPageNum(page.intValue());
             _paginationUtility.setPageSize(rows.intValue());
             _paginationUtility.setOrderBy(sort);
@@ -43,15 +46,18 @@ public class PaginationController<T> extends ResponseController {
         }
 
         else if(rows != null && page != null) {
-            _paginationUtility = new PageUtil();
             _paginationUtility.setPageNum(page.intValue());
             _paginationUtility.setPageSize(rows.intValue());
-            request.setAttribute(PAGINATIONKEY, _paginationUtility);
-        } else if(sort != null && order != null) {
-            _paginationUtility = new PageUtil();
-            _paginationUtility.setOrderBy(sort + " " + order);
-            request.setAttribute(PAGINATIONKEY, _paginationUtility);
+
+        } else if(sort != null) {
+            _paginationUtility.setOrderBy(sort);
+        }
+        else{
+            _paginationUtility.setPageNum(INIT_ROWS);
+            _paginationUtility.setPageSize(INIT_PAGE);
+
         }
+        request.setAttribute(PAGINATIONKEY, _paginationUtility);
 
     }
 

src/main/java/org/rcisoft/common/controller/ValidatedController.java

@@ -26,13 +26,27 @@ public class ValidatedController extends  HttpServletController {
     public ValidatedController() {
     }
 
+    /**
+     * 第一版  验证写在controller里的
+     * @param br
+     * @return
+     */
     public boolean hasErrors(BindingResult br) {
-        ValidatedResult vr = new ValidatedResult();
-        vr.dealBindingResult(br);
+        ValidatedResult vr = ValidatedResult.builder(br);
         this.request.setAttribute("validerrors", vr);
         return vr.hasErrors().booleanValue();
     }
 
+    /**
+     * 第二版写在  aop里的
+     * @param br
+     * @return
+     */
+    public static boolean hasErrorsByStatic(BindingResult br) {
+        ValidatedResult vr = ValidatedResult.builder(br);
+        return vr.hasErrors().booleanValue();
+    }
+
     public Map<String, String[]> getErrorsMap() {
         ValidatedResult vr = (ValidatedResult)this.request.getAttribute("validerrors");
         return vr.getErrorsMap();
@@ -49,8 +63,7 @@ public class ValidatedController extends  HttpServletController {
     }
 
     protected void setBindError(BindingResult br, Result result, String message){
-        ValidatedResult vr = new ValidatedResult();
-
+        ValidatedResult vr = ValidatedResult.builder(br);
         result.setErrorMessage(message,vr);
     }
 }

src/main/java/org/rcisoft/config/AopConfig.java

+package org.rcisoft.config;
+
+import org.apache.poi.ss.formula.functions.T;
+import org.rcisoft.core.aop.EntityParamAspect;
+import org.rcisoft.core.aop.IdGenAspect;
+import org.rcisoft.core.aop.PageUtil;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Created by lcy on 18/1/21.
+ */
+@Configuration
+public class AopConfig {
+
+
+    /**
+     * 分页 bean
+     * @return
+     */
+    @Bean
+    public PageUtil<T> pageUtil(){
+        return new PageUtil<T>();
+    }
+
+    /**
+     * id bean
+     * @return
+     */
+    @Bean
+    public IdGenAspect idGenAspect(){
+        return new IdGenAspect();
+    }
+
+    /**
+     *  web param validation
+     * @return
+     */
+    @Bean
+    public EntityParamAspect entityParamAspect(){
+        return new EntityParamAspect();
+    }
+}

src/main/java/org/rcisoft/config/SecurityConfig.java

@@ -21,7 +21,7 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
  */
 @Configuration
 @EnableWebSecurity   //开启WebSecurity支持
-@EnableGlobalMethodSecurity(prePostEnabled = true) //开启prePostEnabled注解支持
+@EnableGlobalMethodSecurity(prePostEnabled = true) //开启prePostEnabled注解支持    支持方法级别的安全设置 hasRole()
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
 
@@ -67,7 +67,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) throws Exception {
 
         http
-                .csrf()
+                .csrf()     //csrf 对 post delete put 等 进行校验 token 和jwt一样  beforeSecond:{ request.setRequestHeader()}
                 .disable()  //由于使用的是JWT，我们这里不需要csrf
                 .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)  //禁用session
                 .and()

src/main/java/org/rcisoft/core/aop/EntityParamAspect.java

+package org.rcisoft.core.aop;
+
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.rcisoft.common.controller.ValidatedController;
+import org.rcisoft.core.exception.ServiceException;
+import org.rcisoft.core.validate.ValidatedResult;
+import org.springframework.validation.BindingResult;
+
+/**
+ * Created by lcy on 18/1/21.
+ */
+@Aspect
+@Slf4j
+public class EntityParamAspect {
+
+
+    /**
+     * 环绕aop   service.*ByPagination    分页拦截
+     * @param proceedingJoinPoint
+     * @return
+     */
+    @Around("execution(* org.rcisoft..*.controller.*Controller.add*(..))")
+    public Object beforeAddValidate(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
+
+        return dealWithParameterValidate(proceedingJoinPoint);
+    }
+
+    @Around("execution(* org.rcisoft..*.controller.*Controller.update*(..))")
+    public Object beforeUpdateValidate(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
+        return dealWithParameterValidate(proceedingJoinPoint);
+    }
+
+    /**
+     * 处理  增加/修改  方法参数验证
+     * @param proceedingJoinPoint
+     * @return
+     */
+    private Object dealWithParameterValidate(ProceedingJoinPoint proceedingJoinPoint) throws Throwable{
+        try {
+            /*验证 长度必须大于1*/
+            if(proceedingJoinPoint.getArgs().length < 2)
+                return proceedingJoinPoint.proceed();
+            /*BindingResult 必须写在第二个参数里*/
+            Object bindResult = proceedingJoinPoint.getArgs()[1];
+            if(!(bindResult instanceof BindingResult))
+                return proceedingJoinPoint.proceed();
+            BindingResult br = (BindingResult)bindResult;
+            /*有无异常*/
+            if(ValidatedController.hasErrorsByStatic(br))
+                throw new ServiceException(4004, ValidatedResult.builder(br).getValidatedMessage().getResponse());
+                /*
+
+                不能直接返回
+                return Result.builder(new PersistModel(0),
+                                        MessageConstant.MESSAGE_ALERT_SUCCESS,
+                        MessageConstant.MESSAGE_ALERT_INFO_INVALID,
+                        ValidatedResult.builder(br));
+
+                com.fasterxml.jackson.databind.JsonMappingException: No serializer found for class org.springframework.validation.DefaultMessageCodesResolver
+                 and no properties discovered to create BeanSerializer (to avoid exception, disable SerializationFeature.FAIL_ON_EMPTY_BEANS)
+                 (through reference chain: org.rcisoft.core.result.Result["data"]->org.rcisoft.core.validate.ValidatedResult["br"]->
+                 org.springframework.validation.BeanPropertyBindingResult["messageCodesResolver"])
+
+                 getOutputStream() has already been called for this response
+
+                */
+            else
+                return proceedingJoinPoint.proceed();
+        } catch (Throwable var5) {
+            log.error(var5.getMessage());
+            throw var5;
+        }
+    }
+
+
+}

src/main/java/org/rcisoft/core/aop/IdGenAspect.java

@@ -2,6 +2,7 @@ package org.rcisoft.core.aop;
 
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.rcisoft.core.entity.IdEntity;
 import org.rcisoft.core.util.IdGen;
@@ -11,8 +12,7 @@ import java.util.Date;
 /**
  * Created by lcy on 17/11/23.
  */
-//@Aspect
-//@Component
+@Aspect
 public class IdGenAspect {
     /**
      * 插入前  判断是否 存在id

src/main/java/org/rcisoft/core/aop/PageUtil.java

@@ -2,13 +2,13 @@ package org.rcisoft.core.aop;
 
 
 import com.github.pagehelper.PageHelper;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.rcisoft.common.model.CommonPageGridModel;
 import org.rcisoft.common.model.GridModel;
 import org.rcisoft.core.model.PageInfo;
-import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
 import java.util.List;
@@ -18,8 +18,8 @@ import java.util.List;
  * @author cy
  * Created by cy on 16/5/20.
  */
-@Component
 @Aspect
+@Slf4j
 public class PageUtil<T> extends PageInfo<T> implements Serializable {
 
     private static final long serialVersionUID = 8730332880750989562L;
@@ -67,7 +67,7 @@ public class PageUtil<T> extends PageInfo<T> implements Serializable {
      * @return
      */
     @Around("execution(* org.rcisoft..*.service.impl.*ServiceImpl.*ByPagination(..))")
-    public List<T> preparedPageHeplerAndloadingPageInfoSetResults(ProceedingJoinPoint proceedingJoinPoint) {
+    public List<T> preparedPageHeplerAndloadingPageInfoSetResults(ProceedingJoinPoint proceedingJoinPoint) throws Throwable{
         PageUtil paginationUtility = (PageUtil)proceedingJoinPoint.getArgs()[0];
         PageHelper.startPage(paginationUtility.getPageNum(), paginationUtility.getPageSize(), paginationUtility.getOrderBy());
         try {
@@ -76,8 +76,8 @@ public class PageUtil<T> extends PageInfo<T> implements Serializable {
             this.setPageInfo(paginationUtility, pageInfo);
             return e;
         } catch (Throwable var5) {
-            var5.printStackTrace();
-            return null;
+            log.error(var5.getMessage());
+            throw var5;
         }
     }
 

src/main/java/org/rcisoft/core/result/MainStatus.java

-package org.rcisoft.core.result;
-
-/**
- * Created with family.
- * User: cy
- * Date: 16/5/20
- * Time: 下午1:47
- * description:
- */
-public class MainStatus implements ResponseMessage {
-    private static final long serialVersionUID = -7441079017861505376L;
-    private String status;
-
-    public MainStatus() {
-    }
-
-    public String getStatus() {
-        return this.status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getMapperKey() {
-        return "mainstatus";
-    }
-}
\ No newline at end of file

src/main/java/org/rcisoft/core/result/ResponseMessage.java

@@ -11,4 +11,6 @@ import java.io.Serializable;
  */
 public interface ResponseMessage extends Serializable {
     String getMapperKey();
+
+    String getResponse();
 }

src/main/java/org/rcisoft/core/result/ValidatedMessage.java

 package org.rcisoft.core.result;
 
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -9,22 +14,41 @@ import java.util.Map;
  * Time: 下午1:45
  * description:
  */
-public class ValidatedMessage extends MainStatus implements ResponseMessage {
+@Data
+public class ValidatedMessage  implements ResponseMessage {
     private static final long serialVersionUID = -8037198481805394212L;
-    private Map<String, String[]> validmessage;
 
-    public ValidatedMessage() {
+    private Map<String, String[]> validMap;
+
+    private ValidatedMessage() {
+    }
+
+    @Override
+    public String getMapperKey(){
+        return "validatedMessage";
     }
 
-    public Map<String, String[]> getValidmessage() {
-        return this.validmessage;
+    private ValidatedMessage(Map<String, String[]> errorsMap){
+        this.validMap = errorsMap;
     }
 
-    public void setValidmessage(Map<String, String[]> validmessage) {
-        this.validmessage = validmessage;
+    public static ValidatedMessage builder(Map<String, String[]> errorsMap){
+        return new ValidatedMessage(errorsMap);
     }
 
-    public String getMapperKey() {
-        return "validmessage";
+
+    private String validmessage;
+
+    /**
+     * 错误信息
+     * @return
+     */
+    @Override
+    public String getResponse(){
+        List<String> list = new ArrayList<String>();
+        for(Map.Entry<String,String[]> entry : this.validMap.entrySet()){
+            list.add(entry.getKey() + " 异常 " +  entry.getValue()[0]);
+        }
+        return StringUtils.join(list,";");
     }
 }

src/main/java/org/rcisoft/core/validate/ValidatedResult.java

@@ -5,6 +5,7 @@ import org.rcisoft.core.result.ValidatedMessage;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -14,12 +15,24 @@ import java.util.Map;
  * @author  cy
  * Created by cy on 16/5/20.
  */
-public class ValidatedResult {
+public class ValidatedResult implements Serializable{
+
+    private static final long serialVersionUID = -118855035745939849L;
+
     private Boolean hasErrors = Boolean.valueOf(false);
     private Map<String, String[]> errorsMap;
     private BindingResult br;
 
-    public ValidatedResult() {
+    private ValidatedResult() {
+    }
+
+    private ValidatedResult(BindingResult br) {
+        this.br = br;
+        this.dealBindingResult();
+    }
+
+    public static ValidatedResult  builder(BindingResult br){
+        return new ValidatedResult(br);
     }
 
     public Boolean hasErrors() {
@@ -34,7 +47,11 @@ public class ValidatedResult {
         return this.br;
     }
 
-    public Map<String, String[]> dealBindingResult(BindingResult br) {
+    /**
+     * 生成map
+     * @return
+     */
+    public Map<String, String[]> dealBindingResult() {
         this.br = br;
         this.errorsMap = new HashMap();
         if(br.hasErrors()) {
@@ -52,9 +69,6 @@ public class ValidatedResult {
     }
 
     public ResponseMessage getValidatedMessage() {
-        ValidatedMessage vm = new ValidatedMessage();
-        vm.setStatus("2");
-        vm.setValidmessage(this.errorsMap);
-        return vm;
+        return ValidatedMessage.builder(this.errorsMap);
     }
 }

src/main/java/org/rcisoft/sys/dept/controller/SysDeptController.java

@@ -9,7 +9,6 @@ import org.rcisoft.common.model.TreeViewModel;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.Result;
-import org.rcisoft.core.validate.ValidatedResult;
 import org.rcisoft.sys.dept.entity.SysDept;
 import org.rcisoft.sys.dept.service.SysDeptService;
 import org.rcisoft.sys.role.entity.SysRole;
@@ -86,14 +85,6 @@ public class SysDeptController extends ResponseController {
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @PostMapping("adminLog/deptAdd")
     public Result deptAdd(@Valid SysDept dept, BindingResult br){
-        if(super.hasErrors(br)){
-            ValidatedResult vr = new ValidatedResult();
-            vr.dealBindingResult(br);
-            return Result.builder(new PersistModel(0),
-                    MessageConstant.MESSAGE_ALERT_SUCCESS,
-                    MessageConstant.MESSAGE_ALERT_INFO_INVALID,
-                    vr);
-        }
         PersistModel persistModel = sysDeptServiceImpl.persistDept(dept,getToken());
         return Result.builder(persistModel,
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
@@ -113,16 +104,8 @@ public class SysDeptController extends ResponseController {
             @ApiImplicitParam(name = "deptCode", value = "部门编号", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "seqDate", value = "排序日期", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
-    @PostMapping("adminLog/deptUpdate")
-    public Result deptUpdate(@Valid SysDept dept, BindingResult br){
-        if(super.hasErrors(br)){
-            ValidatedResult vr = new ValidatedResult();
-            vr.dealBindingResult(br);
-            return Result.builder(new PersistModel(0),
-                    MessageConstant.MESSAGE_ALERT_SUCCESS,
-                    MessageConstant.MESSAGE_ALERT_INFO_INVALID,
-                    vr);
-        }
+    @PostMapping("updateDept")
+    public Result update(@Valid SysDept dept, BindingResult br){
         PersistModel persistModel = sysDeptServiceImpl.mergeDept(dept,getToken());
         return Result.builder(persistModel,
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
@@ -132,7 +115,7 @@ public class SysDeptController extends ResponseController {
 
     @ApiOperation(value="删除部门", notes="根据ID删除部门")
     @ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar", paramType = "path")
-    @PostMapping("adminLog/deptDelete/{id}")
+    @PostMapping("deptDelete/{id}")
     public Result deptDelete(@PathVariable("id") String id){
         PersistModel persistModel = sysDeptServiceImpl.removeDept(id,getToken());
         return Result.builder(persistModel,

src/main/java/org/rcisoft/sys/dept/entity/SysDept.java

@@ -5,6 +5,7 @@ package org.rcisoft.sys.dept.entity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 import org.rcisoft.core.entity.IdEntity;
 
 import javax.persistence.Entity;
@@ -29,7 +30,8 @@ public class SysDept extends IdEntity<SysDept> {
 
 
     private String parentId;  //父机构id
-
+    /*<property name="useCodeAsDefaultMessage" value="false" />*/
+    @Length(min = 2,max = 10,message = "部门名称{min}和{max}之间")
     private String name;  //部门名称
 
     private String deptCode; //部门编号

src/main/java/org/rcisoft/sys/dept/service/impl/SysDeptServiceImpl.java

@@ -2,7 +2,9 @@ package org.rcisoft.sys.dept.service.impl;
 
 
 import org.rcisoft.common.model.TreeViewModel;
+import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
+import org.rcisoft.core.result.ResultExceptionEnum;
 import org.rcisoft.core.util.UserUtil;
 import org.rcisoft.sys.dept.dao.SysDeptRepository;
 import org.rcisoft.sys.dept.entity.SysDept;
@@ -78,9 +80,10 @@ public class SysDeptServiceImpl implements SysDeptService {
     @Override
     public PersistModel mergeDept(SysDept dept, String token) {
         //修改操作
-        UserUtil.setCurrentPersistOperation(dept);
+        throw  new ServiceException(ResultExceptionEnum.EXIST_LXC_SERVER);
+        /*UserUtil.setCurrentPersistOperation(dept);
         int line = sysDeptRepository.updateByPrimaryKeySelective(dept);
-        return new PersistModel(line);
+        return new PersistModel(line);*/
     }
 
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)

src/main/java/org/rcisoft/sys/menu/controller/SysMenuController.java

@@ -10,7 +10,6 @@ import org.rcisoft.common.model.TreeViewModel;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.Result;
-import org.rcisoft.core.validate.ValidatedResult;
 import org.rcisoft.sys.menu.entity.SysMenu;
 import org.rcisoft.sys.menu.service.SysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -83,14 +82,6 @@ public class SysMenuController extends ResponseController {
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @PostMapping("adminLog/menuAdd")
     public Result menuAdd(@Valid SysMenu menu, BindingResult br){
-        if(super.hasErrors(br)){
-            ValidatedResult vr = new ValidatedResult();
-            vr.dealBindingResult(br);
-            return Result.builder(new PersistModel(0),
-                    MessageConstant.MESSAGE_ALERT_INFO_INVALID,
-                    MessageConstant.MESSAGE_ALERT_ERROR,
-                    vr);
-        }
         PersistModel persistModel = sysMenuServiceImpl.persistMenu(menu,getToken());
         return Result.builder(persistModel,
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
@@ -115,14 +106,6 @@ public class SysMenuController extends ResponseController {
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @PostMapping("adminLog/menuUpdate")
     public Result menuUpdate(@Valid SysMenu menu, BindingResult br){
-        if(super.hasErrors(br)){
-            ValidatedResult vr = new ValidatedResult();
-            vr.dealBindingResult(br);
-            return Result.builder(new PersistModel(0),
-                    MessageConstant.MESSAGE_ALERT_INFO_INVALID,
-                    MessageConstant.MESSAGE_ALERT_ERROR,
-                    vr);
-        }
         PersistModel persistModel = sysMenuServiceImpl.mergeMenu(menu,getToken());
         return Result.builder(persistModel,
                 MessageConstant.MESSAGE_ALERT_SUCCESS,

src/main/java/org/rcisoft/sys/role/controller/SysRoleController.java

@@ -8,7 +8,6 @@ import org.rcisoft.common.model.GridModel;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.Result;
-import org.rcisoft.core.validate.ValidatedResult;
 import org.rcisoft.sys.role.entity.SysRole;
 import org.rcisoft.sys.role.service.SysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -109,16 +108,6 @@ public class SysRoleController extends PaginationController<SysRole> {
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @PostMapping(value = "adminLog/roleUpdate")
     public Result roleUpdate(@Valid SysRole sysRole, BindingResult br){
-        Result result = new Result();
-        if(super.hasErrors(br)){
-            ValidatedResult vr = new ValidatedResult();
-            vr.dealBindingResult(br);
-            result.setSucessMessage(MessageConstant.MESSAGE_ALERT_INFO_INVALID,vr);
-            return Result.builder(new PersistModel(0),
-                    MessageConstant.MESSAGE_ALERT_SUCCESS,
-                    MessageConstant.MESSAGE_ALERT_INFO_INVALID,
-                    vr);
-        }
         PersistModel persistModel = sysRoleServiceImpl.mergeRole(sysRole,getToken());
         return Result.builder(persistModel,
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
@@ -150,17 +139,10 @@ public class SysRoleController extends PaginationController<SysRole> {
     @PostMapping(value = "adminLog/rolePermission")
     public Result rolePermission(@RequestParam("roleId") String roleId, @RequestParam("role_menus") String role_menus ){
 
-        PersistModel persistModel = sysRoleServiceImpl.doAuthorization(roleId,role_menus,getToken());
-        if(persistModel.isSuccessBySinglePersist())
-            return Result.builder(new PersistModel(1),
-                    MessageConstant.MESSAGE_ALERT_SUCCESS,
-                    MessageConstant.MESSAGE_ALERT_ERROR,
-                    roleId);
-        else
-            return Result.builder(new PersistModel(0),
-                    MessageConstant.MESSAGE_ALERT_ERROR,
-                    MessageConstant.MESSAGE_ALERT_ERROR,
-                    roleId);
+        return Result.builder(sysRoleServiceImpl.doAuthorization(roleId,role_menus,getToken()),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                roleId);
     }
     
     @ApiOperation(value="岗位绑定", notes="岗位绑定")