Ver código fonte

超管设置新增用户验证和菜单管理

wangliang 2 anos atrás
pai
commit
2285f7982b

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/backup/MySQLDatabaseBackup.java

@@ -142,7 +142,7 @@ public class MySQLDatabaseBackup {
                             os.close();
                         }
                     } catch (Exception e) {
-                        e.printStackTrace();
+                        log.error(SystemConstant.LOG_ERROR, e);
                     }
                 }
             }).start();

+ 24 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/TSchoolPrivilegeParam.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/SysAdminSetParam.java

@@ -14,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date: 2021/10/30
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class TSchoolPrivilegeParam extends TSchoolPrivilege {
+public class SysAdminSetParam extends TSchoolPrivilege {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "权限id数组")
@@ -24,13 +24,33 @@ public class TSchoolPrivilegeParam extends TSchoolPrivilege {
     private String[] pdfSize;
 
     @ApiModelProperty(value = "用户/密码模式是否开启短信验证")
-    boolean accountSmsVerify;
+    Boolean accountSmsVerify;
 
-    public boolean isAccountSmsVerify() {
+    @ApiModelProperty(value = "第三方统一身份认证地址")
+    String teachcloudExchangeSerivePath;
+
+    public SysAdminSetParam() {
+
+    }
+
+    public SysAdminSetParam(Boolean accountSmsVerify, String teachcloudExchangeSerivePath) {
+        this.accountSmsVerify = accountSmsVerify;
+        this.teachcloudExchangeSerivePath = teachcloudExchangeSerivePath;
+    }
+
+    public String getTeachcloudExchangeSerivePath() {
+        return teachcloudExchangeSerivePath;
+    }
+
+    public void setTeachcloudExchangeSerivePath(String teachcloudExchangeSerivePath) {
+        this.teachcloudExchangeSerivePath = teachcloudExchangeSerivePath;
+    }
+
+    public Boolean getAccountSmsVerify() {
         return accountSmsVerify;
     }
 
-    public void setAccountSmsVerify(boolean accountSmsVerify) {
+    public void setAccountSmsVerify(Boolean accountSmsVerify) {
         this.accountSmsVerify = accountSmsVerify;
     }
 

+ 30 - 21
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/CustomPrivilegeResult.java

@@ -18,29 +18,38 @@ public class CustomPrivilegeResult implements Serializable {
     @ApiModelProperty(value = "自定义菜单")
     List<PrivilegeDto> customPrivilegeList;
 
-    @ApiModelProperty(value = "全局pdf格式")
-    List<String> sysPdfSize;
-
-    @ApiModelProperty(value = "用户/密码模式是否开启短信验证")
-    boolean accountSmsVerify;
+//    @ApiModelProperty(value = "全局pdf格式")
+//    List<String> sysPdfSize;
+//
+//    @ApiModelProperty(value = "用户/密码模式是否开启短信验证")
+//    boolean accountSmsVerify;
 
     public CustomPrivilegeResult() {
 
     }
 
-    public CustomPrivilegeResult(List<PrivilegeDto> customPrivilegeList, List<String> sysPdfSize, boolean accountSmsVerify) {
+    public CustomPrivilegeResult(List<PrivilegeDto> customPrivilegeList) {
         this.customPrivilegeList = customPrivilegeList;
-        this.sysPdfSize = sysPdfSize;
-        this.accountSmsVerify = accountSmsVerify;
     }
 
-    public boolean isAccountSmsVerify() {
-        return accountSmsVerify;
-    }
+//    public CustomPrivilegeResult(List<PrivilegeDto> customPrivilegeList, List<String> sysPdfSize) {
+//        this.customPrivilegeList = customPrivilegeList;
+//        this.sysPdfSize = sysPdfSize;
+//    }
+//
+//    public CustomPrivilegeResult(List<PrivilegeDto> customPrivilegeList, List<String> sysPdfSize, boolean accountSmsVerify) {
+//        this.customPrivilegeList = customPrivilegeList;
+//        this.sysPdfSize = sysPdfSize;
+//        this.accountSmsVerify = accountSmsVerify;
+//    }
 
-    public void setAccountSmsVerify(boolean accountSmsVerify) {
-        this.accountSmsVerify = accountSmsVerify;
-    }
+//    public boolean isAccountSmsVerify() {
+//        return accountSmsVerify;
+//    }
+//
+//    public void setAccountSmsVerify(boolean accountSmsVerify) {
+//        this.accountSmsVerify = accountSmsVerify;
+//    }
 
     public List<PrivilegeDto> getCustomPrivilegeList() {
         return customPrivilegeList;
@@ -50,11 +59,11 @@ public class CustomPrivilegeResult implements Serializable {
         this.customPrivilegeList = customPrivilegeList;
     }
 
-    public List<String> getSysPdfSize() {
-        return sysPdfSize;
-    }
-
-    public void setSysPdfSize(List<String> sysPdfSize) {
-        this.sysPdfSize = sysPdfSize;
-    }
+//    public List<String> getSysPdfSize() {
+//        return sysPdfSize;
+//    }
+//
+//    public void setSysPdfSize(List<String> sysPdfSize) {
+//        this.sysPdfSize = sysPdfSize;
+//    }
 }

+ 22 - 12
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/TSchoolPrivilegeResult.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/SysAdminSetResult.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.bean.result;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +15,8 @@ import java.util.List;
  * @Author: wangliang
  * @Date: 2022/8/24
  */
-public class TSchoolPrivilegeResult implements Serializable {
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SysAdminSetResult implements Serializable {
 
     @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -27,35 +29,43 @@ public class TSchoolPrivilegeResult implements Serializable {
     List<String> pdfSize;
 
     @ApiModelProperty(value = "用户/密码模式是否开启短信验证")
-    boolean accountSmsVerify;
+    Boolean accountSmsVerify;
 
-    public TSchoolPrivilegeResult() {
+    @ApiModelProperty(value = "第三方统一身份认证地址")
+    String teachcloudExchangeSerivePath;
+
+    public SysAdminSetResult() {
 
     }
 
-    public TSchoolPrivilegeResult(List<String> privilegeIdList, List<String> pdfSize) {
-        this.privilegeIdList = privilegeIdList;
+    public SysAdminSetResult(List<String> pdfSize) {
         this.pdfSize = pdfSize;
     }
 
-    public TSchoolPrivilegeResult(Long schoolId, List<String> privilegeIdList, List<String> pdfSize) {
+    public SysAdminSetResult(Long schoolId, List<String> privilegeIdList) {
         this.schoolId = schoolId;
         this.privilegeIdList = privilegeIdList;
-        this.pdfSize = pdfSize;
     }
 
-    public TSchoolPrivilegeResult(Long schoolId, List<String> privilegeIdList, List<String> pdfSize, boolean accountSmsVerify) {
+    public SysAdminSetResult(Long schoolId, Boolean accountSmsVerify, String teachcloudExchangeSerivePath) {
         this.schoolId = schoolId;
-        this.privilegeIdList = privilegeIdList;
-        this.pdfSize = pdfSize;
         this.accountSmsVerify = accountSmsVerify;
+        this.teachcloudExchangeSerivePath = teachcloudExchangeSerivePath;
+    }
+
+    public String getTeachcloudExchangeSerivePath() {
+        return teachcloudExchangeSerivePath;
+    }
+
+    public void setTeachcloudExchangeSerivePath(String teachcloudExchangeSerivePath) {
+        this.teachcloudExchangeSerivePath = teachcloudExchangeSerivePath;
     }
 
-    public boolean isAccountSmsVerify() {
+    public Boolean getAccountSmsVerify() {
         return accountSmsVerify;
     }
 
-    public void setAccountSmsVerify(boolean accountSmsVerify) {
+    public void setAccountSmsVerify(Boolean accountSmsVerify) {
         this.accountSmsVerify = accountSmsVerify;
     }
 

+ 86 - 50
distributed-print/src/main/java/com/qmth/distributed/print/api/MenuCustomController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/SysAdminSetController.java

@@ -3,20 +3,16 @@ package com.qmth.distributed.print.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.params.TSchoolPrivilegeParam;
+import com.qmth.distributed.print.business.bean.params.SysAdminSetParam;
 import com.qmth.distributed.print.business.bean.result.CustomPrivilegeResult;
-import com.qmth.distributed.print.business.bean.result.TSchoolPrivilegeResult;
+import com.qmth.distributed.print.business.bean.result.SysAdminSetResult;
 import com.qmth.teachcloud.common.bean.dto.PrivilegeDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.*;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.*;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -29,17 +25,17 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * @Description: 菜单权限修改
+ * @Description: 超管设置
  * @Param:
  * @return:
  * @Author: wangliang
  * @Date: 2021/10/29
  */
-@Api(tags = "菜单权限修改Controller")
+@Api(tags = "超管设置Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.menu}")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.set}")
 //@Aac(auth = BOOL.FALSE, strict = BOOL.FALSE)
-public class MenuCustomController {
+public class SysAdminSetController {
 
     @Resource
     SysPrivilegeService sysPrivilegeService;
@@ -65,22 +61,62 @@ public class MenuCustomController {
     @Resource
     SysConfigService sysConfigService;
 
+    @ApiOperation(value = "用户验证查询")
+    @ApiResponses({@ApiResponse(code = 200, message = "用户验证信息", response = SysAdminSetResult.class)})
+    @RequestMapping(value = "/user/select", method = RequestMethod.POST)
+    public Result sysadminUserSelect(@ApiParam(value = "学校id ", required = true) @RequestParam Long schoolId) {
+        SysConfig sysConfigAccount = commonCacheService.addSysConfigCache(schoolId, SystemConstant.ACCOUNT_SMS_VERIFY);
+        SysConfig sysConfigTeachcloudExchangeSerivePath = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_EXCHANGE_SERVICE_PATH);
+        return ResultUtil.ok(new SysAdminSetResult(schoolId, Objects.nonNull(sysConfigAccount) ? Boolean.valueOf(sysConfigAccount.getConfigValue()) : false, Objects.nonNull(sysConfigTeachcloudExchangeSerivePath) ? sysConfigTeachcloudExchangeSerivePath.getConfigValue() : ""));
+    }
+
+    @ApiOperation(value = "用户验证保存")
+    @ApiResponses({@ApiResponse(code = 200, message = "用户验证信息", response = ResultUtil.class)})
+    @RequestMapping(value = "/user/save", method = RequestMethod.POST)
+    @Transactional
+    public Result sysadminUserSave(@Valid @RequestBody SysAdminSetParam sysAdminSetParam, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+        }
+        List<SysConfig> sysConfigList = new ArrayList<>();
+        SysConfig sysConfigAccount = commonCacheService.addSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY);
+        if (Objects.isNull(sysConfigAccount)) {
+            sysConfigAccount = new SysConfig(sysAdminSetParam.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY, "用户/密码模式是否开启短信验证", String.valueOf(sysAdminSetParam.getAccountSmsVerify()));
+        } else {
+            sysConfigAccount.setConfigValue(String.valueOf(sysAdminSetParam.getAccountSmsVerify()));
+        }
+        sysConfigList.add(sysConfigAccount);
+
+        SysConfig sysConfigTeachcloudExchangeSerivePath = commonCacheService.addSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.TEACHCLOUD_EXCHANGE_SERVICE_PATH);
+        if (Objects.isNull(sysConfigTeachcloudExchangeSerivePath)) {
+            sysConfigTeachcloudExchangeSerivePath = new SysConfig(sysAdminSetParam.getSchoolId(), SystemConstant.TEACHCLOUD_EXCHANGE_SERVICE_PATH, "第三方统一身份认证", sysAdminSetParam.getTeachcloudExchangeSerivePath());
+        } else {
+            sysConfigTeachcloudExchangeSerivePath.setConfigValue(sysAdminSetParam.getTeachcloudExchangeSerivePath());
+        }
+        sysConfigList.add(sysConfigTeachcloudExchangeSerivePath);
+        sysConfigService.saveOrUpdateBatch(sysConfigList);
+
+        commonCacheService.removeSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY);
+        commonCacheService.removeSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.TEACHCLOUD_EXCHANGE_SERVICE_PATH);
+        return ResultUtil.ok(true);
+    }
+
     @ApiOperation(value = "查询自定义菜单权限")
     @ApiResponses({@ApiResponse(code = 200, message = "菜单权限信息", response = SysPrivilege.class)})
-    @RequestMapping(value = "/custom/list", method = RequestMethod.POST)
+    @RequestMapping(value = "/menu/custom/list", method = RequestMethod.POST)
     public Result customList() {
         List<PrivilegeDto> customPrivilegeList = sysPrivilegeService.addCustomList();
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.SYS_PDF_SIZE_LIST);
-        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置全局pdf格式清单"));
-        SysConfig sysConfigAccount = commonCacheService.addSysConfigCache(SystemConstant.ACCOUNT_SMS_VERIFY);
-        return ResultUtil.ok(new CustomPrivilegeResult(customPrivilegeList, Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", ")), Objects.nonNull(sysConfigAccount) ? Boolean.valueOf(sysConfigAccount.getConfigValue()) : false));
+//        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.SYS_PDF_SIZE_LIST);
+//        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置全局pdf格式清单"));
+//        return ResultUtil.ok(new CustomPrivilegeResult(customPrivilegeList, Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", "))));
+        return ResultUtil.ok(new CustomPrivilegeResult(customPrivilegeList));
     }
 
     @ApiOperation(value = "学校新增/修改自定义菜单权限")
-    @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
-    @RequestMapping(value = "/custom/save", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "菜单权限信息", response = ResultUtil.class)})
+    @RequestMapping(value = "/menu/custom/save", method = RequestMethod.POST)
     @Transactional
-    public Result getRolePrivileges(@Valid @RequestBody TSchoolPrivilegeParam tSchoolPrivilegeParam, BindingResult bindingResult) throws NoSuchAlgorithmException {
+    public Result getRolePrivileges(@Valid @RequestBody SysAdminSetParam tSchoolPrivilegeParam, BindingResult bindingResult) throws NoSuchAlgorithmException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
@@ -143,42 +179,42 @@ public class MenuCustomController {
                 }
             }
         }
-
-        List<SysConfig> sysConfigList = new ArrayList<>();
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.PDF_SIZE_LIST);
-        if (Objects.isNull(sysConfig)) {
-            sysConfig = new SysConfig(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.PDF_SIZE_LIST, "pdf格式清单", Arrays.asList(tSchoolPrivilegeParam.getPdfSize()).toString());
-        } else {
-            if (Objects.nonNull(tSchoolPrivilegeParam.getPdfSize()) && tSchoolPrivilegeParam.getPdfSize().length > 0) {
-                sysConfig.setConfigValue(Arrays.asList(tSchoolPrivilegeParam.getPdfSize()).toString());
-            } else {
-                sysConfig.setConfigValue(null);
-            }
-        }
-        sysConfigList.add(sysConfig);
-
-        SysConfig sysConfigAccount = commonCacheService.addSysConfigCache(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY);
-        if (Objects.isNull(sysConfigAccount)) {
-            sysConfigAccount = new SysConfig(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY, "用户/密码模式是否开启短信验证", String.valueOf(tSchoolPrivilegeParam.isAccountSmsVerify()));
-        } else {
-            sysConfigAccount.setConfigValue(String.valueOf(tSchoolPrivilegeParam.isAccountSmsVerify()));
-        }
-        sysConfigList.add(sysConfigAccount);
-
-        sysConfigService.saveOrUpdateBatch(sysConfigList);
-        commonCacheService.removeSysConfigCache(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.PDF_SIZE_LIST);
-        commonCacheService.removeSysConfigCache(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY);
+//        List<SysConfig> sysConfigList = new ArrayList<>();
+//        SysConfig sysConfig = commonCacheService.addSysConfigCache(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.PDF_SIZE_LIST);
+//        if (Objects.isNull(sysConfig)) {
+//            sysConfig = new SysConfig(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.PDF_SIZE_LIST, "pdf格式清单", Arrays.asList(tSchoolPrivilegeParam.getPdfSize()).toString());
+//        } else {
+//            if (Objects.nonNull(tSchoolPrivilegeParam.getPdfSize()) && tSchoolPrivilegeParam.getPdfSize().length > 0) {
+//                sysConfig.setConfigValue(Arrays.asList(tSchoolPrivilegeParam.getPdfSize()).toString());
+//            } else {
+//                sysConfig.setConfigValue(null);
+//            }
+//        }
+//        sysConfigList.add(sysConfig);
+//
+//        SysConfig sysConfigAccount = commonCacheService.addSysConfigCache(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY);
+//        if (Objects.isNull(sysConfigAccount)) {
+//            sysConfigAccount = new SysConfig(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY, "用户/密码模式是否开启短信验证", String.valueOf(tSchoolPrivilegeParam.isAccountSmsVerify()));
+//        } else {
+//            sysConfigAccount.setConfigValue(String.valueOf(tSchoolPrivilegeParam.isAccountSmsVerify()));
+//        }
+//        sysConfigList.add(sysConfigAccount);
+//
+//        sysConfigService.saveOrUpdateBatch(sysConfigList);
+//        commonCacheService.removeSysConfigCache(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.PDF_SIZE_LIST);
+//        commonCacheService.removeSysConfigCache(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY);
         return ResultUtil.ok(true);
     }
 
     @ApiOperation(value = "学校已绑定自定义菜单权限列表")
-    @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
-    @RequestMapping(value = "/custom/get_school_custom_privileges", method = RequestMethod.POST)
-    public Result getRolePrivileges(@RequestParam(value = "schoolId", required = true) Long schoolId) {
+    @ApiResponses({@ApiResponse(code = 200, message = "菜单权限信息", response = SysAdminSetResult.class)})
+    @RequestMapping(value = "/menu/custom/get_school_custom_privileges", method = RequestMethod.POST)
+    public Result getRolePrivileges(@ApiParam(value = "学校id ", required = true) @RequestParam Long schoolId) {
         List<TSchoolPrivilege> tSchoolPrivilegeList = tSchoolPrivilegeService.findBySchoolId(schoolId);
         List<String> privilegeIdList = tSchoolPrivilegeList.stream().map(s -> String.valueOf(s.getPrivilegeId())).collect(Collectors.toList());
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.PDF_SIZE_LIST);
-        SysConfig sysConfigAccount = commonCacheService.addSysConfigCache(schoolId, SystemConstant.ACCOUNT_SMS_VERIFY);
-        return ResultUtil.ok(new TSchoolPrivilegeResult(schoolId, privilegeIdList, Objects.nonNull(sysConfig) ? Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", ")) : null, Objects.nonNull(sysConfigAccount) ? Boolean.valueOf(sysConfigAccount.getConfigValue()) : false));
+//        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.PDF_SIZE_LIST);
+//        SysConfig sysConfigAccount = commonCacheService.addSysConfigCache(schoolId, SystemConstant.ACCOUNT_SMS_VERIFY);
+//        return ResultUtil.ok(new TSchoolPrivilegeResult(schoolId, privilegeIdList, Objects.nonNull(sysConfig) ? Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", ")) : null, Objects.nonNull(sysConfigAccount) ? Boolean.valueOf(sysConfigAccount.getConfigValue()) : false));
+        return ResultUtil.ok(new SysAdminSetResult(schoolId, CollectionUtils.isEmpty(privilegeIdList) ? new ArrayList<>() : privilegeIdList));
     }
 }

