From e8a641f3a38793997228f20f4684594b794506ab Mon Sep 17 00:00:00 2001
From: LiYaoheng <yaoheng_li@qq.com>
Date: Thu, 6 Jun 2024 14:19:55 +0800
Subject: [PATCH 01/15] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E5=8D=95?=
 =?UTF-8?q?=E8=AF=8D=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                  | 2 +-
 .env.production                   | 2 +-
 src/types/env.d.ts                | 5 ++---
 src/views/monitor/admin/index.vue | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index e1f7af6..52553ff 100644
--- a/.env.development
+++ b/.env.development
@@ -11,7 +11,7 @@ VITE_APP_BASE_API = '/dev-api'
 VITE_APP_CONTEXT_PATH = '/'
 
 # 监控地址
-VITE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/applications'
+VITE_APP_MONITOR_ADMIN = 'http://localhost:9090/admin/applications'
 
 # SnailJob 控制台地址
 VITE_APP_SNAILJOB_ADMIN = 'http://localhost:8800/snail-job'
diff --git a/.env.production b/.env.production
index 9188c63..bf9e644 100644
--- a/.env.production
+++ b/.env.production
@@ -8,7 +8,7 @@ VITE_APP_ENV = 'production'
 VITE_APP_CONTEXT_PATH = '/'
 
 # 监控地址
-VITE_APP_MONITRO_ADMIN = '/admin/applications'
+VITE_APP_MONITOR_ADMIN = '/admin/applications'
 
 # SnailJob 控制台地址
 VITE_APP_SNAILJOB_ADMIN = '/snail-job'
