From e5727893bbfb166118798edcdfed805d77c3f606 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 15 Aug 2024 18:05:19 +0800
Subject: [PATCH 1/8] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=90=9C=E7=B4=A2=E7=BB=84=E4=BB=B6=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue | 2 +-
 src/views/system/user/index.vue | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 0b6ba00..f2299d7 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -18,7 +18,7 @@
             <el-form-item label="创建时间" style="width: 308px">
               <el-date-picker
                 v-model="dateRange"
-                value-format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 type="daterange"
                 range-separator="-"
                 start-placeholder="开始日期"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index c1bdcf9..46bffd2 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -39,11 +39,12 @@
                 <el-form-item label="创建时间" style="width: 308px">
                   <el-date-picker
                     v-model="dateRange"
-                    value-format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD HH:mm:ss"
                     type="daterange"
                     range-separator="-"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
+                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
                   ></el-date-picker>
                 </el-form-item>
                 <el-form-item>

From 2c8873402f94d26f6fffc43cfee9d254a27cc2df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 16 Aug 2024 13:01:54 +0800
Subject: [PATCH 2/8] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=8C=B9=E9=85=8D=E6=A8=A1=E5=BC=8F=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=E9=A2=84=E7=BC=96=E8=AF=91=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 56 +-------------------------------------------------
 1 file changed, 1 insertion(+), 55 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index f8b1200..97c8d9d 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -75,61 +75,7 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
         'diagram-js/lib/draw/BaseRenderer',
         'tiny-svg',
         'image-conversion',
-
-        'element-plus/es/components/text/style/css',
-        'element-plus/es/components/collapse-item/style/css',
-        'element-plus/es/components/collapse/style/css',
-        'element-plus/es/components/space/style/css',
-        'element-plus/es/components/container/style/css',
-        'element-plus/es/components/aside/style/css',
-        'element-plus/es/components/main/style/css',
-        'element-plus/es/components/header/style/css',
-        'element-plus/es/components/button-group/style/css',
-        'element-plus/es/components/radio-button/style/css',
-        'element-plus/es/components/checkbox-group/style/css',
-        'element-plus/es/components/form/style/css',
-        'element-plus/es/components/form-item/style/css',
-        'element-plus/es/components/button/style/css',
-        'element-plus/es/components/input/style/css',
-        'element-plus/es/components/input-number/style/css',
-        'element-plus/es/components/switch/style/css',
-        'element-plus/es/components/upload/style/css',
-        'element-plus/es/components/menu/style/css',
-        'element-plus/es/components/col/style/css',
-        'element-plus/es/components/icon/style/css',
-        'element-plus/es/components/row/style/css',
-        'element-plus/es/components/tag/style/css',
-        'element-plus/es/components/dialog/style/css',
-        'element-plus/es/components/loading/style/css',
-        'element-plus/es/components/radio/style/css',
-        'element-plus/es/components/radio-group/style/css',
-        'element-plus/es/components/popover/style/css',
-        'element-plus/es/components/scrollbar/style/css',
-        'element-plus/es/components/tooltip/style/css',
-        'element-plus/es/components/dropdown/style/css',
-        'element-plus/es/components/dropdown-menu/style/css',
-        'element-plus/es/components/dropdown-item/style/css',
-        'element-plus/es/components/sub-menu/style/css',
-        'element-plus/es/components/menu-item/style/css',
-        'element-plus/es/components/divider/style/css',
-        'element-plus/es/components/card/style/css',
-        'element-plus/es/components/link/style/css',
-        'element-plus/es/components/breadcrumb/style/css',
-        'element-plus/es/components/breadcrumb-item/style/css',
-        'element-plus/es/components/table/style/css',
-        'element-plus/es/components/tree-select/style/css',
-        'element-plus/es/components/table-column/style/css',
-        'element-plus/es/components/select/style/css',
-        'element-plus/es/components/option/style/css',
-        'element-plus/es/components/pagination/style/css',
-        'element-plus/es/components/tree/style/css',
-        'element-plus/es/components/alert/style/css',
-        'element-plus/es/components/checkbox/style/css',
-        'element-plus/es/components/date-picker/style/css',
-        'element-plus/es/components/transfer/style/css',
-        'element-plus/es/components/tabs/style/css',
-        'element-plus/es/components/image/style/css',
-        'element-plus/es/components/tab-pane/style/css'
+        'element-plus/es/components/**/css'
       ]
     }
   };