+ 0 - 1
distributed-print/src/main/resources/application-36dev.properties

@@ -92,7 +92,6 @@ prefix.url.exam=admin/exam
 prefix.url.data=admin/data
 prefix.url.work=admin/work
 prefix.url.client=admin/client
-prefix.url.flow=admin/flow
 prefix.url.statistics=admin/statistics
 prefix.url.sync=admin/sync
 prefix.url.menu=admin/menu

+ 1 - 2
distributed-print/src/main/resources/application-dev.properties

@@ -92,16 +92,15 @@ prefix.url.exam=admin/exam
 prefix.url.data=admin/data
 prefix.url.work=admin/work
 prefix.url.client=admin/client
-prefix.url.flow=admin/flow
 prefix.url.statistics=admin/statistics
 prefix.url.sync=admin/sync
-prefix.url.menu=admin/menu
 prefix.url.customFlow=admin/custom/flow
 prefix.url.teach=admin/teach
 prefix.url.auth=admin/auth
 prefix.url.open=admin/print/open
 prefix.url.notify=admin/print/notify
 prefix.url.grade=admin/grade
+prefix.url.set=admin/set
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

+ 0 - 1
distributed-print/src/main/resources/application-offline.properties

@@ -92,7 +92,6 @@ prefix.url.exam=admin/exam
 prefix.url.data=admin/data
 prefix.url.work=admin/work
 prefix.url.client=admin/client
