Merge branch 'develop'

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

@@ -95,5 +95,6 @@ public class UserAccountVO implements Serializable {
 
     @ApiModelProperty(value = "用户对应的后台用户id")
     private Integer backUserId;
-
+    @ApiModelProperty(value = "密码")
+    private String password;
 }

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;
+}

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

+package com.mmc.iuav.user.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author: zj
+ * @Date: 2023/5/16 15:17
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WebUserSucVO implements Serializable {
+    private static final long serialVersionUID = 7491711282161485720L;
+    @ApiModelProperty(value = "用户id")
+    private Integer userAccountId;
+    @ApiModelProperty(value = "token")
+    private String token;
+    @ApiModelProperty(value = "手机号")
+    private String phoneNum;
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+}

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

@@ -7,10 +7,7 @@ import com.mmc.iuav.user.dao.RoleDao;
 import com.mmc.iuav.user.entity.RoleInfoDO;
 import com.mmc.iuav.user.enums.UserTypeEnums;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
-import com.mmc.iuav.user.model.vo.AppUserSucVO;
-import com.mmc.iuav.user.model.vo.BackUserAccountVO;
-import com.mmc.iuav.user.model.vo.CompanyInfoVO;
-import com.mmc.iuav.user.model.vo.UserAccountVO;
+import com.mmc.iuav.user.model.vo.*;
 import com.mmc.iuav.user.service.CompanyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +49,18 @@ public class AuthHandler {
                 .nickName(userAccountVO.getNickName()).userAccountId(userAccountVO.getId()).portType(UserTypeEnums.APP.getType()).build();
         return appUserSucVO;
     }
+    public WebUserSucVO addWebLoginCache(UserAccountVO userAccountVO) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put(JwtConstant.USER_ACCOUNT_ID, userAccountVO.getId());
+        map.put(JwtConstant.TOKEN_TYPE, JwtConstant.IUAV_TOKEN);
+        String token = JwtUtil.createJwt(map);
+        stringRedisTemplate.opsForValue().set(
+                token, JSONObject.toJSONString(userAccountVO),
+                JwtConstant.EXPIRATION, TimeUnit.MILLISECONDS);
+        WebUserSucVO webUserSucVO = WebUserSucVO.builder().token(token).phoneNum(userAccountVO.getPhoneNum())
+                .nickName(userAccountVO.getNickName()).userAccountId(userAccountVO.getId()).build();
+        return webUserSucVO;
+    }
 
     public LoginSuccessDTO addPcLoginCache(BackUserAccountVO user) {
         // 查询单位信息

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,36 @@ 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);
+    }
+    @ApiOperation(value = "web端账号密码登录")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = LoginSuccessDTO.class)})
+    @PostMapping("webLogin")
+    public ResultBody webLogin(
+            @ApiParam(value = "账号登录QO", required = true) @Validated @RequestBody LoginUserQO param) {
+        return authService.webLogin(param);
+    }
 }

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

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

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();
@@ -137,6 +138,7 @@ public class UserAccountDO implements Serializable {
                 .briefIntroduction(this.briefIntroduction)
                 .coverPicture(this.coverPicture)
                 .districtChildId(this.districtChildId)
+                .password(this.password)
                 .build();
     }
 

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,10 @@ public interface AuthService {
      * @return
      */
     ResultBody getLoginInfo(String randomLoginCode);
+    /**
+     * web端用户注册
+     */
+    ResultBody webRegister(WebRegisterVO webRegisterVO);
+
+    ResultBody webLogin(LoginUserQO param);
 }

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

 package com.mmc.iuav.user.service;
 
 import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.entity.BackUserAccountDO;
 import com.mmc.iuav.user.entity.UserAccountDO;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
