瀏覽代碼

加入分支版本号

wangliang 2 年之前
父節點
當前提交
58a6e74153

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

@@ -30,6 +30,7 @@ import com.qmth.themis.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -81,6 +82,9 @@ public class TBUserController {
     @Resource
     TBSessionService tbSessionService;
 
+    @Value(value = "${app.version}")
+    private String version;
+
     @ApiOperation(value = "用户登录接口")
     @RequestMapping(value = "/login/account", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = TBUser.class)})
@@ -222,6 +226,7 @@ public class TBUserController {
         map.put(SystemConstant.ACCOUNT, user);
         map.put(SystemConstant.SESSION_ID, sessionId);
         map.put("roleCodes", authDto.getRoleCodes());
+        map.put(SystemConstant.VERSION, version);
         if (Objects.nonNull(authDto.getTbOrg())) {
             Map orgMap = new HashMap();
             orgMap.put(SystemConstant.NAME, authDto.getTbOrg().getName());

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

@@ -44,6 +44,7 @@ import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -110,6 +111,9 @@ public class TEStudentController {
     @Resource
     MqUtil mqUtil;
 
+    @Value(value = "${app.version}")
+    private String version;
+
     @ApiOperation(value = "学生登录接口")
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "学生信息", response = TEExamResultDto.class)})
@@ -288,6 +292,7 @@ public class TEStudentController {
         //        map.put(SystemConstant.ACCESS_TOKEN, test);
         map.put(SystemConstant.STUDENT_ACCOUNT, teStudent);
         map.put(SystemConstant.SESSION_ID, sessionId);
+        map.put(SystemConstant.VERSION, version);
         return ResultUtil.ok(map);
     }