ZQN
2025-05-19 0e12e4ab45db6768a0f45d8952f78b0ae9190723
手机号登录,去掉短信验证。脱敏
7个文件已修改
24 ■■■■ 已修改文件
project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
project-admin/src/main/resources/application-dev.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
project-admin/src/main/resources/application-test.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java
@@ -6,6 +6,7 @@
import com.project.common.core.domain.AjaxResult;
import com.project.common.core.page.TableDataInfo;
import com.project.common.enums.BusinessType;
import com.project.common.utils.SensitiveUtil;
import com.project.common.utils.StringUtils;
import com.project.common.utils.file.ImageUtils;
import com.project.common.utils.poi.ExcelUtil;
@@ -51,6 +52,7 @@
    {
        startPage();
        List<SysCompanyVo> list = iSysCompanyService.queryList(bo);
        list.forEach(SensitiveUtil::desensitize);
        return getDataTable(list);
    }
project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
@@ -11,6 +11,7 @@
import com.project.common.core.page.TableDataInfo;
import com.project.common.enums.BusinessType;
import com.project.common.utils.SecurityUtils;
import com.project.common.utils.SensitiveUtil;
import com.project.common.utils.StringUtils;
import com.project.common.utils.poi.ExcelUtil;
import com.project.system.domain.bo.editBo.UserDeptBo;
@@ -55,6 +56,7 @@
    {
        startPage();
        List<SysUser> list = userService.selectUserListCommon(user);
        list.forEach(SensitiveUtil::desensitize);
        return getDataTable(list);
    }
project-admin/src/main/resources/application-dev.yml
@@ -44,7 +44,7 @@
# 开发环境配置
server:
    # 服务器的HTTP端口,默认为8080
    port: 8089
    port: 8086
    servlet:
        # 应用的访问路径
        context-path: /
project-admin/src/main/resources/application-test.yml
@@ -71,7 +71,7 @@
                #url: jdbc:mysql://192.168.1.136:3306/project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                #username: root
                #password: qn123123
                url: jdbc:mysql://116.198.40.76:3306/project_sqys_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                url: jdbc:mysql://116.198.40.76:3306/project_sqys_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                username: root
                password: Bjjmy_2020
            # 从库数据源
project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java
@@ -8,6 +8,7 @@
import com.project.common.annotation.Excel;
import com.project.common.annotation.Excel.Type;
import com.project.common.annotation.Excels;
import com.project.common.annotation.Sensitive;
import com.project.common.xss.Xss;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -47,12 +48,14 @@
    private String userType;
    /** 用户等级 */
    @Sensitive(type = Sensitive.SensitiveType.DEFAULT)
    private String nickName;
    /** 用户邮箱 */
    private String email;
    /** 手机号码 */
    @Sensitive(type = Sensitive.SensitiveType.PHONE)
    private String phonenumber;
    /** openid */
project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
@@ -206,10 +206,10 @@
    public String phoneLogin(UserPhoneLoginBo bo)
    {
        String phone = bo.getPhone();
        Boolean verified = verifyPhone(phone, bo.getCode());
        if (!verified){
            throw new BaseException("手机号验证码校验失败!");
        }
//        Boolean verified = verifyPhone(phone, bo.getCode());
//        if (!verified){
//            throw new BaseException("手机号验证码校验失败!");
//        }
        SysUser user = null;
        if ("01".equals(bo.getUserType())){
            user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.project.common.annotation.Excel;
import com.project.common.annotation.Sensitive;
import com.project.common.core.domain.model.ImportError;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -26,19 +27,23 @@
    private Long companyId;
    @Excel(name = "企业名(企业全称)")
    @Sensitive(type = Sensitive.SensitiveType.DEFAULT)
    @ApiModelProperty("企业名(企业全称)")
    private String companyName;
    @Excel(name = "统一社会信用代码")
    @ApiModelProperty("统一社会信用代码")
    @Sensitive(type = Sensitive.SensitiveType.DEFAULT)
    private String companyCode;
    @Excel(name = "企业联系人")
    @ApiModelProperty("企业联系人")
    @Sensitive(type = Sensitive.SensitiveType.DEFAULT)
    private String companyUser;
    @Excel(name = "联系人电话" )
    @ApiModelProperty("联系人电话")
    @Sensitive(type = Sensitive.SensitiveType.PHONE)
    private String companyPhone;
    @Excel(name = "企业地址")