diff --git a/backend/src/main/java/io/metersphere/base/mapper/UserMapper.java b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.java index 8e738d0d779923f3a0f46976309c9e8ad01d1d30..69d4f622580330054fd4aa4551643d7fe3e0f095 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/UserMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.java @@ -29,8 +29,6 @@ public interface UserMapper { int updateByPrimaryKey(User record); - int updatePassword(User record); - String getDefaultlanguage(String paramKey); } \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml index 43dfaa05ef1a5450796e3196d0c3faf7dcdfba9a..2e9797c759a19e1b95072b754fe451a193cecb09 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml @@ -303,16 +303,5 @@ phone = #{phone,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} - - - update user - set - password=#{password,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=BIGINT} - where id=#{id,jdbcType=VARCHAR} - - + \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.java index 202d02d059012624b05a89c222165f6cee6aa097..b3e7f4a225d1e2d418e38dac4e2d266f79804720 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.java @@ -12,5 +12,5 @@ public interface ExtUserMapper { int updatePassword(User record); - String getDefaultlanguage(String paramKey); + String getDefaultLanguage(String paramKey); } diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml index 161c862d720c150e596d7d5629d8f5d762361e5b..bb4c14a79058cd4cfa0fa22d6f83b791e7a364ee 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml @@ -41,7 +41,7 @@ update_time = #{updateTime,jdbcType=BIGINT} where id=#{id,jdbcType=VARCHAR} - select param_value from system_parameter where param_key=#{paramKey,jdbcType=VARCHAR} diff --git a/backend/src/main/java/io/metersphere/controller/LoginController.java b/backend/src/main/java/io/metersphere/controller/LoginController.java index ca80e0503ea90cec92c9ca595cf577aa82680897..4e46ee8701b2ca5ede729e07d929f7c14190485f 100644 --- a/backend/src/main/java/io/metersphere/controller/LoginController.java +++ b/backend/src/main/java/io/metersphere/controller/LoginController.java @@ -89,8 +89,8 @@ public class LoginController { /*Get default language*/ @PostMapping(value = "/language") - public String getDefaultlanguage() { - return userService.getDefaultlanguage(); + public String getDefaultLanguage() { + return userService.getDefaultLanguage(); } } diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java index cceeee797380729273cda956c73ab8bf7240ef57..7bbf15c563e2971d232664d1f30263787d383414 100644 --- a/backend/src/main/java/io/metersphere/service/UserService.java +++ b/backend/src/main/java/io/metersphere/service/UserService.java @@ -345,8 +345,8 @@ public class UserService { userRoleMapper.insertSelective(userRole); } - public String getDefaultlanguage() { + public String getDefaultLanguage() { final String key = "registry.defaultlanguage"; - return extUserMapper.getDefaultlanguage(key); + return extUserMapper.getDefaultLanguage(key); } } diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue index c9d995de38218d4a20791882c946cc328cc419d2..be61cfa360cdaf054d03a224612927e12be07959 100644 --- a/frontend/src/login/Login.vue +++ b/frontend/src/login/Login.vue @@ -107,9 +107,13 @@ this.$post("signin", this.form, response => { saveLocalStorage(response); let language = response.data.language; - this.$post("language",response=>{ - this.$setLang(language); - }) + if (!language) { + this.$post("language", response => { + language = response.data.language + this.$setLang(language); + }) + } + window.location.href = "/" });