@utogether/udp-core 1.0.1 → 1.0.3

package/src/utils/{http → udp/http}/index.ts

@@ -1,8 +1,8 @@
 import Axios, { type AxiosInstance, type AxiosRequestConfig } from 'axios';
 import type { SuHttpError, RequestMethods, SuHttpResponse, SuHttpRequestConfig } from './types.d';
-import { has } from 'xe-utils';
 import { NProgress, cookies, errorMessage } from '@utogether/utils';
 import { isRef } from 'vue';
+import { has } from 'xe-utils';
 
 const kTOKENKEY = 'authorized-token';
 const defaultConfig: AxiosRequestConfig = {
@@ -18,8 +18,8 @@ class SuHttp {
     this.httpInterceptorsRequest();
     this.httpInterceptorsResponse();
   }
-  baseUrl = null;
-  router = null;
+  router = undefined;
+  baseUrl = 'http: //192.168.101.138.8099';
   /** token过期后，暂存待执行的请求 */
   private static requests = [];
 
@@ -81,18 +81,23 @@ class SuHttp {
               if (!SuHttp.isRefreshing) {
                 SuHttp.isRefreshing = true;
                 // requests.push(() => SuHttp.axiosInstance(config));
-
                 this.get(this.baseUrl + '/uath/refreshToken', {
                   refreshToken: data.refreshToken
                 })
                   .then((res: any) => {
-                    // 替换token
-                    this.setToken(res);
-                    config.headers['Authorization'] = 'Bearer ' + res.access_token;
-                    // token 刷新后将数组的方法重新执行
-                    // @ts-ignore
-                    SuHttp.requests.forEach(cb => cb(res.access_token));
-                    SuHttp.requests = []; // 重新请求完清空
+                    if (!res?.access_token) {
+                      this.routeToLogin();
+                    } else {
+                      // 替换token
+                      this.setToken(res);
+                      config.headers['Authorization'] = 'Bearer ' + res.access_token;
+                      // token 刷新后将数组的方法重新执行
+                      SuHttp.requests.forEach(cb => cb(res.access_token));
+                      SuHttp.requests = []; // 重新请求完清空
+                    }
+                  })
+                  .catch(() => {
+                    this.routeToLogin();
                   })
                   .finally(() => {
                     SuHttp.isRefreshing = false;
@@ -130,6 +135,14 @@ class SuHttp {
     // cookies.set(kTOKENKEY, JSON.stringify(cache), { expires: expires_in });
   }
 
+  private routeToLogin() {
+    SuHttp.requests = []; // 重新请求完清空
+    cookies.remove('kCookies_token');
+    cookies.remove('authorized-token');
+    cookies.remove('loginer');
+    this.router.push({ name: 'login' });
+  }
+
   // 响应拦截
   private httpInterceptorsResponse(): void {
     const instance = SuHttp.axiosInstance;
@@ -153,12 +166,12 @@ class SuHttp {
         return response.data;
       },
       (error: SuHttpError) => {
+        const $error = error;
         // @ts-ignore
-        if (has(error.config, 'loading') && isRef(error.config.loading)) {
+        if (has(error.config, 'loading') && isRef(error?.config?.loading)) {
           // @ts-ignore
           error.config.loading.value = false;
         }
-        const $error = error;
         $error.isCancelRequest = Axios.isCancel($error);
         // 关闭进度条动画
         NProgress.done();
@@ -210,27 +223,11 @@ class SuHttp {
           } else {
             const msg = res?.msg || '服务异常';
             errorMessage(msg, { duration: 8000 });
-            // const code = res.code;
-            // if (
-            //   code === "000001" ||
-            //   (code === "-1" && msg.includes("请重新登陆"))
-            // ) {
-            //   // session过期
-            //   cookies.remove("kCookies_token");
-            //   // @ts-ignore
-            //   this.router?.push({
-            //     path: "/login",
-            //     query: { tokenExpire: "Y" },
-            //   });
-            // }
             reject(msg);
           }
         })
         .catch(e => {
-          debugger;
-          if (e?.response?.data?.path === '/refreshToken') {
-            this.router?.push('/login');
-          } else if (e?.code) {
+          if (e?.code) {
             if (e?.response?.status === 401) {
               // @ts-ignore
               return this.router?.push({ path: '/login' });

package/src/utils/{http → udp/http}/types.d.ts

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2022-03-08 15:17:39
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2023-12-01 11:59:12
+ * @LastEditTime: 2023-12-01 13:55:46
  * @Description: SuHttp Axios 类型定义文件
  */
 import type { Method, AxiosError, AxiosResponse, AxiosRequestConfig } from 'axios';
@@ -13,14 +13,10 @@ export type resultType = {
   expires_in: number;
 };
 
-export type RequestMethods = Extract<
-  Method,
-  'get' | 'post' | 'put' | 'delete' | 'patch' | 'option' | 'head'
->;
+export type RequestMethods = Extract<Method, 'get' | 'post' | 'put' | 'delete' | 'patch' | 'option' | 'head'>;
 
 export interface SuHttpError extends AxiosError {
   isCancelRequest?: boolean;
-  loading?: boolean;
 }
 
 export interface SuHttpResponse extends AxiosResponse {

package/src/views/login/login-view.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="select-none">
-    <div class="absolute flex-c right-5 top-3">
+    <div class="absolute flex justify-center items-center right-5 top-3">
       <!-- 主题 -->
       <!-- <el-switch
         v-model="dataTheme"
@@ -55,23 +55,13 @@
                 :rules="[{ required: true, message: $t('message.username'), trigger: 'blur' }]"
                 prop="username"
               >
-                <el-input
-                  v-model.trim="ruleForm.username"
-                  autofocus
-                  clearable
-                  :prefix-icon="useRenderIcon(User)"
-                />
+                <el-input v-model.trim="ruleForm.username" autofocus clearable :prefix-icon="useRenderIcon(User)" />
               </el-form-item>
             </Motion>
 
             <Motion :delay="150">
               <el-form-item prop="passWord">
-                <el-input
-                  v-model="ruleForm.passWord"
-                  clearable
-                  show-password
-                  :prefix-icon="useRenderIcon(Lock)"
-                />
+                <el-input v-model="ruleForm.passWord" clearable show-password :prefix-icon="useRenderIcon(Lock)" />
               </el-form-item>
             </Motion>
             <Motion :delay="250">
@@ -89,9 +79,7 @@
             </Motion>
           </el-form>
         </div>
-        <div class="fixed text-xs text-gray-500 bottom-4">
-          Copyright ©2021{{ sysConfig['copyright'] }}版权所有
-        </div>
+        <div class="fixed text-xs text-gray-500 bottom-4">Copyright ©2021{{ sysConfig['copyright'] }}版权所有</div>
       </div>
     </div>
   </div>
@@ -229,7 +217,7 @@ const insertLoginInfo = username => {
     browserVersion,
     operatingSystem: getPlatform(userAgent)
   };
-  serviceApi.post('/upms/v1/userMonitor', obj);
+  serviceApi.post('/upfm/v1/userMonitor', obj);
 };
 
 /** 使用公共函数，避免`removeEventListener`失效 */
@@ -261,9 +249,7 @@ const getSysConfig = async () => {
       }
     });
     const env = process.env.NODE_ENV;
-    const title = data.list?.find(
-      f => f.configCode === `${env}Title` || f.configCode === 'title'
-    )?.configValue;
+    const title = data.list?.find(f => f.configCode === `${env}Title` || f.configCode === 'title')?.configValue;
     config['title'] = title || 'U-DP';
     sysConfig.value = config;
     setFavicon();

package/src/views/organization/company/CompanyPanel.vue

@@ -96,7 +96,7 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n';
 import { reactive, watch, inject } from 'vue';
-import { VxeUI, VxeFormPropTypes } from 'vxe-table';
+import { VxeUI } from 'vxe-table';
 import { templateRef } from '@vueuse/core';
 import { clone } from 'xe-utils';
 import { successMessage, warnMessage } from '@utogether/utils';
@@ -111,7 +111,7 @@ const data = reactive<IRecord>({
   dataStatus: ''
 });
 const { t } = useI18n();
-const rules: VxeFormPropTypes.Rules = {
+const rules = {
   unitName: [
     {
       required: true,

package/src/views/organization/department/Department.vue

@@ -1,58 +1,58 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-11-17 16:42:14
- * @LastEditors: wei.li
- * @LastEditTime: 2022-05-31 14:17:41
- * @Description: 部门管理
--->
-<template>
-  <div class="u-content-panel">
-    <div class="u-left-panel">
-      <ScrollPane
-        :title="$t('department')"
-        url="/uums/department/treeDepartment"
-        :tree-otions="{ children: 'children', label: 'deptName' }"
-      />
-    </div>
-    <div class="content">
-      <department-panel />
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { ref, provide } from 'vue';
-import ScrollPane from '../../../components/SuScrollTree/ScrollPanel.vue';
-import DepartmentPanel from './DepartmentPanel.vue';
-
-const active: IRecord = ref({});
-const scrollPanelChange = ref(false);
-const treeList: any = ref([]);
-
-provide('active', active);
-
-provide('scrollPanelChange', scrollPanelChange);
-
-provide('treeList', treeList);
-</script>
-
-<style lang="scss" scoped>
-.u-content-panel {
-  box-sizing: border-box;
-  display: flex;
-  width: 100%;
-  height: 84vh;
-  padding: 5px;
-
-  .u-left-panel {
-    width: 250px;
-  }
-
-  .content {
-    flex: 1;
-    width: calc(100% - 250px);
-    height: 82vh;
-    margin: 0 10px;
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:42:14
+ * @LastEditors: wei.li
+ * @LastEditTime: 2022-05-31 14:17:41
+ * @Description: 部门管理
+-->
+<template>
+  <div class="u-content-panel">
+    <div class="u-left-panel">
+      <ScrollPane
+        :title="$t('department')"
+        url="/uums/department/treeDepartment"
+        :tree-otions="{ children: 'children', label: 'deptName' }"
+      />
+    </div>
+    <div class="content">
+      <department-panel />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, provide } from 'vue';
+import ScrollPane from '../../../components/SuScrollTree/ScrollPanel.vue';
+import DepartmentPanel from './DepartmentPanel.vue';
+
+const active: IRecord = ref({});
+const scrollPanelChange = ref(false);
+const treeList: any = ref([]);
+
+provide('active', active);
+
+provide('scrollPanelChange', scrollPanelChange);
+
+provide('treeList', treeList);
+</script>
+
+<style lang="scss" scoped>
+.u-content-panel {
+  box-sizing: border-box;
+  display: flex;
+  width: 100%;
+  height: 84vh;
+  padding: 5px;
+
+  .u-left-panel {
+    width: 250px;
+  }
+
+  .content {
+    flex: 1;
+    width: calc(100% - 250px);
+    height: 82vh;
+    margin: 0 10px;
+  }
+}
+</style>