Browse Source

登录新加入版本分支号

wangliang 2 years ago
parent
commit
9259f74fc4

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

@@ -38,6 +38,7 @@ 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.*;
@@ -116,6 +117,9 @@ public class SysController {
     @Resource
     ConditionService conditionService;
 
+    @Value(value = "${app.version}")
+    private String version;
+
     /**
      * 登录
      *
@@ -431,7 +435,7 @@ public class SysController {
         if (Objects.nonNull(code) && code.contains("#")) {
             code = code.substring(0, code.indexOf("#"));
         }
-        String version = SystemConstant.getVersion();
+//        String version = SystemConstant.getVersion();
         Map<String, Object> map = new HashMap<>();
         map.put(SystemConstant.VERSION, version);
         if (!code.equalsIgnoreCase(SystemConstant.ADMIN_CODE)) {

+ 1 - 0
distributed-print/src/main/resources/application.properties

@@ -8,6 +8,7 @@ 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

+ 11 - 8
pom.xml

@@ -400,8 +400,8 @@
                     <encoding>UTF-8</encoding>
                     <useDefaultDelimiters>false</useDefaultDelimiters>
                     <delimiters>
-<!--                        <delimiter>@</delimiter>-->
-                        <delimiter>$[*]</delimiter>
+                        <!--                        <delimiter>@</delimiter>-->
+                        <delimiter>@</delimiter>
                     </delimiters>
                     <!-- 过滤后缀不需要转码的文件后缀名pdf -->
                     <nonFilteredFileExtensions>
@@ -410,12 +410,15 @@
                 </configuration>
             </plugin>
         </plugins>
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
 </project>