From 3c2d9100b50c7b609d3f3c0367869d023e103d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 26 Aug 2024 11:40:53 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=F0=9F=98=B4=E5=8F=91=E5=B8=83=20vue=20?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=205.2.2=20=E4=B8=8E=20cloud=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=202.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json        | 2 +-
 src/views/index.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 29cb290..48b1571 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-vue-plus",
-  "version": "5.2.1",
+  "version": "5.2.2",
   "description": "RuoYi-Vue-Plus多租户管理系统",
   "author": "LionLi",
   "license": "MIT",
diff --git a/src/views/index.vue b/src/views/index.vue
index aa60a9b..7bd19e4 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -33,7 +33,7 @@
           * 部署方式 Docker 容器编排 一键部署业务集群<br />
           * 国际化 SpringMessage Spring标准国际化方案<br />
         </p>
-        <p><b>当前版本:</b> <span>v5.2.1</span></p>
+        <p><b>当前版本:</b> <span>v5.2.2</span></p>
         <p>
           <el-tag type="danger">&yen;免费开源</el-tag>
         </p>
@@ -77,7 +77,7 @@
           * 分布式监控 Prometheus、Grafana 全方位性能监控<br />
           * 其余与 Vue 版本一致<br />
         </p>
-        <p><b>当前版本:</b> <span>v2.2.0</span></p>
+        <p><b>当前版本:</b> <span>v2.2.1</span></p>
         <p>
           <el-tag type="danger">&yen;免费开源</el-tag>
         </p>

From 34b929d352514573297bb9a6d4e2fa726744aa47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 26 Aug 2024 17:56:35 +0800
Subject: [PATCH 4/8] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=20=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E7=A7=9F=E6=88=B7=E5=AD=97=E5=85=B8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/tenant/index.ts  |  8 ++++++++
 src/views/system/dict/index.vue | 13 +++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts
index 4380dbe..7b7b93f 100644
--- a/src/api/system/tenant/index.ts
+++ b/src/api/system/tenant/index.ts
@@ -91,3 +91,11 @@ export function syncTenantPackage(tenantId: string | number, packageId: string |
     params: data
   });
 }
+
+// 同步租户字典
+export function syncTenantDict() {
+  return request({
+    url: '/system/tenant/syncTenantDict',
+    method: 'get',
+  });
+}
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index d44a04a..4ad70d0 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -49,6 +49,9 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantDict">同步租户字典</el-button>
+          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
@@ -109,11 +112,15 @@
 
 <script setup name="Dict" lang="ts">
 import useDictStore from '@/store/modules/dict';
+import useUserStore from "@/store/modules/user";
 import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type';
 import { DictTypeForm, DictTypeQuery, DictTypeVO } from '@/api/system/dict/type/types';
