登录新加入版本分支号

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

@@ -38,7 +38,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -117,9 +116,6 @@ public class SysController {
     @Resource
     ConditionService conditionService;
 
-    @Value(value = "${app.version}")
-    private String version;
-
     /**
      * 登录
      *
@@ -435,6 +431,7 @@ public class SysController {
         if (Objects.nonNull(code) && code.contains("#")) {
             code = code.substring(0, code.indexOf("#"));
         }
+        String version = SystemConstant.getVersion();
         Map<String, Object> map = new HashMap<>();
         map.put(SystemConstant.VERSION, version);
         if (!code.equalsIgnoreCase(SystemConstant.ADMIN_CODE)) {

distributed-print/src/main/resources/application.properties

@@ -8,7 +8,6 @@ server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
 spring.application.name=distributed-print
-app.version=@project.version@
 
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost

pom.xml

@@ -356,6 +356,11 @@
                 <artifactId>jasypt-spring-boot-starter</artifactId>
                 <version>${jasypt.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-model</artifactId>
+                <version>3.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -395,7 +400,8 @@
                     <encoding>UTF-8</encoding>
                     <useDefaultDelimiters>false</useDefaultDelimiters>
                     <delimiters>
-                        <delimiter>@</delimiter>
+<!--                        <delimiter>@</delimiter>-->
+                        <delimiter>$[*]</delimiter>
                     </delimiters>
                     <!-- 过滤后缀不需要转码的文件后缀名pdf -->
                     <nonFilteredFileExtensions>
@@ -404,12 +410,12 @@
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
+<!--        <resources>-->
+<!--            <resource>-->
+<!--                <directory>src/main/resources</directory>-->
+<!--                <filtering>true</filtering>-->
+<!--            </resource>-->
+<!--        </resources>-->
     </build>
 
 </project>

teachcloud-common/pom.xml

@@ -169,5 +169,9 @@
             <groupId>com.github.ulisesbocchio</groupId>
             <artifactId>jasypt-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+        </dependency>
     </dependencies>
 </project>

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

@@ -21,6 +21,8 @@ import com.qmth.teachcloud.common.util.Zip4jUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -204,7 +206,7 @@ public class SystemConstant {
     public static final String USER_DIR = "user.dir";
     public static final String OS_NAME = "os.name";
     public static final String TMP_DIR = "java.io.tmpdir";
-//    public static final String PDF_TEMP = "pdf-temp";
+    //    public static final String PDF_TEMP = "pdf-temp";
 //    public static final String FILE_TEMP = "file-temp";
     public static final String TEMP = "temp";
     public static final String SESSION = "session:";
@@ -1080,20 +1082,20 @@ public class SystemConstant {
         return jsonObject;
     }
 
-    public static int calcBackupCount(Double backupCount, Integer studentCount, Integer defaultValue){
-        if(defaultValue == null){
+    public static int calcBackupCount(Double backupCount, Integer studentCount, Integer defaultValue) {
+        if (defaultValue == null) {
             defaultValue = DEFAULT_BACKUP_COUNT;
         }
-        if(backupCount == null || backupCount <= 0){
+        if (backupCount == null || backupCount <= 0) {
             return defaultValue;
         }
         // <1按比例，>=1按数量
-        if(backupCount < 1){
-            if(studentCount == null || studentCount ==0){
+        if (backupCount < 1) {
+            if (studentCount == null || studentCount == 0) {
                 return defaultValue;
             } else {
                 BigDecimal bigDecimal = new BigDecimal(studentCount).multiply(new BigDecimal(backupCount)).setScale(0, RoundingMode.CEILING);
-                if(bigDecimal.intValue() == 0){
+                if (bigDecimal.intValue() == 0) {
                     return defaultValue;
                 } else {
                     return bigDecimal.intValue();
@@ -1123,4 +1125,24 @@ public class SystemConstant {
         }
         return file;
     }
+
+    /**
+     * 获取版本号
+     *
+     * @return
+     */
+    public static String getVersion() {
+        String rootPath = System.getProperty(SystemConstant.USER_DIR);
+        MavenXpp3Reader reader = new MavenXpp3Reader();
+        String myPom = rootPath + File.separator + "pom.xml";
+        Model model = null;
+        String version = null;
+        try {
+            model = reader.read(new FileReader(myPom));
+            version = model.getVersion();
+        } catch (Exception e) {
+            log.error(SystemConstant.LOG_ERROR, e);
+        }
+        return version;
+    }
 }

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

@@ -27,7 +27,6 @@ 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;
@@ -103,9 +102,6 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
     @Resource
     BasicCourseService basicCourseService;
 
-    @Value(value = "${app.version}")
-    private String version;
-
     /**
      * 获取用户菜单
      *
@@ -789,6 +785,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);
+        String version = SystemConstant.getVersion();
         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);

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SysController.java

@@ -7,7 +7,6 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.bean.result.LoginResult;
-import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.*;
@@ -23,7 +22,6 @@ 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.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -50,9 +48,6 @@ public class SysController {
     @Resource
     private BasicVerifyCodeService basicVerifyCodeService;
 
-    @Resource
-    private DictionaryConfig dictionaryConfig;
-
     @Resource
     CommonCacheService commonCacheService;
 
@@ -83,9 +78,6 @@ public class SysController {
     @Resource
     AuthInfoService authInfoService;
 
-    @Value(value = "${app.version}")
-    private String version;
-
     /**
      * 登录
      *
@@ -233,6 +225,7 @@ public class SysController {
         if (Objects.nonNull(code) && code.contains("#")) {
             code = code.substring(0, code.indexOf("#"));
         }
+        String version = SystemConstant.getVersion();
         Map<String, Object> map = new HashMap<>();
         map.put(SystemConstant.VERSION, version);
         if (!Objects.equals(code.toUpperCase(), RoleTypeEnum.ADMIN.name())) {

teachcloud-report/src/main/resources/application.properties

@@ -8,7 +8,6 @@ server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
 spring.application.name=teachcloud-report
-app.version=@project.version@
 
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost

teachcloud-task/src/main/resources/application.properties

@@ -9,7 +9,6 @@ server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
 spring.application.name=teachcloud-task
-app.version=@project.version@
 
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost