Browse Source

路由去除 api/

lyhzzz 3 years ago
parent
commit
42e8b1f114
28 changed files with 42 additions and 45 deletions
  1. 2 2
      src/main/java/com/fdkankan/ucenter/config/WebAppConfig.java
  2. 1 1
      src/main/java/com/fdkankan/ucenter/controller/CameraController.java
  3. 1 1
      src/main/java/com/fdkankan/ucenter/controller/CartController.java
  4. 1 1
      src/main/java/com/fdkankan/ucenter/controller/FolderController.java
  5. 1 1
      src/main/java/com/fdkankan/ucenter/controller/IncrementController.java
  6. 1 1
      src/main/java/com/fdkankan/ucenter/controller/InterComMessageController.java
  7. 1 1
      src/main/java/com/fdkankan/ucenter/controller/LoginController.java
  8. 1 1
      src/main/java/com/fdkankan/ucenter/controller/OrderAlipayController.java
  9. 1 1
      src/main/java/com/fdkankan/ucenter/controller/OrderController.java
  10. 1 1
      src/main/java/com/fdkankan/ucenter/controller/OrderPaypalController.java
  11. 1 1
      src/main/java/com/fdkankan/ucenter/controller/OrderWechatPayController.java
  12. 1 1
      src/main/java/com/fdkankan/ucenter/controller/SceneApplyController.java
  13. 1 1
      src/main/java/com/fdkankan/ucenter/controller/SceneController.java
  14. 1 1
      src/main/java/com/fdkankan/ucenter/controller/SceneCooperationController.java
  15. 1 1
      src/main/java/com/fdkankan/ucenter/controller/UserController.java
  16. 1 1
      src/main/java/com/fdkankan/ucenter/controller/VirtualOrderController.java
  17. 1 1
      src/main/java/com/fdkankan/ucenter/controller/app/AppCameraController.java
  18. 1 1
      src/main/java/com/fdkankan/ucenter/controller/app/AppController.java
  19. 1 1
      src/main/java/com/fdkankan/ucenter/controller/app/AppSceneController.java
  20. 1 1
      src/main/java/com/fdkankan/ucenter/controller/app/AppUserController.java
  21. 1 1
      src/main/java/com/fdkankan/ucenter/controller/app/InvoiceController.java
  22. 1 1
      src/main/java/com/fdkankan/ucenter/controller/app/SceneApiController.java
  23. 1 1
      src/main/java/com/fdkankan/ucenter/pay/alipay/AlipayDefaultConfig.java
  24. 4 4
      src/main/java/com/fdkankan/ucenter/pay/paypal/PayPalDefaultConfig.java
  25. 1 1
      src/main/java/com/fdkankan/ucenter/pay/wx/WXPayDefaultConfig.java
  26. 4 0
      src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java
  27. 8 8
      src/main/resources/bootstrap-pro.yml
  28. 1 8
      src/main/resources/bootstrap-test.yml

+ 2 - 2
src/main/java/com/fdkankan/ucenter/config/WebAppConfig.java

@@ -27,8 +27,8 @@ public class WebAppConfig implements WebMvcConfigurer {
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		registry.addInterceptor(ucenterInterceptor).addPathPatterns("/**")
-				.excludePathPatterns("/**/api/sso/**","/**/api/app/**","/test/**");
-		registry.addInterceptor(appInterceptor).addPathPatterns("/**/api/app/**");
+				.excludePathPatterns("/**/sso/**","/**/app/**","/test/**");
+		registry.addInterceptor(appInterceptor).addPathPatterns("/**/app/**");
 		WebMvcConfigurer.super.addInterceptors(registry);
 	}
 

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/CameraController.java

@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/user/camera")
+@RequestMapping("/user/camera")
 public class CameraController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/CartController.java

@@ -16,7 +16,7 @@ import java.util.List;
  * 购物车
  */
 @RestController
-@RequestMapping("/api/user/cart")
+@RequestMapping("/user/cart")
 public class CartController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/FolderController.java

@@ -23,7 +23,7 @@ import java.util.List;
  * @since 2022-07-07
  */
 @RestController
-@RequestMapping("/api/user/folder")
+@RequestMapping("/user/folder")
 public class FolderController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/IncrementController.java

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/user/increment")
+@RequestMapping("/user/increment")
 public class IncrementController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/InterComMessageController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 
 @RestController
-@RequestMapping("/api/intercomMessage")
+@RequestMapping("/intercomMessage")
 public class InterComMessageController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/LoginController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
  * 登录
  */
 @RestController
-@RequestMapping("/api/sso/user")
+@RequestMapping("/sso/user")
 public class LoginController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/OrderAlipayController.java

@@ -22,7 +22,7 @@ import java.util.Map;
 @Log4j2
 /**支付中心-支付宝支付模块*/
 @RestController
