@das-fed/utils 6.4.0-hot.23 → 6.4.0-hot.25

package/create-api-service/sso/index.js

@@ -1844,13 +1844,13 @@ const _t = (e) => new URL(location.href).searchParams.get(e), _e = {
   // 重定向到登录页
   token: "/api/justauth/oauth-server/v1/visitor/oauth/token"
   // 通过code获取token
-}, { baseURL: kr, noRedireLogin: Cr = !1 } = be(), z = `${location.origin}/`, F = {
+}, { baseURL: kr, noRedireLogin: Cr = !1 } = be(), Nr = "/application", z = location.origin + Nr, F = {
   response_type: "code",
   scope: "sever",
   client_id: "sys",
   client_secret: Lt("das123"),
   state: +/* @__PURE__ */ new Date()
-}, Nr = () => {
+}, Lr = () => {
   const e = Ge(location.href, "redirect_url") || "";
   if (e)
     window.__isAutoCloseApp = !1, window.location.replace(decodeURIComponent(e));
@@ -1869,7 +1869,7 @@ const _t = (e) => new URL(location.href).searchParams.get(e), _e = {
   );
 };
 localStorage.getItem("idelTime") && Pt(Number(localStorage.getItem("idelTime")));
-const Lr = async () => {
+const Ur = async () => {
   const e = _t("code") || "";
   if (!e) return M();
   const { redirectUri: t } = B().getData(), n = Ge(location.href, "kingdee_token") || "";
@@ -1902,11 +1902,11 @@ const Lr = async () => {
     };
     B().save(l), await Ze(o);
     const u = Number(f) - (/* @__PURE__ */ new Date()).getTime();
-    return u && u > 0 && (Pt(u), u && localStorage.setItem("idelTime", u.toString())), Nr(), o;
+    return u && u > 0 && (Pt(u), u && localStorage.setItem("idelTime", u.toString())), Lr(), o;
   } catch {
     return $({ ...F, redirect_uri: t || z });
   }
-}, q = X(!1), Mr = async (e) => {
+}, q = X(!1), Hr = async (e) => {
   if (e.public) return "";
   if (xt.value) return $({ ...F, redirect_uri: z });
   if (q.value)
@@ -1927,7 +1927,7 @@ const Lr = async () => {
   let r = M();
   q.value = !0;
   try {
-    typeof t == "number" && t > 0 && +/* @__PURE__ */ new Date() + 6e4 > t && (r = await Ur(F)), r = await Lr(), q.value = !1;
+    typeof t == "number" && t > 0 && +/* @__PURE__ */ new Date() + 6e4 > t && (r = await Dr(F)), r = await Ur(), q.value = !1;
   } catch {
     q.value = !1;
   }
@@ -1941,7 +1941,7 @@ const Lr = async () => {
   Xe(), sessionStorage.clear(), localStorage.removeItem("idelTime"), B().save({ redirectUri: e.redirect_uri }), window.__isAutoCloseApp = !1, location.replace(s);
 };
 Pr($);
-const Ur = async (e) => {
+const Dr = async (e) => {
   const { baseURL: t } = be(), { refreshToken: n, redirectUri: r } = B().getData();
   try {
     const s = await E.create().post(
@@ -1989,8 +1989,8 @@ const Ur = async (e) => {
 });
 export {
   _t as getQuery,
-  Mr as getToken,
-  Lr as getTokenFromCode,
+  Hr as getToken,
+  Ur as getTokenFromCode,
   F as getTokenParams,
   $ as login,
   z as real_uri,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "6.4.0-hot.23",
+  "version": "6.4.0-hot.25",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "6.4.0-hot.23",
+    "@das-fed/utils": "6.4.0-hot.25",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
@@ -21,8 +21,8 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@das-fed/cli": "6.4.0-hot.23",
-    "@das-fed/web": "6.4.0-hot.23",
+    "@das-fed/cli": "6.4.0-hot.25",
+    "@das-fed/web": "6.4.0-hot.25",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",