user/role/tright 6.1

修改了注册登录部分逻辑
修改了密码的传输方式
还需要调用其他服务

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

@@ -38,6 +38,7 @@ public class AuthorityController {
                 .notBlankCheck("authorityName",authorityVo.getName())
                 .notBlankCheck("type",authorityVo.getType())
                 .notBlankCheck("alias",authorityVo.getAlias())
+                .notBlankCheck("authorityUrl",authorityVo.getUrl())
                 .notBlankCheck("openMode",authorityVo.getOpenMode())
                 .notBlankCheck("remark",authorityVo.getRemark())
                 .notBlankCheck("sort",authorityVo.getSort())

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

@@ -36,7 +36,7 @@ public class ComputerRegisterController {
      * @return
      */
     @RequestMapping(value = "/user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<CompanyVo> saveUser(@RequestBody RegisterUserReqVo registerUserReqVo){
+    public ResponseResult<CompanyVo> saveUser(@RequestBody RegisterUserReqVo registerUserReqVo) throws Exception {
         CheckerHelper.newInstance()
                 .notBlankCheck("account",registerUserReqVo.getAccount())
                 .notBlankCheck("password",registerUserReqVo.getPassword())
@@ -74,11 +74,17 @@ public class ComputerRegisterController {
                 .checkException();
     }
 
+    /**
+     * 将通过公司id获取到的公司信息和验证码传到第三方，并将返回的信息用于更新公司状态
+     * @param reqVo 封装了公司id和验证码的请求对象
+     * @return
+     */
     @RequestMapping(value="/individualSubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult<String> individualSubmit(@RequestBody IndividualSubmitReqVo reqVo){
-        checkIndividual(reqVo);
         CheckerHelper.newInstance()
-                .notBlankCheck("verifyCode",reqVo.getVerifyCode());
+                .notBlankCheck("companyId",reqVo.getId())
+                .notBlankCheck("verifyCode",reqVo.getVerifyCode())
+                .checkException();
         String verifyCode = registerServiceImpl.individualSubmit(reqVo);
         return ResponseResult.result(verifyCode);
     }
@@ -121,11 +127,17 @@ public class ComputerRegisterController {
                 .checkException();
     };
 
+    /**
+     * 将通过公司id获取到的公司信息和验证码传到第三方，并将返回的信息用于更新公司状态
+     * @param reqVo 封装了公司id和验证码的请求对象
+     * @return
+     */
     @RequestMapping(value="/enterpriceSubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult<String> enterpriceSubmit(@RequestBody EnterpriceSubmitReqVo reqVo){
-        checkEnterprice(reqVo);
         CheckerHelper.newInstance()
-                .notBlankCheck("verifyCode",reqVo.getVerifyCode());
+                .notBlankCheck("companyId",reqVo.getId())
+                .notBlankCheck("verifyCode",reqVo.getVerifyCode())
+                .checkException();
         String verifyCode = registerServiceImpl.enterpriceSubmit(reqVo);
         return ResponseResult.result(verifyCode);
     }

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

@@ -88,6 +88,11 @@ public class IndexController {
         return ResponseResult.result(indexServiceImpl.getTransboundaryProfit(reqVo));
     }
 
+    /**
+     * 通过公司id获取该公司的用户趋势
+     * @param reqVo 封装了公司id的请求对象
+     * @return  用户趋势
+     */
     @PostMapping(value = "/userTrending", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult userTrending(@RequestBody UserTrendingReqVo reqVo){
         CheckerHelper.newInstance()
@@ -96,6 +101,11 @@ public class IndexController {
         return ResponseResult.result(indexServiceImpl.getUserTrending(reqVo));
     }
 
+    /**
+     * 通过公司id获取该公司的资金趋势
+     * @param reqVo 封装了公司id的请求对象
+     * @return  资金趋势
+     */
     @PostMapping(value = "/fundTrending", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult fundTrending(@RequestBody FundTrendingReqVo reqVo){
         CheckerHelper.newInstance()

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

@@ -40,7 +40,7 @@ public class LoginController {
      * @return
      */
     @RequestMapping(value = "/login", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<LoginResVo> mobile(@RequestBody LoginReqVo reqVo){
+    public ResponseResult<LoginResVo> mobile(@RequestBody LoginReqVo reqVo) throws Exception {
         CheckerHelper.newInstance()
                 .notBlankCheck("account or phone",reqVo.getAccountOrPhone())
                 .notBlankCheck("password",reqVo.getPassword())

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

@@ -33,7 +33,7 @@ public class MobileRegisterController {
      * @return
      */
     @RequestMapping(value = "/user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<CompanyVo> saveUser(@RequestBody RegisterUserReqVo registerUserReqVo){
+    public ResponseResult<CompanyVo> saveUser(@RequestBody RegisterUserReqVo registerUserReqVo) throws Exception {
         CheckerHelper.newInstance()
                 .notBlankCheck("account",registerUserReqVo.getAccount())
                 .notBlankCheck("password",registerUserReqVo.getPassword())
@@ -70,13 +70,7 @@ public class MobileRegisterController {
     @RequestMapping(value="/individualSubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult<String> individualSubmit(@RequestBody IndividualSubmitReqVo reqVo){
         CheckerHelper.newInstance()
-                .notBlankCheck("contactName",reqVo.getContactName())
-                .notBlankCheck("contactCode",reqVo.getContactCode())
-                .checkIdCard("contactCode",reqVo.getContactCode())
-                .notBlankCheck("companyAttribute",reqVo.getCompanyAttribute())
-                .notBlankCheck("companyName",reqVo.getCompanyName())
-                .notBlankCheck("contactPhone",reqVo.getContactPhone())
-                .checkPhoneNo("contactPhone",reqVo.getContactPhone())
+                .notBlankCheck("companyId",reqVo.getId())
                 .notBlankCheck("verifyCode",reqVo.getVerifyCode())
                 .checkException();
         String verifyCode = registerServiceImpl.individualSubmit(reqVo);

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

@@ -29,7 +29,7 @@ public class UserController {
      * @return
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<String> saveUser(@RequestBody WebUserReqVo webUserReqVo){
+    public ResponseResult<String> saveUser(@RequestBody WebUserReqVo webUserReqVo) throws Exception {
         CheckerHelper.newInstance()
                 .notBlankCheck("account",webUserReqVo.getAccount())
                 .notBlankCheck("password",webUserReqVo.getPassword())

src/main/java/com/pangding/web/authority/service/CompanyService.java

@@ -35,6 +35,11 @@ public interface CompanyService{
      */
     CompanyResVo pdGetDetail(CompanyGetReqVo reqVo);
 
+    /**
+     * 根据请求的数据返回对应的供应商或是接口商列表
+     * @param reqVo
+     * @return
+     */
     List<CompanyVo> productOrInterface(ProductOrInterfaceReqVo reqVo);
 
     /**
@@ -51,6 +56,11 @@ public interface CompanyService{
      */
     CompanyVo saveCompany(CompanyAndCompanyExtendSaveReqVo reqVo);
 
+    /**
+     * 仅将公司状态设置为12（停用）
+     * @param reqVo 封装了公司id 的请求对象
+     * @return
+     */
     void deleteCompany(DeleteCompanyReqVo reqVo);
 
     /**
@@ -61,6 +71,11 @@ public interface CompanyService{
      */
     String saveBank(CompanyBankCardVo reqVo);
 
+    /**
+     * 删除银行卡
+     * @param reqVo 封装了银行卡id的请求对象
+     * @return
+     */
     void deleteBank(CompanyBankCardVo reqVo);
 
    /**
@@ -98,5 +113,5 @@ public interface CompanyService{
      * @param reqVo 封装了用户信息和用户角色信息的请求对象
      * @return 用户id
      */
-    String saveUser(WebUserReqVo reqVo);
+    String saveUser(WebUserReqVo reqVo) throws Exception;
 }

src/main/java/com/pangding/web/authority/service/IndexService.java

@@ -44,9 +44,19 @@ public interface IndexService {
      * @param reqVo 封装了公司id的请求对象
      * @return  跨界盈利
      */
-    String getTransboundaryProfit(TransboundaryProfitReqVo reqVo);
+    BigDecimal getTransboundaryProfit(TransboundaryProfitReqVo reqVo);
 
+    /**
+     * 通过公司id获取该公司的用户趋势
+     * @param reqVo 封装了公司id的请求对象
+     * @return  用户趋势
+     */
     List<Long> getUserTrending(UserTrendingReqVo reqVo);
 
+    /**
+     * 通过公司id获取该公司的资金趋势
+     * @param reqVo 封装了公司id的请求对象
+     * @return  资金趋势
+     */
     Object getFundTrending(FundTrendingReqVo reqVo);
 }

src/main/java/com/pangding/web/authority/service/RegisterService.java

@@ -30,7 +30,7 @@ public interface RegisterService {
      * @param registerUserReqVo
      * @return CompanyVo对象
      */
-    CompanyVo saveUser(RegisterUserReqVo registerUserReqVo);
+    CompanyVo saveUser(RegisterUserReqVo registerUserReqVo) throws Exception;
 
     /**
      * 检查电话号码是否已存在
@@ -62,11 +62,21 @@ public interface RegisterService {
      * @param reqVo
      * @return
      */
-    LoginResVo login(LoginReqVo reqVo);
+    LoginResVo login(LoginReqVo reqVo) throws Exception;
 
-    LoginResVo verifyLogin(ComputerLoginReqVo reqVo, HttpSession session, HttpServletRequest request);
+    LoginResVo verifyLogin(ComputerLoginReqVo reqVo, HttpSession session, HttpServletRequest request) throws Exception;
 
+    /**
+     * 将通过公司id获取到的公司信息和验证码传到第三方，并将返回的信息用于更新公司状态
+     * @param reqVo 封装了公司id和验证码的请求对象
+     * @return
+     */
     String individualSubmit(IndividualSubmitReqVo reqVo);
 
+    /**
+     * 将通过公司id获取到的公司信息和验证码传到第三方，并将返回的信息用于更新公司状态
+     * @param reqVo 封装了公司id和验证码的请求对象
+     * @return
+     */
     String enterpriceSubmit(EnterpriceSubmitReqVo reqVo);
 }

src/main/java/com/pangding/web/authority/service/UserService.java

@@ -17,7 +17,7 @@ public interface UserService {
      *
      * @param userDto UserDto对象
      */
-    String saveUser(WebUserReqVo userDto);
+    String saveUser(WebUserReqVo userDto) throws Exception;
 
     /**
      * 保存更新后的用户信息，并更新用户和角色的对应关系

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

@@ -98,12 +98,14 @@ public class CompanyServiceImpl implements CompanyService{
         /*获取用户表信息*/
         UserGetReqVo userGetReqVo = new UserGetReqVo();
         userGetReqVo.setCompanyId(reqVo.getId());
-        UserVo userVo = userDaoImpl.load(userGetReqVo,UserVo.class);
-        if (null != userVo){
-            userVo.setPassword("");
-            userVo.setRemark("");
-            resVo.setUserVo(userVo);
+        List<UserVo> userVoList = userDaoImpl.loadList(userGetReqVo,UserVo.class);
+        if (null != userVoList){
+            for (UserVo userVo:userVoList) {
+                userVo.setPassword("");
+                userVo.setRemark("");
+            }
         }
+        resVo.setUserVoList(userVoList);
         return resVo;
     }
 
@@ -123,12 +125,14 @@ public class CompanyServiceImpl implements CompanyService{
         /*查询用户信息*/
         UserGetReqVo userGetReqVo = new UserGetReqVo();
         userGetReqVo.setCompanyId(reqVo.getId());
-        UserVo userVo = userDaoImpl.load(userGetReqVo,UserVo.class);
-        if (null != userVo){
-            userVo.setPassword("");
-            userVo.setRemark("");
-            resVo.setUserVo(userVo);
+        List<UserVo> userVoList = userDaoImpl.loadList(userGetReqVo,UserVo.class);
+        if (null != userVoList){
+            for (UserVo userVo:userVoList) {
+                userVo.setPassword("");
+                userVo.setRemark("");
+            }
         }
+        resVo.setUserVoList(userVoList);
         return resVo;
     }
 
@@ -175,6 +179,11 @@ public class CompanyServiceImpl implements CompanyService{
         return companyVo;
     }
 
+    /**
+     * 仅将公司状态设置为12（停用）
+     * @param reqVo 封装了公司id 的请求对象
+     * @return
+     */
     @Override
     public void deleteCompany(DeleteCompanyReqVo reqVo) {
         /*仅修改公司状态status，不删除数据*/
@@ -217,10 +226,15 @@ public class CompanyServiceImpl implements CompanyService{
             companyBankCardDao.create(reqVo);
         }
 
-        /*此处需要调用第三方接口发送手机验证码*/
+        /*此处需要调用第三方接口发送手机验证码，并修改数据库状态*/
         return reqVo.getId();
     }
 
+    /**
+     * 删除银行卡
+     * @param reqVo 封装了银行卡id的请求对象
+     * @return
+     */
     @Override
     public void deleteBank(CompanyBankCardVo reqVo) {
         companyBankCardDao.remove(reqVo);
@@ -247,12 +261,12 @@ public class CompanyServiceImpl implements CompanyService{
      */
     @Override
     public CompanyBankCardVo bankSubmit(BankSubmitReqVo reqVo) {
-        if (null != reqVo.getVerifyCode() || reqVo.getVerifyCode().isEmpty()){
-            /*此处应该将请求数据发送到第三方接口，获取到的返回值用于更新银行卡状态*/
-        }
-
-        CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
-        ObjectHelper.writeWithFrom(companyBankCardVo,reqVo);
+        /*根据银行卡id获取银行卡信息*/
+        CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
+        getReqVo.setId(reqVo.getId());
+        CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo,CompanyBankCardVo.class);
+        String verifyCode = reqVo.getVerifyCode();
+        /*此处应该将companyBankCardVo和verifyCode发送到第三方接口，获取到的返回值用于更新银行卡状态*/
         return companyBankCardVo;
     }
 
@@ -306,10 +320,15 @@ public class CompanyServiceImpl implements CompanyService{
      * @return 用户id
      */
     @Override
-    public String saveUser(WebUserReqVo reqVo) {
+    public String saveUser(WebUserReqVo reqVo) throws Exception {
         return userServiceImpl.saveUser(reqVo);
     }
 
+    /**
+     * 根据请求的数据返回对应的供应商或是接口商列表
+     * @param reqVo
+     * @return
+     */
     @Override
     public List<CompanyVo> productOrInterface(ProductOrInterfaceReqVo reqVo) {
         CompanyGetReqVo getReqVo = new CompanyGetReqVo();

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

@@ -91,16 +91,16 @@ public class IndexServiceImpl implements IndexService {
      * @return  跨界盈利
      */
     @Override
-    public String getTransboundaryProfit(TransboundaryProfitReqVo reqVo) {
+    public BigDecimal getTransboundaryProfit(TransboundaryProfitReqVo reqVo) {
         /*此处需调用订单服务传入公司id获取跨界盈利
-         * 目前仅返回公司id*/
-        return reqVo.getId();
+         * 目前仅返回null*/
+        return null;
     }
 
     /**
-     * 根据公司id获取该公司本年度的用户趋势
-     * @param reqVo
-     * @return
+     * 通过公司id获取该公司的用户趋势
+     * @param reqVo 封装了公司id的请求对象
+     * @return  用户趋势
      */
     @Override
     public List<Long> getUserTrending(UserTrendingReqVo reqVo) {
@@ -130,6 +130,11 @@ public class IndexServiceImpl implements IndexService {
         return resList;
     }
 
+    /**
+     * 通过公司id获取该公司的资金趋势
+     * @param reqVo 封装了公司id的请求对象
+     * @return  资金趋势
+     */
     @Override
     public Object getFundTrending(FundTrendingReqVo reqVo) {
         /*调用订单服务获取资金趋势

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

@@ -4,10 +4,7 @@ import com.pangding.web.authority.dao.*;
 import com.pangding.web.authority.feign.StoreFeign;
 import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.authority.service.VerifyCodeService;
-import com.pangding.web.authority.util.CompanyBankCardConstant;
-import com.pangding.web.authority.util.CompanyConstant;
-import com.pangding.web.authority.util.LoginConstant;
-import com.pangding.web.authority.util.TokenUtil;
+import com.pangding.web.authority.util.*;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.cloudvo.LoginResVo;
 import com.pangding.web.authority.vo.reqvo.*;
@@ -15,15 +12,18 @@ import com.pangding.web.authority.service.RegisterService;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
+import com.pangding.web.util.RSAUtils;
 import com.yanzuoguang.token.TokenHelper;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.ArrayList;
@@ -82,7 +82,7 @@ public class RegisterServiceImpl implements RegisterService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public CompanyVo saveUser(RegisterUserReqVo registerUserReqVo) {
+    public CompanyVo saveUser(RegisterUserReqVo registerUserReqVo) throws Exception {
 
         // 检查账户是否合法
         userServiceImpl.isValid(registerUserReqVo.getAccount());
@@ -101,10 +101,13 @@ public class RegisterServiceImpl implements RegisterService {
             throw new CodeException("注册编码错误");
         }
 
+        /*通过私钥将rsa加密的密码解密*/
+        String password = RSAUtils.decryptionByPrivateKey(registerUserReqVo.getPassword(), RsaConstant.privateKey);
+
         String companyId = StringHelper.getNewID();
-        userVo.setPassword(StringHelper.md5(registerUserReqVo.getPassword()));
+        userVo.setPassword(StringHelper.md5(password));
         userVo.setId(StringHelper.getNewID());
-        userVo.setRemark(registerUserReqVo.getPassword());
+        userVo.setRemark(password);
         userVo.setCompanyId(companyId);
         userDaoImpl.create(userVo);
         CompanyVo companyVo = new CompanyVo();
@@ -140,22 +143,27 @@ public class RegisterServiceImpl implements RegisterService {
 
         this.checkPhone(reqVo.getId(),reqVo.getContactPhone());
 
+        /*更新公司表*/
         CompanyVo companyVo = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo,reqVo);
+        companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
         companyDaoImpl.update(companyVo);
 
+        /*保存公司扩展表*/
         CompanyExtendVo extendVo = new CompanyExtendVo();
         extendVo.setId(reqVo.getId());
         companyExtendDaoImpl.save(extendVo);
 
-        /*此处应该调用第三方接口发送手机验证码*/
+        /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
 
+        /*跟新用户表添加联系方式*/
         UserVo userReqVo = new UserVo();
         userReqVo.setCompanyId(reqVo.getId());
         UserVo userVo = userDaoImpl.load(userReqVo,UserVo.class);
         userVo.setPhone(reqVo.getContactPhone());
         userDaoImpl.update(userVo);
 
+        /*保存或更新商户表*/
         MerchantCreateReqVo req=new MerchantCreateReqVo();
         req.setId(StringHelper.getNewID());
         req.setName(reqVo.getCompanyName());
@@ -198,17 +206,22 @@ public class RegisterServiceImpl implements RegisterService {
 
         this.checkPhone(reqVo.getId(),reqVo.getContactPhone());
 
+        /*更新公司表*/
         CompanyVo companyVo = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo,reqVo);
+        companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
         companyDaoImpl.update(companyVo);
 
+        /*保存公司扩展表*/
         CompanyExtendVo extendVo = new CompanyExtendVo();
         extendVo.setId(reqVo.getId());
         companyExtendDaoImpl.save(extendVo);
 
         SaveCompanyResVo resVo = new SaveCompanyResVo();
 
-        /*此处应该调用第三方接口发送手机验证码*/
+        /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
+
+        /*保存银行卡，并将其设置为默认银行卡*/
         CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
         ObjectHelper.writeWithFrom(companyBankCardVo,reqVo);
         companyBankCardVo.setId(StringHelper.getNewID());
@@ -216,12 +229,14 @@ public class RegisterServiceImpl implements RegisterService {
         companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
         companyBankCardDaoImpl.save(companyBankCardVo);
 
+        /*更新用户信息，保存联系方式*/
         UserVo userReqVo = new UserVo();
         userReqVo.setCompanyId(reqVo.getId());
         UserVo userVo = userDaoImpl.load(userReqVo,UserVo.class);
         userVo.setPhone(reqVo.getContactPhone());
         userDaoImpl.update(userVo);
 
+        /*保存或更新商户表*/
         MerchantCreateReqVo req=new MerchantCreateReqVo();
         req.setReqId(StringHelper.getNewID());
         req.setId(StringHelper.getNewID());
@@ -259,7 +274,7 @@ public class RegisterServiceImpl implements RegisterService {
      * @return
      */
     @Override
-    public LoginResVo login(LoginReqVo reqVo) {
+    public LoginResVo login(LoginReqVo reqVo) throws Exception {
         String accountOrPhone = reqVo.getAccountOrPhone();
         UserVo userVo;
         if (userServiceImpl.isNumeric(accountOrPhone)){
@@ -270,7 +285,10 @@ public class RegisterServiceImpl implements RegisterService {
         if (userVo == null){
             throw new CodeException("用户名或密码错误");
         }
-        if (!(StringHelper.md5(reqVo.getPassword()).equals(userVo.getPassword()))){
+
+        /*通过私钥将rsa加密的密码解密*/
+        String password = RSAUtils.decryptionByPrivateKey(reqVo.getPassword(),RsaConstant.privateKey);
+        if (!(StringHelper.md5(reqVo.getPassword()).equals(password))){
             throw new CodeException("用户名或密码错误");
         }
         String token = TokenUtil.createToken(reqVo.getAccountOrPhone());
@@ -351,22 +369,40 @@ public class RegisterServiceImpl implements RegisterService {
     }
 
     @Override
-    public LoginResVo verifyLogin(ComputerLoginReqVo reqVo, HttpSession session, HttpServletRequest request) {
+    public LoginResVo verifyLogin(ComputerLoginReqVo reqVo, HttpSession session, HttpServletRequest request) throws Exception {
         verifyCodeServiceImpl.validImage(reqVo.getVerifyCode(),session,request);
         LoginReqVo reqVo1 = new LoginReqVo();
         ObjectHelper.writeWithFrom(reqVo1,reqVo);
         return this.login(reqVo1);
     }
 
+    /**
+     * 将通过公司id获取到的公司信息和验证码传到第三方，并将返回的信息用于更新公司状态
+     * @param reqVo 封装了公司id和验证码的请求对象
+     * @return
+     */
     @Override
     public String individualSubmit(IndividualSubmitReqVo reqVo) {
-        /*此处应该将请求数据发送到第三方接口，返回的数据用于更新公司信息*/
+        CompanyGetReqVo getReqVo = new CompanyGetReqVo();
+        getReqVo.setId(reqVo.getId());
+        CompanyVo companyVo = companyDaoImpl.load(getReqVo,CompanyVo.class);
+        String verifyCode = reqVo.getVerifyCode();
+        /*此处应该将companyVo和verifyCode发送到第三方接口，返回的数据用于更新公司信息*/
         return reqVo.getVerifyCode();
     }
 
+    /**
+     * 将通过公司id获取到的公司信息和验证码传到第三方，并将返回的信息用于更新公司状态
+     * @param reqVo 封装了公司id和验证码的请求对象
+     * @return
+     */
     @Override
     public String enterpriceSubmit(EnterpriceSubmitReqVo reqVo) {
-        /*此处应该将请求数据发送到第三方接口，返回的数据用于更新公司信息*/
+        CompanyGetReqVo getReqVo = new CompanyGetReqVo();
+        getReqVo.setId(reqVo.getId());
+        CompanyVo companyVo = companyDaoImpl.load(getReqVo,CompanyVo.class);
+        String verifyCode = reqVo.getVerifyCode();
+        /*此处应该将companyVo和verifyCode发送到第三方接口，返回的数据用于更新公司信息*/
         return reqVo.getVerifyCode();
     }
 }

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

@@ -3,10 +3,12 @@ package com.pangding.web.authority.service.impl;
 import com.pangding.web.authority.dao.RoleDao;
 import com.pangding.web.authority.dao.UserDao;
 import com.pangding.web.authority.dao.UserRoleDao;
+import com.pangding.web.authority.util.RsaConstant;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.resvo.WebUserResVo;
+import com.pangding.web.util.RSAUtils;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.StringHelper;
@@ -35,12 +37,16 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String saveUser(WebUserReqVo webUserReqVo) {
+    public String saveUser(WebUserReqVo webUserReqVo) throws Exception {
         this.isValid(webUserReqVo.getAccount());
         this.checkAccount(webUserReqVo);
         this.checkPhone(webUserReqVo);
-        webUserReqVo.setRemark(webUserReqVo.getPassword());
-        String md5Password = this.passwordEncoder(webUserReqVo.getPassword());
+
+        /*将RSA加密后的密码解密*/
+        String password = RSAUtils.decryptionByPrivateKey(webUserReqVo.getPassword(), RsaConstant.privateKey);
+
+        webUserReqVo.setRemark(password);
+        String md5Password = this.passwordEncoder(password);
         webUserReqVo.setPassword(md5Password);
         webUserReqVo.setId(StringHelper.getNewID());
 

src/main/java/com/pangding/web/authority/util/CompanyConstant.java

@@ -20,4 +20,16 @@ public class CompanyConstant {
      */
     public static final String COMPANY_STATUS_STOP = "12";
 
+    /**
+     * 供应商
+     * 值：0
+     */
+    public static final String PRODUCT = "0";
+
+    /**
+     * 接口商
+     * 值：1
+     */
+    public static final String INTERFACE = "1";
+
 }

src/main/java/com/pangding/web/authority/util/LoginConstant.java

@@ -33,11 +33,11 @@ public class LoginConstant {
      * 已完善基本信息
      * 值：2
      */
-    public static final int FINISHED_BASIC_INFO = 2;
+    public static final String FINISHED_BASIC_INFO = "2";
 
     /**
      * 已签约
      * 值：10
      */
-    public static final int HAVE_SIGNED = 10;
+    public static final String HAVE_SIGNED = "10";
 }

src/main/java/com/pangding/web/authority/util/RsaConstant.java

+package com.pangding.web.authority.util;
+
+import org.springframework.beans.factory.annotation.Value;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/1 15:39
+ */
+public class RsaConstant {
+    @Value("${rsa.privatekey}")
+    public static String privateKey;
+}

src/main/java/com/pangding/web/authority/vo/resvo/CompanyResVo.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @create 2019/5/23 14:53
  */
 public class CompanyResVo {
-    private UserVo userVo;
+    private List<UserVo> userVoList;
 
     private CompanyVo companyVo;
 
@@ -20,12 +20,12 @@ public class CompanyResVo {
 
     private List<CompanyBankCardVo> bankCardVoList;
 
-    public UserVo getUserVo() {
-        return userVo;
+    public List<UserVo> getUserVoList() {
+        return userVoList;
     }
 
-    public void setUserVo(UserVo userVo) {
-        this.userVo = userVo;
+    public void setUserVoList(List<UserVo> userVoList) {
+        this.userVoList = userVoList;
     }
 
     public List<CompanyBankCardVo> getBankCardVoList() {

src/main/java/com/pangding/web/authority/vo/resvo/DetailResVo.java

@@ -3,21 +3,23 @@ package com.pangding.web.authority.vo.resvo;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.UserVo;
 
+import java.util.List;
+
 /**
  * @Author zhangjinyao
  * @create 2019/5/24 11:28
  */
 public class DetailResVo {
-    private UserVo userVo;
+    private List<UserVo> userVoList;
 
     private CompanyVo companyVo;
 
-    public UserVo getUserVo() {
-        return userVo;
+    public List<UserVo> getUserVoList() {
+        return userVoList;
     }
 
-    public void setUserVo(UserVo userVo) {
-        this.userVo = userVo;
+    public void setUserVoList(List<UserVo> userVoList) {
+        this.userVoList = userVoList;
     }
 
     public CompanyVo getCompanyVo() {

src/main/resources/bootstrap.yml

@@ -20,4 +20,8 @@ spring:
         max-attempts: 1000
         multiplier: 1.1
 yzg:
-  PrintSql: true
+  PrintSql: true
\ No newline at end of file
+
+rsa:
+  privatekey: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALZh0s9zLNdnF6OxW9R9nHXHewBs0YwTC9cpXVrjHMkrF+p/WLSwQItzwv+rTaEXCZazGxU2uv/IS58YEhG2i6HqwFJDZwgkQ3TimrGXkZ7w5x7JLXoAvIDgJRNJnL2qOPn1nw47DmZ+VsTK3nK/CPtyeJ+QWYgHXxQDcEyv8911AgMBAAECgYAyLaHhf4+zx+JiIBbi1JhqczKtQEM65baZQQE1U00FL/0JgHX4aJGpjHT3ALt/+aWit65Y3NEANKxRnj7CbtXlhG65zWGfZXoieqFlOxRFcHIWRpEFCtlnflGY1Os0n6dJ335YDWKuxbvq4TiLs6WIG8rIdD6tK1x49VNdukX+dQJBAOPX/rrQHjUuVK6kidhgbZXAjqRfQri50rFOxmvZvfpO+Fn7AuSA5NxXLj+7Jf/5SPJBXP5OhEiNIhh3qnoy1UcCQQDM653qBdR3KR3ro89mzc0RKJjooZVttqHc/FV9vd2dUPYGk0h94mSB2+ofsoOIZYa5eh0lDyBISbofnKjjVwVjAkA70HeSKZLUmU4n7xA1GtOKDdwksNF+V2JFpA2ZQLeMH/E5BhmzTVdHtSdyGbqXIaWR27EDHi/CMDL0Q24g2Hl/AkBP87YfMrsc6vvzjmxDbhSOl0phqXnF3rX0pLcuYj/vO0Fie2CTTRtt10HXsCzFsOcJwu1QIkC0M5/c6aCzYqaFAkBOaY9LoJXr2Fjga4XXWxE0oRvjCaV0p/dKTRAzXKdgqc6ADXc/OiAPr4nH48vnPH2w30nk17CR0WeMqhhgpMtM
+  publickey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2YdLPcyzXZxejsVvUfZx1x3sAbNGMEwvXKV1a4xzJKxfqf1i0sECLc8L/q02hFwmWsxsVNrr/yEufGBIRtouh6sBSQ2cIJEN04pqxl5Ge8OceyS16ALyA4CUTSZy9qjj59Z8OOw5mflbEyt5yvwj7cnifkFmIB18UA3BMr/PddQIDAQAB
\ No newline at end of file