ts-glitter 20.4.2 → 20.4.3

package/lowcode/Entry.js

@@ -144,7 +144,7 @@ export class Entry {
             }
             window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
             console.log(`Entry-time:`, window.renderClock.stop());
-            glitter.share.editerVersion = 'V_20.4.2';
+            glitter.share.editerVersion = 'V_20.4.3';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {
@@ -329,6 +329,31 @@ export class Entry {
                 });
             }
         }
+        Entry.checkSeoInfo(glitter);
+    }
+    static checkSeoInfo(glitter) {
+        var _a, _b, _c;
+        glitter.share.last_seo_config = (_a = glitter.share.last_seo_config) !== null && _a !== void 0 ? _a : {
+            title: document.title,
+            description: (_b = document.querySelector('meta[name="description"]')) === null || _b === void 0 ? void 0 : _b.getAttribute('content'),
+            ogImage: (_c = document.querySelector('meta[property="og:image"]')) === null || _c === void 0 ? void 0 : _c.getAttribute('content')
+        };
+        window.glitterInitialHelper.getPageData(glitter.getUrlParameter('page'), (data) => {
+            var _a, _b;
+            if ((data.response.seo_config && (data.response.seo_config.title && data.response.seo_config.content)) && ([data.response.seo_config.title, data.response.seo_config.content].join('') !== [
+                glitter.share.last_seo_config.title,
+                glitter.share.last_seo_config.description,
+            ].join(''))) {
+                glitter.share.last_seo_config.title = data.response.seo_config.title;
+                glitter.share.last_seo_config.description = data.response.seo_config.content;
+                (_a = document.querySelector('meta[name="description"]')) === null || _a === void 0 ? void 0 : _a.setAttribute('content', data.response.seo_config.content);
+                (_b = document.querySelector('meta[name="og:description"]')) === null || _b === void 0 ? void 0 : _b.setAttribute('content', data.response.seo_config.content);
+                document.title = data.response.seo_config.title;
+            }
+            setTimeout(() => {
+                Entry.checkSeoInfo(glitter);
+            }, 500);
+        });
     }
     static checkIframe(glitter) {
         if (glitter.getUrlParameter('isIframe') === 'true') {

package/lowcode/Entry.ts

@@ -25,6 +25,7 @@ export class Entry {
         return originalReplaceState.apply(history, arguments);
       }
     };
+    //進入時就要提供堆棧，避免頁面返回問題
     window.history.pushState({}, glitter.document.title,location.href);
     function next(){
       //判斷結帳成功清空購物車紀錄
@@ -145,7 +146,7 @@ export class Entry {
       }
       (window as any).renderClock = (window as any).renderClock ?? createClock();
       console.log(`Entry-time:`, (window as any).renderClock.stop());
-      glitter.share.editerVersion = 'V_20.4.2';
+      glitter.share.editerVersion = 'V_20.4.3';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {
@@ -334,7 +335,31 @@ export class Entry {
         })
       }
     }
+    Entry.checkSeoInfo(glitter)
+  }
 
+  //定期確認SEO資訊並更新
+  public static checkSeoInfo(glitter:Glitter){
+    glitter.share.last_seo_config=glitter.share.last_seo_config ?? {
+      title:document.title,
+      description:document.querySelector('meta[name="description"]')?.getAttribute('content'),
+      ogImage:document.querySelector('meta[property="og:image"]')?.getAttribute('content')
+    };
+    (window as any).glitterInitialHelper.getPageData(glitter.getUrlParameter('page'), (data: any) => {
+      if((data.response.seo_config && (data.response.seo_config.title && data.response.seo_config.content)) && ([data.response.seo_config.title,data.response.seo_config.content].join('') !== [
+        glitter.share.last_seo_config.title,
+        glitter.share.last_seo_config.description,
+      ].join(''))){
+        glitter.share.last_seo_config.title=data.response.seo_config.title;
+        glitter.share.last_seo_config.description=data.response.seo_config.content;
+        document.querySelector('meta[name="description"]')?.setAttribute('content',data.response.seo_config.content);
+        document.querySelector('meta[name="og:description"]')?.setAttribute('content',data.response.seo_config.content);
+        document.title=data.response.seo_config.title;
+      }
+      setTimeout(()=>{
+        Entry.checkSeoInfo(glitter)
+      },500)
+    })
   }
 
   // 判斷是否為 Iframe 來覆寫 Glitter 代碼

package/lowcode/glitter-base/route/user.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { BaseApi } from '../../glitterBundle/api/base.js';
 import { GlobalUser } from '../global/global-user.js';
 import { ApiShop } from './shopping.js';
