diff --git a/mallinkAdmin/src/main/java/com/simple/UserApplication.java b/mallinkAdmin/src/main/java/com/simple/UserApplication.java index 3dfeddf2d..ac99f6512 100644 --- a/mallinkAdmin/src/main/java/com/simple/UserApplication.java +++ b/mallinkAdmin/src/main/java/com/simple/UserApplication.java @@ -15,6 +15,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @MapperScan(basePackages = {"com.simple.mapper"}) @EnableSwagger2 @EnableEncryptableProperties + public class UserApplication { public static void main(String[] args) { diff --git a/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java index 948d3b637..023b8ae89 100644 --- a/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java @@ -121,6 +121,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/wxMallApply/add","anon"); filterChainDefinitionMap.put("/wxMallApply/sendvalidationcode","anon"); filterChainDefinitionMap.put("/captcha.jpg", "anon"); + filterChainDefinitionMap.put("/version", "anon"); // filterChainDefinitionMap.put("/role/**", "corsFilter,token"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); // filterChainDefinitionMap.put("/**", "anon"); diff --git a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java index e44428563..56ea79bf8 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java @@ -21,6 +21,7 @@ import org.apache.shiro.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @@ -37,6 +38,8 @@ import java.io.IOException; public class HomeController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Value("${version}") + private String version; @Autowired private Producer producer; @@ -125,4 +128,10 @@ public class HomeController { SecurityUtils.getSubject().logout(); return data; } + + @ApiOperation("获取后端版本号") + @GetMapping("/version") + public ResultData version() { + return new ResultData(version); + } } \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index 7eeac4c96..55c3070c1 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -51,3 +51,4 @@ jasypt: encryptor: password: oRqdnDbK5pj3eMmB +version: @project.version@ \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java index a60032b66..7c91e8a94 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -32,6 +33,9 @@ import java.util.Map; public class WxMallController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Value("${version}") + private String version; + @Autowired private WxMallService wxMallService; @@ -73,7 +77,12 @@ public class WxMallController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", mall); } - + @AuthIgnore + @ApiOperation("获取后端版本号") + @GetMapping("/version") + public ResultData version() { + return new ResultData(version); + } /** * 微信消息服务验证 * @param response diff --git a/mallinkBApi/src/main/resources/application.yml b/mallinkBApi/src/main/resources/application.yml index e4092a2d9..a38f7eb9b 100644 --- a/mallinkBApi/src/main/resources/application.yml +++ b/mallinkBApi/src/main/resources/application.yml @@ -43,4 +43,6 @@ pay: jasypt: encryptor: - password: oRqdnDbK5pj3eMmB \ No newline at end of file + password: oRqdnDbK5pj3eMmB + +version: @project.version@ \ No newline at end of file diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java index c09ce7b34..0095f78cf 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -27,6 +28,9 @@ import java.util.Map; public class WxMallController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Value("${version}") + private String version; + @Autowired private WxMallService wxMallService; @@ -68,5 +72,12 @@ public class WxMallController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", mall); } + @AuthIgnore + @ApiOperation("获取后端版本号") + @GetMapping("/version") + public ResultData version() { + return new ResultData(version); + } + } diff --git a/mallinkCApi/src/main/resources/application.yml b/mallinkCApi/src/main/resources/application.yml index c12fd23de..a54678211 100644 --- a/mallinkCApi/src/main/resources/application.yml +++ b/mallinkCApi/src/main/resources/application.yml @@ -43,4 +43,6 @@ pay: jasypt: encryptor: - password: oRqdnDbK5pj3eMmB \ No newline at end of file + password: oRqdnDbK5pj3eMmB + +version: @project.version@ \ No newline at end of file