-prefix.url.flow=admin/flow
 prefix.url.statistics=admin/statistics
 prefix.url.sync=admin/sync
 prefix.url.menu=admin/menu

+ 0 - 1
distributed-print/src/main/resources/application-test.properties

@@ -92,7 +92,6 @@ prefix.url.exam=admin/exam
 prefix.url.data=admin/data
 prefix.url.work=admin/work
 prefix.url.client=admin/client
-prefix.url.flow=admin/flow
 prefix.url.statistics=admin/statistics
 prefix.url.sync=admin/sync
 prefix.url.menu=admin/menu

+ 1 - 0
teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -40,6 +40,7 @@ public class SystemConstant {
     public static final String SYS_PDF_SIZE_LIST = "sys.pdf.size.list";
     public static final String PDF_SIZE_LIST = "pdf.size.list";
     public static final String ACCOUNT_SMS_VERIFY = "account.sms.verify";
+    public static final String TEACHCLOUD_EXCHANGE_SERVICE_PATH = "teachcloud.exchange.serive.path";
     public static final String CHARSET_NAME = "UTF-8";
     //    public static final String CHARSET_GB2312 = "gb2312";
     public static final String CHARSET_GBK = "gbk";

+ 70 - 0
teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/PrefixUrlDomain.java

@@ -43,6 +43,76 @@ public class PrefixUrlDomain implements Serializable {
 
     String sso;
 
+    String statistics;
+
+    String sync;
+
+    String customFlow;
+
+    String teach;
+
+    String auth;
+
+    String grade;
+
+    String set;
+
+    public String getSet() {
+        return set;
+    }
+
+    public void setSet(String set) {
+        this.set = set;
+    }
+
+    public String getStatistics() {
+        return statistics;
+    }
+
+    public void setStatistics(String statistics) {
+        this.statistics = statistics;
+    }
+
+    public String getSync() {
+        return sync;
+    }
+
+    public void setSync(String sync) {
+        this.sync = sync;
+    }
+
+    public String getCustomFlow() {
+        return customFlow;
+    }
+
+    public void setCustomFlow(String customFlow) {
+        this.customFlow = customFlow;
+    }
+
+    public String getTeach() {
+        return teach;
+    }
+
+    public void setTeach(String teach) {
+        this.teach = teach;
+    }
+
+    public String getAuth() {
+        return auth;
+    }
+
+    public void setAuth(String auth) {
+        this.auth = auth;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
     public String getSso() {
         return sso;
     }