瀏覽代碼

新增版本分支

wangliang 2 年之前
父節點
當前提交
00c746bb35

+ 1 - 7
pom.xml

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

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

@@ -56,6 +56,7 @@ public class OpenApiController {
     private static final String LOGOUT_URL = "http://org.xjtu.edu.cn/openplatform/oauth/logout";
     private static final String SCHOOL_CODE = "xjtu";//测试学校code,正式改成xjtu
     private static final String LOGIN_BEFORE_XJU_LOGIC_API = "/api/admin/print/open/login_before_xju_logic";//西交大登录之前逻辑
+    private static final String VERSION = "1.0.1.1";
 
     @Resource
     CommonService commonService;
@@ -75,9 +76,6 @@ 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)
@@ -87,7 +85,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);
+        log.info("version:{}", VERSION);
         if ((Objects.isNull(code) || Objects.equals(code, ""))
                 || (Objects.isNull(employeeNo) || Objects.equals(employeeNo, ""))) {
             throw ExceptionResultEnum.ERROR.exception("请先通过学校地址登录");

+ 0 - 1
xjtu-exchange/src/main/resources/application.properties

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