model结构调整2

src/main/java/com/caimei365/user/components/WeChatService.java

@@ -2,7 +2,7 @@ package com.caimei365.user.components;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.caimei365.user.model.ResponseJsonVo;
+import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.utils.RequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
@@ -147,7 +147,7 @@ public class WeChatService {
      * @param serverWebExchange ServerWebExchange
      * @return HashMap
      */
-    public ResponseJsonVo<Map<String, Object>> getInfoMapByApplets(String code, ServerWebExchange serverWebExchange) {
+    public ResponseJson<Map<String, Object>> getInfoMapByApplets(String code, ServerWebExchange serverWebExchange) {
         log.info("Start get SessionKey");
         Map<String, Object> returnMap = new HashMap<>(4);
         // 获取当前微信小程序的环境
@@ -172,7 +172,7 @@ public class WeChatService {
         try {
             infos = RequestUtil.sendPost(requestUrl, requestUrlParam);
         } catch (Exception e) {
-            return ResponseJsonVo.error("服务器内部异常", returnMap);
+            return ResponseJson.error("服务器内部异常", returnMap);
         }
         // 解析相应内容（转换成json对象）
         JSONObject jsonObject = JSON.parseObject(infos);
@@ -187,9 +187,9 @@ public class WeChatService {
         returnMap.put("sessionKey", sessionKey);
         boolean errFlag = StringUtils.isNotEmpty(errCode) && ("-1".equals(errCode) || "40029".equals(errCode) || "45011".equals(errCode));
         if (errFlag) {
-            return ResponseJsonVo.error(-1, errMsg, returnMap);
+            return ResponseJson.error(-1, errMsg, returnMap);
         }
-        return ResponseJsonVo.success(returnMap);
+        return ResponseJson.success(returnMap);
     }
 
     /**

src/main/java/com/caimei365/user/controller/AllApi.txt

@@ -2,7 +2,7 @@ package com.caimei365.user.controller;
 
 import com.caimei365.user.idempotent.Idempotent;
 import com.caimei365.user.model.ClubVo;
-import com.caimei365.user.model.ResponseJsonVo;
+import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.model.OperationVo;
 import com.caimei365.user.utils.ValidateUtil;
 import lombok.RequiredArgsConstructor;

src/main/java/com/caimei365/user/controller/BaseApi.java

@@ -1,6 +1,6 @@
 package com.caimei365.user.controller;
 
-import com.caimei365.user.model.ResponseJsonVo;
+import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.service.BaseService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,7 +30,7 @@ public class BaseApi {
      * @param platformType 0:www，1:crm/h5，2:小程序
      */
     @GetMapping("/captcha")
-    public ResponseJsonVo<Map<String, Object>> getCaptchaImage(Integer platformType) {
+    public ResponseJson<Map<String, Object>> getCaptchaImage(Integer platformType) {
         return baseService.getCaptchaImage(platformType);
     }
 
@@ -46,7 +46,7 @@ public class BaseApi {
      * @param platformType     0:www，1:crm/h5，2:小程序
      */
     @GetMapping("/sms/code")
-    public ResponseJsonVo getSmsCode(String mobile, String activateCodeType, String imgCode, String token, Integer platformType) {
+    public ResponseJson getSmsCode(String mobile, String activateCodeType, String imgCode, String token, Integer platformType) {
         return baseService.getSmsCode(mobile, activateCodeType, imgCode, token, platformType);
     }
 

src/main/java/com/caimei365/user/controller/LoginApi.java

@@ -1,7 +1,7 @@
 package com.caimei365.user.controller;
 
-import com.caimei365.user.model.ResponseJsonVo;
-import com.caimei365.user.model.UserLoginVo;
+import com.caimei365.user.model.ResponseJson;
+import com.caimei365.user.model.vo.UserLoginVo;
 import com.caimei365.user.service.LoginService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,7 +33,7 @@ public class LoginApi {
      * @return BaseUser
      */
     @PostMapping("/password")
-    public ResponseJsonVo<UserLoginVo> passwordLogin(String mobileOrEmail, String password) {
+    public ResponseJson<UserLoginVo> passwordLogin(String mobileOrEmail, String password) {
         return loginService.passwordLogin(mobileOrEmail, password);
     }
 
@@ -47,7 +47,7 @@ public class LoginApi {
      * @param iv            加密算法的初始向量
      */
     @PostMapping("/auth/applets")
-    public ResponseJsonVo<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, ServerWebExchange serverWebExchange) {
+    public ResponseJson<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, ServerWebExchange serverWebExchange) {
         return loginService.appletsAuthorization(code, encryptedData, iv, serverWebExchange);
     }
 
@@ -60,7 +60,7 @@ public class LoginApi {
      * @param mode        授权方式：1静默授权，其他手动同意授权
      */
     @GetMapping("/auth/link")
-    public ResponseJsonVo<String> getAuthorizationLink(String redirectUri, Integer mode) {
+    public ResponseJson<String> getAuthorizationLink(String redirectUri, Integer mode) {
         return loginService.getAuthorizationLink(redirectUri, mode);
     }
 
@@ -74,7 +74,7 @@ public class LoginApi {
      * @param mode  1:静默授权,2:用户手动授权
      */
     @GetMapping("/auth/website")
-    public ResponseJsonVo<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, ServerWebExchange serverWebExchange) {
+    public ResponseJson<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, ServerWebExchange serverWebExchange) {
         return loginService.websiteAuthorization(code, state, mode, serverWebExchange);
     }
 

src/main/java/com/caimei365/user/controller/RegisterApi.java

@@ -1,8 +1,8 @@
 package com.caimei365.user.controller;
 
 import com.caimei365.user.idempotent.Idempotent;
-import com.caimei365.user.model.ClubPo;
-import com.caimei365.user.model.ResponseJsonVo;
+import com.caimei365.user.model.ResponseJson;
+import com.caimei365.user.model.po.ClubPo;
 import com.caimei365.user.service.RegisterService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -40,17 +40,17 @@ public class RegisterApi {
      */
     @Idempotent(prefix="idempotent_club", keys={"#baseUser"}, expire=5)
     @PostMapping("/club")
-    public ResponseJsonVo<ClubPo> clubRegister(Integer source,
-                                               String userName,
-                                               String bindMobile,
-                                               String password,
-                                               String passWordConfirm,
-                                               String smsCode,
-                                               Integer isAgreed,
-                                               String unionId,
-                                               String nickName,
-                                               String avatarUrl,
-                                               ServerWebExchange serverWebExchange) {
+    public ResponseJson<ClubPo> clubRegister(Integer source,
+                                             String userName,
+                                             String bindMobile,
+                                             String password,
+                                             String passWordConfirm,
+                                             String smsCode,
+                                             Integer isAgreed,
+                                             String unionId,
+                                             String nickName,
+                                             String avatarUrl,
+                                             ServerWebExchange serverWebExchange) {
         return registerService.clubRegister(source, userName, bindMobile, password, passWordConfirm, smsCode, isAgreed, unionId, nickName, avatarUrl, serverWebExchange);
     }
 

src/main/java/com/caimei365/user/controller/ShopApi.java

@@ -1,7 +1,7 @@
 package com.caimei365.user.controller;
 
 import com.caimei365.user.idempotent.Idempotent;
-import com.caimei365.user.model.ResponseJsonVo;
+import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.service.ShopService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -50,26 +50,26 @@ public class ShopApi {
      */
     @Idempotent(prefix="idempotent_club", keys={"#baseUser"}, expire=5)
     @PostMapping("/pc/register")
-    public ResponseJsonVo pcRegister(Integer source,
-                                     String name,
-                                     String sName,
-                                     String bindMobile,
-                                     String email,
-                                     String smsCode,
-                                     String password,
-                                     String passWordConfirm,
-                                     String linkMan,
-                                     Integer provinceId,
-                                     Integer cityId,
-                                     Integer townId,
-                                     String address,
-                                     String socialCreditCode,
-                                     String businessLicenseImage,
-                                     String firstShopType,
-                                     String secondShopType,
-                                     String mainPro,
-                                     Integer isAgreed,
-                                     ServerWebExchange serverWebExchange) {
+    public ResponseJson pcRegister(Integer source,
+                                   String name,
+                                   String sName,
+                                   String bindMobile,
+                                   String email,
+                                   String smsCode,
+                                   String password,
+                                   String passWordConfirm,
+                                   String linkMan,
+                                   Integer provinceId,
+                                   Integer cityId,
+                                   Integer townId,
+                                   String address,
+                                   String socialCreditCode,
+                                   String businessLicenseImage,
+                                   String firstShopType,
+                                   String secondShopType,
+                                   String mainPro,
+                                   Integer isAgreed,
+                                   ServerWebExchange serverWebExchange) {
         return shopService.register(source, name, sName, bindMobile, email, smsCode, password, passWordConfirm, linkMan, provinceId, cityId, townId, address, socialCreditCode, businessLicenseImage, firstShopType, secondShopType, mainPro, isAgreed, serverWebExchange);
     }
 
@@ -102,27 +102,27 @@ public class ShopApi {
     @ApiOperation("小程序端分步供应商注册")
     @ApiImplicitParam(name = "name", value = "供应商名称", required = true, dataType = "String")
     @PostMapping("/applets/register")
-    public ResponseJsonVo appletsRegister(Integer source,
-                                          String name,
-                                          String sName,
-                                          String bindMobile,
-                                          String email,
-                                          String smsCode,
-                                          String password,
-                                          String passWordConfirm,
-                                          String linkMan,
-                                          Integer provinceId,
-                                          Integer cityId,
-                                          Integer townId,
-                                          String address,
-                                          String socialCreditCode,
-                                          String businessLicenseImage,
-                                          String firstShopType,
-                                          String secondShopType,
-                                          String mainPro,
-                                          Integer isAgreed,
-                                          ServerWebExchange serverWebExchange,
-                                          Integer whichStep) {
+    public ResponseJson appletsRegister(Integer source,
+                                        String name,
+                                        String sName,
+                                        String bindMobile,
+                                        String email,
+                                        String smsCode,
+                                        String password,
+                                        String passWordConfirm,
+                                        String linkMan,
+                                        Integer provinceId,
+                                        Integer cityId,
+                                        Integer townId,
+                                        String address,
+                                        String socialCreditCode,
+                                        String businessLicenseImage,
+                                        String firstShopType,
+                                        String secondShopType,
+                                        String mainPro,
+                                        Integer isAgreed,
+                                        ServerWebExchange serverWebExchange,
+                                        Integer whichStep) {
         return shopService.appletsRegister(source, name, sName, bindMobile, email, smsCode, password, passWordConfirm, linkMan, provinceId, cityId, townId, address, socialCreditCode, businessLicenseImage, firstShopType, secondShopType, mainPro, isAgreed, serverWebExchange, whichStep);
     }
 

src/main/java/com/caimei365/user/mapper/LoginMapper.java

@@ -1,7 +1,7 @@
 package com.caimei365.user.mapper;
 
-import com.caimei365.user.model.OperationPo;
-import com.caimei365.user.model.UserLoginVo;
+import com.caimei365.user.model.po.OperationPo;
+import com.caimei365.user.model.vo.UserLoginVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/caimei365/user/mapper/RegisterMapper.java

@@ -1,9 +1,9 @@
 package com.caimei365.user.mapper;
 
-import com.caimei365.user.model.ClubPo;
-import com.caimei365.user.model.OperationPo;
-import com.caimei365.user.model.ShopPo;
-import com.caimei365.user.model.UserPo;
+import com.caimei365.user.model.po.ClubPo;
+import com.caimei365.user.model.po.OperationPo;
+import com.caimei365.user.model.po.ShopPo;
+import com.caimei365.user.model.po.UserPo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/caimei365/user/model/ResponseJson.java

@@ -0,0 +1,81 @@
+package com.caimei365.user.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 全局API返回值
+ *
+ * @author : Charles
+ * @date : 2021/3/4
+ */
+@Data
+public class ResponseJson<T> implements Serializable {
+    /** 状态码 */
+    private int code;
+    /** 提示信息 */
+    private String msg;
+    /** 返回的数据 */
+    private T data;
+
+    private ResponseJson() {}
+
+    private ResponseJson(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    private ResponseJson(int code, String msg, T data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    public static ResponseJson success() {
+        return new ResponseJson<>(0, "操作成功");
+    }
+
+    public static<T> ResponseJson<T> success(T data) {
+        return new ResponseJson<>(0, "操作成功", data);
+    }
+
+    public static<T> ResponseJson<T> success(String msg, T data) {
+        return new ResponseJson<>(0, msg, data);
+    }
+
+    public static<T> ResponseJson<T> success(int code, String msg, T data) {
+        return new ResponseJson<>(code, msg, data);
+    }
+
+    public static ResponseJson error() {
+        return new ResponseJson<>(-1, "操作失败");
+    }
+
+    public static ResponseJson error(String msg) {
+        return new ResponseJson<>(-1, msg);
+    }
+
+    public static ResponseJson error(int code, String msg) {
+        return new ResponseJson<>(code, msg);
+    }
+
+    public static<T> ResponseJson<T> error(T data) {
+        return new ResponseJson<>(-1, "操作失败", data);
+    }
+
+    public static<T> ResponseJson<T> error(String msg, T data) {
+        return new ResponseJson<>(-1, msg, data);
+    }
+
+    public static<T> ResponseJson<T> error(int code, String msg, T data) {
+        return new ResponseJson<>(code, msg, data);
+    }
+
+    @Override
+    public String toString() {
+        return "JsonModel{" + "code=" + code + ", msg='" + msg + '\'' + ", data=" + data + '}';
+    }
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/caimei365/user/model/ResponseJsonVo.java

@@ -1,81 +0,0 @@
-package com.caimei365.user.model;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 全局API返回值
- *
- * @author : Charles
- * @date : 2021/3/4
- */
-@Data
-public class ResponseJsonVo<T> implements Serializable {
-    /** 状态码 */
-    private int code;
-    /** 提示信息 */
-    private String msg;
-    /** 返回的数据 */
-    private T data;
-
-    private ResponseJsonVo() {}
-
-    private ResponseJsonVo(int code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    private ResponseJsonVo(int code, String msg, T data) {
-        this.code = code;
-        this.msg = msg;
-        this.data = data;
-    }
-
-    public static ResponseJsonVo success() {
-        return new ResponseJsonVo<>(0, "操作成功");
-    }
-
-    public static<T> ResponseJsonVo<T> success(T data) {
-        return new ResponseJsonVo<>(0, "操作成功", data);
-    }
-
-    public static<T> ResponseJsonVo<T> success(String msg, T data) {
-        return new ResponseJsonVo<>(0, msg, data);
-    }
-
-    public static<T> ResponseJsonVo<T> success(int code, String msg, T data) {
-        return new ResponseJsonVo<>(code, msg, data);
-    }
-
-    public static ResponseJsonVo error() {
-        return new ResponseJsonVo<>(-1, "操作失败");
-    }
-
-    public static ResponseJsonVo error(String msg) {
-        return new ResponseJsonVo<>(-1, msg);
-    }
-
-    public static ResponseJsonVo error(int code, String msg) {
-        return new ResponseJsonVo<>(code, msg);
-    }
-
-    public static<T> ResponseJsonVo<T> error(T data) {
-        return new ResponseJsonVo<>(-1, "操作失败", data);
-    }
-
-    public static<T> ResponseJsonVo<T> error(String msg, T data) {
-        return new ResponseJsonVo<>(-1, msg, data);
-    }
-
-    public static<T> ResponseJsonVo<T> error(int code, String msg, T data) {
-        return new ResponseJsonVo<>(code, msg, data);
-    }
-
-    @Override
-    public String toString() {
-        return "JsonModel{" + "code=" + code + ", msg='" + msg + '\'' + ", data=" + data + '}';
-    }
-
-    private static final long serialVersionUID = 1L;
-}

src/main/java/com/caimei365/user/model/ClubPo.java → src/main/java/com/caimei365/user/model/po/ClubPo.java

@@ -1,4 +1,4 @@
-package com.caimei365.user.model;
+package com.caimei365.user.model.po;
 
 import lombok.Data;
 

src/main/java/com/caimei365/user/model/OperationPo.java → src/main/java/com/caimei365/user/model/po/OperationPo.java

@@ -1,4 +1,4 @@
-package com.caimei365.user.model;
+package com.caimei365.user.model.po;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

src/main/java/com/caimei365/user/model/ShopPo.java → src/main/java/com/caimei365/user/model/po/ShopPo.java

@@ -1,4 +1,4 @@
-package com.caimei365.user.model;
+package com.caimei365.user.model.po;
 
 import lombok.Data;
 

src/main/java/com/caimei365/user/model/UserPo.java → src/main/java/com/caimei365/user/model/po/UserPo.java

@@ -1,4 +1,4 @@
-package com.caimei365.user.model;
+package com.caimei365.user.model.po;
 
 import lombok.Data;
 

src/main/java/com/caimei365/user/model/UserLoginVo.java → src/main/java/com/caimei365/user/model/vo/UserLoginVo.java

@@ -1,4 +1,4 @@
-package com.caimei365.user.model;
+package com.caimei365.user.model.vo;
 
 import lombok.Data;
 

src/main/java/com/caimei365/user/service/BaseService.java

@@ -1,6 +1,6 @@
 package com.caimei365.user.service;
 
-import com.caimei365.user.model.ResponseJsonVo;
+import com.caimei365.user.model.ResponseJson;
 
 import java.util.Map;
 
@@ -17,7 +17,7 @@ public interface BaseService {
      * @param platformType 0:www，1:crm/h5，2:小程序
      * @return Map<String, Object>
      */
-    ResponseJsonVo<Map<String, Object>> getCaptchaImage(Integer platformType);
+    ResponseJson<Map<String, Object>> getCaptchaImage(Integer platformType);
 
     /**
      * 校验图片验证码
@@ -39,5 +39,5 @@ public interface BaseService {
      * @param platformType     0:www，1:crm/h5，2:小程序
      * @return void
      */
-    ResponseJsonVo getSmsCode(String mobile, String activateCodeType, String imgCode, String token, Integer platformType);
+    ResponseJson getSmsCode(String mobile, String activateCodeType, String imgCode, String token, Integer platformType);
 }

src/main/java/com/caimei365/user/service/LoginService.java

@@ -1,7 +1,7 @@
 package com.caimei365.user.service;
 
-import com.caimei365.user.model.ResponseJsonVo;
-import com.caimei365.user.model.UserLoginVo;
+import com.caimei365.user.model.ResponseJson;
+import com.caimei365.user.model.vo.UserLoginVo;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
@@ -19,7 +19,7 @@ public interface LoginService {
      * @param password      密码
      * @return BaseUser
      */
-    ResponseJsonVo<UserLoginVo> passwordLogin(String mobileOrEmail, String password);
+    ResponseJson<UserLoginVo> passwordLogin(String mobileOrEmail, String password);
 
     /**
      * 微信授权登录（小程序）
@@ -30,7 +30,7 @@ public interface LoginService {
      * @param serverWebExchange ServerWebExchange
      * @return BaseUser
      */
-    ResponseJsonVo<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, ServerWebExchange serverWebExchange);
+    ResponseJson<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, ServerWebExchange serverWebExchange);
 
     /**
      * 微信公众号授权链接(www)
@@ -38,7 +38,7 @@ public interface LoginService {
      * @param redirectUri 用于微信授权的中间页面
      * @param mode        授权方式：1静默授权，其他手动同意授权
      */
-    ResponseJsonVo<String> getAuthorizationLink(String redirectUri, Integer mode);
+    ResponseJson<String> getAuthorizationLink(String redirectUri, Integer mode);
 
     /**
      * 微信公众号授权登录(www)
@@ -49,5 +49,5 @@ public interface LoginService {
      * @param state 安全认证
      * @param mode  1:静默授权,2:用户手动授权
      */
-    ResponseJsonVo<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, ServerWebExchange serverWebExchange);
+    ResponseJson<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, ServerWebExchange serverWebExchange);
 }

src/main/java/com/caimei365/user/service/RegisterService.java

@@ -1,7 +1,7 @@
 package com.caimei365.user.service;
 
-import com.caimei365.user.model.ClubPo;
-import com.caimei365.user.model.ResponseJsonVo;
+import com.caimei365.user.model.ResponseJson;
+import com.caimei365.user.model.po.ClubPo;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
@@ -27,6 +27,6 @@ public interface RegisterService {
      * @param serverWebExchange ServerWebExchange
      * @return BaseUser
      */
-    ResponseJsonVo<ClubPo> clubRegister(Integer source, String userName, String bindMobile, String password, String passWordConfirm, String smsCode, Integer isAgreed, String unionId, String nickName, String avatarUrl, ServerWebExchange serverWebExchange);
+    ResponseJson<ClubPo> clubRegister(Integer source, String userName, String bindMobile, String password, String passWordConfirm, String smsCode, Integer isAgreed, String unionId, String nickName, String avatarUrl, ServerWebExchange serverWebExchange);
 
 }

src/main/java/com/caimei365/user/service/ShopService.java

@@ -1,6 +1,6 @@
 package com.caimei365.user.service;
 
-import com.caimei365.user.model.ResponseJsonVo;
+import com.caimei365.user.model.ResponseJson;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
@@ -35,7 +35,7 @@ public interface ShopService {
      * @param serverWebExchange     ServerWebExchange(新参数)
      * @return BaseUser
      */
-    ResponseJsonVo register(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange);
+    ResponseJson register(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange);
 
     /**
      * 小程序端分步供应商注册
@@ -63,5 +63,5 @@ public interface ShopService {
      * @param whichStep             注册步数
      * @return BaseUser
      */
-    ResponseJsonVo appletsRegister(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange, Integer whichStep);
+    ResponseJson appletsRegister(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange, Integer whichStep);
 }

src/main/java/com/caimei365/user/service/impl/BaseServiceImpl.java

@@ -1,7 +1,7 @@
 package com.caimei365.user.service.impl;
 
 import com.caimei365.user.mapper.BaseMapper;
-import com.caimei365.user.model.ResponseJsonVo;
+import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.components.RedisService;
 import com.caimei365.user.service.BaseService;
 import com.caimei365.user.utils.AliyunSmsUtil;
@@ -38,7 +38,7 @@ public class BaseServiceImpl implements BaseService {
      * @param platformType 0:www，1:crm/h5，2:小程序
      */
     @Override
-    public ResponseJsonVo<Map<String, Object>> getCaptchaImage(Integer platformType) {
+    public ResponseJson<Map<String, Object>> getCaptchaImage(Integer platformType) {
         Map<String, Object> result = new HashMap<>(2);
         try {
             ImageCaptchaUtil.Captcha captcha = null;
@@ -56,9 +56,9 @@ public class BaseServiceImpl implements BaseService {
             }
             result.put("baseImage", captcha.getBase64Image());
             result.put("token", captcha.getMd5Code());
-            return ResponseJsonVo.success(result);
+            return ResponseJson.success(result);
         } catch (Exception e) {
-            return ResponseJsonVo.error("获取图片验证码异常", null);
+            return ResponseJson.error("获取图片验证码异常", null);
         }
     }
 
@@ -96,11 +96,11 @@ public class BaseServiceImpl implements BaseService {
      * @param platformType     0:www，1:crm/h5，2:小程序
      */
     @Override
-    public ResponseJsonVo getSmsCode(String mobile, String activateCodeType, String imgCode, String token, Integer platformType) {
+    public ResponseJson getSmsCode(String mobile, String activateCodeType, String imgCode, String token, Integer platformType) {
         Boolean checkFlag = checkCaptchaImage(token, imgCode, platformType);
         if (checkFlag) {
             // 验证手机号
-            ResponseJsonVo mobileModel = ValidateUtil.validateMobile(mobile);
+            ResponseJson mobileModel = ValidateUtil.validateMobile(mobile);
             if (mobileModel.getCode() == -1) {
                 return mobileModel;
             }
@@ -111,13 +111,13 @@ public class BaseServiceImpl implements BaseService {
             Integer userId = baseMapper.getUserIdByMobile(mobile);
             if ("1".equals(activateCodeType)) {
                 if (null == userId || userId < 1) {
-                    return ResponseJsonVo.error("该手机号尚未注册");
+                    return ResponseJson.error("该手机号尚未注册");
                 }
                 // 找回密码
                 sendFlag = AliyunSmsUtil.sendSms(mobile, 1, "{code:" + randomCode + "}");
             } else {
                 if (userId > 0) {
-                    return ResponseJsonVo.error("该手机号已被使用");
+                    return ResponseJson.error("该手机号已被使用");
                 }
                 if ("2".equals(activateCodeType)) {
                     // 机构用户(自主)注册
@@ -126,18 +126,18 @@ public class BaseServiceImpl implements BaseService {
                     // 供应商(自主)注册
                     sendFlag = AliyunSmsUtil.sendSms(mobile, 9, "{code:"+ randomCode +"}");
                 } else {
-                    return ResponseJsonVo.error("参数错误：activateCodeType");
+                    return ResponseJson.error("参数错误：activateCodeType");
                 }
             }
             if (sendFlag) {
                 redisService.set("code:"+mobile, randomCode, 1800L);
                 log.info("你发送的手机验证码: " + randomCode);
             } else {
-                return ResponseJsonVo.error("验证码发送失败！请稍后重试");
+                return ResponseJson.error("验证码发送失败！请稍后重试");
             }
         } else {
-            return ResponseJsonVo.error("图片验证码错误");
+            return ResponseJson.error("图片验证码错误");
         }
-        return ResponseJsonVo.success("发送验证码成功");
+        return ResponseJson.success("发送验证码成功");
     }
 }

src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -3,8 +3,8 @@ package com.caimei365.user.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.caimei365.user.components.WeChatService;
 import com.caimei365.user.mapper.LoginMapper;
-import com.caimei365.user.model.ResponseJsonVo;
-import com.caimei365.user.model.UserLoginVo;
+import com.caimei365.user.model.ResponseJson;
+import com.caimei365.user.model.vo.UserLoginVo;
 import com.caimei365.user.service.LoginService;
 import com.caimei365.user.components.RedisService;
 import com.caimei365.user.utils.JwtUtil;
@@ -43,12 +43,12 @@ public class LoginServiceImpl implements LoginService {
      * @return BaseUser
      */
     @Override
-    public ResponseJsonVo<UserLoginVo> passwordLogin(String mobileOrEmail, String password) {
+    public ResponseJson<UserLoginVo> passwordLogin(String mobileOrEmail, String password) {
         if (mobileOrEmail.isEmpty()) {
-            return ResponseJsonVo.error("请填写账户名", null);
+            return ResponseJson.error("请填写账户名", null);
         }
         if (password.isEmpty()) {
-            return ResponseJsonVo.error("请填写密码", null);
+            return ResponseJson.error("请填写密码", null);
         }
         //处理比对密码
         UserLoginVo baseUser = loginMapper.getLoginUserByMobileOrEmail(mobileOrEmail);
@@ -58,14 +58,14 @@ public class LoginServiceImpl implements LoginService {
             if (md5Password.equals(dbPassword)) {
                 if (baseUser.getUserIdentity() == 1) {
                     // 协销登录
-                    return ResponseJsonVo.success(baseUser);
+                    return ResponseJson.success(baseUser);
                 } else {
                     // 返回登录校验结果
                     return logonVerify(baseUser);
                 }
             }
         }
-        return ResponseJsonVo.error("输入的密码和账户名不匹配", null);
+        return ResponseJson.error("输入的密码和账户名不匹配", null);
     }
 
     /**
@@ -77,14 +77,14 @@ public class LoginServiceImpl implements LoginService {
      * @param serverWebExchange ServerWebExchange
      */
     @Override
-    public ResponseJsonVo<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, ServerWebExchange serverWebExchange) {
+    public ResponseJson<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, ServerWebExchange serverWebExchange) {
         if (StringUtils.isBlank(code)) {
-            return ResponseJsonVo.error("没有获取到微信授权code", null);
+            return ResponseJson.error("没有获取到微信授权code", null);
         }
         // 小程序微信授权获取登录信息
-        ResponseJsonVo<Map<String, Object>> appletsInfo = weChatService.getInfoMapByApplets(code, serverWebExchange);
+        ResponseJson<Map<String, Object>> appletsInfo = weChatService.getInfoMapByApplets(code, serverWebExchange);
         if (appletsInfo.getCode() == -1) {
-            return ResponseJsonVo.error(appletsInfo.getMsg(), null);
+            return ResponseJson.error(appletsInfo.getMsg(), null);
         }
         Map<String, Object> infoData = appletsInfo.getData();
         String openId = (String) infoData.get("openId");
@@ -101,7 +101,7 @@ public class LoginServiceImpl implements LoginService {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return ResponseJsonVo.error("微信解密失败", null);
+            return ResponseJson.error("微信解密失败", null);
         }
         // 用户数据存入Redis，key前缀：wxInfo:applets:
         redisService.setMap("wxInfo:applets:" + unionId, infoData);
@@ -114,7 +114,7 @@ public class LoginServiceImpl implements LoginService {
             seller.setToken(token);
             seller.setUnionId(unionId);
             seller.setOpenId(openId);
-            return ResponseJsonVo.success(seller);
+            return ResponseJson.success(seller);
         }
         // 运营人员授权登录
         return operationAuthLogin(openId, unionId, "mini");
@@ -127,12 +127,12 @@ public class LoginServiceImpl implements LoginService {
      * @param mode        授权方式：1静默授权，其他手动同意授权
      */
     @Override
-    public ResponseJsonVo<String> getAuthorizationLink(String redirectUri, Integer mode) {
+    public ResponseJson<String> getAuthorizationLink(String redirectUri, Integer mode) {
         String link = weChatService.getAuthorizationLink(redirectUri, mode);
         String state = UUID.randomUUID().toString();
         redisService.set(state, state, 1800L);
         link = link.replace("STATE", state);
-        return ResponseJsonVo.success(link);
+        return ResponseJson.success(link);
     }
 
     /**
@@ -146,9 +146,9 @@ public class LoginServiceImpl implements LoginService {
      * @param serverWebExchange ServerWebExchange
      */
     @Override
-    public ResponseJsonVo<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, ServerWebExchange serverWebExchange) {
+    public ResponseJson<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, ServerWebExchange serverWebExchange) {
         if (StringUtils.isBlank(code) || StringUtils.isBlank(state)) {
-            return ResponseJsonVo.error("参数异常", null);
+            return ResponseJson.error("参数异常", null);
         }
         String wxState = (String) redisService.get(state);
         log.info("微信code>>>" + code + "state>>>" + wxState + "----" + state + "mode>>>" + mode);
@@ -165,7 +165,7 @@ public class LoginServiceImpl implements LoginService {
                         // 返回登录用户
                         return logonVerify(user);
                     } else {
-                        return ResponseJsonVo.error(-4, "您的微信尚未绑定任何机构", null);
+                        return ResponseJson.error(-4, "您的微信尚未绑定任何机构", null);
                     }
                 } else {
                     // 获取access_token
@@ -181,10 +181,10 @@ public class LoginServiceImpl implements LoginService {
                 }
             } catch (Exception e) {
                 e.printStackTrace();
-                return ResponseJsonVo.error("获取微信信息异常", null);
+                return ResponseJson.error("获取微信信息异常", null);
             }
         }
-        return ResponseJsonVo.error("请从正确的途径打开链接", null);
+        return ResponseJson.error("请从正确的途径打开链接", null);
     }
 
     /**
@@ -194,7 +194,7 @@ public class LoginServiceImpl implements LoginService {
      * @param source 来源：www网站, mini小程序
      * @return BaseUser
      */
-    private ResponseJsonVo<UserLoginVo> operationAuthLogin(String openId, String unionId, String source) {
+    private ResponseJson<UserLoginVo> operationAuthLogin(String openId, String unionId, String source) {
         UserLoginVo operation = loginMapper.getOperationUserByUnionId(unionId, source);
         if (null == operation) {
             operation = loginMapper.getOperationUserByOpenId(openId, source);
@@ -202,7 +202,7 @@ public class LoginServiceImpl implements LoginService {
                 operation = new UserLoginVo();
                 operation.setOpenId(openId);
                 operation.setUnionId(unionId);
-                return ResponseJsonVo.error("您的微信尚未绑定任何机构", operation);
+                return ResponseJson.error("您的微信尚未绑定任何机构", operation);
             } else {
                 // 表示 openId存在, unionId不存在
                 loginMapper.updateOperationUnionId(operation.getUserId(), unionId);
@@ -222,7 +222,7 @@ public class LoginServiceImpl implements LoginService {
      * @param baseUser 用户信息
      * @return BaseUser
      */
-    private ResponseJsonVo<UserLoginVo> logonVerify(UserLoginVo baseUser) {
+    private ResponseJson<UserLoginVo> logonVerify(UserLoginVo baseUser) {
         // 生成token给用户
         String token = JwtUtil.createToken(baseUser.getUserId());
         // 为了过期续签，将token存入redis，并设置超时时间
@@ -230,18 +230,18 @@ public class LoginServiceImpl implements LoginService {
         baseUser.setToken(token);
         if (baseUser.getStatus() == 91) {
             //机构 / 供应商
-            return ResponseJsonVo.error(-2, "您的企业账号已被冻结，请联系客服处理", null);
+            return ResponseJson.error(-2, "您的企业账号已被冻结，请联系客服处理", null);
         }
         // 供应商
         if (baseUser.getUserIdentity() == 3) {
             if (baseUser.getStatus() == 3) {
-                return ResponseJsonVo.error(-2, "您的企业账号正在加速审核中,审核通过后即可登录", null);
+                return ResponseJson.error(-2, "您的企业账号正在加速审核中,审核通过后即可登录", null);
             }
             if (baseUser.getStatus() == 92) {
-                return ResponseJsonVo.error(-3, "您的企业账号审核未通过", baseUser);
+                return ResponseJson.error(-3, "您的企业账号审核未通过", baseUser);
             }
         }
-        return ResponseJsonVo.success("登录成功", baseUser);
+        return ResponseJson.success("登录成功", baseUser);
     }
 
 }

src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -2,7 +2,10 @@ package com.caimei365.user.service.impl;
 
 import com.caimei365.user.mapper.BaseMapper;
 import com.caimei365.user.mapper.RegisterMapper;
-import com.caimei365.user.model.*;
+import com.caimei365.user.model.ResponseJson;
+import com.caimei365.user.model.po.ClubPo;
+import com.caimei365.user.model.po.OperationPo;
+import com.caimei365.user.model.po.UserPo;
 import com.caimei365.user.service.RegisterService;
 import com.caimei365.user.components.RedisService;
 import com.caimei365.user.utils.AliyunSmsUtil;
@@ -54,7 +57,7 @@ public class RegisterServiceImpl implements RegisterService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseJsonVo<ClubPo> clubRegister(Integer source, String userName, String bindMobile, String password, String passWordConfirm, String smsCode, Integer isAgreed, String unionId, String nickName, String avatarUrl, ServerWebExchange serverWebExchange) {
+    public ResponseJson<ClubPo> clubRegister(Integer source, String userName, String bindMobile, String password, String passWordConfirm, String smsCode, Integer isAgreed, String unionId, String nickName, String avatarUrl, ServerWebExchange serverWebExchange) {
         // 打印IP
         String ip = RequestUtil.getIp(serverWebExchange);
         log.info("X-Forwarded-For:" + ip);
@@ -62,27 +65,27 @@ public class RegisterServiceImpl implements RegisterService {
         if (StringUtils.isBlank(userName) || StringUtils.isBlank(bindMobile)
             || StringUtils.isBlank(password) || StringUtils.isBlank(passWordConfirm) ||
             StringUtils.isBlank(smsCode)) {
-            return ResponseJsonVo.error("参数异常", null);
+            return ResponseJson.error("参数异常", null);
         }
         if (!password.equals(passWordConfirm)) {
-            return ResponseJsonVo.error("输入的密码不一致", null);
+            return ResponseJson.error("输入的密码不一致", null);
         }
         String redisSmsCode = (String) redisService.get("code:" + bindMobile);
         if (redisSmsCode.equals(smsCode)) {
-            return ResponseJsonVo.error("手机验证码错误", null);
+            return ResponseJson.error("手机验证码错误", null);
         }
         if (1 != isAgreed) {
-            return ResponseJsonVo.error("请勾选同意协议", null);
+            return ResponseJson.error("请勾选同意协议", null);
         }
         // 查找用户表是否存在
         Integer dbUserId = baseMapper.getUserIdByMobile(bindMobile);
         if (dbUserId > 0) {
-            return ResponseJsonVo.error("该手机号已被使用", null);
+            return ResponseJson.error("该手机号已被使用", null);
         }
         // 查找运营人员表是否存在
         Integer dbOperationId = baseMapper.getOperationIdByMobile(bindMobile);
         if (dbOperationId > 0) {
-            return ResponseJsonVo.error("您已是机构运营人员，无需再注册机构", null);
+            return ResponseJson.error("您已是机构运营人员，无需再注册机构", null);
         }
         /*
             组装用户数据 user
@@ -209,7 +212,7 @@ public class RegisterServiceImpl implements RegisterService {
             }
             log.info("注册普通机构,默认绑定为机构运营人员");
         }
-        return ResponseJsonVo.success(club);
+        return ResponseJson.success(club);
     }
 }
 

src/main/java/com/caimei365/user/service/impl/ShopServiceImpl.java

@@ -3,9 +3,9 @@ package com.caimei365.user.service.impl;
 import com.caimei365.user.components.RedisService;
 import com.caimei365.user.mapper.BaseMapper;
 import com.caimei365.user.mapper.RegisterMapper;
-import com.caimei365.user.model.ResponseJsonVo;
-import com.caimei365.user.model.ShopPo;
-import com.caimei365.user.model.UserPo;
+import com.caimei365.user.model.ResponseJson;
+import com.caimei365.user.model.po.ShopPo;
+import com.caimei365.user.model.po.UserPo;
 import com.caimei365.user.service.ShopService;
 import com.caimei365.user.utils.Md5Util;
 import com.caimei365.user.utils.RequestUtil;
@@ -62,7 +62,7 @@ public class ShopServiceImpl implements ShopService {
      * @return BaseUser
      */
     @Override
-    public ResponseJsonVo register(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange) {
+    public ResponseJson register(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange) {
         // 打印IP
         String ip = RequestUtil.getIp(serverWebExchange);
         log.info("X-Forwarded-For:" + ip);
@@ -70,36 +70,36 @@ public class ShopServiceImpl implements ShopService {
         if (StringUtils.isBlank(name) || StringUtils.isBlank(bindMobile)
                 || StringUtils.isBlank(password) || StringUtils.isBlank(passWordConfirm)
                 || StringUtils.isBlank(smsCode) || StringUtils.isBlank(linkMan)) {
-            return ResponseJsonVo.error("参数异常", null);
+            return ResponseJson.error("参数异常", null);
         }
-        ResponseJsonVo model = ValidateUtil.validateMobile(bindMobile);
+        ResponseJson model = ValidateUtil.validateMobile(bindMobile);
         if (model.getCode() == -1) {
             return model;
         }
         if (!password.equals(passWordConfirm)) {
-            return ResponseJsonVo.error("输入的密码不一致", null);
+            return ResponseJson.error("输入的密码不一致", null);
         }
         if (1 != isAgreed) {
-            return ResponseJsonVo.error("请勾选同意协议", null);
+            return ResponseJson.error("请勾选同意协议", null);
         }
         // 查找用户表是否存在
         Integer dbUserId = baseMapper.getUserIdByMobile(bindMobile);
         if (dbUserId > 0) {
-            return ResponseJsonVo.error("该手机号已被使用", null);
+            return ResponseJson.error("该手机号已被使用", null);
         }
         // 查找运营人员表是否存在
         Integer dbOperationId = baseMapper.getOperationIdByMobile(bindMobile);
         if (dbOperationId > 0) {
-            return ResponseJsonVo.error("您已是机构运营人员，无需再注册机构", null);
+            return ResponseJson.error("您已是机构运营人员，无需再注册机构", null);
         }
         String redisSmsCode = (String) redisService.get("code:" + bindMobile);
         if (redisSmsCode.equals(smsCode)) {
-            return ResponseJsonVo.error("手机验证码错误", null);
+            return ResponseJson.error("手机验证码错误", null);
         }
         if (StringUtils.isNotBlank(email)) {
             dbUserId = baseMapper.getUserIdByEmail(email);
             if (dbUserId > 0) {
-                return ResponseJsonVo.error("该邮箱已被使用", null);
+                return ResponseJson.error("该邮箱已被使用", null);
             }
         }
         /*
@@ -185,13 +185,13 @@ public class ShopServiceImpl implements ShopService {
         int insertShopFlag = registerMapper.insertShop(shop);
         if (insertShopFlag < 1) {
             log.info(shop.getUserId() + " 插入数据库异常shop:" + shop.toString());
-            return ResponseJsonVo.error("插入数据库异常", null);
+            return ResponseJson.error("插入数据库异常", null);
         }
         // user更新shopId
         user.setShopId(shop.getShopId());
         registerMapper.updateUserShopId(user.getUserId(), shop.getShopId());
         log.info("注册供应商---------userID:" + user.getUserId());
-        return ResponseJsonVo.success();
+        return ResponseJson.success();
     }
 
     /**
@@ -221,46 +221,46 @@ public class ShopServiceImpl implements ShopService {
      * @return BaseUser
      */
     @Override
-    public ResponseJsonVo appletsRegister(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange, Integer whichStep) {
+    public ResponseJson appletsRegister(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange, Integer whichStep) {
         // 参数校验
         if (1 == whichStep) {
             if (StringUtils.isBlank(bindMobile) || StringUtils.isBlank(password)
                     || StringUtils.isBlank(smsCode) || StringUtils.isBlank(password)
                     || StringUtils.isBlank(passWordConfirm)) {
-                return ResponseJsonVo.error("参数异常");
+                return ResponseJson.error("参数异常");
             }
             if (!password.equals(passWordConfirm)) {
-                return ResponseJsonVo.error("两次输入的密码不一致");
+                return ResponseJson.error("两次输入的密码不一致");
             }
             // 查找用户表是否存在
             Integer dbUserId = baseMapper.getUserIdByMobile(bindMobile);
             if (dbUserId > 0) {
-                return ResponseJsonVo.error("该手机号已被使用", null);
+                return ResponseJson.error("该手机号已被使用", null);
             }
             // 查找运营人员表是否存在
             Integer dbOperationId = baseMapper.getOperationIdByMobile(bindMobile);
             if (dbOperationId > 0) {
-                return ResponseJsonVo.error("您已是机构运营人员，无需再注册机构", null);
+                return ResponseJson.error("您已是机构运营人员，无需再注册机构", null);
             }
             String redisSmsCode = (String) redisService.get("code:" + bindMobile);
             if (redisSmsCode.equals(smsCode)) {
-                return ResponseJsonVo.error("手机验证码错误", null);
+                return ResponseJson.error("手机验证码错误", null);
             }
-            return ResponseJsonVo.success();
+            return ResponseJson.success();
         } else if (2 == whichStep) {
             if (StringUtils.isBlank(name) || StringUtils.isBlank(linkMan)) {
-                return ResponseJsonVo.error("参数异常");
+                return ResponseJson.error("参数异常");
             }
             if (StringUtils.isNotBlank(email)) {
                 // 查找用户表是否存在相同邮箱
                 Integer dbUserId = baseMapper.getUserIdByEmail(email);
                 if (dbUserId > 0) {
-                    return ResponseJsonVo.error("该邮箱已被使用", null);
+                    return ResponseJson.error("该邮箱已被使用", null);
                 }
             }
-            return ResponseJsonVo.success();
+            return ResponseJson.success();
         } else if (1 != isAgreed) {
-            return ResponseJsonVo.error("请勾选同意协议");
+            return ResponseJson.error("请勾选同意协议");
         }
         return register(source, name, sName, bindMobile, email, smsCode, password, passWordConfirm, linkMan, provinceId, cityId, townId, address, socialCreditCode, businessLicenseImage, firstShopType, secondShopType, mainPro, isAgreed, serverWebExchange);
     }

src/main/java/com/caimei365/user/utils/ValidateUtil.java

@@ -1,6 +1,6 @@
 package com.caimei365.user.utils;
 
-import com.caimei365.user.model.ResponseJsonVo;
+import com.caimei365.user.model.ResponseJson;
 import org.apache.commons.lang.StringUtils;
 
 import java.util.regex.Matcher;
@@ -32,16 +32,16 @@ public class ValidateUtil {
      *
      * @param mobile 手机号
      */
-    public static ResponseJsonVo validateMobile(String mobile) {
+    public static ResponseJson validateMobile(String mobile) {
         if (StringUtils.isEmpty(mobile) || StringUtils.isBlank(mobile)) {
-            return ResponseJsonVo.error("手机号不可为空");
+            return ResponseJson.error("手机号不可为空");
         } else {
             Pattern pattern = Pattern.compile(MOBILE_PATTERN);
             Matcher matcher = pattern.matcher(mobile);
             if (matcher.matches()) {
-                return ResponseJsonVo.success();
+                return ResponseJson.success();
             } else {
-                return ResponseJsonVo.error("手机号码格式不正确");
+                return ResponseJson.error("手机号码格式不正确");
             }
         }
     }
@@ -64,48 +64,48 @@ public class ValidateUtil {
     /**
      * 密码验证
      */
-    public static ResponseJsonVo validatePassWord(String password) {
+    public static ResponseJson validatePassWord(String password) {
         if (StringUtils.isEmpty(password) || StringUtils.isBlank(password)) {
-            return ResponseJsonVo.error("密码不可为空");
+            return ResponseJson.error("密码不可为空");
         }
         if (password.length() > 16 || password.length() < 8) {
-            return ResponseJsonVo.error("密码长度不正确(8-16)");
+            return ResponseJson.error("密码长度不正确(8-16)");
         }
         Pattern pattern = Pattern.compile(PASSWORD_PATTERN);
         Matcher matcher = pattern.matcher(password);
         if (matcher.matches()) {
-            return ResponseJsonVo.success();
+            return ResponseJson.success();
         } else {
-            return ResponseJsonVo.error("请输入8-16位字符，需字母数字组合。");
+            return ResponseJson.error("请输入8-16位字符，需字母数字组合。");
         }
     }
 
     /**
      * 确认密码验证
      */
-    public static ResponseJsonVo validatePassWordConfirm(String password, String passWordConfirm) {
+    public static ResponseJson validatePassWordConfirm(String password, String passWordConfirm) {
         if (StringUtils.isEmpty(passWordConfirm) || StringUtils.isBlank(passWordConfirm)) {
-            return ResponseJsonVo.error("确认密码不可为空");
+            return ResponseJson.error("确认密码不可为空");
         }
         if (!password.equals(passWordConfirm)) {
-            return ResponseJsonVo.error("确认密码与登录密码不一致");
+            return ResponseJson.error("确认密码与登录密码不一致");
         }
-        return ResponseJsonVo.success();
+        return ResponseJson.success();
     }
 
     /**
      * 验证机构名称
      */
-    public static ResponseJsonVo validateClubName(String name) {
+    public static ResponseJson validateClubName(String name) {
         if (StringUtils.isEmpty(name) || StringUtils.isBlank(name)) {
-            return ResponseJsonVo.error("请填写美容机构名称");
+            return ResponseJson.error("请填写美容机构名称");
         } else {
             Pattern pattern = Pattern.compile(CLUB_NAME_PATTERN);
             Matcher matcher = pattern.matcher(name);
             if (matcher.matches()) {
-                return ResponseJsonVo.success();
+                return ResponseJson.success();
             } else {
-                return ResponseJsonVo.error("机构名称格式不正确");
+                return ResponseJson.error("机构名称格式不正确");
             }
         }
     }
@@ -113,23 +113,23 @@ public class ValidateUtil {
     /**
      * 验证姓名为中文:匹配2-8个中文字或不超过16位的英文
      */
-    public static ResponseJsonVo validateUserName(String name) {
+    public static ResponseJson validateUserName(String name) {
         if (StringUtils.isEmpty(name) || StringUtils.isBlank(name) || name.length() < 2) {
-            return ResponseJsonVo.error("请输入真实名称");
+            return ResponseJson.error("请输入真实名称");
         } else {
             // 判断中文名
             Pattern pattern = Pattern.compile(USER_CN_NAME_PATTERN);
             Matcher matcher = pattern.matcher(name);
             if (matcher.find()) {
-                return ResponseJsonVo.success();
+                return ResponseJson.success();
             } else {
                 // 判断英文名
                 pattern = Pattern.compile(USER_EN_NAME_PATTERN);
                 matcher = pattern.matcher(name);
                 if (matcher.matches()) {
-                    return ResponseJsonVo.success();
+                    return ResponseJson.success();
                 } else {
-                    return ResponseJsonVo.error("名称格式不正确");
+                    return ResponseJson.error("名称格式不正确");
                 }
             }
         }
@@ -141,29 +141,29 @@ public class ValidateUtil {
      * @param address
      * @return JsonForm验证信息
      */
-    public static ResponseJsonVo validateAddress(String address) {
+    public static ResponseJson validateAddress(String address) {
         if (StringUtils.isEmpty(address) || StringUtils.isBlank(address)) {
-            return ResponseJsonVo.error("请输入您的详细街道地址");
+            return ResponseJson.error("请输入您的详细街道地址");
         }
         if (address.length() > 50) {
-            return ResponseJsonVo.error("地址过长");
+            return ResponseJson.error("地址过长");
         }
-        return ResponseJsonVo.success();
+        return ResponseJson.success();
     }
 
     /**
      * 统一社会信用代码验证
      */
-    public static ResponseJsonVo validateSocialCreditCode(String socialCreditCode) {
+    public static ResponseJson validateSocialCreditCode(String socialCreditCode) {
         if (StringUtils.isEmpty(socialCreditCode) || StringUtils.isBlank(socialCreditCode)) {
-            return ResponseJsonVo.error("请输入您的统一社会信用代码");
+            return ResponseJson.error("请输入您的统一社会信用代码");
         } else {
             Pattern pattern = Pattern.compile(SOCIAL_CREDIT_CODE_PATTERN);
             Matcher matcher = pattern.matcher(socialCreditCode);
             if (matcher.matches()) {
-                return ResponseJsonVo.success();
+                return ResponseJson.success();
             } else {
-                return ResponseJsonVo.error("统一社会信用代码格式不正确");
+                return ResponseJson.error("统一社会信用代码格式不正确");
             }
         }
     }

src/main/resources/mapper/LoginMapper.xml

@@ -19,7 +19,7 @@
         ) and u.userIdentity in (1,2,3,4)
         limit 1
     </select>-->
-    <select id="getLoginUserByUserId" resultType="com.caimei365.user.model.UserLoginVo">
+    <select id="getLoginUserByUserId" resultType="com.caimei365.user.model.vo.UserLoginVo">
         select u.userID as userId,
                u.userName as userName,
                u.mobile as mobile,
@@ -32,7 +32,7 @@
         where u.userID = #{userId}
         limit 1
     </select>
-    <select id="getLoginUserByMobileOrEmail" resultType="com.caimei365.user.model.UserLoginVo">
+    <select id="getLoginUserByMobileOrEmail" resultType="com.caimei365.user.model.vo.UserLoginVo">
         select u.userID as userId,
             u.userName as userName,
             u.mobile as mobile,
@@ -54,7 +54,7 @@
         ) and u.userIdentity in (1,2,3,4)
         limit 1
     </select>
-    <select id="getOperationByMobile" resultType="com.caimei365.user.model.OperationPo">
+    <select id="getOperationByMobile" resultType="com.caimei365.user.model.po.OperationPo">
         select o.userID as userId,
                o.mobile as mobile,
                o.clubID as clubId,
@@ -63,7 +63,7 @@
         where o.mobile = #{mobile} and o.delFlag = '0'
         limit 1
     </select>
-    <select id="getServiceProviderByOpenId" resultType="com.caimei365.user.model.UserLoginVo">
+    <select id="getServiceProviderByOpenId" resultType="com.caimei365.user.model.vo.UserLoginVo">
         select u.userID as userId,
                u.userName as userName,
                u.mobile as mobile,
@@ -77,7 +77,7 @@
         where s.openid = #{openid} and u.validFlag = 1
         limit 1
     </select>
-    <select id="getOperationUserByUnionId" resultType="com.caimei365.user.model.UserLoginVo">
+    <select id="getOperationUserByUnionId" resultType="com.caimei365.user.model.vo.UserLoginVo">
         select o.userID as userId,
                o.mobile as mobile,
                o.clubID as clubId,
@@ -98,7 +98,7 @@
         and (userOrganizeID='2' or userOrganizeID is null)
         limit 1
     </select>
-    <select id="getOperationUserByOpenId" resultType="com.caimei365.user.model.UserLoginVo">
+    <select id="getOperationUserByOpenId" resultType="com.caimei365.user.model.vo.UserLoginVo">
         select o.userID as userId,
                o.mobile as mobile,
                o.clubID as clubId,

src/main/resources/mapper/RegisterMapper.xml

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei365.user.mapper.RegisterMapper">
-    <insert id="insertClubUser" parameterType="com.caimei365.user.model.UserPo" keyProperty="userId" useGeneratedKeys="true">
+    <insert id="insertClubUser" parameterType="com.caimei365.user.model.po.UserPo" keyProperty="userId" useGeneratedKeys="true">
         insert into user(`registerTime`, `registerIP`, `source`, `registerUserTypeID`, `name`, `userName`, `bindMobile`,`userIdentity`, `userPermission`, `clubStatus`, `password`, `agreeFlag`, `validFlag`, `serviceProviderID`, `serviceProviderStatus`)
                   values(#{registerTime},#{registerIp},#{source},#{registerUserTypeID},#{name},#{userName},#{bindMobile},#{userIdentity},#{userPermission},#{clubStatus},#{password},#{agreeFlag},#{validFlag},#{serviceProviderId},#{serviceProviderStatus})
     </insert>
-    <insert id="insertClub" parameterType="com.caimei365.user.model.ClubPo" keyProperty="clubId" useGeneratedKeys="true">
+    <insert id="insertClub" parameterType="com.caimei365.user.model.po.ClubPo" keyProperty="clubId" useGeneratedKeys="true">
         insert into club(`name`, `sName`, `contractMobile`, `linkMan`, `userID`, `addTime`, `status`, `spID`)
                   values(#{name},#{sName},#{contractMobile},#{linkMan},#{userId},#{addTime},#{status},#{serviceProviderId})
     </insert>
-    <insert id="insertOperation" parameterType="com.caimei365.user.model.OperationPo" keyProperty="clubId" useGeneratedKeys="true">
+    <insert id="insertOperation" parameterType="com.caimei365.user.model.po.OperationPo" keyProperty="clubId" useGeneratedKeys="true">
         insert into cm_mall_operation_user(`userID`, `clubID`, `nickName`, `headimgurl`, `userType`, `mobile`, `linkName`, `status`, `unionId`, `openid`, `addTime`, `updateTime`, `bindTime`, `delFlag`)
                                     values(#{userId},#{clubId},#{nickName},#{avatarUrl},#{UserType},#{mobile},#{linkName},#{status},#{unionId},#{openid},#{addTime},#{updateTime},#{bindTime},#{delFlag})
     </insert>
     <update id="updateUserClubId">
         update user set clubID = #{clubId} where userID = #{userId}
     </update>
-    <insert id="insertShopUser" parameterType="com.caimei365.user.model.UserPo" keyProperty="userId" useGeneratedKeys="true">
+    <insert id="insertShopUser" parameterType="com.caimei365.user.model.po.UserPo" keyProperty="userId" useGeneratedKeys="true">
         insert into user(`registerTime`, `registerIP`, `source`, `registerUserTypeID`, `name`, `userName`, `bindMobile`, `email`, `userIdentity`, `userPermission`, `manufacturerStatus` , `password`, `agreeFlag`, `validFlag`)
         values(#{registerTime},#{registerIp},#{source},#{registerUserTypeID},#{name},#{userName},#{bindMobile},#{email},#{userIdentity},#{userPermission},#{manufacturerStatus},#{password},#{agreeFlag},#{validFlag})
     </insert>
-    <insert id="insertShop" parameterType="com.caimei365.user.model.ShopPo" keyProperty="shopId" useGeneratedKeys="true">
+    <insert id="insertShop" parameterType="com.caimei365.user.model.po.ShopPo" keyProperty="shopId" useGeneratedKeys="true">
         insert into shop(`userID`, `name`, `sname`, `linkMan`, `linkMan1`, `linkMan2`, `contractMobile`, `contractMobile1`, `contractMobile2`, `contractEmail1`, `contractEmail2`, `provinceID`, `cityID`, `townID`, `address`, `socialCreditCode`, `businessLicenseImage`, `firstShopType`, `secondShopType`, `mainpro`, `addTime`, `validFlag`, `status`)
         values(#{userId},#{name},#{sName},#{linkMan},#{linkMan1},#{linkMan2},#{contractMobile},#{contractMobile1},#{contractMobile2},#{contractEmail1},#{contractEmail2},#{provinceId},#{cityId},#{townId},#{address},#{socialCreditCode},#{businessLicenseImage},#{firstShopType},#{secondShopType},#{mainPro},#{addTime},#{validFlag},#{status})
     </insert>