迁移代码

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/RemoteUserService.java

@@ -89,14 +89,6 @@ public interface RemoteUserService {
     List<UserAccessMenuInfoResDto> queryUserAccessMenu(long id);
 
 
-    /**
-     * @param reqDto 忘记密码入参
-     * @desc: 忘记密码
-     * @author: czh
-     * @date: 2023/6/19
-     */
-    void forgetPassword(ForgetPasswordReqDto reqDto);
-
     /**
      * @param userLoginReqDto  用户登录信息
      * @desc: 保存用户登录信息

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/req/RegisterReqDto.java

@@ -32,18 +32,24 @@ public class RegisterReqDto implements Serializable {
     private String phone;
 
     /**
-     * 是否是企业管理（1是 0否）
+     * 系统类型(1运营端、2企业开户)
      */
-    private Integer isMain;
+    private Integer systemType;
 
     /**
-     *系统类型(1运营端、2企业开户)
+     * 验证码
      */
-    private Integer systemType;
+    private String captcha;
+
+    /**
+     * 是否是企业管理（1是 0否）
+     */
+    private Integer isMain;
 
     /**
      * 密码
      */
     private String password;
 
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -8,11 +8,12 @@ import com.sckw.core.model.page.PageResult;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.system.model.KwsUser;
+import com.sckw.system.model.vo.req.ForgetPasswordReqVo;
 import com.sckw.system.model.vo.req.ResetPasswordReqVo;
 import com.sckw.system.model.vo.req.UserAddReqVo;
 import com.sckw.system.model.vo.res.KwsUserResVo;
-import com.sckw.system.service.CommonService;
 import com.sckw.system.service.KwsUserService;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +25,6 @@ import java.util.List;
 
 /**
  * 用户
- *
  * @author zk
  * @date 2023-05-30
  */
@@ -35,9 +35,6 @@ public class KwsUserController {
     @Autowired
     private KwsUserService kwsUserService;
 
-    @Autowired
-    private CommonService commonService;
-
     /**
      * @param id 主键ID
      * @description 根据主键查询
@@ -126,6 +123,22 @@ public class KwsUserController {
         return HttpResult.ok(HttpStatus.MSG_008);
     }
 
+
+    /**
+     * @param reqVo 忘记密码入参
+     * @return HttpResult
+     * @desc: 忘记密码
+     * @author: czh
+     * @date: 2023/6/19
+     */
+    @PostMapping("/forgetPassword")
+    public HttpResult forgetPassword(@Valid @RequestBody ForgetPasswordReqVo reqVo,
+                                     @RequestHeader(name = "System-Type", required = true) int systemType) throws SystemException {
+        reqVo.setSystemType(systemType);
+        kwsUserService.forgetPassword(reqVo);
+        return HttpResult.ok(HttpStatus.MSG_002);
+    }
+
     /**
      * @param reqVo 重置入参
      * @return HttpResult
@@ -139,6 +152,22 @@ public class KwsUserController {
         return HttpResult.ok(HttpStatus.MSG_005);
     }
 
+
+    /**
+     * @param reqVo 注册
+     * @return HttpResult
+     * @desc: 用户注册
+     * @author: czh
+     * @date: 2023/6/16
+     */
+    @PostMapping("/register")
+    public HttpResult register(@Valid @RequestBody RegisterReqDto reqVo,
+                               @RequestHeader(name = "System-Type", required = true) int systemType) throws SystemException {
+        reqVo.setSystemType(systemType);
+        kwsUserService.register(reqVo);
+        return HttpResult.ok(HttpStatus.MSG_007);
+    }
+
     /**
      * @param ids 主键
      * @return HttpResult

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteUserServiceImpl.java

@@ -89,12 +89,6 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         return BeanUtils.copyToList(kwsMenuResVos, UserAccessMenuInfoResDto.class);
     }
 
-    @Override
-    public void forgetPassword(ForgetPasswordReqDto reqDto) throws SystemException {
-        com.sckw.system.model.vo.req.ForgetPasswordReqVo forgetPasswordReqVo = new ForgetPasswordReqVo();
-        BeanUtils.copyProperties(reqDto, forgetPasswordReqVo);
-        kwsUserService.forgetPassword(forgetPasswordReqVo);
-    }
 
     @Override
     public void saveUserLogin(UserLoginReqDto userLoginReqDto) {

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -575,6 +575,7 @@ public class KwsEnterpriseService {
         kwsEnterprise.setPhone(reqVo.getPhone());
         kwsEnterprise.setCreateBy(LoginUserHolder.getUserId());
         kwsEnterprise.setUpdateBy(LoginUserHolder.getUserId());
+        kwsEnterprise.setCityCode(reqVo.getCityCode());
         if (kwsEnterpriseDao.insert(kwsEnterprise) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -1,5 +1,6 @@
 package com.sckw.system.service;
 
+import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.ApprovalEnum;
@@ -7,6 +8,7 @@ import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
+import com.sckw.redis.constant.RedisConstant;
 import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.system.api.model.dto.req.UpdatePasswordReqDto;
@@ -111,6 +113,12 @@ public class KwsUserService {
      */
     @Transactional(rollbackFor = {})
     public RegisterResDto register(RegisterReqDto reqDto) throws SystemException {
+        String key = StringUtils.format(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, DictEnum.SMS_REGISTER.getValue(), reqDto.getPhone());
+        String sms = RedissonUtils.getString(key);
+        if (!reqDto.getCaptcha().equals(sms)) {
+            throw new SystemException(HttpStatus.CODE_10301, HttpStatus.CAPTCHA_ERROR);
+        }
+
         commonService.checkEntRepeat(reqDto.getEntName(), reqDto.getPhone());
         /*1、数据校验*/
         checkAccountValid(reqDto.getPhone(), reqDto.getSystemType());
@@ -421,8 +429,8 @@ public class KwsUserService {
         KwsUser kwsUser = checkUserBase(reqVo.getAccount(), reqVo.getSystemType());
 
         //从缓存中取出验证码,校验
-        String sms = "12345";
-//        String sms = RedissonUtils.getString(Global.getForgetKey(reqVo.getSystemType(), reqVo.getAccount()));
+        String key = StringUtils.format(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, DictEnum.SMS_REGISTER.getValue(), reqVo.getAccount());
+        String sms = RedissonUtils.getString(key);
         if (!reqVo.getCaptcha().equals(sms)) {
             throw new SystemException(HttpStatus.CODE_10301, HttpStatus.CAPTCHA_ERROR);
         }
@@ -440,7 +448,7 @@ public class KwsUserService {
      */
     public KwsUser checkUserBase(String account, int systemType) throws SystemException {
         KwsUser kwsUser = getUserByAccount(account, systemType);
-        if (Objects.isNull(kwsUser)) {
+        if (Objects.isNull(kwsUser) || kwsUser.getStatus().equals(Global.YES)) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ACCOUNT_NOT_EXISTS);
         }
         return kwsUser;
@@ -552,6 +560,7 @@ public class KwsUserService {
             if (kwsUserDao.update(kwsUser) <= 0) {
                 throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
             }
+            RedissonUtils.remove(Global.getFullUserLoginKey(kwsUser.getSystemType(), kwsUser.getId()));
         }
     }