+import { ShareDialog } from '../../dialog/ShareDialog.js';
 export class ApiUser {
     static register(json) {
         return BaseApi.create({
@@ -208,16 +209,28 @@ export class ApiUser {
         });
     }
     static phoneVerify(phone_number) {
-        return BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/user/phone-verify`,
-            type: 'POST',
-            headers: {
-                'g-app': getConfig().config.appName,
-                'Content-Type': 'application/json',
-            },
-            data: JSON.stringify({
-                phone_number: phone_number,
-            }),
+        return new Promise((resolve, reject) => {
+            BaseApi.create({
+                url: getBaseUrl() + `/api-public/v1/user/phone-verify`,
+                type: 'POST',
+                headers: {
+                    'g-app': getConfig().config.appName,
+                    'Content-Type': 'application/json',
+                },
+                data: JSON.stringify({
+                    phone_number: phone_number,
+                }),
+            }).then((res) => {
+                if (res.response.out_limit) {
+                    const dialog = new ShareDialog(window.glitter);
+                    dialog.errorMessage({
+                        text: '連續驗證失敗超過三次，請聯絡客服進行修改'
+                    });
+                }
+                else {
+                    resolve(res);
+                }
+            });
         });
     }
     static registerFCM(userID, deviceToken, app_name) {

package/lowcode/glitter-base/route/user.ts

@@ -1,6 +1,7 @@
 import { BaseApi } from '../../glitterBundle/api/base.js';
 import { GlobalUser } from '../global/global-user.js';
 import { ApiShop } from './shopping.js';
+import { ShareDialog } from '../../dialog/ShareDialog.js';
 
 export class ApiUser {
   public static register(json: { account: string; pwd: string; userData: any }) {
@@ -219,17 +220,28 @@ export class ApiUser {
   }
 
   public static phoneVerify(phone_number: string) {
-    return BaseApi.create({
-      url: getBaseUrl() + `/api-public/v1/user/phone-verify`,
-      type: 'POST',
-      headers: {
-        'g-app': getConfig().config.appName,
-        'Content-Type': 'application/json',
-      },
-      data: JSON.stringify({
-        phone_number: phone_number,
-      }),
-    });
+    return new Promise<{result:boolean,response:any}>((resolve, reject) => {
+      BaseApi.create({
+        url: getBaseUrl() + `/api-public/v1/user/phone-verify`,
+        type: 'POST',
+        headers: {
+          'g-app': getConfig().config.appName,
+          'Content-Type': 'application/json',
+        },
+        data: JSON.stringify({
+          phone_number: phone_number,
+        }),
+      }).then((res)=>{
+        if(res.response.out_limit){
+         const dialog=new ShareDialog((window as any).glitter);
+         dialog.errorMessage({
+           text:'連續驗證失敗超過三次，請聯絡客服進行修改'
+         })
+        }else{
+          resolve(res)
+        }
+      })
+    })
   }
 
   public static registerFCM(userID: string, deviceToken: string, app_name?: string) {

package/lowcode/official_event/page/change-page.js

@@ -20,6 +20,7 @@ class ChangePage {
             url.searchParams.set('page', link);
             const saasConfig = window.saasConfig;
             window.glitterInitialHelper.getPageData(link, (data) => {
+                console.log(`seo_config==>`, data.response.seo_config);
                 if (data.response.result.length === 0) {
                     const url = new URL("./", location.href);
                     url.searchParams.set('page', data.response.redirect);

package/lowcode/official_event/page/change-page.ts

@@ -17,6 +17,7 @@ class ChangePage {
                 appConfig: any
             } = (window as any).saasConfig;
             (window as any).glitterInitialHelper.getPageData(link, (data: any) => {
+                console.log(`seo_config==>`,data.response.seo_config)
                 if (data.response.result.length === 0) {
                     const url = new URL("./", location.href)
                     url.searchParams.set('page', data.response.redirect)

package/lowcode/public-components/blogs/blogs-01.ts

@@ -8,6 +8,7 @@ import { GlobalUser } from '../../glitter-base/global/global-user.js';
 
 export class Blogs01 {
   static main(gvc: GVC, subData: any) {
+
     if (subData.content.generator !== 'page_editor') {
       const dd = subData.content;
       return `<div class="container mx-auto fr-view mb-5" style="max-width: 1100px;font-family: 'Source Sans Pro', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', 'STHeiti', 'WenQuanYi Micro Hei', SimSun, sans-serif;">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-glitter",
-  "version": "20.4.2",
+  "version": "20.4.3",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/api-public/services/phone-verify.d.ts

@@ -0,0 +1,3 @@
+export declare class PhoneVerify {
+    static verify(phone: string, code: string): Promise<boolean>;
+}

package/src/api-public/services/phone-verify.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PhoneVerify = void 0;
+const redis_js_1 = __importDefault(require("../../modules/redis.js"));
+class PhoneVerify {
+    static async verify(phone, code) {
+        if (await redis_js_1.default.getValue(`verify-phone-${phone}`) === code) {
+            await redis_js_1.default.deleteKey(`verify-phone-${phone}-last-count`);
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+}
+exports.PhoneVerify = PhoneVerify;
+//# sourceMappingURL=phone-verify.js.map

package/src/api-public/services/phone-verify.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"phone-verify.js","sourceRoot":"","sources":["phone-verify.ts"],"names":[],"mappings":";;;;;;AAAA,sEAA2C;AAE3C,MAAa,WAAW;IACf,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAY,EAAC,IAAW;QACjD,IAAG,MAAM,kBAAK,CAAC,QAAQ,CAAC,gBAAgB,KAAK,EAAE,CAAC,KAAG,IAAI,EAAC,CAAC;YACvD,MAAM,kBAAK,CAAC,SAAS,CAAC,gBAAgB,KAAK,aAAa,CAAC,CAAC;YAC1D,OAAO,IAAI,CAAC;QACd,CAAC;aAAI,CAAC;YACJ,OAAO,KAAK,CAAC;QACf,CAAC;IAEH,CAAC;CACF;AAVD,kCAUC"}

package/src/api-public/services/phone-verify.ts

@@ -0,0 +1,13 @@
+import redis from '../../modules/redis.js';
+
+export class PhoneVerify{
+  public static async verify(phone:string,code:string){
+    if(await redis.getValue(`verify-phone-${phone}`)===code){
+      await redis.deleteKey(`verify-phone-${phone}-last-count`);
+      return true;
+    }else{
+      return false;
+    }
+
+  }
+}

package/src/api-public/services/user.d.ts

@@ -60,7 +60,11 @@ export declare class User {
         result: boolean;
     }>;
     phoneVerify(account: string): Promise<{
+        out_limit: boolean;
+        result?: undefined;
+    } | {
         result: boolean;
+        out_limit?: undefined;
     }>;
     createUser(account: string, pwd: string, userData: any, req: any, pass_verify?: boolean): Promise<any>;
     createUserHook(userID: string): Promise<void>;

package/src/api-public/services/user.js

@@ -58,6 +58,7 @@ const user_update_js_1 = require("./user-update.js");
 const public_table_check_js_1 = require("./public-table-check.js");
 const ut_timer_1 = require("../utils/ut-timer");
 const auto_fcm_js_1 = require("../../public-config-initial/auto-fcm.js");
+const phone_verify_js_1 = require("./phone-verify.js");
 class User {
     constructor(app, token) {
         this.normalMember = {
@@ -119,6 +120,14 @@ class User {
     }
     async phoneVerify(account) {
         const time = await redis_js_1.default.getValue(`verify-phone-${account}-last-time`);
+        let last_count = parseInt(`${(await redis_js_1.default.getValue(`verify-phone-${account}-last-count`)) || '0'}`, 10);
+        last_count++;
+        if (last_count > 3) {
+            return {
+                out_limit: true,
+            };
+        }
+        await redis_js_1.default.setValue(`verify-phone-${account}-last-count`, last_count);
         if (!time || new Date().getTime() - new Date(time).getTime() > 1000 * 30) {
             await redis_js_1.default.setValue(`verify-phone-${account}-last-time`, new Date().toISOString());
             const data = await auto_send_email_js_1.AutoSendEmail.getDefCompare(this.app, 'auto-phone-verify-update', 'zh-TW');
@@ -183,7 +192,7 @@ class User {
                     });
                 }
                 if (login_config.phone_verify &&
-                    userData.verify_code_phone !== (await redis_js_1.default.getValue(`verify-phone-${userData.phone}`)) &&
+                    !(await phone_verify_js_1.PhoneVerify.verify(userData.phone, userData.verify_code_phone)) &&
                     register_form.list.find((dd) => {
                         return dd.key === 'phone' && `${dd.hidden}` !== 'true';
                     })) {
@@ -1701,10 +1710,11 @@ class User {
                     });
                 }
                 if (login_config.phone_verify &&
-                    par.userData.verify_code_phone !== (await redis_js_1.default.getValue(`verify-phone-${par.userData.phone}`)) &&
-                    register_form.list.find((dd) => {
-                        return dd.key === 'phone' && `${dd.hidden}` !== 'true';
-                    })) {
+                    !(await phone_verify_js_1.PhoneVerify.verify(par.userData.phone, par.userData.verify_code_phone))
+                    &&
+                        register_form.list.find((dd) => {
+                            return dd.key === 'phone' && `${dd.hidden}` !== 'true';
+                        })) {
                     throw exception_1.default.BadRequestError('BAD_REQUEST', 'Verify code error.', {
                         msg: 'phone-verify-false',
                     });