加入分支版本号

themis-admin/src/main/java/com/qmth/themis/admin/api/SysController.java

@@ -261,16 +261,19 @@ public class SysController {
     @ApiResponses({@ApiResponse(code = 200, message = "机构信息", response = TBOrg.class)})
     public Result queryByOrgCode(@ApiParam(value = "机构code", required = true) @RequestParam String code) {
         Optional.ofNullable(code).orElseThrow(() -> new BusinessException(ExceptionResultEnum.ORG_CODE_IS_NULL));
+        Map<String, Object> map = new HashMap<>();
+        map.put(SystemConstant.VERSION, SystemConstant.VERSION_VALUE);
         if (!Objects.equals(code.toUpperCase(), SystemConstant.ADMIN)) {
             TBOrg tbOrg = themisCacheService.addOrgCodeCache(code);
             Optional.ofNullable(tbOrg).orElseThrow(() -> new BusinessException(ExceptionResultEnum.ORG_NO));
             authInfoService.appHasExpired(code);
-            return ResultUtil.ok(Collections.singletonMap("logo", tbOrg.getLogo()));
+            map.put("logo", tbOrg.getLogo());
         } else {
             SysConfig sysConfig = themisCacheService.addSysConfigCache(SystemConstant.ADMIN_LOGO_URL);
             Optional.ofNullable(sysConfig).orElseThrow(() -> new BusinessException("未配置超级管理员logo"));
-            return ResultUtil.ok(Collections.singletonMap("logo", sysConfig.getConfigValue()));
+            map.put("logo", sysConfig.getConfigValue());
         }
+        return ResultUtil.ok(map);
     }
 
     @ApiOperation(value = "机构查询接口")

themis-admin/src/main/java/com/qmth/themis/admin/api/TBUserController.java

@@ -218,6 +218,7 @@ public class TBUserController {
 //        String test = SignatureInfo.build(SignatureType.TOKEN, sessionId, token);
         Map<String, Object> map = new HashMap<>();
         map.put(SystemConstant.ACCESS_TOKEN, token);
+        map.put(SystemConstant.VERSION, SystemConstant.VERSION_VALUE);
 //        map.put(SystemConstant.ACCESS_TOKEN, test);
         map.put(SystemConstant.ACCOUNT, user);
         map.put(SystemConstant.SESSION_ID, sessionId);

themis-business/src/main/java/com/qmth/themis/business/constant/SystemConstant.java

@@ -385,6 +385,7 @@ public class SystemConstant {
     public final static String REDIS_ACTIVITY_CODE_SEQUENCE = "redis:seq:activity:code:";
 
     public static final String VERSION = "version";
+    public static final String VERSION_VALUE = "1.2.7.1";
 
     /**
      * session过期时间

themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java

@@ -284,6 +284,7 @@ public class TEStudentController {
         //获取全局考试配置
         TEConfig teConfig = teConfigService.getGlobalConfig();
         map.put(SystemConstant.ACCESS_TOKEN, token);
+        map.put(SystemConstant.VERSION, SystemConstant.VERSION_VALUE);
         map.put(SystemConstant.GLOBAL, teConfig);
         //        map.put(SystemConstant.ACCESS_TOKEN, test);
         map.put(SystemConstant.STUDENT_ACCOUNT, teStudent);