From 80a2b739a84d59a70b5575a7193e7fa409837ba2 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Wed, 6 Jul 2022 11:23:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=AF=86=E7=A0=81=E5=AF=BC=E8=87=B4=E7=99=BB=E5=BD=95=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E5=BE=88=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #15509
---
.../metersphere/base/mapper/ext/ExtOperatingLogMapper.java | 2 --
.../metersphere/base/mapper/ext/ExtOperatingLogMapper.xml | 3 ---
.../src/main/java/io/metersphere/service/UserService.java | 6 +-----
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtOperatingLogMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtOperatingLogMapper.java
index 600eb87054..f504daa3b3 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtOperatingLogMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtOperatingLogMapper.java
@@ -15,6 +15,4 @@ public interface ExtOperatingLogMapper {
List<OperatingLogDTO> findBySourceIdEnv(@Param("request") OperatingLogRequest request);
List<OperatingLogDTO> findSourceIdByLogIds(@Param("ids") List<String> ids);
-
- boolean isNewInstallation();
}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtOperatingLogMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtOperatingLogMapper.xml
index 002f093299..1e4e5afef7 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtOperatingLogMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtOperatingLogMapper.xml
@@ -110,9 +110,6 @@
order by tt.oper_time desc
</select>
- <select id="isNewInstallation" resultType="boolean">
- SELECT count(1) = 0 from operating_log limit 1
- </select>
<select id="findSourceIdByLogIds" resultType="io.metersphere.log.vo.OperatingLogDTO">
select * from operating_log_resource where operating_log_id in
<foreach collection="ids" item="id" index="index"
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index 53e49b1052..2780c24164 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -1411,11 +1411,7 @@ public class UserService {
}
public boolean checkWhetherChangePasswordOrNot(LoginRequest request) {
- // 首次登录需要提示
- if (extOperatingLogMapper.isNewInstallation()) {
- return true;
- }
-
+ // 只验证admin
// 升级之后 admin 还使用弱密码也提示修改
if (StringUtils.equals("admin", request.getUsername())) {
UserExample example = new UserExample();