tangbin 10 сар өмнө
parent
commit
33db0de4fd

+ 1 - 1
yezhu-api/src/main/java/com/kioor/common/controller/ApiTestController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author Mark sunlightcs@gmail.com
  */
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/client")
 @Tag(name = "测试接口")
 public class ApiTestController {
 

+ 11 - 1
yezhu-api/src/main/java/com/kioor/config/WebMvcConfig.java

@@ -25,6 +25,7 @@ import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -44,9 +45,18 @@ public class WebMvcConfig implements WebMvcConfigurer {
     @Resource
     private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver;
 
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOriginPatterns("*")
+                .allowCredentials(true)
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .maxAge(3600);
+    }
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(authorizationInterceptor).addPathPatterns("/api/**");
+        registry.addInterceptor(authorizationInterceptor).addPathPatterns("/client/**");
     }
 
     @Override

+ 1 - 1
yezhu-api/src/main/java/com/kioor/messageboard/controller/ApiMessageBoardController.java

@@ -38,7 +38,7 @@ import java.util.Map;
  */
 @AllArgsConstructor
 @RestController
-@RequestMapping("/api/messageboard")
+@RequestMapping("/client/messageboard")
 @Tag(name = "留言板")
 public class ApiMessageBoardController {
 

+ 1 - 1
yezhu-api/src/main/java/com/kioor/messageboard/controller/ApiMessageController.java

@@ -41,7 +41,7 @@ import java.util.Map;
  */
 @AllArgsConstructor
 @RestController
-@RequestMapping("/api/message")
+@RequestMapping("/client/message")
 @Tag(name = "留言")
 public class ApiMessageController {
 

+ 1 - 1
yezhu-api/src/main/java/com/kioor/room/controller/ApiBuildingController.java

@@ -36,7 +36,7 @@ import java.util.Map;
  */
 @AllArgsConstructor
 @RestController
-@RequestMapping("/api/building")
+@RequestMapping("/client/building")
 @Tag(name = "楼栋")
 public class ApiBuildingController {
 

+ 1 - 1
yezhu-api/src/main/java/com/kioor/room/controller/ApiFloorController.java

@@ -36,7 +36,7 @@ import java.util.Map;
  */
 @AllArgsConstructor
 @RestController
-@RequestMapping("/api/floor")
+@RequestMapping("/client/floor")
 @Tag(name = "楼层")
 public class ApiFloorController {
 

+ 1 - 1
yezhu-api/src/main/java/com/kioor/room/controller/ApiHousingEstateController.java

@@ -46,7 +46,7 @@ import java.util.Map;
  */
 @AllArgsConstructor
 @RestController
-@RequestMapping("/api/housingestate")
+@RequestMapping("/client/housingestate")
 @Tag(name = "小区")
 public class ApiHousingEstateController {
 

+ 1 - 1
yezhu-api/src/main/java/com/kioor/room/controller/ApiRoomController.java

@@ -41,7 +41,7 @@ import java.util.Map;
  */
 @AllArgsConstructor
 @RestController
-@RequestMapping("/api/room")
+@RequestMapping("/client/room")
 @Tag(name = "房间")
 public class ApiRoomController {
 

+ 1 - 1
yezhu-api/src/main/java/com/kioor/room/controller/ApiUnitController.java

@@ -36,7 +36,7 @@ import java.util.Map;
  */
 @AllArgsConstructor
 @RestController
-@RequestMapping("/api/unit")
+@RequestMapping("/client/unit")
 @Tag(name = "单元")
 public class ApiUnitController {
 

+ 1 - 1
yezhu-api/src/main/java/com/kioor/room/controller/ApiUserHousingEstateController.java

@@ -33,7 +33,7 @@ import java.util.Map;
  */
 @AllArgsConstructor
 @RestController
-@RequestMapping("/api/useruousingestate")
+@RequestMapping("/client/useruousingestate")
 @Tag(name = "用户和房屋关系")
 public class ApiUserHousingEstateController {
 

+ 1 - 1
yezhu-api/src/main/java/com/kioor/user/controller/ApiLoginController.java

@@ -30,7 +30,7 @@ import java.util.Map;
  */
 @AllArgsConstructor
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/client")
 @Tag(name = "登录接口")
 public class ApiLoginController {
     private final UserService userService;

+ 1 - 1
yezhu-api/src/main/java/com/kioor/user/controller/ApiRegisterController.java

@@ -36,7 +36,7 @@ import java.util.Map;
  */
 @AllArgsConstructor
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/client")
 @Tag(name = "注册接口")
 public class ApiRegisterController {
     private final UserService userService;

+ 1 - 1
yezhu-api/src/main/java/com/kioor/user/controller/ApiUserController.java

@@ -30,7 +30,7 @@ import java.util.Map;
  */
 @AllArgsConstructor
 @RestController
-@RequestMapping("/api/user")
+@RequestMapping("/client/user")
 @Tag(name = "用户")
 public class ApiUserController {
     private final UserService userService;

+ 4 - 4
yezhu-api/src/main/resources/application-prod.yml

@@ -2,9 +2,9 @@ spring:
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://localhost:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-      username: yezhu
-      password: 123456
+      url: jdbc:mysql://localhost:3306/yezhu?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+      username: root
+      password: 5253546t..B
       initial-size: 10
       max-active: 100
       min-idle: 10
@@ -36,7 +36,7 @@ spring:
       database: 1
       host: localhost
       port: 6379
-      password: 123456 # 密码(默认为空)
+      password: 5253546t # 密码(默认为空)
       timeout: 6000ms  # 连接超时时长(毫秒)
       lettuce:
         pool:

+ 3 - 3
yezhu-api/src/main/resources/application-test.yml

@@ -2,9 +2,9 @@ spring:
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://localhost:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-      username: yezhu
-      password: 123456
+      url: jdbc:mysql://8.137.12.141:3306/yezhu?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+      username: root
+      password: 5253546t..B
       initial-size: 10
       max-active: 100
       min-idle: 10

+ 1 - 1
yezhu-api/src/main/resources/application.yml

@@ -13,7 +13,7 @@ server:
 spring:
   # 环境 dev|test|prod
   profiles:
-    active: dev
+    active: test
   messages:
     encoding: UTF-8
     basename: i18n/messages