diff --git a/src/types/env.d.ts b/src/types/env.d.ts
index bfc37cc..777c858 100644
--- a/src/types/env.d.ts
+++ b/src/types/env.d.ts
@@ -11,9 +11,8 @@ interface ImportMetaEnv {
   VITE_APP_BASE_API: string;
   VITE_APP_BASE_URL: string;
   VITE_APP_CONTEXT_PATH: string;
-  VITE_APP_MONITRO_ADMIN: string;
-  VITE_APP_POWERJOB_ADMIN: string;
-  VITE_APP_EASYRETRY_ADMIN: string;
+  VITE_APP_MONITOR_ADMIN: string;
+  VITE_APP_SNAILJOB_ADMIN: string;
   VITE_APP_ENV: string;
   VITE_APP_ENCRYPT: string;
   VITE_APP_RSA_PUBLIC_KEY: string;
diff --git a/src/views/monitor/admin/index.vue b/src/views/monitor/admin/index.vue
index 04c63b5..b71a5cc 100644
--- a/src/views/monitor/admin/index.vue
+++ b/src/views/monitor/admin/index.vue
@@ -5,5 +5,5 @@
 </template>
 
 <script setup lang="ts">
-const url = ref(import.meta.env.VITE_APP_MONITRO_ADMIN);
+const url = ref(import.meta.env.VITE_APP_MONITOR_ADMIN);
 </script>

From 7904496df115c8df9b757c4c6ee2cb698dd79098 Mon Sep 17 00:00:00 2001
From: zl <11656279+xbbzjsj@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 08:53:59 +0000
Subject: [PATCH 02/15] =?UTF-8?q?=E5=B1=82=E7=BA=A7=E9=94=99=E8=AF=AF,?=
 =?UTF-8?q?=E4=B8=94element-plus=E6=8C=89=E9=9C=80=E5=BC=95=E5=85=A5?=
 =?UTF-8?q?=E4=B8=8D=E7=94=A8=E9=85=8D=E7=BD=AEtsconfig.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zl <11656279+xbbzjsj@user.noreply.gitee.com>
---
 tsconfig.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index e4bf3ac..bb287e9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,9 +19,6 @@
     "paths": {
       "@/*": ["src/*"]
     },
-    "compilerOptions": {
-      "types": ["element-plus/global"]
-    },
     "types": ["vite/client"],
     "skipLibCheck": true,
     "removeComments": true,

From 2c9c837c1b999748e3ec7e0526f5673111d108bd 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, 6 Jun 2024 17:27:39 +0800
Subject: [PATCH 03/15] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E8=AF=B7?=
 =?UTF-8?q?=E5=81=87=E5=A4=A9=E6=95=B0=E8=AE=A1=E7=AE=97=E4=B8=8D=E7=B2=BE?=
 =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index d6210f0..28087ab 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -154,7 +154,7 @@ const changeLeaveTime = () => {
   const startDate = new Date(leaveTime.value[0]).getTime();
   const endDate = new Date(leaveTime.value[1]).getTime();
   const diffInMilliseconds = endDate - startDate;
-  form.value.leaveDays = Math.floor(diffInMilliseconds / (1000 * 60 * 60 * 24));
+  form.value.leaveDays = Math.floor(diffInMilliseconds / (1000 * 60 * 60 * 24)) + 1;
 };
 /** 获取详情 */
 const getInfo = () => {

From f95f6e8390c355bd601849de26b338bb64c97b90 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Fri, 7 Jun 2024 21:38:17 +0800
Subject: [PATCH 04/15] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=8C=89=E9=92=AE=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workflow/processInstance/index.ts    |  2 +-
 src/components/Process/approvalRecord.vue    |  2 +-
 src/components/Process/multiInstanceUser.vue | 60 ++++++++++++--------
 src/views/workflow/leave/leaveEdit.vue       | 47 +++++++--------
 4 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/src/api/workflow/processInstance/index.ts b/src/api/workflow/processInstance/index.ts
index b949b51..6d5e53b 100644
--- a/src/api/workflow/processInstance/index.ts
+++ b/src/api/workflow/processInstance/index.ts
@@ -53,7 +53,7 @@ export const getHistoryList = (businessKey: string): AxiosPromise<Record<string,
  * @param businessKey 业务id
  * @returns
  */
-export const getHistoryRecord = (businessKey: string) => {
+export const getHistoryRecord = (businessKey: string | number) => {
   return request({
     url: `/workflow/processInstance/getHistoryRecord/${businessKey}`,
     method: 'get'
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index 37667ca..bb4ed91 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -67,7 +67,7 @@ const tabActiveName = ref('bpmn');
 const bpmnViewRef = ref<BpmnView>();
 
 //初始化查询审批记录
-const init = async (businessKey: string) => {
+const init = async (businessKey: string | number) => {
   visible.value = true;
   loading.value = true;
   tabActiveName.value = 'bpmn';
diff --git a/src/components/Process/multiInstanceUser.vue b/src/components/Process/multiInstanceUser.vue
index b2039b9..292b1b7 100644
--- a/src/components/Process/multiInstanceUser.vue
+++ b/src/components/Process/multiInstanceUser.vue
@@ -1,22 +1,28 @@
 <template>
-  <el-dialog v-model="visible" draggable :title="title" :width="width" :height="height" append-to-body
-    :close-on-click-modal="false">
-    <div class="p-2" v-if="multiInstance === 'add'">
+  <el-dialog v-model="visible" draggable :title="title" :width="width" :height="height" append-to-body :close-on-click-modal="false">
+    <div v-if="multiInstance === 'add'" class="p-2">
       <el-row :gutter="20">
         <!-- 部门树 -->
         <el-col :lg="4" :xs="24" style="">
           <el-card shadow="hover">
             <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
-            <el-tree class="mt-2" ref="deptTreeRef" node-key="id" :data="deptOptions"
-              :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false"
-              :filter-node-method="filterNode" highlight-current default-expand-all
-              @node-click="handleNodeClick"></el-tree>
+            <el-tree
+              ref="deptTreeRef"
+              class="mt-2"
+              node-key="id"
+              :data="deptOptions"
+              :props="{ label: 'label', children: 'children' }"
+              :expand-on-click-node="false"
+              :filter-node-method="filterNode"
+              highlight-current
+              default-expand-all
+              @node-click="handleNodeClick"
+            ></el-tree>
           </el-card>
         </el-col>
         <el-col :lg="20" :xs="24">
-          <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-            :leave-active-class="proxy?.animate.searchAnimate.leave">
-            <div class="search" v-show="showSearch">
+          <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div v-show="showSearch" class="search">
               <el-form ref="queryFormRef" :model="queryParams" :inline="true">
                 <el-form-item label="用户名称" prop="userName">
                   <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
@@ -25,8 +31,8 @@
                   <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
                 <el-form-item>
-                  <el-button type="primary" @click="handleQuery" icon="Search">搜索</el-button>
-                  <el-button @click="resetQuery" icon="Refresh">重置</el-button>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
                 </el-form-item>
               </el-form>
             </div>
@@ -35,17 +41,16 @@
           <el-card shadow="hover">
             <template #header>
               <el-row :gutter="10">
-                <right-toolbar v-model:showSearch="showSearch" @queryTable="handleQuery" :search="true"></right-toolbar>
+                <right-toolbar v-model:showSearch="showSearch" :search="true" @query-table="handleQuery"></right-toolbar>
               </el-row>
             </template>
 
-            <el-table v-loading="loading" :data="userList" ref="multipleTableRef" row-key="userId"
-              @selection-change="handleSelectionChange">
+            <el-table ref="multipleTableRef" v-loading="loading" :data="userList" row-key="userId" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" />
-              <el-table-column label="用户编号" align="center" key="userId" prop="userId" />
-              <el-table-column label="用户名称" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
-              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
-              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" width="120" />
+              <el-table-column key="userId" label="用户编号" align="center" prop="userId" />
+              <el-table-column key="userName" label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
+              <el-table-column key="nickName" label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
+              <el-table-column key="phonenumber" label="手机号码" align="center" prop="phonenumber" width="120" />
               <el-table-column label="创建时间" align="center" prop="createTime" width="160">
                 <template #default="scope">
                   <span>{{ scope.row.createTime }}</span>
@@ -53,18 +58,23 @@
               </el-table-column>
             </el-table>
 
-            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-              v-model:limit="queryParams.pageSize" @pagination="handleQuery" />
+            <pagination
+              v-show="total > 0"
+              v-model:page="queryParams.pageNum"
+              v-model:limit="queryParams.pageSize"
+              :total="total"
+              @pagination="handleQuery"
+            />
           </el-card>
           <el-card shadow="hover">
-            <el-tag v-for="(user, index) in chooseUserList" :key="user.userId" style="margin:2px" closable
-              @close="handleCloseTag(user, index)">{{ user.userName }}
+            <el-tag v-for="(user, index) in chooseUserList" :key="user.userId" style="margin: 2px" closable @close="handleCloseTag(user, index)"
+              >{{ user.userName }}
             </el-tag>
           </el-card>
         </el-col>
       </el-row>
     </div>
-    <div class="p-2" v-if="multiInstance === 'delete'">
+    <div v-if="multiInstance === 'delete'" class="p-2">
       <el-table v-loading="loading" :data="taskList" @selection-change="handleTaskSelection">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="name" label="任务名称" />
@@ -285,7 +295,7 @@ const handleNodeClick = (data: DeptVO) => {
 //删除tag
 const handleCloseTag = (user: UserVO, index: any) => {
   if (multipleTableRef.value.selection && multipleTableRef.value.selection.length > 0) {
-    multipleTableRef.value.selection.forEach((u: UserVO, i: Number) => {
+    multipleTableRef.value.selection.forEach((u: UserVO, i: number) => {
       if (user.userId === u.userId) {
         multipleTableRef.value.selection.splice(i, 1);
       }
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index 28087ab..a4ed946 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -3,34 +3,10 @@
     <el-card shadow="never">
       <div style="display: flex; justify-content: space-between">
         <div>
-          <el-button
-            v-if="
-              routeParams.type === 'add' ||
-              (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
-            "
-            :loading="buttonLoading"
-            type="info"
-            @click="submitForm('draft')"
-            >暂存</el-button
-          >
-          <el-button
-            v-if="
-              routeParams.type === 'add' ||
-              (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
-            "
-            :loading="buttonLoading"
-            type="primary"
-            @click="submitForm('submit')"
-            >提 交</el-button
-          >
-          <el-button
-            v-if="routeParams.type === 'approval' && form.status && form.status === 'waiting'"
-            :loading="buttonLoading"
-            type="primary"
-            @click="approvalVerifyOpen"
-            >审批</el-button
-          >
-          <el-button v-if="form.status !== 'draft'" type="primary" @click="handleApprovalRecord">流程进度</el-button>
+          <el-button v-if="submitButtonShow" :loading="buttonLoading" type="info" @click="submitForm('draft')">暂存</el-button>
+          <el-button v-if="submitButtonShow" :loading="buttonLoading" type="primary" @click="submitForm('submit')">提 交</el-button>
+          <el-button v-if="approvalButtonShow" :loading="buttonLoading" type="primary" @click="approvalVerifyOpen">审批</el-button>
+          <el-button v-if="form && form.id && form.status !== 'draft'" type="primary" @click="handleApprovalRecord">流程进度</el-button>
         </div>
         <div>
           <el-button style="float: right" @click="goBack()">返回</el-button>
@@ -246,6 +222,21 @@ const goBack = () => {
 const approvalVerifyOpen = async () => {
   submitVerifyRef.value.openDialog(routeParams.value.taskId);
 };
+//校验提交按钮是否显示
+const submitButtonShow = computed(() => {
+  return (
+    routeParams.value.type === 'add' ||
+    (routeParams.value.type === 'update' &&
+      form.value.status &&
+      (form.value.status === 'draft' || form.value.status === 'cancel' || form.value.status === 'back'))
+  );
+});
+
+//校验审批按钮是否显示
+const approvalButtonShow = computed(() => {
+  return routeParams.value.type === 'approval' && form.value.status && form.value.status === 'waiting';
+});
+
 onMounted(() => {
   nextTick(async () => {
     routeParams.value = proxy.$route.query;

From 3c713c9258fbba6e3611c907ab3e730f91a513d1 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: Sat, 15 Jun 2024 15:53:02 +0800
Subject: [PATCH 05/15] update element 2.7.2 => 2.7.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3557360..02277fb 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "diagram-js": "12.3.0",
     "didi": "9.0.2",
     "echarts": "5.5.0",
-    "element-plus": "2.7.2",
+    "element-plus": "2.7.5",
     "file-saver": "2.0.5",
     "fuse.js": "7.0.0",
     "highlight.js": "11.9.0",

From 72610ab1948bf57e0073a0dd377ab84393459ca0 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: Tue, 18 Jun 2024 18:44:17 +0800
Subject: [PATCH 06/15] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E7=99=BB=E5=BD=95=E4=B8=8D=E5=90=8C=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E7=A7=9F=E6=88=B7id?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/SocialCallback/index.vue | 10 +++++++---
 src/views/login.vue                            | 10 +---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index eac66bc..dcc10a6 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -17,18 +17,22 @@ const loading = ref(true);
 const code = route.query.code as string;
 const state = route.query.state as string;
 const source = route.query.source as string;
-const tenantId = localStorage.getItem('tenantId') ? (localStorage.getItem('tenantId') as string) : '000000';
+const tenantId = route.query.tenantId as string ? route.query.tenantId as string : '000000';
 
 const processResponse = async (res: any) => {
   if (res.code !== 200) {
     throw new Error(res.msg);
   }
-  if (res.data !== null) {
+  if (res.data !== null && res.data.access_token !== null) {
     setToken(res.data.access_token);
   }
   ElMessage.success(res.msg);
   setTimeout(() => {
-    location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+    if (res.data !== null  && res.data.domain !== null) {
+      location.href = res.data.domain + import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+    } else {
+      location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+    }
   }, 2000);
 };
 
diff --git a/src/views/login.vue b/src/views/login.vue
index 7e1394e..0bb9a3f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -186,14 +186,6 @@ const initTenantList = async () => {
   }
 };
 
-//检测租户选择框的变化
-watch(
-  () => loginForm.value.tenantId,
-  () => {
-    localStorage.setItem('tenantId', String(loginForm.value.tenantId));
-  }
-);
-
 /**
  * 第三方登录
  * @param type
@@ -202,7 +194,7 @@ const doSocialLogin = (type: string) => {
   authBinding(type).then((res: any) => {
     if (res.code === HttpStatus.SUCCESS) {
       // 获取授权地址跳转
-      window.location.href = res.data;
+      window.location.href = res.data + '&tenantId=' + loginForm.value.tenantId;
     } else {
       ElMessage.error(res.msg);
     }

From 4143285ec6fbe024e5627b380a2081ac937dc0d4 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: Tue, 18 Jun 2024 19:08:51 +0800
Subject: [PATCH 07/15] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E5=8D=8F=E8=AE=AE=E5=A4=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/SocialCallback/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index dcc10a6..17a7631 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -29,7 +29,8 @@ const processResponse = async (res: any) => {
   ElMessage.success(res.msg);
   setTimeout(() => {
     if (res.data !== null  && res.data.domain !== null) {
-      location.href = res.data.domain + import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+      let protocol = window.location.protocol === 'https:' ? 'https://' : 'http://';
+      location.href = protocol + res.data.domain + import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
     } else {
       location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
     }

From 3e7c2f26fa1bfed32ad8e00919edf3ab71930fe4 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: Tue, 18 Jun 2024 22:54:30 +0800
Subject: [PATCH 08/15] =?UTF-8?q?update=20=E5=A2=9E=E5=8A=A0=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E7=BC=93=E5=AD=98=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user/types.ts                 | 1 +
 src/store/modules/user.ts                    | 2 ++
 src/views/system/user/profile/thirdParty.vue | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts
index 3488e9f..0787372 100644
--- a/src/api/system/user/types.ts
+++ b/src/api/system/user/types.ts
@@ -26,6 +26,7 @@ export interface UserQuery extends PageQuery {
  */
 export interface UserVO extends BaseEntity {
   userId: string | number;
+  tenantId: string;
   deptId: number;
   userName: string;
   nickName: string;
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 4122294..67fd740 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -10,6 +10,7 @@ export const useUserStore = defineStore('user', () => {
   const name = ref('');
   const nickname = ref('');
   const userId = ref<string | number>('');
+  const tenantId = ref<string>('');
   const avatar = ref('');
   const roles = ref<Array<string>>([]); // 用户角色编码集合 → 判断路由权限
   const permissions = ref<Array<string>>([]); // 用户权限编码集合 → 判断按钮权限
@@ -49,6 +50,7 @@ export const useUserStore = defineStore('user', () => {
       nickname.value = user.nickName;
       avatar.value = profile;
       userId.value = user.userId;
+      tenantId.value = user.tenantId;
       return Promise.resolve();
     }
     return Promise.reject(err);
diff --git a/src/views/system/user/profile/thirdParty.vue b/src/views/system/user/profile/thirdParty.vue
index 40daa86..3d489b4 100644
--- a/src/views/system/user/profile/thirdParty.vue
+++ b/src/views/system/user/profile/thirdParty.vue
@@ -58,6 +58,7 @@
 <script lang="ts" setup>
 import { authUnlock, authBinding } from '@/api/system/social/auth';
 import { propTypes } from '@/utils/propTypes';
+import useUserStore from "@/store/modules/user";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -85,7 +86,7 @@ const unlockAuth = (row: any) => {
 const authUrl = (source: string) => {
   authBinding(source).then((res: any) => {
     if (res.code === 200) {
-      window.location.href = res.data;
+      window.location.href = res.data + '&tenantId=' + useUserStore().tenantId;
     } else {
       proxy?.$modal.msgError(res.msg);
     }

From 3b254cc16bf01b03e5f4d5951b30838523c4a940 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: Tue, 18 Jun 2024 23:05:40 +0800
Subject: [PATCH 09/15] =?UTF-8?q?update=20=E5=A2=9E=E5=8A=A0=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E7=BC=93=E5=AD=98=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 67fd740..56f369b 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -71,6 +71,7 @@ export const useUserStore = defineStore('user', () => {
 
   return {
     userId,
+    tenantId,
     token,
     nickname,
     avatar,

From 1f2add4b6bece17ed26a4816f447a4e00f22192d 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, 19 Jun 2024 10:11:32 +0800
Subject: [PATCH 10/15] =?UTF-8?q?update=20=E6=9B=B4=E6=8D=A2=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E5=9B=9E=E8=B0=83=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/SocialCallback/index.vue | 18 +++++++++++-------
 src/views/login.vue                            |  2 +-
 src/views/system/user/profile/thirdParty.vue   |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index 17a7631..723d593 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -18,22 +18,18 @@ const code = route.query.code as string;
 const state = route.query.state as string;
 const source = route.query.source as string;
 const tenantId = route.query.tenantId as string ? route.query.tenantId as string : '000000';
+const domain = route.query.domain as string;
 
 const processResponse = async (res: any) => {
   if (res.code !== 200) {
     throw new Error(res.msg);
   }
-  if (res.data !== null && res.data.access_token !== null) {
+  if (res.data !== null) {
     setToken(res.data.access_token);
   }
   ElMessage.success(res.msg);
   setTimeout(() => {
-    if (res.data !== null  && res.data.domain !== null) {
-      let protocol = window.location.protocol === 'https:' ? 'https://' : 'http://';
-      location.href = protocol + res.data.domain + import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
-    } else {
-      location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
-    }
+    location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
   }, 2000);
 };
 
@@ -65,6 +61,14 @@ const loginByCode = async (data: LoginData) => {
 };
 
 const init = async () => {
+  // 如果域名不相等 则重定向处理
+  let host = window.location.host;
+  if (domain !== host) {
+    let urlFull = new URL(window.location.href);
+    urlFull.hostname = domain;
+    window.location.href = urlFull.toString();
+  }
+
   const data: LoginData = {
     socialCode: code,
     socialState: state,
diff --git a/src/views/login.vue b/src/views/login.vue
index 0bb9a3f..02c7d77 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -194,7 +194,7 @@ const doSocialLogin = (type: string) => {
   authBinding(type).then((res: any) => {
     if (res.code === HttpStatus.SUCCESS) {
       // 获取授权地址跳转
-      window.location.href = res.data + '&tenantId=' + loginForm.value.tenantId;
+      window.location.href = res.data + '&tenantId=' + loginForm.value.tenantId + '&domain=' + window.location.host;
     } else {
       ElMessage.error(res.msg);
     }
diff --git a/src/views/system/user/profile/thirdParty.vue b/src/views/system/user/profile/thirdParty.vue
index 3d489b4..ad090c4 100644
--- a/src/views/system/user/profile/thirdParty.vue
+++ b/src/views/system/user/profile/thirdParty.vue
@@ -86,7 +86,7 @@ const unlockAuth = (row: any) => {
 const authUrl = (source: string) => {
   authBinding(source).then((res: any) => {
     if (res.code === 200) {
-      window.location.href = res.data + '&tenantId=' + useUserStore().tenantId;
+      window.location.href = res.data + '&tenantId=' + useUserStore().tenantId + '&domain=' + window.location.host;
     } else {
       proxy?.$modal.msgError(res.msg);
     }

From fe1942c2479d3024d867ab65849737c3e5e7542f 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, 19 Jun 2024 10:16:21 +0800
Subject: [PATCH 11/15] =?UTF-8?q?update=20=E6=9B=B4=E6=8D=A2=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E5=9B=9E=E8=B0=83=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/SocialCallback/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index 723d593..7edae44 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -65,7 +65,7 @@ const init = async () => {
   let host = window.location.host;
   if (domain !== host) {
     let urlFull = new URL(window.location.href);
-    urlFull.hostname = domain;
+    urlFull.host = domain;
     window.location.href = urlFull.toString();
   }
 

From c206ab5b4a38f99bec4ee34d7b01bbabc83fa120 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, 19 Jun 2024 14:29:44 +0800
Subject: [PATCH 12/15] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E7=99=BB=E5=BD=95=E4=B8=8D=E5=90=8C=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E9=87=87=E7=94=A8=E6=96=B0=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/social/auth.ts                  | 8 ++++++--
 src/layout/components/SocialCallback/index.vue | 6 ++++--
 src/views/login.vue                            | 4 ++--
 src/views/system/user/profile/thirdParty.vue   | 4 ++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/api/system/social/auth.ts b/src/api/system/social/auth.ts
index 17a46d3..69f0d7e 100644
--- a/src/api/system/social/auth.ts
+++ b/src/api/system/social/auth.ts
@@ -1,10 +1,14 @@
 import request from '@/utils/request';
 
 // 绑定账号
-export function authBinding(source: string) {
+export function authBinding(source: string, tenantId: string) {
   return request({
     url: '/auth/binding/' + source,
-    method: 'get'
+    method: 'get',
+    params: {
+      tenantId: tenantId,
+      domain: window.location.host
+    }
   });
 }
 
diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index 7edae44..1cfeca8 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -17,8 +17,9 @@ const loading = ref(true);
 const code = route.query.code as string;
 const state = route.query.state as string;
 const source = route.query.source as string;
-const tenantId = route.query.tenantId as string ? route.query.tenantId as string : '000000';
-const domain = route.query.domain as string;
+const stateJson = JSON.parse(atob(state));
+const tenantId = stateJson.tenantId as string ? stateJson.tenantId as string : '000000';
+const domain = stateJson.domain as string;
 
 const processResponse = async (res: any) => {
   if (res.code !== 200) {
@@ -67,6 +68,7 @@ const init = async () => {
     let urlFull = new URL(window.location.href);
     urlFull.host = domain;
     window.location.href = urlFull.toString();
+    return;
   }
 
   const data: LoginData = {
diff --git a/src/views/login.vue b/src/views/login.vue
index 02c7d77..ca2903f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -191,10 +191,10 @@ const initTenantList = async () => {
  * @param type
  */
 const doSocialLogin = (type: string) => {
-  authBinding(type).then((res: any) => {
+  authBinding(type, loginForm.value.tenantId).then((res: any) => {
     if (res.code === HttpStatus.SUCCESS) {
       // 获取授权地址跳转
-      window.location.href = res.data + '&tenantId=' + loginForm.value.tenantId + '&domain=' + window.location.host;
+      window.location.href = res.data;
     } else {
       ElMessage.error(res.msg);
     }
diff --git a/src/views/system/user/profile/thirdParty.vue b/src/views/system/user/profile/thirdParty.vue
index ad090c4..957122a 100644
--- a/src/views/system/user/profile/thirdParty.vue
+++ b/src/views/system/user/profile/thirdParty.vue
@@ -84,9 +84,9 @@ const unlockAuth = (row: any) => {
 };
 
 const authUrl = (source: string) => {
-  authBinding(source).then((res: any) => {
+  authBinding(source, useUserStore().tenantId).then((res: any) => {
     if (res.code === 200) {
-      window.location.href = res.data + '&tenantId=' + useUserStore().tenantId + '&domain=' + window.location.host;
+      window.location.href = res.data;
     } else {
       proxy?.$modal.msgError(res.msg);
     }

From fec61f965088248911bdd14071c2bcedc3cca5a4 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, 19 Jun 2024 14:30:19 +0800
Subject: [PATCH 13/15] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20clientid?=
 =?UTF-8?q?=E5=86=99=E6=AD=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/SocialCallback/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index 1cfeca8..de65aed 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -76,7 +76,7 @@ const init = async () => {
     socialState: state,
     tenantId: tenantId,
     source: source,
-    clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e',
+    clientId: import.meta.env.VITE_APP_CLIENT_ID,
     grantType: 'social'
   };
 

From d1be442c6ee699647d393a09b6247d14cb7a4f33 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Wed, 19 Jun 2024 21:13:58 +0800
Subject: [PATCH 14/15] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E9=80=89?=
 =?UTF-8?q?=E7=9D=80=E4=BA=BA=E5=91=98=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bpmn/panel/TaskPanel.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/bpmn/panel/TaskPanel.vue b/src/bpmn/panel/TaskPanel.vue
index 358fba9..a42de8a 100644
--- a/src/bpmn/panel/TaskPanel.vue
+++ b/src/bpmn/panel/TaskPanel.vue
@@ -281,12 +281,11 @@ const singleUserSelectRef = ref<InstanceType<typeof UserSelect>>();
 const roleSelectRef = ref<InstanceType<typeof RoleSelect>>();
 const dueDateRef = ref<InstanceType<typeof DueDate>>();
 
-const isMultiple = ref(true);
 const openUserSelect = () => {
   userSelectRef.value.open();
 };
 const openSingleUserSelect = () => {
-  if (formData.value.assignee.includes('$')) {
+  if (formData.value.assignee?.includes('$')) {
     formData.value.assignee = '';
   }
   singleUserSelectRef.value.open();

From 71f4d36c2119b75e4f90020d74be0c0007eee380 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, 20 Jun 2024 10:14:58 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E2=99=A5=EF=B8=8F=E5=8F=91=E5=B8=83=20vu?=
 =?UTF-8?q?e=20=E7=89=88=E6=9C=AC=205.2.0=20=E4=B8=8E=20cloud=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=202.2.0?=
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 02277fb..7995d93 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-vue-plus",
-  "version": "5.2.0-BETA",
+  "version": "5.2.0",
   "description": "RuoYi-Vue-Plus多租户管理系统",
   "author": "LionLi",
   "license": "MIT",
diff --git a/src/views/index.vue b/src/views/index.vue
index e02c9fe..d384909 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.0-BETA</span></p>
+        <p><b>当前版本:</b> <span>v5.2.0</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-BETA</span></p>
+        <p><b>当前版本:</b> <span>v2.2.0</span></p>
         <p>
           <el-tag type="danger">&yen;免费开源</el-tag>
         </p>