@ibiz-template/runtime 0.4.9 → 0.4.10

package/out/interface/service/service/i-auth.service.d.ts

@@ -25,5 +25,13 @@ export interface IAuthService {
      * @return {*}  {Promise<boolean>}
      */
     logout(): Promise<boolean>;
+    /**
+     * 页面未关闭情况下，自动延长登录时间
+     *
+     * @author chitanda
+     * @date 2023-12-11 11:12:54
+     * @return {*}  {Promise<void>}
+     */
+    extendLogin(): Promise<void>;
 }
 //# sourceMappingURL=i-auth.service.d.ts.map

package/out/interface/service/service/i-auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-auth.service.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;;OAQG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC5B"}
+{"version":3,"file":"i-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-auth.service.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;;OAQG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3B;;;;;;OAMG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B"}

package/out/service/service/auth/v7-auth.service.d.ts

@@ -10,5 +10,6 @@ import { IAuthService } from '../../../interface';
 export declare class V7AuthService implements IAuthService {
     login(loginname: string, password: string, rememberme?: boolean): Promise<boolean>;
     logout(): Promise<boolean>;
+    extendLogin(): Promise<void>;
 }
 //# sourceMappingURL=v7-auth.service.d.ts.map

package/out/service/service/auth/v7-auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAC1C,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,OAAO,CAAC;IAyBb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;CAcjC"}
+{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAC1C,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,OAAO,CAAC;IA8Bb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAe1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAqBnC"}

package/out/service/service/auth/v7-auth.service.js

@@ -1,5 +1,5 @@
 import { CoreConst } from '@ibiz-template/core';
-import { clearCookie, setCookie } from 'qx-util';
+import { clearCookie, getCookie, setCookie } from 'qx-util';
 /**
  * 认证服务
  *
@@ -19,9 +19,9 @@ export class V7AuthService {
             });
             const { data } = res;
             if (data && data.token) {
-                setCookie(CoreConst.TOKEN, data.token, 0, true);
+                setCookie(CoreConst.TOKEN, data.token, rememberme ? 7 : 0, true);
                 const expiredDate = new Date().getTime() + (data.expirein || 7199) * 1000;
-                setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, 0, true);
+                setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, rememberme ? 7 : 0, true);
             }
             return true;
         }
@@ -48,4 +48,24 @@ export class V7AuthService {
         }
         return false;
     }
+    async extendLogin() {
+        const token = getCookie(CoreConst.TOKEN);
+        const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
+        if (token && expirein) {
+            // 计算到过期时间所需的延时毫秒数，预留提前量
+            let wait = Number(expirein) - new Date().getTime();
+            const early = 5 * 60 * 1000;
+            wait = wait > early ? wait - early : 0;
+            setTimeout(async () => {
+                const res = await ibiz.net.get(`/uaa/refreshtoken2`);
+                if (res.ok) {
+                    setCookie(CoreConst.TOKEN, res.data.token, 0, true);
+                    const expiredDate = new Date().getTime() + (res.data.expirein || 7199) * 1000;
+                    setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, 0, true);
+                }
+                // 下一次延时做准备
+                this.extendLogin();
+            }, wait);
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/core": "^0.4.9",
-    "@ibiz/model-core": "^0.0.26",
+    "@ibiz/model-core": "^0.0.27",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.10",
     "@types/systemjs": "^6.13.5",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.4.0",
-    "@ibiz/model-core": "^0.0.26",
+    "@ibiz/model-core": "^0.0.27",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "aed61e1dc8d1cf0f56bbed55cfe70d6ea0f5cc58"
+  "gitHead": "88ed67d86d5cb1fe5d8e0683cef777f1c607611f"
 }

package/src/interface/service/service/i-auth.service.ts

@@ -30,4 +30,13 @@ export interface IAuthService {
    * @return {*}  {Promise<boolean>}
    */
   logout(): Promise<boolean>;
+
+  /**
+   * 页面未关闭情况下，自动延长登录时间
+   *
+   * @author chitanda
+   * @date 2023-12-11 11:12:54
+   * @return {*}  {Promise<void>}
+   */
+  extendLogin(): Promise<void>;
 }

package/src/service/service/auth/v7-auth.service.ts

@@ -1,5 +1,5 @@
 import { CoreConst, HttpError } from '@ibiz-template/core';
-import { clearCookie, setCookie } from 'qx-util';
+import { clearCookie, getCookie, setCookie } from 'qx-util';
 import { IAuthService } from '../../../interface';
 
 /**
@@ -25,10 +25,15 @@ export class V7AuthService implements IAuthService {
       });
       const { data } = res;
       if (data && data.token) {
-        setCookie(CoreConst.TOKEN, data.token, 0, true);
+        setCookie(CoreConst.TOKEN, data.token, rememberme ? 7 : 0, true);
         const expiredDate =
           new Date().getTime() + (data.expirein || 7199) * 1000;
-        setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, 0, true);
+        setCookie(
+          CoreConst.TOKEN_EXPIRES,
+          `${expiredDate}`,
+          rememberme ? 7 : 0,
+          true,
+        );
       }
       return true;
     } catch (err: unknown) {
@@ -54,4 +59,26 @@ export class V7AuthService implements IAuthService {
     }
     return false;
   }
+
+  async extendLogin(): Promise<void> {
+    const token = getCookie(CoreConst.TOKEN);
+    const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
+    if (token && expirein) {
+      // 计算到过期时间所需的延时毫秒数，预留提前量
+      let wait = Number(expirein) - new Date().getTime();
+      const early = 5 * 60 * 1000;
+      wait = wait > early ? wait - early : 0;
+      setTimeout(async () => {
+        const res = await ibiz.net.get(`/uaa/refreshtoken2`);
+        if (res.ok) {
+          setCookie(CoreConst.TOKEN, res.data.token, 0, true);
+          const expiredDate =
+            new Date().getTime() + (res.data.expirein || 7199) * 1000;
+          setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, 0, true);
+        }
+        // 下一次延时做准备
+        this.extendLogin();
+      }, wait);
+    }
+  }
 }