Merge branch 'feature' into 'dev'

更改test方法访问路径

See merge request !8

src/main/java/com/zhiwei/brandkbs2/controller/CommonController.java

@@ -67,10 +67,4 @@ public class CommonController extends BaseController {
         return ResponseResult.success(projectService.getUserAllProjects());
     }
 
-    @ApiOperation("测试接口")
-    @GetMapping("/test")
-    public ResponseResult test() {
-        return ResponseResult.success("true");
-    }
-
 }

src/main/java/com/zhiwei/brandkbs2/controller/LoginController.java

@@ -92,5 +92,11 @@ public class LoginController extends BaseController {
         return ResponseResult.success(iProjectService.getLoginUserAllProjects());
     }
 
+    @ApiOperation("测试接口")
+    @GetMapping("/test")
+    public ResponseResult test() {
+        return ResponseResult.success("brandkbs2-success 2022/7/8");
+    }
+
 }
 

src/main/resources/application-dev.properties

 application.name = brandkbs2
+server.port=8888
+spring.flyway.encoding=UTF-8
+server.servlet.context-path=/brandkbs
 #jwt
 jwt.key=Token
 jwt.hour=120

src/main/resources/application-local.properties

 application.name = brandkbs2
+server.port=8888
+spring.flyway.encoding=UTF-8
+server.servlet.context-path=/brandkbs
 #jwt
 jwt.key=Token
 jwt.hour=120

src/main/resources/application-prod.properties

 application.name = brandkbs2
+server.port=8888
+spring.flyway.encoding=UTF-8
+server.servlet.context-path=/brandkbs
 
 #jwt
 jwt.key=Token

src/main/resources/application.properties

-server.port=8888
 spring.profiles.active=pro
-spring.flyway.encoding=UTF-8
-server.servlet.context-path=/brandkbs
\ No newline at end of file