增加与ai大模型对话

doc/灵活用工-mysql.sql

@@ -38,6 +38,7 @@ CREATE TABLE `fe_user` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_fe_user_openid` (`openid`, `del_flag`),
   UNIQUE KEY `uk_fe_user_username` (`username`, `del_flag`),
+  UNIQUE KEY `uk_fe_user_mobile_enc` (`mobile_enc`(128), `del_flag`),
   KEY `idx_fe_user_type` (`user_type`, `status`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='微信用户主表，企业主与临时工共用账号体系，通过 user_type 区分身份。支撑微信小程序 code2session 登录与 Session 鉴权，是 fe_enterprise_user、fe_conversation、fe_worker 等表的用户外键来源。敏感手机号仅存密文与脱敏值，禁止明文入库。';
 

doc/灵活用工.sql

@@ -60,6 +60,7 @@ CREATE TABLE fe_user (
 );
 CREATE UNIQUE INDEX uk_fe_user_openid ON fe_user (openid) WHERE del_flag = 0;
 CREATE UNIQUE INDEX uk_fe_user_username ON fe_user (username) WHERE del_flag = 0 AND username IS NOT NULL;
+CREATE UNIQUE INDEX uk_fe_user_mobile_enc ON fe_user (mobile_enc, del_flag);
 CREATE INDEX idx_fe_user_type ON fe_user (user_type, status);
 
 

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/auth/AuthService.java

@@ -15,6 +15,9 @@ import com.huimv.employment.service.auth.dto.WechatLoginRequest;
 import com.huimv.employment.service.config.SecurityProperties;
 import com.huimv.employment.service.sms.SmsCodeService;
 import com.huimv.employment.service.wechat.WeChatMiniAppService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -27,6 +30,8 @@ import java.time.LocalDateTime;
 @Service
 public class AuthService {
 
+    private static final Logger log = LoggerFactory.getLogger(AuthService.class);
+
     private static final String STATUS_ACTIVE = "active";
     private static final String STATUS_DISABLED = "disabled";
 
@@ -60,21 +65,14 @@ public class AuthService {
         String mobileEnc = AesUtils.encrypt(request.getMobile(), securityProperties.getMobileAesKey());
         String mobileMask = MobileUtils.mask(request.getMobile());
 
-        FeUser user = feUserMapper.selectOne(new LambdaQueryWrapper<FeUser>()
-                .eq(FeUser::getMobileEnc, mobileEnc)
-                .last("LIMIT 1"));
-
-        if (user == null) {
-            user = createUserBySms(mobileEnc, mobileMask, request.getUserType());
-        } else {
-            ensureUserActive(user);
-            if (!request.getUserType().equals(user.getUserType())) {
-                user.setUserType(request.getUserType());
-            }
-            user.setMobileMask(mobileMask);
-            touchLogin(user);
-            feUserMapper.updateById(user);
+        FeUser user = findOrCreateByMobile(mobileEnc, mobileMask, request.getUserType());
+        ensureUserActive(user);
+        if (!request.getUserType().equals(user.getUserType())) {
+            user.setUserType(request.getUserType());
         }
+        user.setMobileMask(mobileMask);
+        touchLogin(user);
+        feUserMapper.updateById(user);
 
         return buildLoginResponse(user);
     }
@@ -83,24 +81,71 @@ public class AuthService {
     public LoginResponse loginByWechat(WechatLoginRequest request) {
         WeChatMiniAppService.WxSession session = weChatMiniAppService.code2Session(request.getCode());
 
-        FeUser user = feUserMapper.selectOne(new LambdaQueryWrapper<FeUser>()
-                .eq(FeUser::getOpenid, session.getOpenid())
-                .last("LIMIT 1"));
+        FeUser user = findOrCreateByOpenid(session, request.getUserType());
+        ensureUserActive(user);
+        if (!request.getUserType().equals(user.getUserType())) {
+            user.setUserType(request.getUserType());
+        }
+        user.setUnionid(session.getUnionid());
+        user.setSessionKey(session.getSessionKey());
+        touchLogin(user);
+        feUserMapper.updateById(user);
+
+        return buildLoginResponse(user);
+    }
 
-        if (user == null) {
-            user = createUserByWechat(session, request.getUserType());
-        } else {
-            ensureUserActive(user);
-            if (!request.getUserType().equals(user.getUserType())) {
-                user.setUserType(request.getUserType());
+    /**
+     * 按加密手机号查找或创建用户；并发 insert 冲突时重查已存在记录。
+     */
+    private FeUser findOrCreateByMobile(String mobileEnc, String mobileMask, String userType) {
+        FeUser user = findByMobileEnc(mobileEnc);
+        if (user != null) {
+            return user;
+        }
+        try {
+            return createUserBySms(mobileEnc, mobileMask, userType);
+        } catch (DuplicateKeyException ex) {
+            log.debug("Concurrent sms login insert for mobile_enc, re-select", ex);
+            user = findByMobileEnc(mobileEnc);
+            if (user == null) {
+                log.error("DuplicateKey on mobile_enc but re-select returned null", ex);
+                throw new BizException(ErrorCode.INTERNAL_ERROR);
             }
-            user.setUnionid(session.getUnionid());
-            user.setSessionKey(session.getSessionKey());
-            touchLogin(user);
-            feUserMapper.updateById(user);
+            return user;
         }
+    }
 
-        return buildLoginResponse(user);
+    /**
+     * 按 openid 查找或创建用户；并发 insert 冲突时重查已存在记录。
+     */
+    private FeUser findOrCreateByOpenid(WeChatMiniAppService.WxSession session, String userType) {
+        FeUser user = findByOpenid(session.getOpenid());
+        if (user != null) {
+            return user;
+        }
+        try {
+            return createUserByWechat(session, userType);
+        } catch (DuplicateKeyException ex) {
+            log.debug("Concurrent wechat login insert for openid, re-select", ex);
+            user = findByOpenid(session.getOpenid());
+            if (user == null) {
+                log.error("DuplicateKey on openid but re-select returned null", ex);
+                throw new BizException(ErrorCode.INTERNAL_ERROR);
+            }
+            return user;
+        }
+    }
+
+    private FeUser findByMobileEnc(String mobileEnc) {
+        return feUserMapper.selectOne(new LambdaQueryWrapper<FeUser>()
+                .eq(FeUser::getMobileEnc, mobileEnc)
+                .last("LIMIT 1"));
+    }
+
+    private FeUser findByOpenid(String openid) {
+        return feUserMapper.selectOne(new LambdaQueryWrapper<FeUser>()
+                .eq(FeUser::getOpenid, openid)
+                .last("LIMIT 1"));
     }
 
     private FeUser createUserBySms(String mobileEnc, String mobileMask, String userType) {