登录新加入版本分支号

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/LoginClientResult.java

@@ -68,6 +68,9 @@ public class LoginClientResult implements Serializable {
     @ApiModelProperty(name = "返回url")
     String returnUrl;
 
+    @ApiModelProperty(name = "版本号")
+    String version;
+
     public String getReturnUrl() {
         return returnUrl;
     }
@@ -101,6 +104,15 @@ public class LoginClientResult implements Serializable {
         this.time = loginResult.getTime();
         this.userLoginCheckResult = loginResult.getUserLoginCheckResult();
         this.returnUrl = loginResult.returnUrl;
+        this.version = loginResult.getVersion();
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
     }
 
     public List<RoleResult> getRoleSource() {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/LoginResult.java

@@ -66,6 +66,17 @@ public class LoginResult implements Serializable {
     @ApiModelProperty(name = "返回url")
     String returnUrl;
 
+    @ApiModelProperty(name = "版本号")
+    String version;
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
     public String getReturnUrl() {
         return returnUrl;
     }
@@ -78,7 +89,7 @@ public class LoginResult implements Serializable {
 
     }
 
-    public LoginResult(SysUser sysUser, String sessionId, String accessToken, Set<String> roleList, AppSourceEnum appSource, List<RoleResult> roleSource) {
+    public LoginResult(SysUser sysUser, String sessionId, String accessToken, Set<String> roleList, AppSourceEnum appSource, List<RoleResult> roleSource, String version) {
         this.id = sysUser.getId();
         ServletUtil.setRequestId(Arrays.asList(id));
         this.loginName = sysUser.getLoginName();
@@ -89,9 +100,10 @@ public class LoginResult implements Serializable {
         this.appSource = appSource;
         this.pwdCount = sysUser.getPwdCount();
         this.roleSource = roleSource;
+        this.version = version;
     }
 
-    public LoginResult(SysUser sysUser, String sessionId, String accessToken, List<SchoolNativeBean> schoolInfo, OrgNativeBean orgInfo, AppSourceEnum appSource) {
+    public LoginResult(SysUser sysUser, String sessionId, String accessToken, List<SchoolNativeBean> schoolInfo, OrgNativeBean orgInfo, AppSourceEnum appSource, String version) {
         this.loginName = sysUser.getLoginName();
         this.realName = sysUser.getRealName();
         this.sessionId = sessionId;
@@ -99,6 +111,7 @@ public class LoginResult implements Serializable {
         this.schoolInfo = schoolInfo;
         this.orgInfo = orgInfo;
         this.appSource = appSource;
+        this.version = version;
     }
 
     public List<RoleResult> getRoleSource() {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -27,6 +27,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.FileCopyUtils;
@@ -102,6 +103,9 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
     @Resource
     BasicCourseService basicCourseService;
 
+    @Value(value = "${app.version}")
+    private String version;
+
     /**
      * 获取用户菜单
      *
@@ -785,7 +789,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         redisUtil.setUserSession(sessionId, tbSession, expireTime.getExpireSeconds());
 
 //        LoginResult loginResult = new LoginResult(sysUser, sessionId, test, Objects.nonNull(roleTypes) && roleTypes.size() > 0 ? roleTypes : roleNamesSet, appSource, roleSource);
-        LoginResult loginResult = new LoginResult(sysUser, sessionId, token, Objects.nonNull(roleTypes) && roleTypes.size() > 0 ? roleTypes : roleNamesSet, appSource, roleSource);
+        LoginResult loginResult = new LoginResult(sysUser, sessionId, token, Objects.nonNull(roleTypes) && roleTypes.size() > 0 ? roleTypes : roleNamesSet, appSource, roleSource, version);
         loginResult.setSchoolInfo(Objects.nonNull(authBean.getSchool()) ? Lists.newArrayList(loginResult.new SchoolNativeBean(authBean.getSchool())) : null);
         loginResult.setOrgInfo(Objects.nonNull(authBean.getOrg()) ? loginResult.new OrgNativeBean(authBean.getOrg()) : null);
         loginResult.setTime(System.currentTimeMillis());