yuang-framework-ui-common 1.0.19 → 1.0.21

package/lib/config/gatewayConfig.ts

@@ -1,23 +1,20 @@
 import { http } from '../config/httpConfig';
 import { getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem } from '../utils/storageUtils';
 
-const initGateway = () => {
+const initGatewayConfig = () => {
     return new Promise<void>(async resolve => {
-        let gatewayAccessToken = getLocalStorageItem("gatewayAccessToken");
-        if (!gatewayAccessToken) {
-            let res = await http.get('/server/gateway/getGatewayConfig');
-            setLocalStorageItem("gatewayAccessToken", res.data.data.gatewayAccessToken, res.data.data.gatewayTimeout);
-            setLocalStorageItem("gatewayPublicKey", res.data.data.gatewayPublicKey, res.data.data.gatewayTimeout);
-        }
+        let res = await http.get('/server/gateway/getGatewayConfig');
+        setLocalStorageItem("gatewayAccessToken", res.data.data.gatewayAccessToken, res.data.data.gatewayTimeout);
+        setLocalStorageItem("gatewayPublicKey", res.data.data.gatewayPublicKey, res.data.data.gatewayTimeout);
         resolve();
     })
 }
 
-const clearGateway = () => {
+const clearGatewayConfig = () => {
     removeLocalStorageItem("gatewayAccessToken");
     removeLocalStorageItem("gatewayPublicKey");
 }
 export {
-    initGateway,
-    clearGateway
+    initGatewayConfig,
+    clearGatewayConfig
 }

package/lib/config/httpConfig.ts

@@ -3,11 +3,11 @@ import axios from "axios"
 import { showErrorMessage } from '../utils/messageUtils';
 import { alertMessageBox } from '../utils/messageBoxUtils';
 
-import { getSsoLoginUrl, clearSsoAccessToken } from '../utils/ssoUtils';
+import { getSsoLoginUrl, clearSsoAccessToken, setSsoAccessToken } from '../utils/ssoUtils';
 
-import { clearGateway } from '../config/gatewayConfig';
+import { clearGatewayConfig, initGatewayConfig } from '../config/gatewayConfig';
 
-import {getLocalStorageItem} from '../utils/storageUtils'
+import { getLocalStorageItem } from '../utils/storageUtils'
 
 const messageMap = {
     requestError: '请求异常',
@@ -22,12 +22,19 @@ const http = axios.create({
 
 
 /* 请求拦截 */
-http.interceptors.request.use(config => {
+http.interceptors.request.use(async config => {
     config.headers["X-Requested-With"] = 'XMLHttpRequest';
 
     let gatewayAccessToken = getLocalStorageItem("gatewayAccessToken") ?? '';
     let gatewayPublicKey = getLocalStorageItem("gatewayPublicKey") ?? '';
     let ssoAccessToken = getLocalStorageItem("ssoAccessToken") ?? '';
+
+    debugger
+    if(!gatewayAccessToken && config.url != '/server/gateway/getGatewayConfig') {
+        await initGatewayConfig();
+        return axios.request(config);
+    }
+
     if (gatewayAccessToken) {
         config.headers["Gateway-Access-Token"] = gatewayAccessToken;
     }
@@ -68,10 +75,25 @@ http.interceptors.response.use((res) => {
             });
             return Promise.reject(new Error(res?.data?.message));
         } else if (res?.data?.statusCode === 822001) {
-            clearGateway();
+            clearGatewayConfig();
             showErrorMessage(messageMap.requestError);
             return Promise.reject(new Error(res?.data?.message));
+        } else if (res?.data?.statusCode === 815001) {
+            showErrorMessage(res?.data?.message);
+            clearSsoAccessToken();
+            location.href = getSsoLoginUrl();
+            return Promise.reject(new Error(res?.data?.message));
+        } else if (res?.data?.statusCode === 815002) {
+            axios.get('/sso-api/client/auth/getSsoRefreshToken').then(res => {
+                setSsoAccessToken(res.data.data);
+                // 重发请求
+                return axios.request(res.config);
+            })
+        } else if (res?.data?.statusCode === 815003) {
+            showErrorMessage(res?.data?.message);
+            return Promise.reject(new Error(res?.data?.message));
         }
+
         showErrorMessage(res?.data?.message || messageMap.requestError);
         return Promise.reject(new Error(res?.data?.message));
     }

package/lib/config/initConfig.ts

@@ -12,7 +12,7 @@ import 'vant/lib/index.css';
 import {http} from './httpConfig';
 import moment from 'moment';
 
-const initConfig = (app) => {
+const initConfig = (app: any) => {
     app.config.globalProperties.$http = http;
     app.config.globalProperties.$moment = moment;
 

package/lib/utils/dateUtils.ts

@@ -0,0 +1,41 @@
+/**
+ * 某个时间在当前时间的多久前
+ * @param time 需要语义化的时间
+ * @param onlyDate 超过30天是否仅返回日期
+ * @returns {string} 语义化后的时间
+ */
+const getTimeAgoString = (time, onlyDate) => {
+    if (!time) return '';
+    if (typeof time === 'string') time = time.replace(/-/g, '/');
+    let arr = [[], []], stamp = new Date().getTime() - new Date(time).getTime();
+    // 30天以上返回具体日期
+    if (stamp > 1000 * 60 * 60 * 24 * 31) {
+        stamp = new Date(time);
+        arr[0][0] = this.digit(stamp.getFullYear(), 4);
+        arr[0][1] = this.digit(stamp.getMonth() + 1);
+        arr[0][2] = this.digit(stamp.getDate());
+        if (!onlyDate) {  // 是否输出时间
+            arr[1][0] = this.digit(stamp.getHours());
+            arr[1][1] = this.digit(stamp.getMinutes());
+            arr[1][2] = this.digit(stamp.getSeconds());
+        }
+        return arr[0].join('-') + ' ' + arr[1].join(':');
+    }
+    // 30天以内，返回“多久前”
+    if (stamp >= 1000 * 60 * 60 * 24) {
+        return ((stamp / 1000 / 60 / 60 / 24) | 0) + '天前';
+    } else if (stamp >= 1000 * 60 * 60) {
+        return ((stamp / 1000 / 60 / 60) | 0) + '小时前';
+    } else if (stamp >= 1000 * 60 * 3) {  // 3分钟以内为：刚刚
+        return ((stamp / 1000 / 60) | 0) + '分钟前';
+    } else if (stamp < 0) {
+        return '未来';
+    } else {
+        return '刚刚';
+    }
+}
+
+export {
+    getTimeAgoString,
+
+}

package/lib/utils/objectUtils.ts

@@ -1,6 +1,5 @@
 import { cloneDeep } from 'lodash';
 
 export {
-
     cloneDeep
 }

package/lib/utils/uuidUtils.ts

@@ -0,0 +1,26 @@
+/**
+ * 生成UUID
+ * @returns {string}
+ */
+const getUuid = () => {
+    let d = new Date().getTime();
+    if (window.performance && typeof window.performance.now === "function") {
+        d += performance.now(); //use high-precision timer if available
+    }
+    let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = (d + Math.random() * 16) % 16 | 0;
+        d = Math.floor(d / 16);
+        return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+    });
+    return uuid;
+}
+const getShortUuid = () => {
+    let uuid = this.getUuid();
+    uuid = uuid.replace(/-/g, '');
+    return uuid;
+}
+
+export {
+    getUuid,
+    getShortUuid
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "private": false,
   "type": "module",
   "scripts": {

package/src/App.vue

@@ -1,19 +1,8 @@
 <template>
-<RouterView v-if="isShowRouterView"/>
+<RouterView />
 </template>
 <script setup lang="ts">
 import { RouterView } from 'vue-router'
-import { onBeforeMount, ref, getCurrentInstance } from 'vue';
-import { initGateway } from '../lib/config/gatewayConfig'
-
-let isShowRouterView = ref(false);
-
-const { proxy } = getCurrentInstance() as any;
-
-onBeforeMount(async () => {
-  await initGateway();
-  isShowRouterView.value = true;
-})
 </script>
 
 <style scoped>