@@ -25,6 +26,7 @@ public interface UserAccountService {
      * @return
      */
     UserAccountVO getUserAccountInfoByUnionId(String unionId);
+    UserAccountVO getUserAccountInfoByPhoneNum(String phoneNum);
 
     /**
      * Insert the user account
@@ -187,4 +189,5 @@ public interface UserAccountService {
      * 根据手机号查询unionId
      */
     String selectUnionIdByPhone(String phone);
+
 }

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,66 @@ 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.insertUserAccount1(userAccountDO);
+            userAccountDO.setNickName("云享飞用户_"+ userAccountDO.getId());
+            userServiceDao.update(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();
+    }
+
+    @Override
+    public ResultBody webLogin(LoginUserQO param) {
+        UserAccountVO user = userAccountService.getUserAccountInfoByPhoneNum(param.getAccountNo());
+        //查询用户信息
+//        BackUserAccountDO user = backUserAccountService.getUserLoginInfo(param.getAccountNo(), param.getPassWord());
+        if (user == null) {
+            return ResultBody.error(ResultEnum.LOGIN_ACCOUNT_NOT_EXIT_ERROR);
+        }
+        String loginPwd = "";
+        try {
+            loginPwd = PwdUtil.securityPwd(param.getPassWord());
+        } catch (NoSuchAlgorithmException e) {
+            return ResultBody.error(ResultEnum.PWD_CONPARED_ERROR);
+        }
+        if (!loginPwd.equals(user.getPassword())) {
+            return ResultBody.error(ResultEnum.LOGIN_PASSWORD_ERROR);
+        }
+        WebUserSucVO webUserSucVO = authHandler.addWebLoginCache(user);
+        return ResultBody.success(webUserSucVO);
+    }
+
 
     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

@@ -101,6 +101,15 @@ public class UserAccountServiceImpl implements UserAccountService {
     }
 
     @Override
+    public UserAccountVO getUserAccountInfoByPhoneNum(String phoneNum) {
+        UserAccountDO userAccountDO = userServiceDao.getUserAccountInfoByPhoneNum(phoneNum);
+        if (userAccountDO != null) {
+            return userAccountDO.buildUserAccountVO();
+        }
+        return null;
+    }
+
+    @Override
     public void insertUserAccount(UserAccountDO userAccountDO) {
         if(userServiceDao.getUserAccountInfoByUnionId(userAccountDO.getUnionId()) == null){
             userServiceDao.insertUserAccount(userAccountDO);
@@ -252,6 +261,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(user.getId());
+            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 +595,6 @@ 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,11 +38,52 @@
             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="insertUserAccount1" parameterType="com.mmc.iuav.user.entity.UserAccountDO"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into user_account
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="phoneNum != null">phone_num,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="nickName != null">nick_name,</if>
+            <if test="userImg != null">user_img,</if>
+            <if test="openId != null">open_id,</if>
+            <if test="unionId != null">union_id,</if>
+            <if test="userSex != null">user_sex,</if>
+            <if test="email != null">email,</if>
+            <if test="source != null">source,</if>
+            <if test="provinceCode != null">province_code,</if>
+            <if test="cityCode != null">city_code,</if>
+            <if test="districtCode != null">district_code,</if>
+            <if test="remark != null">remark,</if>
+            <if test="portType != null">port_type,</if>
+            <if test="password != null">password,</if>
+            create_time
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="phoneNum != null">#{phoneNum},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="nickName != null">#{nickName},</if>
+            <if test="userImg != null">#{userImg},</if>
+            <if test="openId != null">#{openId},</if>
+            <if test="unionId != null">#{unionId},</if>
+            <if test="userSex != null">#{userSex},</if>
+            <if test="email != null">#{email},</if>
+            <if test="source != null">#{source},</if>
+            <if test="provinceCode != null">#{provinceCode},</if>
+            <if test="cityCode != null">#{cityCode},</if>
+            <if test="districtCode != null">#{districtCode},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="portType != null">#{portType},</if>
+            <if test="password != null">#{password},</if>
+            NOW()
+        </trim>
+    </insert>
+
 
     <insert id="insertUserRcd" parameterType="com.mmc.iuav.user.entity.UserRcdDO">
         insert into user_rcd (user_account_id, rcd_user_id, create_time)
@@ -57,6 +98,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 +144,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 +721,54 @@
         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>
+    <select id="getUserAccountInfoByPhoneNum" 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
+    </select>
 
 </mapper>

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

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

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 37919562896a7efde10fb36125f3e9357bea6828
+  newTag: baf6aff295e1b24a8739489b5a2bd38cf0b1d6f7