yuang-framework-ui-pc 1.0.5 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-pc",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "private": false,
   "type": "module",
   "scripts": {
@@ -8,8 +8,6 @@
     "build": "vite build",
     "preview": "vite preview",
     "test:unit": "vitest",
-    "test:e2e": "start-server-and-test preview http://localhost:4173 'cypress run --e2e'",
-    "test:e2e:dev": "start-server-and-test 'vite dev --port 4173' http://localhost:4173 'cypress open --e2e'",
     "build-only": "vite build",
     "type-check": "vue-tsc --build --force",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
@@ -19,9 +17,9 @@
     "dist",
     "src"
   ],
-"main": "dist/yuang-framework-ui-pc.umd.js",
-"module": "dist/yuang-framework-ui-pc.es.js",
-"unpkg": "dist/yuang-framework-ui-pc.iife.js",
+  "main": "dist/yuang-framework-ui-pc.umd.js",
+  "module": "dist/yuang-framework-ui-pc.es.js",
+  "unpkg": "dist/yuang-framework-ui-pc.iife.js",
   "author": "yuang",
   "license": "ISC",
   "dependencies": {
@@ -30,6 +28,7 @@
     "axios": "^1.7.3",
     "element-plus": "^2.7.8",
     "js-cookie": "^3.0.5",
+    "moment": "^2.30.1",
     "pinia": "^2.1.7",
     "vue": "^3.4.29",
     "vue-router": "^4.3.3"
@@ -46,7 +45,6 @@
     "@vue/eslint-config-typescript": "^13.0.0",
     "@vue/test-utils": "^2.4.6",
     "@vue/tsconfig": "^0.5.1",
-    "cypress": "^13.12.0",
     "eslint": "^8.57.0",
     "eslint-plugin-cypress": "^3.3.0",
     "eslint-plugin-vue": "^9.23.0",

package/src/config/http.ts

@@ -1,40 +1,37 @@
 import axios from "axios"
 import router from "@/router/index";
 
+import {clearSsoAccessToken} from '@/utils/ssoUtils';
+
 
 const $http = axios.create({
-    baseURL: '/sso-api/',
+    baseURL: '/gateway-api/',
     timeout: 5000,
-    headers: {'Authorization': 'none'}
+    headers: {}
 })
 
 
 /* 请求拦截 */
-$http.interceptors.request.use(
-      config => {
-
-          let anonymousAccessToken = localStorage.getItem("anonymousAccessToken") ?? 'test';
-          let ssoAccessToken = localStorage.getItem("ssoAccessToken") ?? '';
-          if (anonymousAccessToken) {
-              config.headers["anonymousAccessToken"] = anonymousAccessToken;
-          }
-          if (ssoAccessToken) {
-              config.headers["ssoAccessToken"] = ssoAccessToken;
-          }
-
+$http.interceptors.request.use(config => {
 
-          return config;
-      },
-      err => Promise.reject(err)
-);
+    let gatewayAccessToken = localStorage.getItem("gatewayAccessToken") ?? '';
+    let ssoAccessToken = localStorage.getItem("ssoAccessToken") ?? '';
+    if (gatewayAccessToken) {
+        config.headers["Gateway-Access-Token"] = gatewayAccessToken;
+    }
+    if (ssoAccessToken) {
+        config.headers["Sso-Access-Token"] = ssoAccessToken;
+    }
+    config.headers["Request-Id"] = 'test';
+    return config;
+}, err => Promise.reject(err));
 
 
 /* 响应拦截器 */
 $http.interceptors.response.use((res) => {
     // 登录过期处理
     if (res.data.statusCode === 401) {
-        localStorage.removeItem('ssoAccessToken');
-        localStorage.removeItem('ssoRefreshToken');
+        clearSsoAccessToken();
         router.push('/sso/login');
         return Promise.reject(new Error(res.data.message));
     }

package/src/router/index.ts

@@ -1,7 +1,5 @@
 import {createRouter, createWebHistory} from 'vue-router'
 
-import ssoClient from '../common/ssoClient';
-
 const router = createRouter({
     history: createWebHistory(import.meta.env.BASE_URL),
     routes: [

package/src/utils/gatewayUtils.ts

@@ -0,0 +1,22 @@
+import {ElMessage} from 'element-plus/es';
+
+import http from '@/config/http';
+
+const initGateway = () => {
+    return new Promise(async resolve => {
+        let gatewayAccessToken = localStorage.getItem("gatewayAccessToken");
+        if (!gatewayAccessToken) {
+            let res = await http.get('/server/gateway/getGatewayAccessToken');
+            if (res.data.statusCode != 200) {
+                return EleMessage.error(res.data.message);
+            }
+            localStorage.setItem("gatewayAccessToken", res.data.data.gatewayAccessToken);
+        }
+        resolve();
+    })
+
+}
+
+export {
+    initGateway
+}

package/src/utils/ssoUtils.ts

@@ -0,0 +1,57 @@
+'use strict'
+
+
+import Cookies from 'js-cookie'
+
+const getSsoLoginUrl = function () {
+    return 'http://localhost:8110/sso-ui-pc/sso/login';
+}
+
+const getSsoLogoutUrl = function () {
+    return 'http://localhost:8110/sso-ui-pc/sso/logout';
+}
+
+
+const ssoAccessTokenCookieKey:string =  'Sso-Access-Token';
+const ssoAccessTokenLocalKey:string =  'ssoAccessToken';
+const ssoRefreshTokenLocalKey:string =  'ssoRefreshToken';
+
+
+const getSsoAccessToken = function () {
+    let ssoAccessToken = Cookies.get(ssoAccessTokenCookieKey);
+
+    if (!ssoAccessToken) {
+        ssoAccessToken = localStorage.getItem(ssoAccessTokenLocalKey) as string;
+        return ssoAccessToken
+    }
+
+    return ssoAccessToken
+}
+
+
+const setSsoAccessToken = function (param: any) {
+    localStorage.setItem(ssoAccessTokenLocalKey, param.ssoAccessToken);
+    localStorage.setItem(ssoRefreshTokenLocalKey, param.ssoRefreshToken);
+
+}
+
+
+const clearSsoAccessToken = function () {
+    Cookies.remove(ssoAccessTokenCookieKey);
+
+    localStorage.removeItem(ssoAccessTokenLocalKey);
+    localStorage.removeItem(ssoRefreshTokenLocalKey);
+
+}
+
+
+export {
+    getSsoLoginUrl,
+    getSsoLogoutUrl,
+
+    getSsoAccessToken,
+    setSsoAccessToken,
+
+    clearSsoAccessToken,
+
+}

package/dist/style.css

@@ -1 +0,0 @@
-button[data-v-842edfb2]{width:100px;height:50px;display:flex;align-items:center;justify-content:center;border:none;border-radius:10px;cursor:pointer}

package/dist/yuang-framework-ui-pc.es.js

@@ -1,24 +0,0 @@
-import { defineComponent as s, getCurrentInstance as r, openBlock as a, createElementBlock as _, createElementVNode as u } from "vue";
-const l = /* @__PURE__ */ s({
-  __name: "index",
-  setup(e) {
-    const { proxy: t } = r(), n = () => {
-      t.$message.success("我是测试按钮");
-    };
-    return (o, c) => (a(), _("div", null, [
-      u("button", { onClick: n }, "我是测试按钮")
-    ]));
-  }
-}), p = (e, t) => {
-  const n = e.__vccOpts || e;
-  for (const [o, c] of t)
-    n[o] = c;
-  return n;
-}, m = /* @__PURE__ */ p(l, [["__scopeId", "data-v-842edfb2"]]), f = [m], d = function(e) {
-  f.forEach((t) => {
-    e.component(t.name, t);
-  });
-};
-export {
-  d as default
-};

package/dist/yuang-framework-ui-pc.umd.js

@@ -1 +0,0 @@
-(function(e,o){typeof exports=="object"&&typeof module<"u"?module.exports=o(require("vue")):typeof define=="function"&&define.amd?define(["vue"],o):(e=typeof globalThis<"u"?globalThis:e||self,e["yuang-framework-ui-pc"]=o(e.Vue))})(this,function(e){"use strict";const i=[((t,n)=>{const c=t.__vccOpts||t;for(const[s,u]of n)c[s]=u;return c})(e.defineComponent({__name:"index",setup(t){const{proxy:n}=e.getCurrentInstance(),c=()=>{n.$message.success("我是测试按钮")};return(s,u)=>(e.openBlock(),e.createElementBlock("div",null,[e.createElementVNode("button",{onClick:c},"我是测试按钮")]))}}),[["__scopeId","data-v-842edfb2"]])];return function(t){i.forEach(n=>{t.component(n.name,n)})}});

package/src/common/ssoClient.ts

@@ -1,102 +0,0 @@
-'use strict'
-
-
-import Cookies from "js-cookie"
-
-// const getLoginUrl = function () {
-//     return window.$config.sso.loginUrl;
-// }
-//
-// const getLogoutUrl = function () {
-//     return window.$config.sso.logoutUrl;
-// }
-//
-// const getTicketUrl = function () {
-//     return window.$config.sso.ticketUrl;
-// }
-//
-// const getSessionName = function () {
-//     return window.$config.sso.sessionName;
-// }
-
-
-const getUserUid = function () {
-    // const userUid = Cookies.get(getSessionName())
-    //
-    // if (userUid === null || userUid === undefined || userUid.length === 0) {
-    //     return null
-    // }
-    //
-    // return userUid
-}
-
-// const setUserUid = function (userUid) {
-//     Cookies.set(getSessionName(), userUid)
-// }
-
-function getTokenName() {
-    return "ssoAccessToken"
-}
-
-export function getToken() {
-    const token = Cookies.get(getTokenName())
-
-    if (token === null || token === undefined || token.length === 0) {
-        return null
-    }
-
-    return token
-}
-
-// export function setToken(token: String) {
-//     Cookies.set(getTokenName(), token)
-// }
-
-
-
-// const clearUserUid = function () {
-//     Cookies.remove(getSessionName())
-// }
-
-const clearToken = function () {
-    Cookies.remove(getTokenName())
-}
-
-const signOut = function () {
-    // clearUserUid()
-    // clearToken()
-    //
-    // if(window.$config.sso.useMode == 1) {
-    //     var parent = document.querySelector("body");
-    //     var iframe = document.createElement("iframe");
-    //     iframe.setAttribute("src", getLogoutUrl());
-    //     iframe.setAttribute("style", "display:none;");
-    //
-    //     parent.appendChild(iframe);
-    // }else if(window.$config.sso.useMode == 2) {
-    //     let win = window.open(getLogoutUrl());
-    //     setTimeout(()=>{
-    //         win.close();
-    //     },100);
-    // }else{
-    //     const actionUrl = encodeURIComponent(`${window.$config.misAdmin.fullBaseUrl}/server/sso/login?actionUrl=/`)
-    //     window.location.href = `${getLogoutUrl()}?actionUrl=${actionUrl}`
-    // }
-}
-
-
-export default {
-    // getLoginUrl,
-    // getLogoutUrl,
-    // getTicketUrl,
-    // getSessionName,
-
-    getUserUid,
-    // setUserUid,
-    // setToken,
-    getToken,
-    signOut,
-    // clearUserUid,
-    clearToken,
-
-}