user/role/tright 5.16

个体用户还需要增加Token
代码写完
准备测试

src/main/java/com/pangding/web/authority/cloudvo/ComputerRegisterUserReturnVo.java

-package com.pangding.web.authority.cloudvo;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/14 17:48
- */
-public class ComputerRegisterUserReturnVo {
-    private String companyId;
-
-    private String merchantId;
-
-    private int companyType;
-
-    public int getCompanyType() {
-        return companyType;
-    }
-
-    public void setCompanyType(int companyType) {
-        this.companyType = companyType;
-    }
-
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
-    }
-
-    public String getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(String merchantId) {
-        this.merchantId = merchantId;
-    }
-}

src/main/java/com/pangding/web/authority/controller/ComputerRegisterController.java

 package com.pangding.web.authority.controller;
 
-import com.pangding.web.authority.cloudvo.ComputerRegisterUserReturnVo;
 import com.pangding.web.authority.vo.reqvo.RegisterEnterpriceReqVo;
 import com.pangding.web.authority.vo.reqvo.RegisterIndividualReqVo;
 import com.pangding.web.authority.vo.reqvo.RegisterUserReqVo;
@@ -8,7 +7,6 @@ import com.pangding.web.authority.service.RegisterService;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.reqvo.LoginReqVo;
-import com.yanzuoguang.token.TokenHelper;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/pangding/web/authority/currency/Result.java

-package com.pangding.web.authority.currency;
-
-import java.io.Serializable;
-
-/**
- * @author Administrator
- */
-public class Result implements Serializable {
-    private Integer code;
-    private String message;
-    private Object data;
-
-    public Result(Integer code, String message, Object data) {
-        this.code = code;
-        this.message = message;
-        this.data = data;
-    }
-    public Result() {}
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public Object getData() {
-        return data;
-    }
-
-    public void setData(Object data) {
-        this.data = data;
-    }
-}

src/main/java/com/pangding/web/authority/reqvo/RoleDaoCheckNameExistReqVo.java

-package com.pangding.web.authority.reqvo;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/11 18:52
- */
-public class RoleDaoCheckNameExistReqVo {
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java

@@ -2,8 +2,9 @@ package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
 import com.pangding.web.authority.vo.*;
+import com.pangding.web.authority.vo.cloudVo.LoginResVo;
 import com.pangding.web.authority.vo.reqvo.*;
-import com.pangding.web.authority.reqvo.CheckMerchantIdReqVo;
+import com.pangding.web.authority.vo.reqvo.CompanyGetReqVo;
 import com.pangding.web.authority.service.RegisterService;
 import com.pangding.web.authority.service.UserService;
 import com.yanzuoguang.token.TokenHelper;
@@ -36,9 +37,9 @@ public class RegisterServiceImpl implements RegisterService {
 
     @Override
     public Boolean checkMerchantId(String merchantId) {
-        CheckMerchantIdReqVo idReqVo = new CheckMerchantIdReqVo();
-        idReqVo.setId(merchantId);
-        CompanyVo companyVo = companyDaoImpl.load(idReqVo,CompanyVo.class);
+        CompanyGetReqVo ReqVo = new CompanyGetReqVo();
+        ReqVo.setId(merchantId);
+        CompanyVo companyVo = companyDaoImpl.load(ReqVo,CompanyVo.class);
         return companyVo == null ? false : true;
     }
 

src/main/java/com/pangding/web/authority/vo/reqvo/LoginResVo.java → src/main/java/com/pangding/web/authority/vo/cloudVo/LoginResVo.java

-package com.pangding.web.authority.vo.reqvo;
+package com.pangding.web.authority.vo.cloudVo;
 
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.UserVo;

src/main/java/com/pangding/web/authority/reqvo/CheckMerchantIdReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/CompanyGetReqVo.java

-package com.pangding.web.authority.reqvo;
+package com.pangding.web.authority.vo.reqvo;
 
 /**
  * @Author zhangjinyao
  * @create 2019/5/13 15:45
  */
-public class CheckMerchantIdReqVo {
+public class CompanyGetReqVo {
     private String id;
 
     public String getId() {