Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
41bdc4e3
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 大约 3 年
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
41bdc4e3
编写于
5月 20, 2020
作者:
Q
q4speed
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/dev' into dev
上级
b3724c0f
a7f413fc
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
0 addition
and
36 deletion
+0
-36
backend/src/main/java/io/metersphere/controller/UserController.java
...c/main/java/io/metersphere/controller/UserController.java
+0
-7
backend/src/main/java/io/metersphere/controller/request/member/SetAdminRequest.java
...etersphere/controller/request/member/SetAdminRequest.java
+0
-10
backend/src/main/java/io/metersphere/service/UserService.java
...end/src/main/java/io/metersphere/service/UserService.java
+0
-19
未找到文件。
backend/src/main/java/io/metersphere/controller/UserController.java
浏览文件 @
41bdc4e3
...
@@ -13,7 +13,6 @@ import io.metersphere.controller.request.UserRequest;
...
@@ -13,7 +13,6 @@ import io.metersphere.controller.request.UserRequest;
import
io.metersphere.controller.request.member.AddMemberRequest
;
import
io.metersphere.controller.request.member.AddMemberRequest
;
import
io.metersphere.controller.request.member.EditPassWordRequest
;
import
io.metersphere.controller.request.member.EditPassWordRequest
;
import
io.metersphere.controller.request.member.QueryMemberRequest
;
import
io.metersphere.controller.request.member.QueryMemberRequest
;
import
io.metersphere.controller.request.member.SetAdminRequest
;
import
io.metersphere.controller.request.organization.AddOrgMemberRequest
;
import
io.metersphere.controller.request.organization.AddOrgMemberRequest
;
import
io.metersphere.controller.request.organization.QueryOrgMemberRequest
;
import
io.metersphere.controller.request.organization.QueryOrgMemberRequest
;
import
io.metersphere.dto.UserDTO
;
import
io.metersphere.dto.UserDTO
;
...
@@ -270,10 +269,4 @@ public class UserController {
...
@@ -270,10 +269,4 @@ public class UserController {
return
userService
.
updateUserPassword
(
request
);
return
userService
.
updateUserPassword
(
request
);
}
}
@PostMapping
(
"/set/admin"
)
@RequiresRoles
(
RoleConstants
.
ADMIN
)
public
void
setAdmin
(
@RequestBody
SetAdminRequest
request
)
{
userService
.
setAdmin
(
request
);
}
}
}
backend/src/main/java/io/metersphere/controller/request/member/SetAdminRequest.java
已删除
100644 → 0
浏览文件 @
b3724c0f
package
io.metersphere.controller.request.member
;
import
lombok.Data
;
@Data
public
class
SetAdminRequest
{
private
String
id
;
private
String
adminId
;
private
String
password
;
}
backend/src/main/java/io/metersphere/service/UserService.java
浏览文件 @
41bdc4e3
...
@@ -4,7 +4,6 @@ import io.metersphere.base.domain.*;
...
@@ -4,7 +4,6 @@ import io.metersphere.base.domain.*;
import
io.metersphere.base.mapper.*
;
import
io.metersphere.base.mapper.*
;
import
io.metersphere.base.mapper.ext.ExtUserMapper
;
import
io.metersphere.base.mapper.ext.ExtUserMapper
;
import
io.metersphere.base.mapper.ext.ExtUserRoleMapper
;
import
io.metersphere.base.mapper.ext.ExtUserRoleMapper
;
import
io.metersphere.commons.constants.RoleConstants
;
import
io.metersphere.commons.exception.MSException
;
import
io.metersphere.commons.exception.MSException
;
import
io.metersphere.commons.user.SessionUser
;
import
io.metersphere.commons.user.SessionUser
;
import
io.metersphere.commons.utils.CodingUtil
;
import
io.metersphere.commons.utils.CodingUtil
;
...
@@ -13,7 +12,6 @@ import io.metersphere.controller.request.UserRequest;
...
@@ -13,7 +12,6 @@ import io.metersphere.controller.request.UserRequest;
import
io.metersphere.controller.request.member.AddMemberRequest
;
import
io.metersphere.controller.request.member.AddMemberRequest
;
import
io.metersphere.controller.request.member.EditPassWordRequest
;
import
io.metersphere.controller.request.member.EditPassWordRequest
;
import
io.metersphere.controller.request.member.QueryMemberRequest
;
import
io.metersphere.controller.request.member.QueryMemberRequest
;
import
io.metersphere.controller.request.member.SetAdminRequest
;
import
io.metersphere.controller.request.organization.AddOrgMemberRequest
;
import
io.metersphere.controller.request.organization.AddOrgMemberRequest
;
import
io.metersphere.controller.request.organization.QueryOrgMemberRequest
;
import
io.metersphere.controller.request.organization.QueryOrgMemberRequest
;
import
io.metersphere.dto.UserDTO
;
import
io.metersphere.dto.UserDTO
;
...
@@ -336,23 +334,6 @@ public class UserService {
...
@@ -336,23 +334,6 @@ public class UserService {
return
extUserMapper
.
updatePassword
(
user
);
return
extUserMapper
.
updatePassword
(
user
);
}
}
public
void
setAdmin
(
SetAdminRequest
request
)
{
String
adminId
=
request
.
getAdminId
();
String
password
=
request
.
getPassword
();
if
(!
checkUserPassword
(
adminId
,
password
))
{
MSException
.
throwException
(
"verification failed!"
);
}
UserRole
userRole
=
new
UserRole
();
userRole
.
setId
(
UUID
.
randomUUID
().
toString
());
userRole
.
setUserId
(
request
.
getId
());
// TODO 修改admin sourceId
userRole
.
setSourceId
(
"adminSourceId"
);
userRole
.
setRoleId
(
RoleConstants
.
ADMIN
);
userRole
.
setCreateTime
(
System
.
currentTimeMillis
());
userRole
.
setUpdateTime
(
System
.
currentTimeMillis
());
userRoleMapper
.
insertSelective
(
userRole
);
}
public
String
getDefaultLanguage
()
{
public
String
getDefaultLanguage
()
{
final
String
key
=
"default.language"
;
final
String
key
=
"default.language"
;
return
extUserMapper
.
getDefaultLanguage
(
key
);
return
extUserMapper
.
getDefaultLanguage
(
key
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录