Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
bd036513
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,发现更多精彩内容 >>
提交
bd036513
编写于
5月 14, 2020
作者:
C
chenjianxing
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/fit2cloudrd/metersphere-server
into dev
上级
a560fc8d
9e4a3801
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
14 addition
and
23 deletion
+14
-23
backend/src/main/java/io/metersphere/base/mapper/UserMapper.java
.../src/main/java/io/metersphere/base/mapper/UserMapper.java
+0
-2
backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml
...d/src/main/java/io/metersphere/base/mapper/UserMapper.xml
+1
-12
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.java
...in/java/io/metersphere/base/mapper/ext/ExtUserMapper.java
+1
-1
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
...ain/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
+1
-1
backend/src/main/java/io/metersphere/controller/LoginController.java
.../main/java/io/metersphere/controller/LoginController.java
+2
-2
backend/src/main/java/io/metersphere/service/UserService.java
...end/src/main/java/io/metersphere/service/UserService.java
+2
-2
frontend/src/login/Login.vue
frontend/src/login/Login.vue
+7
-3
未找到文件。
backend/src/main/java/io/metersphere/base/mapper/UserMapper.java
浏览文件 @
bd036513
...
@@ -29,8 +29,6 @@ public interface UserMapper {
...
@@ -29,8 +29,6 @@ public interface UserMapper {
int
updateByPrimaryKey
(
User
record
);
int
updateByPrimaryKey
(
User
record
);
int
updatePassword
(
User
record
);
String
getDefaultlanguage
(
String
paramKey
);
}
}
\ No newline at end of file
backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml
浏览文件 @
bd036513
...
@@ -303,16 +303,5 @@
...
@@ -303,16 +303,5 @@
phone = #{phone,jdbcType=VARCHAR}
phone = #{phone,jdbcType=VARCHAR}
where id = #{id,jdbcType=VARCHAR}
where id = #{id,jdbcType=VARCHAR}
</update>
</update>
<!--修改密码-->
<update
id=
"updatePassword"
parameterType=
"io.metersphere.base.domain.User"
>
update user
set
password=#{password,jdbcType=VARCHAR},
update_time = #{updateTime,jdbcType=BIGINT}
where id=#{id,jdbcType=VARCHAR}
</update>
<select
id=
"getDefaultlanguage"
parameterType=
"java.lang.String"
resultType=
"java.lang.String"
>
select param_value from system_parameter
where param_key=#{paramKey,jdbcType=VARCHAR}
</select>
</mapper>
</mapper>
\ No newline at end of file
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.java
浏览文件 @
bd036513
...
@@ -12,5 +12,5 @@ public interface ExtUserMapper {
...
@@ -12,5 +12,5 @@ public interface ExtUserMapper {
int
updatePassword
(
User
record
);
int
updatePassword
(
User
record
);
String
getDefault
l
anguage
(
String
paramKey
);
String
getDefault
L
anguage
(
String
paramKey
);
}
}
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
浏览文件 @
bd036513
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
update_time = #{updateTime,jdbcType=BIGINT}
update_time = #{updateTime,jdbcType=BIGINT}
where id=#{id,jdbcType=VARCHAR}
where id=#{id,jdbcType=VARCHAR}
</update>
</update>
<select
id=
"getDefault
l
anguage"
parameterType=
"java.lang.String"
resultType=
"java.lang.String"
>
<select
id=
"getDefault
L
anguage"
parameterType=
"java.lang.String"
resultType=
"java.lang.String"
>
select param_value from system_parameter
select param_value from system_parameter
where param_key=#{paramKey,jdbcType=VARCHAR}
where param_key=#{paramKey,jdbcType=VARCHAR}
</select>
</select>
...
...
backend/src/main/java/io/metersphere/controller/LoginController.java
浏览文件 @
bd036513
...
@@ -89,8 +89,8 @@ public class LoginController {
...
@@ -89,8 +89,8 @@ public class LoginController {
/*Get default language*/
/*Get default language*/
@PostMapping
(
value
=
"/language"
)
@PostMapping
(
value
=
"/language"
)
public
String
getDefault
l
anguage
()
{
public
String
getDefault
L
anguage
()
{
return
userService
.
getDefault
l
anguage
();
return
userService
.
getDefault
L
anguage
();
}
}
}
}
backend/src/main/java/io/metersphere/service/UserService.java
浏览文件 @
bd036513
...
@@ -345,8 +345,8 @@ public class UserService {
...
@@ -345,8 +345,8 @@ public class UserService {
userRoleMapper
.
insertSelective
(
userRole
);
userRoleMapper
.
insertSelective
(
userRole
);
}
}
public
String
getDefault
l
anguage
()
{
public
String
getDefault
L
anguage
()
{
final
String
key
=
"registry.defaultlanguage"
;
final
String
key
=
"registry.defaultlanguage"
;
return
extUserMapper
.
getDefault
l
anguage
(
key
);
return
extUserMapper
.
getDefault
L
anguage
(
key
);
}
}
}
}
frontend/src/login/Login.vue
浏览文件 @
bd036513
...
@@ -107,9 +107,13 @@
...
@@ -107,9 +107,13 @@
this
.
$post
(
"
signin
"
,
this
.
form
,
response
=>
{
this
.
$post
(
"
signin
"
,
this
.
form
,
response
=>
{
saveLocalStorage
(
response
);
saveLocalStorage
(
response
);
let
language
=
response
.
data
.
language
;
let
language
=
response
.
data
.
language
;
this
.
$post
(
"
language
"
,
response
=>
{
if
(
!
language
)
{
this
.
$setLang
(
language
);
this
.
$post
(
"
language
"
,
response
=>
{
})
language
=
response
.
data
.
language
this
.
$setLang
(
language
);
})
}
window
.
location
.
href
=
"
/
"
window
.
location
.
href
=
"
/
"
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录