Merge branch 'master' into feature/master-payment

# Conflicts:
#	pom.xml
#	src/main/java/cn/xf/basedemo/service/impl/UserServiceImpl.java

src/main/java/cn/xf/basedemo/controller/business/UserController.java

@@ -39,23 +39,4 @@ public class UserController {
         return RetObj.success(loginUser);
     }
 
-    @Operation(summary = "es同步用户信息", description = "用户信息")
-    @GetMapping("/syncEs")
-    public RetObj syncEs(Long userId) {
-        return userService.syncEs(userId);
-    }
-
-    @Operation(summary = "es查询用户信息", description = "用户信息")
-    @GetMapping("/getEsId")
-    public RetObj getEsId(Long userId) {
-        return userService.getEsId(userId);
-    }
-
-
-    //发送队列消息
-    @Operation(summary = "发送队列消息", description = "发送队列消息")
-    @GetMapping("/sendMsg")
-    public RetObj sendMsg(String msg) {
-        return userService.sendMQMsg(msg);
-    }
 }