同步配置修改

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

@@ -196,10 +196,7 @@ public class MySQLDatabaseBackup {
 
                 if (!CollectionUtils.isEmpty(sysUserList)) {
                     for (SysUser s : sysUserList) {
-                        commonCacheService.removeUserAuthCache(s.getId());
-                        commonCacheService.removeUserCache(s.getId());
-                        commonCacheService.removeUserMenuCache(s.getId());
-                        commonCacheService.removeUserRolePrivilegeCache(s.getId());
+                        SystemConstant.deleteUserCache(s.getId());
                     }
                 }
 
@@ -211,10 +208,7 @@ public class MySQLDatabaseBackup {
 
                 if (!CollectionUtils.isEmpty(sysConfigList)) {
                     for (SysConfig s : sysConfigList) {
-                        commonCacheService.removeSysConfigCache(s.getSchoolId(), SystemConstant.PDF_SIZE_LIST);
-                        commonCacheService.removeSysConfigCache(s.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY);
-                        commonCacheService.removeSysConfigCache(s.getSchoolId(), SystemConstant.TEACHCLOUD_EXCHANGE_HOST_URL);
-                        commonCacheService.removeSysConfigCache(s.getSchoolId(), SystemConstant.SYNC_SERVICE_PATHS);
+                        commonCacheService.removeSysConfigCache(s.getSchoolId(), s.getConfigKey());
                     }
                 }
             }

distributed-print/src/main/java/com/qmth/distributed/print/api/SysAdminSetController.java

@@ -82,18 +82,29 @@ public class SysAdminSetController {
     @ApiResponses({@ApiResponse(code = 200, message = "同步配置信息", response = SysAdminSetResult.class)})
     @RequestMapping(value = "/sync/select", method = RequestMethod.POST)
     public Result sysadminSyncSelect(@ApiParam(value = "学校id ", required = true) @RequestParam Long schoolId) {
-        SysConfig sysConfigSyncServicePath = commonCacheService.addSysConfigCache(schoolId, SystemConstant.SYNC_SERVICE_PATHS);
-        String syncServicePath = null;
-        if (Objects.nonNull(sysConfigSyncServicePath)) {
-            syncServicePath = sysConfigSyncServicePath.getConfigValue();
+        SysConfig sysConfigQuestionHostUrl = commonCacheService.addSysConfigCache(schoolId, SystemConstant.QUESTION_HOST_URL);
+        SysConfig sysConfigCloudmarkHostUrl = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfigTeachcloudReportHostUrl = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
+        JSONObject jsonObject = new JSONObject();
+
+        if (Objects.nonNull(sysConfigQuestionHostUrl)) {
+            jsonObject.put(SystemConstant.QUESTION_HOST_URL, sysConfigQuestionHostUrl.getConfigValue());
         } else {
-            JSONObject jsonObject = new JSONObject();
             jsonObject.put(SystemConstant.QUESTION_HOST_URL, "");
+        }
+
+        if (Objects.nonNull(sysConfigCloudmarkHostUrl)) {
+            jsonObject.put(SystemConstant.CLOUDMARK_HOST_URL, sysConfigCloudmarkHostUrl.getConfigValue());
+        } else {
             jsonObject.put(SystemConstant.CLOUDMARK_HOST_URL, "");
+        }
+
+        if (Objects.nonNull(sysConfigTeachcloudReportHostUrl)) {
+            jsonObject.put(SystemConstant.TEACHCLOUD_REPORT_HOST_URL, sysConfigTeachcloudReportHostUrl.getConfigValue());
+        } else {
             jsonObject.put(SystemConstant.TEACHCLOUD_REPORT_HOST_URL, "");
-            syncServicePath = jsonObject.toString();
         }
-        return ResultUtil.ok(new SysAdminSetResult(schoolId, syncServicePath));
+        return ResultUtil.ok(new SysAdminSetResult(schoolId, jsonObject.toString()));
     }
 
     @ApiOperation(value = "同步配置保存")
@@ -106,34 +117,26 @@ public class SysAdminSetController {
         }
         Optional.ofNullable(sysAdminSetParam.getSyncServicePaths()).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("同步配置地址不能为空"));
 
-//        SysConfig sysConfigSyncServicePath = commonCacheService.addSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.SYNC_SERVICE_PATHS);
-
         SysConfig sysConfigQuestionHostUrl = commonCacheService.addSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.QUESTION_HOST_URL);
         SysConfig sysConfigCloudmarkHostUrl = commonCacheService.addSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.CLOUDMARK_HOST_URL);
         SysConfig sysConfigTeachcloudReportHostUrl = commonCacheService.addSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
+        JSONObject jsonObject = JSONObject.parseObject(sysAdminSetParam.getSyncServicePaths());
 