-@RequestMapping("/api/order/pay")
+@RequestMapping("/order/pay")
 public class OrderAlipayController extends BaseController {
     @Autowired
     private AlipayDefaultConfig alipayDefaultConfig;

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/OrderController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
  *
  */
 @RestController
-@RequestMapping("/api/user/order")
+@RequestMapping("/user/order")
 public class OrderController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/OrderPaypalController.java

@@ -30,7 +30,7 @@ import java.util.Enumeration;
 @Log4j2
 /**支付中心-paypal支付模块*/
 @Controller
-@RequestMapping("/api/order/pay")
+@RequestMapping("/order/pay")
 public class OrderPaypalController extends BaseController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/OrderWechatPayController.java

@@ -37,7 +37,7 @@ import java.util.Map;
 @Log4j2
 /**支付中心-微信支付模块"*/
 @Controller
-@RequestMapping("/api/order/pay")
+@RequestMapping("/order/pay")
 public class OrderWechatPayController extends BaseController {
     @Autowired
     private OrderStrategyFactory orderStrategyFactory;

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/SceneApplyController.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-07-15
  */
 @RestController
-@RequestMapping("/api/demo/scen")
+@RequestMapping("/demo/scen")
 public class SceneApplyController {
     @Autowired
     private ISceneApplyService sceneApplyService;

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -27,7 +27,7 @@ import java.util.List;
  * @since 2022-07-04
  */
 @RestController
-@RequestMapping("/api/user/scene")
+@RequestMapping("/user/scene")
 public class SceneController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/SceneCooperationController.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/user/scene/cooperation")
+@RequestMapping("/user/scene/cooperation")
 public class SceneCooperationController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/UserController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
  * 个人中心
  */
 @RestController
-@RequestMapping("/api/user")
+@RequestMapping("/user")
 public class UserController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/VirtualOrderController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2022-07-13
  */
 @RestController
-@RequestMapping("/api/user/virtualOrder")
+@RequestMapping("/user/virtualOrder")
 public class VirtualOrderController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/app/AppCameraController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/app/camera")
+@RequestMapping("/app/camera")
 public class AppCameraController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/app/AppController.java

@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/sso/app")
+@RequestMapping("/sso/app")
 public class AppController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/app/AppSceneController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/app/scene")
+@RequestMapping("/app/scene")
 public class AppSceneController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/app/AppUserController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/app/user")
+@RequestMapping("/app/user")
 public class AppUserController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/app/InvoiceController.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/user/invoice")
+@RequestMapping("/user/invoice")
 public class InvoiceController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/app/SceneApiController.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/scene")
+@RequestMapping("/scene")
 public class SceneApiController {
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/ucenter/pay/alipay/AlipayDefaultConfig.java

@@ -24,7 +24,7 @@ public class AlipayDefaultConfig extends AlipayConfig {
     /** 同步地址 */
     private String returnUrl = "mobile.html#/payresult/success";
     /** 异步地址 */
-    private String notifyUrl = "api/order/pay/alipay/async_notify";
+    private String notifyUrl = "order/pay/alipay/async_notify";
 
     /**
      * PostContruct是spring框架的注解,在方法上加该注解会在项目启动的时候执行该方法,也可以理解为在spring容器初始化的时候执行该方法。

+ 4 - 4
src/main/java/com/fdkankan/ucenter/pay/paypal/PayPalDefaultConfig.java

@@ -22,19 +22,19 @@ public class PayPalDefaultConfig extends PayPalConfig {
     }
 
     public String getPaySuccessUrl(){
-        return "api/order/pay/paypal/callback";
+        return "order/pay/paypal/callback";
     }
 
     public String getH5PaySuccessUrl(){
-        return "api/order/pay/paypal/callbackH5";
+        return "order/pay/paypal/callbackH5";
     }
 
     public String getCancelUrl(){
-        return "api/order/pay/paypal/cancel";
+        return "order/pay/paypal/cancel";
     }
 
     public String getH5CancelUrl(){
-        return "api/order/pay/paypal/cancelH5";
+        return "order/pay/paypal/cancelH5";
     }
 
     public String getSuccessUrl(){

+ 1 - 1
src/main/java/com/fdkankan/ucenter/pay/wx/WXPayDefaultConfig.java

@@ -41,7 +41,7 @@ public class WXPayDefaultConfig implements WXPayConfig {
     }
 
     public String getNotifyURL() {
-        return "api/order/pay/wechatPay/notify";
+        return "order/pay/wechatPay/notify";
     }
 
     public String getOrderURL() {

+ 4 - 0
src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java

@@ -23,6 +23,7 @@ import com.fdkankan.ucenter.service.IReceiverInfoService;
 import com.fdkankan.ucenter.service.IUserIncrementService;
 import com.fdkankan.ucenter.service.IUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.ucenter.util.DateUserUtil;
 import com.fdkankan.ucenter.vo.request.RegisterParam;
 import com.fdkankan.ucenter.vo.request.ShipAddressParam;
 import com.fdkankan.ucenter.vo.request.UserParam;
@@ -90,6 +91,9 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         userEntity.setCountry(param.getCountry());
         userEntity.setStatus(1);
         userEntity.setIsNotice(1);
+        userEntity.setRecStatus("A");
+        userEntity.setCreateTime(DateUserUtil.getDate(new Date()));
+        userEntity.setUpdateTime(DateUserUtil.getDate(new Date()));
         this.save(userEntity);
     }
 

+ 8 - 8
src/main/resources/bootstrap-pro.yml

@@ -1,14 +1,14 @@
 spring:
   application:
-    name: 4dkankan-center-user
+    name: 4dkankan-center-ucenter
   cloud:
     nacos:
       config:
-        server-addr: 172.18.157.42:8848
+        server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-pro
+        namespace: 4dkankan-test
         extension-configs:
-          - data-id: 4dkankan-center-user.yaml
+          - data-id: 4dkankan-center-ucenter.yaml
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
@@ -16,7 +16,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-redis-config.yaml
+          - data-id: common-redis-config-52.yaml
             group: DEFAULT_GROUP
             refresh: true
 
@@ -31,10 +31,10 @@ spring:
           - data-id: common-upload-config.yaml
             group: DEFAULT_GROUP
             refresh: true
-      discovery:
-        server-addr: 172.18.157.42:8848
-        namespace: 4dkankan-pro
 
+      discovery:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: 4dkankan-test
 
 
 

+ 1 - 8
src/main/resources/bootstrap-test.yml

@@ -32,15 +32,8 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-mongodb-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-satoken-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
       discovery:
-        server-addr: 120.24.144.164:8848
+        server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: 4dkankan-test