fix: 登录优化

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/controller/LoginController.java

@@ -16,6 +16,7 @@ import com.wx.blink.base.module.support.captcha.domain.CaptchaVO;
 import com.wx.blink.base.module.support.securityprotect.service.Level3ProtectConfigService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +44,9 @@ public class LoginController {
     @PostMapping("/login")
     @Operation(summary = "登录 @author admin")
     public ResponseDTO<LoginResultVO> login(@Valid @RequestBody LoginForm loginForm, HttpServletRequest request) {
+        if (StringUtils.isEmpty(loginForm.getLoginType())) {
+            loginForm.setLoginType("USERNAME_PASSWORD");
+        }
         LoginStrategy loginStrategy = loginStrategyFactory.getLoginStrategy(loginForm.getLoginType());
         return loginStrategy.login(loginForm, request);
     }

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/manager/factory/LoginStrategyFactory.java

@@ -23,9 +23,6 @@ public class LoginStrategyFactory {
     }
 
     public LoginStrategy getLoginStrategy(String loginType) {
-        if (StringUtils.isEmpty(loginType)) {
-            loginType = "USERNAME_PASSWORD";
-        }
         switch (loginType) {
             case "USERNAME_PASSWORD":
                 return applicationContext.getBean(UsernamePasswordLoginStrategy.class);

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/service/LoginService.java

@@ -3,9 +3,8 @@ package com.wx.blink.admin.system.login.service;
 import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.lang.UUID;
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.RandomUtil;
 import cn.hutool.extra.servlet.ServletUtil;
+import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import com.wx.blink.admin.system.department.domain.vo.DepartmentVO;
 import com.wx.blink.admin.system.department.service.DepartmentService;
 import com.wx.blink.admin.system.employee.domain.entity.EmployeeEntity;
@@ -27,9 +26,7 @@ import com.wx.blink.base.common.enumeration.UserTypeEnum;
 import com.wx.blink.base.common.util.BlinkBeanUtil;
 import com.wx.blink.base.common.util.BlinkEnumUtil;
 import com.wx.blink.base.common.util.BlinkIpUtil;
-import com.wx.blink.base.common.util.BlinkStringUtil;
 import com.wx.blink.base.constant.LoginDeviceEnum;
-import com.wx.blink.base.constant.RedisKeyConst;
 import com.wx.blink.base.module.support.apiencrypt.service.ApiEncryptService;
 import com.wx.blink.base.module.support.captcha.CaptchaService;
 import com.wx.blink.base.module.support.captcha.domain.CaptchaVO;
@@ -41,13 +38,11 @@ import com.wx.blink.base.module.support.loginlog.LoginLogService;
 import com.wx.blink.base.module.support.loginlog.domain.LoginLogEntity;
 import com.wx.blink.base.module.support.loginlog.domain.LoginLogVO;
 import com.wx.blink.base.module.support.mail.MailService;
-import com.wx.blink.base.module.support.mail.constant.MailTemplateCodeEnum;
 import com.wx.blink.base.module.support.redis.RedisService;
 import com.wx.blink.base.module.support.securityprotect.domain.LoginFailEntity;
 import com.wx.blink.base.module.support.securityprotect.service.Level3ProtectConfigService;
 import com.wx.blink.base.module.support.securityprotect.service.SecurityLoginService;
 import com.wx.blink.base.module.support.securityprotect.service.SecurityPasswordService;
-import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -147,7 +142,7 @@ public class LoginService implements StpInterface {
      * @return 返回用户登录信息
      */
     public ResponseDTO<LoginResultVO> login(LoginForm loginForm, String ip, String userAgent) {
-
+        UserTypeEnum userType = parseUserType(loginForm.getLoginType());
         LoginDeviceEnum loginDeviceEnum = BlinkEnumUtil.getEnumByValue(loginForm.getLoginDevice(), LoginDeviceEnum.class);
         if (loginDeviceEnum == null) {
             return ResponseDTO.userErrorParam("登录设备暂不支持！");
@@ -196,7 +191,7 @@ public class LoginService implements StpInterface {
         } else {
 
             // 按照等保登录要求，进行登录失败次数校验
-            ResponseDTO<LoginFailEntity> loginFailEntityResponseDTO = securityLoginService.checkLogin(employeeEntity.getEmployeeId(), UserTypeEnum.EMPLOYEE);
+            ResponseDTO<LoginFailEntity> loginFailEntityResponseDTO = securityLoginService.checkLogin(employeeEntity.getEmployeeId(), userType);
             if (!loginFailEntityResponseDTO.getOk()) {
                 return ResponseDTO.error(loginFailEntityResponseDTO);
             }
@@ -206,11 +201,11 @@ public class LoginService implements StpInterface {
                 // 记录登录失败
                 saveLoginLog(employeeEntity, ip, userAgent, "密码错误", LoginLogResultEnum.LOGIN_FAIL);
                 // 记录等级保护次数
-                String msg = securityLoginService.recordLoginFail(employeeEntity.getEmployeeId(), UserTypeEnum.EMPLOYEE, employeeEntity.getLoginName(), loginFailEntityResponseDTO.getData());
+                String msg = securityLoginService.recordLoginFail(employeeEntity.getEmployeeId(), userType, employeeEntity.getLoginName(), loginFailEntityResponseDTO.getData());
                 return msg == null ? ResponseDTO.userErrorParam("登录名或密码错误！") : ResponseDTO.error(UserErrorCode.LOGIN_FAIL_WILL_LOCK, msg);
             }
 
-            String saTokenLoginId = UserTypeEnum.EMPLOYEE.getValue() + StringConst.COLON + employeeEntity.getEmployeeId();
+            String saTokenLoginId = userType.getValue() + StringConst.COLON + employeeEntity.getEmployeeId();
             // 登录
             StpUtil.login(saTokenLoginId, String.valueOf(loginDeviceEnum.getDesc()));
         }
@@ -222,7 +217,7 @@ public class LoginService implements StpInterface {
         loginEmployeeCache.put(employeeEntity.getEmployeeId(), requestEmployee);
 
         // 移除登录失败
-        securityLoginService.removeLoginFail(employeeEntity.getEmployeeId(), UserTypeEnum.EMPLOYEE);
+        securityLoginService.removeLoginFail(employeeEntity.getEmployeeId(), userType);
 
         // 获取登录结果信息
         String token = StpUtil.getTokenValue();
@@ -238,6 +233,14 @@ public class LoginService implements StpInterface {
         return ResponseDTO.ok(loginResultVO);
     }
 
+    private UserTypeEnum parseUserType(String loginType) {
+        if (loginType.equals("USERNAME_PASSWORD")) {
+            return UserTypeEnum.EMPLOYEE;
+        } else {
+            return UserTypeEnum.PROVIDER;
+        }
+    }
+
     /**
      * 员工登陆
      *

bound-link-api/blink-backend/pom.xml

@@ -19,5 +19,10 @@
             <artifactId>blink-base</artifactId>
             <version>3.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.cloud</groupId>
+            <artifactId>blink-common-dto</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 </project>

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkProviderController.java

@@ -2,9 +2,9 @@ package com.wx.blink.backend.controller;
 
 import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
-import com.wx.blink.backend.domain.dto.BlinkProviderDTO;
 import com.wx.blink.backend.domain.qry.BlinkProviderQry;
 import com.wx.blink.backend.service.IBlinkProviderService;
+import com.wx.blink.common.dto.provider.BlinkProviderDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkProviderServiceImpl.java

@@ -9,11 +9,11 @@ import com.wx.blink.base.common.util.BlinkPageUtil;
 import com.wx.blink.base.module.support.serialnumber.constant.SerialNumberIdEnum;
 import com.wx.blink.base.module.support.serialnumber.service.SerialNumberService;
 import com.wx.blink.backend.domain.dataobject.BlinkProviderDO;
-import com.wx.blink.backend.domain.dto.BlinkProviderDTO;
 import com.wx.blink.backend.domain.qry.BlinkProviderQry;
 import com.wx.blink.backend.objectmapper.BlinkProviderMapper;
 import com.wx.blink.backend.repository.BlinkProviderRepository;
 import com.wx.blink.backend.service.IBlinkProviderService;
+import com.wx.blink.common.dto.provider.BlinkProviderDTO;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/objectmapper/BlinkProviderMapper.java

@@ -1,7 +1,7 @@
 package com.wx.blink.backend.objectmapper;
 
 import com.wx.blink.backend.domain.dataobject.BlinkProviderDO;
-import com.wx.blink.backend.domain.dto.BlinkProviderDTO;
+import com.wx.blink.common.dto.provider.BlinkProviderDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.NullValuePropertyMappingStrategy;

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkProviderRepository.java

@@ -3,8 +3,8 @@ package com.wx.blink.backend.repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wx.blink.backend.domain.dataobject.BlinkProviderDO;
-import com.wx.blink.backend.domain.dto.BlinkProviderDTO;
 import com.wx.blink.backend.domain.qry.BlinkProviderQry;
+import com.wx.blink.common.dto.provider.BlinkProviderDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkProviderService.java

@@ -2,8 +2,8 @@ package com.wx.blink.backend.service;
 
 import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
-import com.wx.blink.backend.domain.dto.BlinkProviderDTO;
 import com.wx.blink.backend.domain.qry.BlinkProviderQry;
+import com.wx.blink.common.dto.provider.BlinkProviderDTO;
 
 public interface IBlinkProviderService {
 

bound-link-api/blink-backend/src/main/resources/mapper/BlinkProviderRepositoryMapper.xml

@@ -14,7 +14,7 @@
         </if>
     </select>
     <!--    查询服务商列表-->
-    <select id="supportsProviderQueryPage" resultType="com.wx.blink.backend.domain.dto.BlinkProviderDTO">
+    <select id="supportsProviderQueryPage" resultType="com.wx.blink.common.dto.provider.BlinkProviderDTO">
         select *
         from blink_provider
         where deleted_flag = '0'

bound-link-api/blink-base/src/main/java/com/wx/blink/base/common/enumeration/UserTypeEnum.java

@@ -36,4 +36,8 @@ public enum UserTypeEnum implements BaseEnum {
     public String getDesc() {
         return desc;
     }
+
+    public static UserTypeEnum parseUserType(Integer userType) {
+        return UserTypeEnum.valueOf(userType.toString());
+    }
 }

bound-link-api/blink-common-dto/pom.xml

@@ -13,23 +13,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>3.2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.poi</groupId>
-                    <artifactId>poi-ooxml-schemas</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.poi</groupId>
-                    <artifactId>poi-ooxml</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.poi</groupId>
-                    <artifactId>poi</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>com.cloud</groupId>
+            <artifactId>blink-base</artifactId>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 </project>

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkProviderDTO.java → bound-link-api/blink-common-dto/src/main/java/com/wx/blink/common/dto/provider/BlinkProviderDTO.java

@@ -1,13 +1,12 @@
-package com.wx.blink.backend.domain.dto;
+package com.wx.blink.common.dto.provider;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.wx.blink.base.common.annoation.DataAdaptorMapping;
 import com.wx.blink.base.common.domain.BaseEntity;
 import com.wx.blink.base.common.json.deserializer.DictValueVoDeserializer;
 import com.wx.blink.base.common.json.deserializer.FileKeyVoDeserializer;
-import com.wx.blink.base.common.json.serializer.EmployeeLoginNameVoDeserializer;
 import com.wx.blink.base.common.json.serializer.FileKeyVoSerializer;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 
 @Data
@@ -26,27 +25,17 @@ public class BlinkProviderDTO extends BaseEntity {
     private String providerType;
 
     /**
-     * 审批流水号
+     * 区域类型
      */
-    private String sequenceNumber;
+    @JsonDeserialize(using = DictValueVoDeserializer.class)
+    @DataAdaptorMapping(type = "dict", value = "BLINK_PROVIDER_REGION_TYPE")
+    private String regionType;
 
     /**
      * 服务商名称
      */
     private String providerName;
 
-    /**
-     * 服务商账号
-     */
-    private String providerAccount;
-
-    /**
-     * 服务商等级
-     */
-    @JsonDeserialize(using = DictValueVoDeserializer.class)
-    @DataAdaptorMapping(type = "dict", value = "BLINK_PROVIDER_GRADE")
-    private String providerGrade;
-
     /**
      * 统一社会代码
      */
@@ -118,37 +107,34 @@ public class BlinkProviderDTO extends BaseEntity {
     private String contactPeople;
 
     /**
-     * 注册时间
+     * 联系人电话
      */
-    private String companyRegisterDate;
+    private String contactPhone;
 
     /**
-     * 注册资本
+     * 紧急审核状态
      */
-    private String companyRegisterCapital;
+    @JsonDeserialize(using = DictValueVoDeserializer.class)
+    @DataAdaptorMapping(type = "dict", value = "BLINK_COMMON_JUDGE")
+    private String emergencyState;
 
     /**
-     * 联系人电话
+     * 是否有在手项目
      */
-    private String contactPhone;
+    @JsonDeserialize(using = DictValueVoDeserializer.class)
+    @DataAdaptorMapping(type = "dict", value = "BLINK_COMMON_JUDGE")
+    private String inHandState;
 
     /**
-     * 公司简介
+     * 企业业务简介
      */
     private String companyDescription;
 
     /**
-     * 经营范围
+     * 业务资源简介
      */
     private String companyNature;
 
-    /**
-     * 归属地区
-     */
-    @JsonDeserialize(using = DictValueVoDeserializer.class)
-    @DataAdaptorMapping(type = "dict", value = "BLINK_BELONG_REGION")
-    private String belongRegion;
-
     /**
      * 注册来源
      */
@@ -156,12 +142,6 @@ public class BlinkProviderDTO extends BaseEntity {
     @DataAdaptorMapping(type = "dict", value = "BLINK_ENROLL_SOURCE")
     private String storeSource;
 
-    /**
-     * 归属营销经理
-     */
-    @JsonSerialize(using = EmployeeLoginNameVoDeserializer.class)
-    private String marketingStaff;
-
     /**
      * 营业执照
      */
@@ -169,55 +149,4 @@ public class BlinkProviderDTO extends BaseEntity {
     @JsonSerialize(using = FileKeyVoSerializer.class)
     private String businessCertificate;
 
-    /**
-     * 身份证人像面
-     */
-    @JsonDeserialize(using = FileKeyVoDeserializer.class)
-    @JsonSerialize(using = FileKeyVoSerializer.class)
-    private String idCardFront;
-
-    /**
-     * 身份证国徽面
-     */
-    @JsonDeserialize(using = FileKeyVoDeserializer.class)
-    @JsonSerialize(using = FileKeyVoSerializer.class)
-    private String idCardBack;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 附件
-     */
-    @JsonDeserialize(using = FileKeyVoDeserializer.class)
-    @JsonSerialize(using = FileKeyVoSerializer.class)
-    private String attachment;
-
-    /**
-     * 审核状态 0待审核 1审核中 2 审核完毕
-     */
-    private String auditStatus;
-
-    /**
-     * 入库状态 0已认证 1不合格
-     */
-    private String storeStatus;
-
-    /**
-     * 确认日期
-     */
-    private String confirmDate;
-
-    /**
-     * 过程评价
-     */
-    private String processEvaluate;
-
-    /**
-     * 审核意见
-     */
-    private String checkOpinions;
-
 }

bound-link-api/blink-portal/pom.xml

@@ -19,5 +19,10 @@
             <artifactId>blink-base</artifactId>
             <version>3.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.cloud</groupId>
+            <artifactId>blink-common-dto</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 </project>

bound-link-api/blink-portal/src/main/java/com/wx/blink/portal/controller/ProviderController.java

@@ -0,0 +1,26 @@
+package com.wx.blink.portal.controller;
+
+import com.wx.blink.base.common.annoation.NoNeedLogin;
+import com.wx.blink.base.common.domain.ResponseDTO;
+import com.wx.blink.common.dto.provider.BlinkProviderDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 服务商
+ *
+ * @Author 云畅联:admin
+ * @Date 2025-05-08 21:05:46
+ */
+@RestController
+public class ProviderController {
+
+    @NoNeedLogin
+    @PostMapping("/provider/register")
+    @Operation(summary = "服务商注册接口")
+    public ResponseDTO<BlinkProviderDTO> login(@RequestBody BlinkProviderDTO dto) {
+        return ResponseDTO.ok(dto);
+    }
+}

bound-link-api/blink-portal/src/test/java/com/wx/blink/portal/BlinkPortalApplicationTests.java

@@ -1,13 +0,0 @@
-package com.wx.blink.portal;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class BlinkPortalApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}

bound-link-api/blink-start/src/main/resources/dev/application.yaml

@@ -5,7 +5,7 @@ project:
 
 # 项目端口和url根路径
 server:
-  port: 6008
+  port: 9000
   servlet:
     context-path: /