+import { syncTenantDict } from "@/api/system/tenant";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
+const userStore = useUserStore();
+const userId = ref(userStore.userId);
 const typeList = ref<DictTypeVO[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -239,6 +246,12 @@ const handleRefreshCache = async () => {
   proxy?.$modal.msgSuccess('刷新成功');
   useDictStore().cleanDict();
 };
+/**同步租户字典*/
+const handleSyncTenantDict = async () => {
+  await proxy?.$modal.confirm('确认要同步所有租户字典吗？');
+  let res = await syncTenantDict();
+  proxy?.$modal.msgSuccess(res.msg);
+};
 
 onMounted(() => {
   getList();

From e1860a30fc27d95637220a87f3befd4aae19e7ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 26 Aug 2024 12:29:29 +0000
Subject: [PATCH 5/8] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E5=A5=97=E9=A4=90=E5=AF=BC=E5=87=BA=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E7=BC=96=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 疯狂的狮子Li <15040126243@163.com>
---
 src/views/system/tenantPackage/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index 30c9455..05a0b41 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -321,7 +321,7 @@ const handleDelete = async (row?: TenantPkgVO) => {
 /** 导出按钮操作 */
 const handleExport = () => {
   proxy?.download(
-    'system/package/export',
+    'system/tenant/package/export',
     {
       ...queryParams.value
     },

From 9f13c29cd7c196203f25e2681a8fe2e4b912a76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 4 Sep 2024 16:16:35 +0800
Subject: [PATCH 6/8] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E8=8F=9C=E5=8D=95id=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/gen/genInfoForm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index 0ee9f1d..05b728b 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -274,7 +274,6 @@ const setSubTableColumns = (value: string) => {
 /** 查询菜单下拉树结构 */
 const getMenuTreeselect = async () => {
   const res = await listMenu();
-  res.data.forEach((m) => (m.menuId = m.menuId.toString()));
   const data = proxy?.handleTree<MenuOptionsType>(res.data, 'menuId');
 
   if (data) {

From 25848ea99e788b568be5f115a8abf27149d5a6e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 6 Sep 2024 17:58:28 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E7=99=BB=E5=BD=95=E6=97=A0=E6=B3=95=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B0=E8=BF=87=E6=9C=9F=E5=89=8D=E9=A1=B5=E9=9D=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.ts | 10 ++++++++--
 src/views/login.vue  |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/utils/request.ts b/src/utils/request.ts
index f2a69f0..f8f1f53 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -10,6 +10,7 @@ import FileSaver from 'file-saver';
 import { getLanguage } from '@/lang';
 import { encryptBase64, encryptWithAes, generateAesKey, decryptWithAes, decryptBase64 } from '@/utils/crypto';
 import { encrypt, decrypt } from '@/utils/jsencrypt';
+import router from "@/router";
 
 const encryptHeader = 'encrypt-key';
 let downloadLoadingInstance: LoadingInstance;
@@ -134,8 +135,13 @@ service.interceptors.response.use(
         }).then(() => {
           isRelogin.show = false;
           useUserStore().logout().then(() => {
-              location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
-            });
+            router.replace({
+              path: '/login',
+              query: {
+                redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/')
+              }
+            })
+          });
         }).catch(() => {
           isRelogin.show = false;
         });
diff --git a/src/views/login.vue b/src/views/login.vue
index ca2903f..36e3dec 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -97,7 +97,7 @@ const tenantEnabled = ref(true);
 
 // 注册开关
 const register = ref(false);
-const redirect = ref(undefined);
+const redirect = ref('');
 const loginRef = ref<ElFormInstance>();
 // 租户列表
 const tenantList = ref<TenantVO[]>([]);
@@ -105,7 +105,7 @@ const tenantList = ref<TenantVO[]>([]);
 watch(
   () => router.currentRoute.value,
   (newRoute: any) => {
-    redirect.value = newRoute.query && newRoute.query.redirect;
+    redirect.value = newRoute.query && decodeURIComponent(newRoute.query.redirect);
   },
   { immediate: true }
 );

From 483af137419fdbccc7a74a74c082e7972886a8b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 6 Sep 2024 18:06:16 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E7=99=BB=E5=BD=95=E6=97=A0=E6=B3=95=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B0=E8=BF=87=E6=9C=9F=E5=89=8D=E9=A1=B5=E9=9D=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index 36e3dec..db1fca6 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -97,7 +97,7 @@ const tenantEnabled = ref(true);
 
 // 注册开关
 const register = ref(false);
-const redirect = ref('');
+const redirect = ref('/');
 const loginRef = ref<ElFormInstance>();
 // 租户列表
 const tenantList = ref<TenantVO[]>([]);