From 31e5cca4395c8342e9038e3101b8243bb3dde95f Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 18 May 2021 15:46:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=89=8D=E7=AB=AF=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/auth/entity/SysUserEntity.java   |  2 +
 .../java/io/dataease/base/domain/SysUser.java |  2 +
 .../dataease/base/domain/SysUserExample.java  | 70 +++++++++++++++++++
 .../io/dataease/base/mapper/SysUserMapper.xml | 29 ++++++--
 .../dataease/base/mapper/ext/AuthMapper.java  |  1 -
 .../dataease/base/mapper/ext/AuthMapper.xml   |  4 +-
 .../controller/sys/SysUserController.java     | 12 ++++
 .../dataease/service/sys/SysUserService.java  |  8 +++
 frontend/src/api/user.js                      |  7 ++
 frontend/src/components/LangSelect/index.vue  |  2 +-
 frontend/src/layout/components/Topbar.vue     |  8 +--
 frontend/src/store/getters.js                 |  2 +-
 frontend/src/store/modules/app.js             | 12 +---
 frontend/src/store/modules/user.js            | 20 ++++--
 14 files changed, 150 insertions(+), 29 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java b/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
index 2d07480db9..e74ae836d0 100644
--- a/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
+++ b/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
@@ -23,4 +23,6 @@ public class SysUserEntity implements Serializable {
     private String email;
 
     private String phone;
+
+    private String language;
 }
