From 0e12e4ab45db6768a0f45d8952f78b0ae9190723 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 19 五月 2025 16:09:01 +0800
Subject: [PATCH] 手机号登录，去掉短信验证。脱敏
---
project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java | 5 +++++
project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java | 2 ++
project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java | 8 ++++----
project-admin/src/main/resources/application-test.yml | 2 +-
project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java | 3 +++
project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java | 2 ++
project-admin/src/main/resources/application-dev.yml | 2 +-
7 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java
index 2862213..60dfb2a 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java
+++ b/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);
}
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
index a5714ee..411b4ff 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
+++ b/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);
}
diff --git a/project-admin/src/main/resources/application-dev.yml b/project-admin/src/main/resources/application-dev.yml
index e85532c..d15d2bf 100644
--- a/project-admin/src/main/resources/application-dev.yml
+++ b/project-admin/src/main/resources/application-dev.yml
@@ -44,7 +44,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8089
+ port: 8086
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
diff --git a/project-admin/src/main/resources/application-test.yml b/project-admin/src/main/resources/application-test.yml
index f6c65a8..ad20a34 100644
--- a/project-admin/src/main/resources/application-test.yml
+++ b/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
# 浠庡簱鏁版嵁婧�
diff --git a/project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java b/project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java
index e8b5ecf..ad283ad 100644
--- a/project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java
+++ b/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 */
diff --git a/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java b/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
index ffee8d1..e622e67 100644
--- a/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
+++ b/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>()
diff --git a/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java b/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java
index 593de96..4e046ec 100644
--- a/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java
+++ b/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 = "浼佷笟鍦板潃")
--
Gitblit v1.9.1