web端用户注册

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/WebRegisterVO.java

+package com.mmc.iuav.user.model.vo;
+
+import com.mmc.iuav.group.Insert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author: zj
+ * @Date: 2023/5/16 13:56
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WebRegisterVO implements Serializable {
+    private static final long serialVersionUID = 2500957724470423989L;
+    @ApiModelProperty(value = "手机号")
+    @NotNull(message = "手机号不能为空", groups = {Insert.class})
+    private String phoneNum;
+    @ApiModelProperty(value = "密码")
+    @NotNull(message = "密码不能为空", groups = {Insert.class})
+    private String password;
+    @ApiModelProperty(value = "请求code")
+    @NotNull(message = "验证码不能为空", groups = {Insert.class})
+    private String code;
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/AuthController.java

 package com.mmc.iuav.user.controller;
 
+import com.mmc.iuav.general.CodeUtil;
 import com.mmc.iuav.group.Insert;
 import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.dao.UserServiceDao;
+import com.mmc.iuav.user.entity.UserAccountDO;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.qo.LoginUserQO;
 import com.mmc.iuav.user.model.vo.AppUserSucVO;
+import com.mmc.iuav.user.model.vo.WebRegisterVO;
 import com.mmc.iuav.user.model.vo.WxLoginVO;
 import com.mmc.iuav.user.service.AuthService;
 import com.mmc.iuav.user.service.UserAccountService;
+import com.mmc.iuav.user.util.SmsUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
 /**
  * @author: zj
  * @Date: 2023/5/15 15:50
@@ -26,7 +36,10 @@ public class AuthController {
     private AuthService authService;
     @Autowired
     private UserAccountService userAccountService;
-
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+    @Autowired
+    private UserServiceDao userServiceDao;
     @ApiOperation(value = "小程序登录/注册")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppUserSucVO.class)})
     @PostMapping("appletLogin")
@@ -56,4 +69,29 @@ public class AuthController {
         String unionId = userAccountService.selectUnionIdByPhone(phone);
         return authService.testAppletLogin(unionId);
     }
+
+    @ApiOperation(value = "web注册获取手机号验证码")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("getVerifyCode")
+    public ResultBody getVerifyCode(@RequestParam(value = "phoneNum") String phoneNum) {
+        if(phoneNum == null){
+            return ResultBody.error("手机号不能为空");
+        }
+        // 根据手机号生成验证码
+        String verifyCode = CodeUtil.getRandomNum(6);
+        // 发送给用户
+        SmsUtil.verifyCode(verifyCode, phoneNum);
+        Map<String, String> redisData = new HashMap<>();
+        redisData.put("phoneNum", phoneNum);
+        redisData.put("verifyCode", verifyCode);
+        stringRedisTemplate.opsForHash().putAll(verifyCode + phoneNum, redisData);
+        stringRedisTemplate.expire(verifyCode + phoneNum, 120, TimeUnit.SECONDS);
+        return ResultBody.success();
+    }
+    @ApiOperation(value = "web端注册")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppUserSucVO.class)})
+    @PostMapping("webRegister")
+    public ResultBody webRegister(@Validated(value = {Insert.class}) @RequestBody WebRegisterVO webRegisterVO) {
+        return authService.webRegister(webRegisterVO);
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/UserServiceDao.java

@@ -51,6 +51,7 @@ public interface UserServiceDao {
      */
     void update(UserAccountDO userAccountDO);
 
+    void updateId(@Param("userAccountDO") UserAccountDO userAccountDO,@Param("newId") Integer newId);
     /**
      * 查询是否存在这个用户
      * @param userId 用户id
@@ -239,4 +240,17 @@ public interface UserServiceDao {
      * 根据手机号查询unionId
      */
     String selectUnionIdByPhone(String phone);
+
+    /**
+     * 根据手机号查询用户信息
+     *
+     * @param phoneNum
+     * @return
+     */
+    UserAccountDO getUserByPhoneNum(String phoneNum);
+
+    /**
+     * 删除用户信息
+     */
+    void deleteById(Integer id);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserAccountDO.java

@@ -25,6 +25,7 @@ import java.util.stream.Collectors;
 public class UserAccountDO implements Serializable {
     private static final long serialVersionUID = 5007589179946146721L;
     private Integer id;
+    private Integer newId;
     private String uid;
     private String phoneNum;
     private String userName;
@@ -88,8 +89,8 @@ public class UserAccountDO implements Serializable {
     private String coverPicture;
     @ApiModelProperty(value = "地区id")
     private Integer districtChildId;
-
-
+    //web端登录密码
+    private String password;
     public UserAccountDO(UserAccountVO userAccountVO) {
         this.id = userAccountVO.getId();
         this.phoneNum = userAccountVO.getPhoneNum();

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/AuthService.java

 package com.mmc.iuav.user.service;
 
+import com.mmc.iuav.group.Insert;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.qo.LoginUserQO;
+import com.mmc.iuav.user.model.vo.WebRegisterVO;
 import com.mmc.iuav.user.model.vo.WxLoginVO;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @author: zj
@@ -51,4 +55,8 @@ public interface AuthService {
      * @return
      */
     ResultBody getLoginInfo(String randomLoginCode);
+    /**
+     * web端用户注册
+     */
+    ResultBody webRegister(WebRegisterVO webRegisterVO);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/AuthServiceImpl.java

@@ -36,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.security.NoSuchAlgorithmException;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -262,6 +263,43 @@ public class AuthServiceImpl implements AuthService {
         return ResultBody.success(loginSuccessDTO);
     }
 
+    @Override
+    public ResultBody webRegister(WebRegisterVO webRegisterVO) {
+        Map<Object, Object> redisData = stringRedisTemplate.opsForHash().entries(webRegisterVO.getCode() + webRegisterVO.getPhoneNum());
+        if (redisData.isEmpty()) {
+            return ResultBody.error("验证码错误,请重新输入");
+        }
+        String code = redisData.get("verifyCode").toString();
+        String phoneNum = redisData.get("phoneNum").toString();
+        // 验证码错误则修改失败，并提醒
+        if (!code.equals(webRegisterVO.getCode())) {
+            return ResultBody.error("验证码错误,请重新输入");
+        }
+        UserAccountDO userAccountDO = userServiceDao.getUserByPhoneNum(phoneNum);
+        // 小程序未登录过或者未绑定过手机号
+        if (userAccountDO == null){
+            userAccountDO = new UserAccountDO();
+            userAccountDO.setPhoneNum(webRegisterVO.getPhoneNum());
+            try {
+                userAccountDO.setPassword(PwdUtil.securityPwd(webRegisterVO.getPassword()));
+            } catch (NoSuchAlgorithmException e) {
+                return ResultBody.error(ResultEnum.PWD_CREATE_ERROR);
+            }
+            userServiceDao.insertUserAccount(userAccountDO);
+        }else if(userAccountDO.getPassword() == null){
+            //小程序登录过且绑定过手机号
+            try {
+                userAccountDO.setPassword(PwdUtil.securityPwd(webRegisterVO.getPassword()));
+            } catch (NoSuchAlgorithmException e) {
+                return ResultBody.error(ResultEnum.PWD_CREATE_ERROR);
+            }
+            userServiceDao.update(userAccountDO);
+        }else{
+            return ResultBody.error("已经注册过，请直接登录");
+        }
+        return ResultBody.success();
+    }
+
 
     private void extracted(Integer id) {
         UserPointsVO userPointsVO = new UserPointsVO(id, NumberOfUserPoints.match(0).getMessage());

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java

@@ -252,6 +252,17 @@ public class UserAccountServiceImpl implements UserAccountService {
 //            return ResultBody.error(ResultEnum.AUTH_PHONE_NUMBER_ERROR);
 //        }
         UserAccountDO userAccount = new UserAccountDO();
+        UserAccountDO user = userServiceDao.getUserByPhoneNum(userPhoneNumber);
+        if(user != null){
+            userAccount.setNewId(user.getId());
+            userServiceDao.deleteById(id);
+            if(user.getPassword() != null){
+                userAccount.setPassword(user.getPassword());
+            }
+            if(user.getNickName() != null){
+                userAccount.setNickName(user.getNickName());
+            }
+        }
         userAccount.setId(id);
         userAccount.setPhoneNum(userPhoneNumber);
         userServiceDao.update(userAccount);
@@ -575,4 +586,5 @@ public class UserAccountServiceImpl implements UserAccountService {
     }
 
 
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/SmsUtil.java

@@ -30,7 +30,7 @@ public class SmsUtil {
 
     private static String COOPERATION_TEMPLATE_PASS_CODE_7 = "SMS_464335035";
     //短信验证码模板
-    private static String VERIFYCODE="SMS_211825548";
+    private static String VERIFYCODE="SMS_291570267";
 
     /**
      * 加盟审核未通过

csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml

@@ -38,10 +38,10 @@
             useGeneratedKeys="true" keyProperty="id">
         insert into user_account(phone_num, user_name, nick_name, user_img, open_id,
                                  union_id, user_sex, email, source, province_code, city_code, district_code, remark,
-                                 port_type, create_time)
+                                 port_type, create_time,password)
         values (#{phoneNum}, #{userName}, #{nickName}, #{userImg}, #{openId},
                 #{unionId}, #{userSex}, #{email}, #{source}, #{provinceCode}, #{cityCode}, #{districtCode}, #{remark},
-                #{portType}, NOW())
+                #{portType}, NOW(), #{password})
     </insert>
 
     <insert id="insertUserRcd" parameterType="com.mmc.iuav.user.entity.UserRcdDO">
@@ -57,6 +57,9 @@
     <update id="update" parameterType="com.mmc.iuav.user.entity.UserAccountDO">
         update user_account
         <set>
+            <if test="newId != null">
+                id = #{newId},
+            </if>
             <if test="phoneNum != null">
                 phone_num = #{phoneNum},
             </if>
@@ -100,20 +103,25 @@
                 district_child_id=#{districtChildId},
             </if>
             <if test="briefIntroduction!='' and briefIntroduction!=null">
-                brief_introduction=#{briefIntroduction}
+                brief_introduction=#{briefIntroduction},
+            </if>
+            <if test="password !='' and password != null">
+                password=#{password}
             </if>
         </set>
         <where>
             id = #{id}
         </where>
     </update>
-
     <update id="disableUserAccount">
         update user_account
         set disable  = 1,
             union_id = #{removeNO}
         where id = #{userAccountId}
     </update>
+    <delete id="deleteById">
+        delete from user_account where id = #{id}
+    </delete>
 
     <select id="getUserAccountInfoByUnionId" resultType="com.mmc.iuav.user.entity.UserAccountDO">
         select id,
@@ -672,5 +680,32 @@
         where phone_num = #{phone} and disable = 0
         limit 1
     </select>
+    <select id="isPhoneNums" resultType="java.lang.Integer">
+        select count(*)
+        from user_account
+        where phone_num = #{phoneNum} and disable = 0 and password is not null
+    </select>
+    <select id="getUserByPhoneNum" resultType="com.mmc.iuav.user.entity.UserAccountDO">
+        select id,
+               phone_num,
+               user_name,
+               nick_name,
+               user_img,
+               open_id,
+               union_id,
+               user_sex,
+               email,
+               source,
+               account_status,
+               remark,
+               port_type,
+               disable,
+               create_time,
+               update_time,
+               password
+        from user_account
+        where phone_num = #{phoneNum} and disable = 0
+        limit 1
+    </select>
 
 </mapper>

csm-service/cms-service-user/src/main/resources/not-check.yml

@@ -45,4 +45,6 @@ data-filter:
     - /userapp/user-account/feignGetUserBaseInfo
     - /userapp/back-user/getMessage
     - /userapp/user-account/feignListAppUserAccount1
+    - /userapp/auth/getVerifyCode
+    - /userapp/auth/webRegister