diff --git a/backend/src/main/java/io/dataease/base/domain/SysUser.java b/backend/src/main/java/io/dataease/base/domain/SysUser.java
index 56775ba68b..8f62905999 100644
--- a/backend/src/main/java/io/dataease/base/domain/SysUser.java
+++ b/backend/src/main/java/io/dataease/base/domain/SysUser.java
@@ -35,5 +35,7 @@ public class SysUser implements Serializable {
 
     private Long updateTime;
 
+    private String language;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/dataease/base/domain/SysUserExample.java b/backend/src/main/java/io/dataease/base/domain/SysUserExample.java
index 1bc5260883..27cef73bb8 100644
--- a/backend/src/main/java/io/dataease/base/domain/SysUserExample.java
+++ b/backend/src/main/java/io/dataease/base/domain/SysUserExample.java
@@ -1083,6 +1083,76 @@ public class SysUserExample {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andLanguageIsNull() {
+            addCriterion("`language` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageIsNotNull() {
+            addCriterion("`language` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageEqualTo(String value) {
+            addCriterion("`language` =", value, "language");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageNotEqualTo(String value) {
+            addCriterion("`language` <>", value, "language");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageGreaterThan(String value) {
+            addCriterion("`language` >", value, "language");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageGreaterThanOrEqualTo(String value) {
+            addCriterion("`language` >=", value, "language");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageLessThan(String value) {
+            addCriterion("`language` <", value, "language");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageLessThanOrEqualTo(String value) {
+            addCriterion("`language` <=", value, "language");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageLike(String value) {
+            addCriterion("`language` like", value, "language");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageNotLike(String value) {
+            addCriterion("`language` not like", value, "language");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageIn(List<String> values) {
+            addCriterion("`language` in", values, "language");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageNotIn(List<String> values) {
+            addCriterion("`language` not in", values, "language");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageBetween(String value1, String value2) {
+            addCriterion("`language` between", value1, value2, "language");
+            return (Criteria) this;
+        }
+
+        public Criteria andLanguageNotBetween(String value1, String value2) {
+            addCriterion("`language` not between", value1, value2, "language");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml
index de12f32bbc..41f42fc47a 100644
--- a/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml
@@ -17,6 +17,7 @@
     <result column="pwd_reset_time" jdbcType="BIGINT" property="pwdResetTime" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
+    <result column="language" jdbcType="VARCHAR" property="language" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -78,7 +79,7 @@
   </sql>
   <sql id="Base_Column_List">
     user_id, dept_id, username, nick_name, gender, phone, email, `password`, is_admin, 
-    enabled, create_by, update_by, pwd_reset_time, create_time, update_time
+    enabled, create_by, update_by, pwd_reset_time, create_time, update_time, `language`
   </sql>
   <select id="selectByExample" parameterType="io.dataease.base.domain.SysUserExample" resultMap="BaseResultMap">
     select
@@ -115,14 +116,14 @@
       nick_name, gender, phone, 
       email, `password`, is_admin, 
       enabled, create_by, update_by, 
-      pwd_reset_time, create_time, update_time
-      )
+      pwd_reset_time, create_time, update_time, 
+      `language`)
     values (#{userId,jdbcType=BIGINT}, #{deptId,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, 
       #{nickName,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, 
       #{email,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{isAdmin,jdbcType=BIT}, 
       #{enabled,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR}, 
-      #{pwdResetTime,jdbcType=BIGINT}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}
-      )
+      #{pwdResetTime,jdbcType=BIGINT}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
+      #{language,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.SysUser">
     insert into sys_user
@@ -172,6 +173,9 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="language != null">
+        `language`,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="userId != null">
@@ -219,6 +223,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=BIGINT},
       </if>
+      <if test="language != null">
+        #{language,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.dataease.base.domain.SysUserExample" resultType="java.lang.Long">
@@ -275,6 +282,9 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=BIGINT},
       </if>
+      <if test="record.language != null">
+        `language` = #{record.language,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -296,7 +306,8 @@
       update_by = #{record.updateBy,jdbcType=VARCHAR},
       pwd_reset_time = #{record.pwdResetTime,jdbcType=BIGINT},
       create_time = #{record.createTime,jdbcType=BIGINT},
-      update_time = #{record.updateTime,jdbcType=BIGINT}
+      update_time = #{record.updateTime,jdbcType=BIGINT},
+      `language` = #{record.language,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -346,6 +357,9 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=BIGINT},
       </if>
+      <if test="language != null">
+        `language` = #{language,jdbcType=VARCHAR},
+      </if>
     </set>
     where user_id = #{userId,jdbcType=BIGINT}
   </update>
@@ -364,7 +378,8 @@
       update_by = #{updateBy,jdbcType=VARCHAR},
       pwd_reset_time = #{pwdResetTime,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=BIGINT},
-      update_time = #{updateTime,jdbcType=BIGINT}
+      update_time = #{updateTime,jdbcType=BIGINT},
+      `language` = #{language,jdbcType=VARCHAR}
     where user_id = #{userId,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java
index 050702436a..418ac6375f 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java
@@ -6,7 +6,6 @@ import io.dataease.auth.api.dto.CurrentRoleDto;
 import io.dataease.auth.entity.SysUserEntity;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
-import java.util.Map;
 
 public interface AuthMapper {
 
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
index 8ec4698628..c99b962d5b 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
@@ -20,11 +20,11 @@
 
 
     <select id="findUser" resultMap="baseMap">
-        select user_id, username,nick_name, dept_id, password, enabled,email, phone from sys_user where user_id = #{userId}
+        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language from sys_user where user_id = #{userId}
     </select>
 
     <select id="findUserByName" resultMap="baseMap">
-        select user_id, username,nick_name, dept_id, password, enabled,email, phone from sys_user where username = #{username}
+        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language from sys_user where username = #{username}
     </select>
 
     <select id="roleCodes" resultType="String">
diff --git a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
index 5b877e9327..c098defdfe 100644
--- a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
+++ b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Optional;
 
 @RestController
 @Api(tags = "系统：用户管理")
@@ -89,4 +90,15 @@ public class SysUserController {
     public void updatePersonInfo(@RequestBody SysUserCreateRequest request){
         sysUserService.updatePersonInfo(request);
     }
+
+    @ApiOperation("设置语言")
+    @PostMapping("/setLanguage/{language}")
+    public void setLanguage(@PathVariable String language) {
+        CurrentUserDto user = AuthUtils.getUser();
+        Optional.ofNullable(language).ifPresent(currentLanguage -> {
+            if (!currentLanguage.equals(user.getLanguage())) {
+                sysUserService.setLanguage(user.getUserId(), currentLanguage);
+            }
+        });
+    }
 }
diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
index 9f6e448efc..455cf479ca 100644
--- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java
+++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
@@ -201,4 +201,12 @@ public class SysUserService {
         return userIds.stream().map(sysUserMapper::selectByPrimaryKey).collect(Collectors.toList());
     }
 
+    @CacheEvict(value = AuthConstants.USER_CACHE_NAME, key = "'user' + #userId")
+    public void setLanguage(Long userId,String language) {
+        SysUser sysUser = new SysUser();
+        sysUser.setUserId(userId);
+        sysUser.setLanguage(language);
+        sysUserMapper.updateByPrimaryKeySelective(sysUser);
+    }
+
 }
diff --git a/frontend/src/api/user.js b/frontend/src/api/user.js
index 2f82672213..ee99beb1eb 100644
--- a/frontend/src/api/user.js
+++ b/frontend/src/api/user.js
@@ -43,3 +43,10 @@ export function uiImage(imageId) {
     method: 'get'
   })
 }
+
+export function languageApi(language) {
+  return request({
+    url: '/api/user/setLanguage/' + language,
+    method: 'post'
+  })
+}
diff --git a/frontend/src/components/LangSelect/index.vue b/frontend/src/components/LangSelect/index.vue
index f606735f2c..32c9a4c1fa 100644
--- a/frontend/src/components/LangSelect/index.vue
+++ b/frontend/src/components/LangSelect/index.vue
@@ -33,7 +33,7 @@ export default {
   methods: {
     handleSetLanguage(lang) {
       this.$i18n.locale = lang
-      this.$store.dispatch('app/setLanguage', lang)
+      this.$store.dispatch('user/setLanguage', lang)
       this.$message({
         message: 'Switch Language Success',
         type: 'success'
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue
index 47c850f589..888f58ec3e 100644
--- a/frontend/src/layout/components/Topbar.vue
+++ b/frontend/src/layout/components/Topbar.vue
@@ -35,7 +35,7 @@
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip> -->
 
-<!--        <lang-select class="right-menu-item hover-effect" />-->
+        <lang-select class="right-menu-item hover-effect" />
       </template>
 
       <el-dropdown class="top-dropdown" style="display: flex;align-items: center;">
@@ -72,15 +72,15 @@ import { isExternal } from '@/utils/validate'
 // import Doc from '@/components/Doc'
 // import Screenfull from '@/components/Screenfull'
 // import SizeSelect from '@/components/SizeSelect'
-// import LangSelect from '@/components/LangSelect'
+import LangSelect from '@/components/LangSelect'
 import { getSysUI } from '@/utils/auth'
 export default {
   name: 'Topbar',
   components: {
-    AppLink
+    AppLink,
     // Screenfull,
     // SizeSelect,
-    // LangSelect
+    LangSelect
     // Doc
   },
   data() {
diff --git a/frontend/src/store/getters.js b/frontend/src/store/getters.js
index e7030857aa..b12c9dcaa7 100644
--- a/frontend/src/store/getters.js
+++ b/frontend/src/store/getters.js
@@ -1,6 +1,6 @@
 const getters = {
   sidebar: state => state.app.sidebar,
-  language: state => state.app.language,
+  language: state => state.user.language,
   size: state => state.app.size,
   device: state => state.app.device,
   token: state => state.user.token,
diff --git a/frontend/src/store/modules/app.js b/frontend/src/store/modules/app.js
index d5c7131ade..93eaba66fa 100644
--- a/frontend/src/store/modules/app.js
+++ b/frontend/src/store/modules/app.js
@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie'
-import { getLanguage } from '@/lang/index'
+
 const state = {
   sidebar: {
     opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
@@ -7,7 +7,7 @@ const state = {
     hide: false
   },
   device: 'desktop',
-  language: getLanguage(),
+
   size: Cookies.get('size') || 'small'
 }
 
@@ -32,10 +32,7 @@ const mutations = {
   SET_SIDEBAR_HIDE: (state, status) => {
     state.sidebar.hide = status
   },
-  SET_LANGUAGE: (state, language) => {
-    state.language = language
-    Cookies.set('language', language)
-  },
+
   SET_SIZE: (state, size) => {
     state.size = size
     Cookies.set('size', size)
@@ -57,9 +54,6 @@ const actions = {
   },
   setSize({ commit }, size) {
     commit('SET_SIZE', size)
-  },
-  setLanguage({ commit }, language) {
-    commit('SET_LANGUAGE', language)
   }
 }
 
diff --git a/frontend/src/store/modules/user.js b/frontend/src/store/modules/user.js
index 4b2a70c041..c7757dfa42 100644
--- a/frontend/src/store/modules/user.js
+++ b/frontend/src/store/modules/user.js
@@ -1,8 +1,9 @@
-import { login, logout, getInfo, getUIinfo } from '@/api/user'
+import { login, logout, getInfo, getUIinfo, languageApi } from '@/api/user'
 import { getToken, setToken, removeToken, setSysUI } from '@/utils/auth'
 import { resetRouter } from '@/router'
 import { format } from '@/utils/formatUi'
-
+import { getLanguage } from '@/lang/index'
+import Cookies from 'js-cookie'
 const getDefaultState = () => {
   return {
     token: getToken(),
@@ -14,7 +15,7 @@ const getDefaultState = () => {
     loadMenus: false,
     // 当前用户拥有哪些资源权限
     permissions: [],
-
+    language: getLanguage(),
     uiInfo: null
   }
 }
@@ -51,6 +52,10 @@ const mutations = {
   },
   SET_UI_INFO: (state, info) => {
     state.uiInfo = info
+  },
+  SET_LANGUAGE: (state, language) => {
+    state.language = language
+    Cookies.set('language', language)
   }
 }
 
@@ -87,13 +92,15 @@ const actions = {
         const currentUser = data
         commit('SET_USER', currentUser)
 
-        const { roles, nickName, permissions } = data
+        const { roles, nickName, permissions, language } = data
         commit('SET_ROLES', roles)
 
         commit('SET_NAME', nickName)
         // commit('SET_AVATAR', avatar)
 
         commit('SET_PERMISSIONS', permissions)
+
+        commit('SET_LANGUAGE', language)
         resolve(data)
       }).catch(error => {
         reject(error)
@@ -144,6 +151,11 @@ const actions = {
   },
   setLoginMsg({ commit, msg }) {
     commit('SET_LOGIN_MSG', msg)
+  },
+  setLanguage({ commit }, language) {
+    languageApi(language).then(() => {
+      commit('SET_LANGUAGE', language)
+    })
   }
 }