加入分支版本号

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.themis</groupId>
     <artifactId>themis-service</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6.1</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -321,7 +321,29 @@
                     <generateBackupPoms>false</generateBackupPoms>
                 </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>
+                    </delimiters>
+                    <!-- 过滤后缀不需要转码的文件后缀名pdf -->
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
 </project>

themis-admin/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.themis.admin</groupId>
     <artifactId>themis-admin</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.themis</groupId>
         <artifactId>themis-service</artifactId>
-        <version>1.2.5</version>
+        <version>1.2.6.1</version>
     </parent>
 
     <dependencies>

themis-admin/src/main/java/com/qmth/themis/admin/api/SysController.java

@@ -30,6 +30,7 @@ import com.tencentcloudapi.vod.v20180717.models.MediaBasicInfo;
 import com.tencentcloudapi.vod.v20180717.models.MediaInfo;
 import com.tencentcloudapi.vod.v20180717.models.SearchMediaResponse;
 import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -123,6 +124,9 @@ public class SysController {
     @Resource
     TMTencentVideoMessageService tmTencentVideoMessageService;
 
+    @Value(value = "${app.version}")
+    private String version;
+
     @ApiOperation(value = "同步机构接口")
     @RequestMapping(value = "/sync/org", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "菜单信息", response = Result.class)})
@@ -261,16 +265,19 @@ public class SysController {
     @ApiResponses({@ApiResponse(code = 200, message = "机构信息", response = TBOrg.class)})
     public Result queryByOrgCode(@ApiParam(value = "机构code", required = true) @RequestParam String code) {
         Optional.ofNullable(code).orElseThrow(() -> new BusinessException(ExceptionResultEnum.ORG_CODE_IS_NULL));
+        Map<String, Object> map = new HashMap<>();
+        map.put(SystemConstant.VERSION, version);
         if (!Objects.equals(code.toUpperCase(), SystemConstant.ADMIN)) {
             TBOrg tbOrg = themisCacheService.addOrgCodeCache(code);
             Optional.ofNullable(tbOrg).orElseThrow(() -> new BusinessException(ExceptionResultEnum.ORG_NO));
             authInfoService.appHasExpired(code);
-            return ResultUtil.ok(Collections.singletonMap("logo", tbOrg.getLogo()));
+            map.put("logo", tbOrg.getLogo());
         } else {
             SysConfig sysConfig = themisCacheService.addSysConfigCache(SystemConstant.ADMIN_LOGO_URL);
             Optional.ofNullable(sysConfig).orElseThrow(() -> new BusinessException("未配置超级管理员logo"));
-            return ResultUtil.ok(Collections.singletonMap("logo", sysConfig.getConfigValue()));
+            map.put("logo", sysConfig.getConfigValue());
         }
+        return ResultUtil.ok(map);
     }
 
     @ApiOperation(value = "机构查询接口")

themis-admin/src/main/resources/application.properties

@@ -17,6 +17,7 @@ server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
 spring.application.name=themis-admin
+app.version=@project.version@
 
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
@@ -120,8 +121,8 @@ rocketmq.producer.enable-msg-trace=true
 #\u81EA\u5B9A\u4E49\u7684\u6D88\u606F\u8F68\u8FF9\u4E3B\u9898
 #rocketmq.producer.customized-trace-topic=my-trace-topic
 
-com.qmth.solar.access-key=8134f6aae0134770b8618913705d3667
-com.qmth.solar.access-secret=s1NENpvc8Jq5evcE0B7GfLmoQOvwmlCy
+com.qmth.solar.access-key=0de21ea8c3f041819af866a160f38b12
+com.qmth.solar.access-secret=Ly3AxTF2Mbek8vcTmZiKa8zDDKUej4n2
 #com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u77E5\u5B66\u77E5\u8003/\u897F\u4EA4\u5927\u6FC0\u6D3B\u6587\u4EF6/tc-xjtu.lic
 
 #\u65E0\u9700\u9274\u6743\u7684url

themis-business/pom.xml

@@ -5,13 +5,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.qmth.themis.business</groupId>
 	<artifactId>themis-business</artifactId>
-	<version>1.2.5</version>
+	<version>1.2.6.1</version>
 	<packaging>jar</packaging>
 
 	<parent>
 		<groupId>com.qmth.themis</groupId>
 		<artifactId>themis-service</artifactId>
-		<version>1.2.5</version>
+		<version>1.2.6.1</version>
 	</parent>
 
 	<dependencies>

themis-common/pom.xml

@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.themis.common</groupId>
     <artifactId>themis-common</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.themis</groupId>
         <artifactId>themis-service</artifactId>
-        <version>1.2.5</version>
+        <version>1.2.6.1</version>
     </parent>
 
     <dependencies>

themis-exam/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.themis.exam</groupId>
     <artifactId>themis-exam</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.themis</groupId>
         <artifactId>themis-service</artifactId>
-        <version>1.2.5</version>
+        <version>1.2.6.1</version>
     </parent>
 
     <dependencies>

themis-exam/src/main/resources/application.properties

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

themis-mq/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.themis.mq</groupId>
     <artifactId>themis-mq</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.themis</groupId>
         <artifactId>themis-service</artifactId>
-        <version>1.2.5</version>
+        <version>1.2.6.1</version>
     </parent>
 
     <dependencies>

themis-task/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.themis.task</groupId>
     <artifactId>themis-task</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.themis</groupId>
         <artifactId>themis-service</artifactId>
-        <version>1.2.5</version>
+        <version>1.2.6.1</version>
     </parent>
 
     <dependencies>

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

@@ -9,11 +9,12 @@ server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
 spring.application.name=themis-task
+app.version=@project.version@
 
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
 db.port=3306
-db.name=themis_v1.1
+db.name=themis_release
 db.username=root
 db.password=123456789