Merge branch 'dev/dev_xp' into dev/dev

src/main/java/com/ai/da/controller/AccountController.java

@@ -235,7 +235,7 @@ public class AccountController {
         return Response.success("success");
     }
 
-    @ApiOperation(value = "verifyUserEmail")
+    /*@ApiOperation(value = "verifyUserEmail")
     @GetMapping("/verifyUserEmail")
     public Response<String> verifyUserEmail(@RequestParam("verifyCode") String verifyCode){
         accountService.verifyUserEmail(verifyCode);
@@ -254,7 +254,7 @@ public class AccountController {
     public Response<String> activateNewEmail(@RequestParam("token") String token){
         accountService.activateNewEmail(token);
         return Response.success("success");
-    }
+    }*/
 
     @PostMapping("halfPricePromotion")
     @ApiOperation(value = "十月半价活动")

src/main/java/com/ai/da/controller/StripeController.java

@@ -112,4 +112,10 @@ public class StripeController {
         return Response.success(stripeService.detachCustomerAllPaymentMethod(name, email));
     }
 
+    @ApiOperation("临时 获取ip")
+    @GetMapping("/getIp2")
+    public Response<String> getIp2(HttpServletRequest request) {
+        return Response.success(stripeService.getIp2(request));
+    }
+
 }

src/main/java/com/ai/da/controller/TagsController.java

@@ -25,7 +25,7 @@ public class TagsController {
 
     @ApiOperation("获取标签")
     @GetMapping("/getTags")
-    public Response<List<Tags>> getTags(@RequestParam("userInput") String userInput) {
+    public Response<List<Tags>> getTags(@RequestParam(value = "userInput", required = false) String userInput) {
         return Response.success(tagsService.getTags(userInput));
     }
 }