新增版本分支

cdut-exchange/pom.xml

@@ -4,14 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.cdut.exchange</groupId>
     <artifactId>cdut-exchange</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.1.1</version>
     <packaging>jar</packaging>
     <description>成都理工大学单点登录</description>
 
     <parent>
         <groupId>com.qmth.teachcloud.exchange.service</groupId>
         <artifactId>teachcloud-exchange-service</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.1.1</version>
     </parent>
 
     <dependencies>

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.teachcloud.exchange.service</groupId>
     <artifactId>teachcloud-exchange-service</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.1.1</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -263,7 +263,7 @@
                     <encoding>UTF-8</encoding>
                     <useDefaultDelimiters>false</useDefaultDelimiters>
                     <delimiters>
-                        <delimiter>$[*]</delimiter>
+                        <delimiter>@</delimiter>
                     </delimiters>
                     <!-- 过滤后缀不需要转码的文件后缀名pdf -->
                     <nonFilteredFileExtensions>
@@ -272,6 +272,12 @@
                 </configuration>
             </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
 </project>

sxufe-exchange/pom.xml

@@ -4,14 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.sxufe.exchange</groupId>
     <artifactId>sxufe-exchange</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.1.1</version>
     <packaging>jar</packaging>
     <description>山西财经大学单点登录</description>
 
     <parent>
         <groupId>com.qmth.teachcloud.exchange.service</groupId>
         <artifactId>teachcloud-exchange-service</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.1.1</version>
     </parent>
 
     <dependencies>

teachcloud-exchange-common/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.teachcloud.exchange.common</groupId>
     <artifactId>teachcloud-exchange-common</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.1.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.teachcloud.exchange.service</groupId>
         <artifactId>teachcloud-exchange-service</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.1.1</version>
     </parent>
 
     <dependencies>

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

@@ -1,13 +1,12 @@
 package com.qmth.teachcloud.exchange.common.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qmth.boot.core.cache.service.CacheService;
 import com.qmth.boot.tools.signature.SignatureEntity;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.teachcloud.exchange.common.bean.params.OpenParams;
 import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
 import com.qmth.teachcloud.exchange.common.entity.BasicSchool;
 import com.qmth.teachcloud.exchange.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.exchange.common.service.BasicSchoolService;
 import com.qmth.teachcloud.exchange.common.service.CommonService;
 import com.qmth.teachcloud.exchange.common.util.Base64Util;
 import com.qmth.teachcloud.exchange.common.util.JacksonUtil;
@@ -39,7 +38,7 @@ public class CommonServiceImpl implements CommonService {
     private final static Logger log = LoggerFactory.getLogger(CommonServiceImpl.class);
 
     @Resource
-    BasicSchoolService basicSchoolService;
+    CacheService cacheService;
 
     @Value("${cas.config.teachcloudPrintLoginUrl}")
     String teachcloudLoginUrl;
@@ -67,9 +66,7 @@ public class CommonServiceImpl implements CommonService {
         }
 //        accountUser = URLDecoder.decode(accountUser, SystemConstant.CHARSET_NAME);
 
-        QueryWrapper<BasicSchool> basicSchoolQueryWrapper = new QueryWrapper<>();
-        basicSchoolQueryWrapper.lambda().eq(BasicSchool::getCode, schoolCode);
-        BasicSchool basicSchool = basicSchoolService.getOne(basicSchoolQueryWrapper);
+        BasicSchool basicSchool = (BasicSchool) cacheService.get(SystemConstant.SCHOOL_CODE_CACHE, schoolCode);
         Optional.ofNullable(basicSchool).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("学校信息不存在"));
 
         if (teachcloudLoginUrl.contains(SystemConstant.PATH_MATCH)) {

xjtu-exchange/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.xjtu.exchange</groupId>
     <artifactId>xjtu-exchange</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.1.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.teachcloud.exchange.service</groupId>
         <artifactId>teachcloud-exchange-service</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.1.1</version>
     </parent>
 
     <dependencies>

xjtu-exchange/src/main/java/com/qmth/xjtu/api/OpenApiController.java

@@ -75,6 +75,9 @@ public class OpenApiController {
     @Resource
     CacheService cacheService;
 
+    @Value(value = "${app.version}")
+    private String version;
+
     @ApiOperation(value = "西安交通大学cas鉴权接口")
     @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
     @RequestMapping(value = "/authentication", method = RequestMethod.GET)
@@ -84,6 +87,7 @@ public class OpenApiController {
                                @ApiParam(value = "用户类型") @RequestParam(required = false) String userType,
                                @ApiParam(value = "员工工号") @RequestParam(required = false) String employeeNo,
                                @ApiParam(value = "返回url") @RequestParam(required = false) String returnUrl) throws IOException {
+        log.info("version:{}", version);
         if ((Objects.isNull(code) || Objects.equals(code, ""))
                 || (Objects.isNull(employeeNo) || Objects.equals(employeeNo, ""))) {
             throw ExceptionResultEnum.ERROR.exception("请先通过学校地址登录");

xjtu-exchange/src/main/resources/application.properties

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