-        JSONObject jsonObject = JSONObject.parseObject(sysAdminSetParam.getSyncServicePaths());;
         if (Objects.isNull(sysConfigQuestionHostUrl)) {
-            sysConfigQuestionHostUrl = new SysConfig(sysAdminSetParam.getSchoolId(), SystemConstant.QUESTION_HOST_URL, "同步配置地址", jsonObject.getString(SystemConstant.QUESTION_HOST_URL));
-//            JSONObject jsonObject = JSONObject.parseObject(sysConfigSyncServicePath.getConfigValue());
-////            SysConfig sysConfigQuestionHostUrl = commonCacheService.addSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.QUESTION_HOST_URL);
-//            sysConfigQuestionHostUrl.setConfigValue(jsonObject.getString(SystemConstant.QUESTION_HOST_URL));
-//
-//            SysConfig sysConfigCloudmarkHostUrl = commonCacheService.addSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.CLOUDMARK_HOST_URL);
-//            sysConfigCloudmarkHostUrl.setConfigValue(jsonObject.getString(SystemConstant.CLOUDMARK_HOST_URL));
-//
-//            SysConfig sysConfigTeachcloudReportHostUrl = commonCacheService.addSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
-//            sysConfigQuestionHostUrl.setConfigValue(jsonObject.getString(SystemConstant.TEACHCLOUD_REPORT_HOST_URL));
-//
-//            sysConfigService.saveOrUpdateBatch(Arrays.asList(sysConfigQuestionHostUrl, sysConfigCloudmarkHostUrl, sysConfigTeachcloudReportHostUrl));
-//
-//            commonCacheService.updateSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.QUESTION_HOST_URL);
-//            commonCacheService.updateSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.CLOUDMARK_HOST_URL);
-//            commonCacheService.updateSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
+            sysConfigQuestionHostUrl = new SysConfig(sysAdminSetParam.getSchoolId(), SystemConstant.QUESTION_HOST_URL, "题库地址", jsonObject.getString(SystemConstant.QUESTION_HOST_URL));
+        } else {
+            sysConfigQuestionHostUrl.setConfigValue(jsonObject.getString(SystemConstant.QUESTION_HOST_URL));
+        }
+        if (Objects.isNull(sysConfigCloudmarkHostUrl)) {
+            sysConfigCloudmarkHostUrl = new SysConfig(sysAdminSetParam.getSchoolId(), SystemConstant.CLOUDMARK_HOST_URL, "云阅卷地址", jsonObject.getString(SystemConstant.CLOUDMARK_HOST_URL));
+        } else {
+            sysConfigCloudmarkHostUrl.setConfigValue(jsonObject.getString(SystemConstant.CLOUDMARK_HOST_URL));
+        }
+        if (Objects.isNull(sysConfigTeachcloudReportHostUrl)) {
+            sysConfigTeachcloudReportHostUrl = new SysConfig(sysAdminSetParam.getSchoolId(), SystemConstant.TEACHCLOUD_REPORT_HOST_URL, "教研分析地址", jsonObject.getString(SystemConstant.TEACHCLOUD_REPORT_HOST_URL));
         } else {
-            jsonObject = JSONObject.parseObject(sysAdminSetParam.getSyncServicePaths());
+            sysConfigTeachcloudReportHostUrl.setConfigValue(jsonObject.getString(SystemConstant.TEACHCLOUD_REPORT_HOST_URL));
         }
-//        sysConfigService.saveOrUpdate(sysConfigSyncServicePath);
         sysConfigService.saveOrUpdateBatch(Arrays.asList(sysConfigQuestionHostUrl, sysConfigCloudmarkHostUrl, sysConfigTeachcloudReportHostUrl));
 
         commonCacheService.updateSysConfigCache(sysAdminSetParam.getSchoolId(), SystemConstant.QUESTION_HOST_URL);
@@ -381,10 +384,7 @@ public class SysAdminSetController {
         //清缓存
         if (!CollectionUtils.isEmpty(userSetIds)) {
             for (Long l : userSetIds) {
-                commonCacheService.removeUserCache(l);
-                commonCacheService.removeUserAuthCache(l);
-                commonCacheService.removeUserMenuCache(l);
-                commonCacheService.removeUserRolePrivilegeCache(l);
+                SystemConstant.deleteUserCache(l);
             }
         }
         return ResultUtil.ok(true);

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

@@ -148,7 +148,6 @@ public class SystemConstant {
      */
     public static final String ACCOUNT_SMS_VERIFY = "account.sms.verify";
     public static final String TEACHCLOUD_EXCHANGE_HOST_URL = "teachcloud.exchange.host.url";
-    public static final String SYNC_SERVICE_PATHS = "sync.service.paths";
     public static final String PDF_SIZE_LIST = "pdf.size.list";
 
     /**