登录新加入版本分支号

distributed-print/pom.xml

@@ -71,33 +71,7 @@
                     </buildArgs>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                    <useDefaultDelimiters>false</useDefaultDelimiters>
-                    <delimiters>
-                        <!--                        <delimiter>@</delimiter>-->
-                        <delimiter>@</delimiter>
-                    </delimiters>
-                    <!-- 过滤后缀不需要转码的文件后缀名pdf -->
-                    <nonFilteredFileExtensions>
-                        <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
-                    </nonFilteredFileExtensions>
-                </configuration>
-            </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
     </build>
 
 </project>

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

@@ -427,6 +427,9 @@ public class SysController {
         return ResultUtil.ok(userLoginCheckResult, "");
     }
 
+//    @Resource
+//    private Environment env;
+
     @ApiOperation(value = "根据机构代码查询机构信息接口")
     @RequestMapping(value = "/school/query_by_school_code", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "学校信息", response = EditResult.class)})
@@ -435,7 +438,23 @@ public class SysController {
         if (Objects.nonNull(code) && code.contains("#")) {
             code = code.substring(0, code.indexOf("#"));
         }
-//        String version = SystemConstant.getVersion();
+//        String jdbcUrl = env.getProperty("app1.version");
+//        String[] strs = env.getActiveProfiles();
+//        String version1 = this.getClass().getPackage().getImplementationVersion();
+//        String version = Application.class.getPackage().getImplementationVersion();
+//        Enumeration<URL> urls = null;
+//        try {
+//            //假设读取META-INF/MANIFEST.MF文件
+//            urls = SpringContextHolder.class.getClassLoader().getResources("META-INF/MANIFEST.MF");
+//            int i = 1;
+//            while (urls.hasMoreElements()) {
+//                URL url = urls.nextElement();
+//                log.info("===={}, {}", i++, url.getPath());
+//            }
+//        } catch (IOException e) {
+//            log.error(e.getMessage());
+//        }
+        String version2 = SystemConstant.getVersion();
         Map<String, Object> map = new HashMap<>();
         map.put(SystemConstant.VERSION, version);
         if (!code.equalsIgnoreCase(SystemConstant.ADMIN_CODE)) {

pom.xml

@@ -23,7 +23,6 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <qmth.boot.version>1.0.3</qmth.boot.version>
-        <java.version>1.8</java.version>
         <swagger2.version>2.9.2</swagger2.version>
         <fastjson.version>1.2.68</fastjson.version>
         <fileupload.version>1.4</fileupload.version>
@@ -400,7 +399,6 @@
                     <encoding>UTF-8</encoding>
                     <useDefaultDelimiters>false</useDefaultDelimiters>
                     <delimiters>
-                        <!--                        <delimiter>@</delimiter>-->
                         <delimiter>@</delimiter>
                     </delimiters>
                     <!-- 过滤后缀不需要转码的文件后缀名pdf -->
@@ -413,9 +411,6 @@
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
                 <filtering>true</filtering>
             </resource>
         </resources>

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

@@ -1132,13 +1132,13 @@ public class SystemConstant {
      * @return
      */
     public static String getVersion() {
-        String rootPath = System.getProperty(SystemConstant.USER_DIR);
+//        String rootPath = System.getProperty(SystemConstant.USER_DIR);
         MavenXpp3Reader reader = new MavenXpp3Reader();
-        String myPom = rootPath + File.separator + "pom.xml";
+//        String myPom = rootPath + File.separator + "pom.xml";
         Model model = null;
         String version = null;
         try {
-            model = reader.read(new FileReader(myPom));
+            model = reader.read(new FileReader("pom.xml"));
             version = model.getVersion();
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);