Merge remote-tracking branch 'origin/dev' into dev

backend/src/main/java/io/metersphere/base/mapper/UserMapper.java

@@ -2,9 +2,10 @@ package io.metersphere.base.mapper;
 
 import io.metersphere.base.domain.User;
 import io.metersphere.base.domain.UserExample;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface UserMapper {
     long countByExample(UserExample example);
 
@@ -29,4 +30,7 @@ public interface UserMapper {
     int updateByPrimaryKey(User record);
 
     int updatePassword(User record);
+
+    String getDefaultlanguage(String paramKey);
+
 }

backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml

@@ -304,11 +304,15 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <!--修改密码-->
-   <update id="updatePassword" parameterType="io.metersphere.base.domain.User">
+  <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>

backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.java

@@ -3,10 +3,14 @@ package io.metersphere.base.mapper.ext;
 import io.metersphere.base.domain.User;
 import io.metersphere.controller.request.UserRequest;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 public interface ExtUserMapper {
 
     List<User> getUserList(@Param("userRequest") UserRequest request);
+
     int updatePassword(User record);
+
+    String getDefaultlanguage(String paramKey);
 }

backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml

@@ -41,5 +41,9 @@
        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>

backend/src/main/java/io/metersphere/controller/LoginController.java

@@ -87,4 +87,10 @@ public class LoginController {
         return ResultHolder.success("");
     }
 
+    /*Get default language*/
+    @PostMapping(value = "/language")
+    public String getDefaultlanguage() {
+        return userService.getDefaultlanguage();
+    }
+
 }

backend/src/main/java/io/metersphere/service/TestResourcePoolService.java

@@ -223,7 +223,7 @@ public class TestResourcePoolService {
         List<TestResourcePoolDTO> testResourcePools = listResourcePools(request);
         // 重新校验 pool
         for (TestResourcePoolDTO pool : testResourcePools) {
-            // 手动设置成无效的, 排除
+            // 手动设置成无效的, 排除 
             if (INVALID.name().equals(pool.getStatus())) {
                 continue;
             }

backend/src/main/java/io/metersphere/service/UserService.java

@@ -344,4 +344,9 @@ public class UserService {
         userRole.setUpdateTime(System.currentTimeMillis());
         userRoleMapper.insertSelective(userRole);
     }
+
+    public String getDefaultlanguage() {
+        final String key = "registry.defaultlanguage";
+        return extUserMapper.getDefaultlanguage(key);
+    }
 }

frontend/src/login/Login.vue

@@ -107,10 +107,10 @@
             this.$post("signin", this.form, response => {
               saveLocalStorage(response);
               let language = response.data.language;
-              if (!language) {
-                language = 'zh_CN';
-              }
-              this.$setLang(language);
+              this.$post("language",response=>{
+                this.$setLang(language);
+              })
+
               window.location.href = "/"
             });
           } else {