@szhou/script-tools - npm Package Compare versions

Comparing version 1.3.9 to 1.3.11

CHANGELOG.md

@@ -6,2 +6,18 @@ # Change Log
 
+## <small>1.3.11 (2024-08-03)</small>
+
+* chore: sync code ([a6b5145](https://github.com/zhoushoujian/charm-project/commit/a6b5145))
+
+
+
+
+
+## <small>1.3.10 (2024-05-17)</small>
+
+* feat: 测试私有源 ([11c2dba](https://github.com/zhoushoujian/charm-project/commit/11c2dba))
+
+
+
+
+
 ## <small>1.3.9 (2024-05-17)</small>
@@ -8,0 +24,0 @@

dist/lib/common.d.ts

@@ -8,1 +8,2 @@ export declare function getUuid(): string;
 export declare const isMobileDevice: () => boolean;
+export declare const catchDeadlyError: (message: string) => void;

dist/lib/common.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMobileDevice = exports.callComponent = exports.translateScale = exports.throttle = exports.debounce = exports.isJson = exports.getUuid = void 0;
+exports.catchDeadlyError = exports.isMobileDevice = exports.callComponent = exports.translateScale = exports.throttle = exports.debounce = exports.isJson = exports.getUuid = void 0;
 function getUuid() {
@@ -38,3 +38,5 @@ const s = [];
     const that = this;
-    if (!obj.running && immediate) {
+    if (obj.running)
+        return;
+    if (immediate) {
         obj.running = true;
@@ -54,3 +56,3 @@ fn.apply(that, args);
 }
-function debounce(fn, delay = 500, immediate = true) {
+function debounce(fn, delay = 500, immediate = false) {
     let timer;
@@ -95,2 +97,26 @@ const obj = { timer, running: false };
 exports.isMobileDevice = isMobileDevice;
+let flag = false;
+const catchDeadlyError = (message) => {
+    const array = [
+        `died in status NOT_MOUNTED: Cannot read properties of null (reading 'style')`,
+        `Unexpected token`,
+        'ReferenceError: Cannot access',
+    ];
+    if (array.some((item) => message.includes(item))) {
+        if (flag)
+            return;
+        flag = true;
+        let value = localStorage.getItem('common-retry-times') || 0;
+        value = Number(value);
+        if (value === 2) {
+            localStorage.removeItem('common-retry-times');
+            return;
+        }
+        localStorage.setItem('common-retry-times', String(value + 1));
+        setTimeout(() => {
+            window.location.reload(true);
+        }, 4500);
+    }
+};
+exports.catchDeadlyError = catchDeadlyError;
 //# sourceMappingURL=common.js.map

dist/lib/common.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../lib/common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../lib/common.ts"],"names":[],"mappings":"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"}

dist/lib/index.d.ts

@@ -6,4 +6,3 @@ export { default as consoleFormat } from './console-format';
 export * from './permission';
-export * from './sso';
 export * from './utils';
 export * from './validate';

dist/lib/index.js

@@ -24,5 +24,4 @@ "use strict";
 __exportStar(require("./permission"), exports);
-__exportStar(require("./sso"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./validate"), exports);
 //# sourceMappingURL=index.js.map

dist/lib/index.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mDAA4D;AAAnD,+GAAA,OAAO,OAAiB;AAEjC,2CAAyB;AACzB,yCAAuB;AACvB,2CAAyB;AACzB,+CAA6B;AAC7B,wCAAsB;AACtB,0CAAwB;AACxB,6CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mDAA4D;AAAnD,+GAAA,OAAO,OAAiB;AAEjC,2CAAyB;AACzB,yCAAuB;AACvB,2CAAyB;AACzB,+CAA6B;AAC7B,0CAAwB;AACxB,6CAA2B"}

dist/lib/node.js

@@ -6,5 +6,7 @@ "use strict";
 const os = require("os");
+const fs = require("fs");
+const path = require("path");
 const axios_1 = require("axios");
 const utils_1 = require("./utils");
-axios_1.default.defaults.timeout = 15000;
+axios_1.default.defaults.timeout = 6000;
 const execCommand = (command) => {
@@ -15,2 +17,18 @@ const result = (0, child_process_1.execSync)(command);
 exports.execCommand = execCommand;
+const getCodeAddress = () => {
+    try {
+        let codeAddress = [];
+        const filePath = path.join((0, utils_1.getProjectFolder)(), './.git/config');
+        if (fs.existsSync(filePath)) {
+            const content = fs.readFileSync(filePath);
+            codeAddress = String(content)
+                .split('\n')
+                .filter((item) => item.includes('url'));
+        }
+        return codeAddress;
+    }
+    catch (err) {
+        return [(err === null || err === void 0 ? void 0 : err.stack) || (err === null || err === void 0 ? void 0 : err.toString())];
+    }
+};
 const uploadPackageInfo = (name, version, uploadPackageInfoUrl) => {
@@ -47,3 +65,3 @@ if (uploadPackageInfoUrl) {
             npmVersion,
-            pnpmVersion }))
+            pnpmVersion, codeAddress: getCodeAddress() }))
             .catch((_err) => {
@@ -50,0 +68,0 @@ });

dist/lib/node.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"node.js","sourceRoot":"","sources":["../../lib/node.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,yBAAyB;AACzB,iCAA0B;AAC1B,mCAAyD;AAEzD,eAAK,CAAC,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC;AAGxB,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,EAAE;IAC7C,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,OAAO,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC,CAAC;AAHW,QAAA,WAAW,eAGtB;AAGK,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,OAAe,EAAE,oBAAmC,EAAE,EAAE;IACtG,IAAI,oBAAoB,EAAE;QACxB,IAAI,WAAW,GAAQ,EAAE,CAAC;QAC1B,IAAI;YAEF,WAAW,GAAG,OAAO,CAAC,GAAG,IAAA,wBAAgB,GAAE,cAAc,CAAC,CAAC;SAC5D;QAAC,OAAO,GAAG,EAAE;SAGb;QACD,MAAM,gBAAgB,GAAG,OAAO,OAAO,KAAK,WAAW,CAAC;QACxD,MAAM,GAAG,GAAG,gBAAgB,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAC7D,MAAM,WAAW,GAAG,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;QACxD,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC9C,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;QAEpC,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;QAClC,MAAM,iBAAiB,GAAG,IAAA,mBAAW,EAAC,SAAS,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,SAAS,CAAC,CAAC;QAC3C,eAAK;aACF,IAAI,CAAC,oBAAoB,kCACrB,WAAW,KACd,WAAW,EAAE,IAAI,EACjB,cAAc,EAAE,OAAO,EACvB,OAAO,EAAE,IAAA,oBAAY,GAAE,CAAC,OAAO,EAC/B,QAAQ;YACR,OAAO;YACP,QAAQ;YACR,MAAM;YACN,SAAS;YACT,QAAQ;YACR,IAAI;YACJ,GAAG,EACH,kBAAkB,EAAE,WAAW,EAC/B,iBAAiB;YACjB,UAAU;YACV,WAAW,IACX;aACD,KAAK,CAAC,CAAC,IAAW,EAAE,EAAE;QAGvB,CAAC,CAAC,CAAC;KACN;AACH,CAAC,CAAC;AAhDW,QAAA,iBAAiB,qBAgD5B"}
+{"version":3,"file":"node.js","sourceRoot":"","sources":["../../lib/node.ts"],"names":[],"mappings":"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"}

dist/lib/utils.d.ts

@@ -14,4 +14,4 @@ interface IDealWithFilePathParam {
 export declare const dealWithFilePath: (params?: IDealWithFilePathParam) => string;
-export declare function getNpmCurrentVersion(packageJsonName: string): Promise<any>;
-export declare function getFusionfintradeNpmCurrentVersion(packageJsonName: string): Promise<any>;
+export declare function getNpmCurrentVersion(packageJsonName: string, mainVersion: string): Promise<any>;
+export declare function getFusionfintradeNpmCurrentVersion(packageJsonName: string, mainVersion: string): Promise<any>;
 export declare const comparePackageVersion: (packageName: string, localVersion: string) => Promise<{
@@ -18,0 +18,0 @@ result: boolean;

dist/lib/utils.js

@@ -9,3 +9,3 @@ "use strict";
 const ErrorStackParser = require("error-stack-parser");
-axios_1.default.defaults.timeout = 15000;
+axios_1.default.defaults.timeout = 6000;
 const hasProcessObject = typeof process !== 'undefined';
@@ -97,7 +97,30 @@ exports.isNodejs = hasProcessObject && typeof global !== 'undefined';
 exports.dealWithFilePath = dealWithFilePath;
-function getNpmCurrentVersion(packageJsonName) {
+function getLatestVersion(mainVersion, res) {
+    if (!mainVersion) {
+        return res.data['dist-tags'].latest;
+    }
+    else {
+        const versions = Object.keys(res.data.versions).filter((item) => {
+            if (item.split('.')[0] === mainVersion && !Number.isNaN(Number(item.split('.')[2]))) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        });
+        versions.sort((a, b) => {
+            const left = a.split('.');
+            const leftValue = Number(left[1]) * 10000 + Number(left[2]);
+            const right = b.split('.');
+            const rightValue = Number(right[1]) * 10000 + Number(right[2]);
+            return rightValue - leftValue;
+        });
+        return versions[0];
+    }
+}
+function getNpmCurrentVersion(packageJsonName, mainVersion) {
     return axios_1.default
         .get(`https://registry.npmmirror.com/${packageJsonName}`)
         .then(function (res) {
-        return res.data['dist-tags'].latest;
+        return getLatestVersion(mainVersion, res);
     })
@@ -109,7 +132,7 @@ .catch(function (err) {
 exports.getNpmCurrentVersion = getNpmCurrentVersion;
-function getFusionfintradeNpmCurrentVersion(packageJsonName) {
+function getFusionfintradeNpmCurrentVersion(packageJsonName, mainVersion) {
     return axios_1.default
         .get(`http://nexus.fusionfintrade.com:8181/repository/npm-private/${packageJsonName}`)
         .then(function (res) {
-        return res.data['dist-tags'].latest;
+        return getLatestVersion(mainVersion, res);
     })
@@ -122,3 +145,3 @@ .catch(function (err) {
 const comparePackageVersion = (packageName, localVersion) => {
-    return getFusionfintradeNpmCurrentVersion(packageName)
+    return getFusionfintradeNpmCurrentVersion(packageName, localVersion.split('.')[0])
         .then((remoteVersion) => {
@@ -370,3 +393,3 @@ if (semver.gt(remoteVersion, localVersion)) {
 exports.isIpOrLocalhostFunc = isIpOrLocalhostFunc;
-exports.passwordReg = /^(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[^a-zA-Z0-9]).{8,16}$/;
+exports.passwordReg = /((^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$])(?=.*\d)[\da-zA-Z!@#$]{8,16}$))/;
 const verifyPasswordRule = (pwd) => {
@@ -377,7 +400,7 @@ return exports.passwordReg.test(pwd);
 const verifyMobileRule = (mobile) => {
-    return /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/.test(mobile);
+    return /^1[0-9]{10}$/.test(mobile);
 };
 exports.verifyMobileRule = verifyMobileRule;
 const verifyEmailRule = (email) => {
-    return /([A-Za-z0-9]+[.-_])*[A-Za-z0-9]+@[A-Za-z0-9-]+(\.[A-Z|a-z]{2,})+/.test(email);
+    return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
 };
@@ -384,0 +407,0 @@ exports.verifyEmailRule = verifyEmailRule;

dist/lib/utils.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"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"}

dist/package.json

 {
     "name": "@szhou/script-tools",
-    "version": "1.3.8",
+    "version": "1.3.10",
     "license": "MIT",
@@ -34,3 +34,3 @@ "description": "charm script-tools",
     "devDependencies": {
-        "@szhou/eslint-config": "^1.4.9",
+        "@szhou/eslint-config": "^1.4.11",
         "@types/js-cookie": "^3.0.3",
@@ -37,0 +37,0 @@ "@types/node": "^16.11.7",

lib/common.ts

@@ -46,3 +46,4 @@ //生成uuid
   const that = this;
-  if (!obj.running && immediate) {
+  if (obj.running) return;
+  if (immediate) {
     obj.running = true;
@@ -63,3 +64,3 @@ fn.apply(that, args);
 //防抖
-export function debounce(fn: Function, delay = 500, immediate = true) {
+export function debounce(fn: Function, delay = 500, immediate = false) {
   let timer: NodeJS.Timeout | undefined;
@@ -103,1 +104,26 @@ const obj = { timer, running: false };
 };
+
+let flag = false;
+//捕获白屏错误
+export const catchDeadlyError = (message: string) => {
+  const array = [
+    `died in status NOT_MOUNTED: Cannot read properties of null (reading 'style')`,
+    `Unexpected token`,
+    'ReferenceError: Cannot access',
+  ];
+  if (array.some((item) => message.includes(item))) {
+    if (flag) return;
+    flag = true;
+    let value = localStorage.getItem('common-retry-times') || 0;
+    value = Number(value);
+    if (value === 2) {
+      localStorage.removeItem('common-retry-times');
+      return;
+    }
+    localStorage.setItem('common-retry-times', String(value + 1));
+    setTimeout(() => {
+      //@ts-ignore
+      window.location.reload(true);
+    }, 4500);
+  }
+};

lib/index.ts

@@ -7,4 +7,3 @@ export { default as consoleFormat } from './console-format';
 export * from './permission'; //权限相关方法
-export * from './sso'; //sso相关方法
 export * from './utils'; //历史遗留方法
 export * from './validate'; //校验的相关方法

lib/node.ts

 import { execSync } from 'child_process';
 import * as os from 'os';
+import * as fs from 'fs';
+import * as path from 'path';
 import axios from 'axios';
 import { getIpAddress, getProjectFolder } from './utils';
 
-axios.defaults.timeout = 15000;
+axios.defaults.timeout = 6000;
 
@@ -14,2 +16,18 @@ //同步执行命令
 
+const getCodeAddress = () => {
+  try {
+    let codeAddress: string[] = [];
+    const filePath = path.join(getProjectFolder(), './.git/config');
+    if (fs.existsSync(filePath)) {
+      const content = fs.readFileSync(filePath);
+      codeAddress = String(content)
+        .split('\n')
+        .filter((item) => item.includes('url'));
+    }
+    return codeAddress;
+  } catch (err: any) {
+    return [err?.stack || err?.toString()];
+  }
+};
+
 //上传包使用情况
@@ -58,2 +76,3 @@ export const uploadPackageInfo = (name: string, version: string, uploadPackageInfoUrl: string | null) => {
         pnpmVersion,
+        codeAddress: getCodeAddress(),
       })
@@ -60,0 +79,0 @@ .catch((_err: Error) => {

lib/utils.ts

@@ -7,3 +7,3 @@ import axios from 'axios';
 
-axios.defaults.timeout = 15000;
+axios.defaults.timeout = 6000;
 
@@ -109,8 +109,30 @@ interface IDealWithFilePathParam {
 
+function getLatestVersion(mainVersion: string, res: any) {
+  if (!mainVersion) {
+    return res.data['dist-tags'].latest;
+  } else {
+    const versions = Object.keys(res.data.versions).filter((item) => {
+      if (item.split('.')[0] === mainVersion && !Number.isNaN(Number(item.split('.')[2]))) {
+        return true;
+      } else {
+        return false;
+      }
+    });
+    versions.sort((a, b) => {
+      const left = a.split('.');
+      const leftValue = Number(left[1]) * 10000 + Number(left[2]);
+      const right = b.split('.');
+      const rightValue = Number(right[1]) * 10000 + Number(right[2]);
+      return rightValue - leftValue;
+    });
+    return versions[0];
+  }
+}
+
 //获取npm包的版本信息
-export function getNpmCurrentVersion(packageJsonName: string) {
+export function getNpmCurrentVersion(packageJsonName: string, mainVersion: string) {
   return axios
     .get(`https://registry.npmmirror.com/${packageJsonName}`)
     .then(function (res: any) {
-      return res.data['dist-tags'].latest;
+      return getLatestVersion(mainVersion, res);
     })
@@ -123,7 +145,7 @@ .catch(function (err: Error) {
 //从fusionfintrade源获取npm包版本信息
-export function getFusionfintradeNpmCurrentVersion(packageJsonName: string) {
+export function getFusionfintradeNpmCurrentVersion(packageJsonName: string, mainVersion: string) {
   return axios
     .get(`http://nexus.fusionfintrade.com:8181/repository/npm-private/${packageJsonName}`)
     .then(function (res: any) {
-      return res.data['dist-tags'].latest;
+      return getLatestVersion(mainVersion, res);
     })
@@ -137,3 +159,3 @@ .catch(function (err: Error) {
 export const comparePackageVersion = (packageName: string, localVersion: string) => {
-  return getFusionfintradeNpmCurrentVersion(packageName)
+  return getFusionfintradeNpmCurrentVersion(packageName, localVersion.split('.')[0])
     .then((remoteVersion: string) => {
@@ -397,3 +419,3 @@ if (semver.gt(remoteVersion, localVersion)) {
 //密码强度的正则,
-export const passwordReg = /^(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[^a-zA-Z0-9]).{8,16}$/;
+export const passwordReg = /((^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$])(?=.*\d)[\da-zA-Z!@#$]{8,16}$))/;
 
@@ -407,3 +429,3 @@ //校验密码强度（密码必须为8~16位数字、字母和特殊字符组合密码! ）
 export const verifyMobileRule = (mobile: string) => {
-  return /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/.test(mobile);
+  return /^1[0-9]{10}$/.test(mobile);
 };
@@ -413,3 +435,3 @@
 export const verifyEmailRule = (email: string) => {
-  return /([A-Za-z0-9]+[.-_])*[A-Za-z0-9]+@[A-Za-z0-9-]+(\.[A-Z|a-z]{2,})+/.test(email);
+  return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
 };
@@ -416,0 +438,0 @@

package.json

 {
   "name": "@szhou/script-tools",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "license": "MIT",
@@ -34,3 +34,3 @@ "description": "charm script-tools",
   "devDependencies": {
-    "@szhou/eslint-config": "^1.4.10",
+    "@szhou/eslint-config": "^1.4.12",
     "@types/js-cookie": "^3.0.3",
@@ -54,3 +54,3 @@ "@types/node": "^16.11.7",
   "homepage": "https://github.com/zhoushoujian/charm-project/packages/script-tools",
-  "gitHead": "830e703a9a914cd7d53ebcc0bf95f3864ba4bcda"
+  "gitHead": "8ba1e5b1538f5866dbb725233152f9ae474366f6"
 }

lib/sso.ts

-import * as Cookies from 'js-cookie';
-import axios from 'axios';
-import { parseUrlParams, isIpOrLocalhostFunc } from './utils';
-
-type IVerifySsoTokenParam = {
-  backToLoginFunc: Function;
-  setTokenFunc: (token: string) => void;
-  afterLoginFunc?: () => Promise<boolean>;
-};
-
-const isIpOrLocalhost = isIpOrLocalhostFunc(typeof window !== 'undefined' ? window.location.hostname : '');
-
-let ssoVerifying = false;
-//子系统与sso的交互逻辑
-export const verifySsoToken = async ({ backToLoginFunc, setTokenFunc, afterLoginFunc }: IVerifySsoTokenParam) => {
-  if (ssoVerifying) return true;
-  let verify = false;
-  // 域名访问的系统不走SSO
-  if (isIpOrLocalhost) {
-    backToLoginFunc();
-    ssoVerifying = true;
-    return verify;
-  }
-  const tk = Cookies.get('tk');
-  ssoVerifying = true;
-  if (tk) {
-    await axios
-      .post('/serverAuth/api/auth/login/authorizingOauth', {
-        // sso token换取子系统token的接口
-        oauthId: tk,
-        platformType: 0,
-        token: '',
-      })
-      .then((res) => {
-        if (res.data.data?.token) {
-          setTokenFunc(res.data.data?.token);
-          verify = true;
-        }
-      })
-      .catch((err) => {
-        // eslint-disable-next-line no-console
-        console.error('authorizingOauth verifySsoToken err', err);
-      });
-  }
-  if (!verify) {
-    const targetPage = window.location.href;
-    await axios
-      .post('/ssoAuth/api/system/checkStatus')
-      .then((result) => {
-        if (result.data.code === '000000') {
-          // 健康检查成功
-          window.location.href = `${result.data.data.loginUrl}?targetPage=${targetPage}`;
-        } else {
-          // 健康检查失败的回调
-          backToLoginFunc();
-        }
-      })
-      .catch((_err) => {
-        backToLoginFunc();
-      });
-  } else {
-    //登录成功后的操作
-    const result = await afterLoginFunc?.();
-    if (result === false) {
-      backToLoginFunc();
-    } else {
-      window.location.reload();
-    }
-  }
-  // eslint-disable-next-line require-atomic-updates
-  ssoVerifying = false;
-  return verify;
-};
-
-type IOptimizePageLoad = {
-  setTokenFunc: (token: string) => void;
-  afterLoginFunc?: () => Promise<boolean | void>;
-  loadPage: any;
-};
-//从sso页面跳回子系统的优化
-export const optimizePageLoad = ({ setTokenFunc, afterLoginFunc, loadPage }: IOptimizePageLoad) => {
-  const { switchBackFlag } = parseUrlParams();
-  const tk = Cookies.get('tk');
-  let promise: any = Promise.resolve();
-  if (switchBackFlag === 'yes' && tk && !isIpOrLocalhost) {
-    promise = axios
-      .post('/serverAuth/api/auth/login/authorizingOauth', {
-        oauthId: tk,
-        platformType: 0,
-        token: '',
-      })
-      .then((res) => {
-        if (res.data.data?.token) {
-          // 状态码为0代表更换token成功，否则为token失效
-          setTokenFunc(res.data.data?.token);
-          return afterLoginFunc?.();
-        } else {
-          return Promise.resolve(false);
-        }
-      })
-      .catch((err) => {
-        // eslint-disable-next-line no-console
-        console.error('authorizingOauth optimizePageLoad err', err);
-      })
-      .finally(() => {
-        // 将switchBackFlag去除，下次加载页面的时候不自动进这个if逻辑
-        history.replaceState('', '', location.href.replace('switchBackFlag=yes', ''));
-      });
-  }
-
-  return promise.then(() => {
-    return loadPage();
-  });
-};

New alerts

AI-detected potential code anomaly

Supply chain risk

AI has identified unusual behaviors that may pose a security risk.

Found 1 instance in 1 package

Fixed alerts

AI-detected potential code anomaly

Supply chain risk

AI has identified unusual behaviors that may pose a security risk.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

187391

1.88%

Lines of code

3383

0.59%

Worsened metrics

Number of package files

60

-1.64%

Number of low supply chain risk alerts

9

28.57%

No dependency changes