baja-lite 1.6.2 → 1.6.4

package/{test-postgresql.js → src/test-postgresql.ts}

@@ -1,91 +1,80 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { DBType, Field, SqlType } from 'baja-lite-field';
-import 'reflect-metadata';
-import { Boot } from './boot.js';
-import { ColumnMode, DB, SelectResult, SqlService, } from './sql.js';
-class AmaFuck2 {
-}
-__decorate([
-    Field({ type: SqlType.int, length: 200, id: true, uuid: true }),
-    __metadata("design:type", Number)
-], AmaFuck2.prototype, "userid", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 200, def: '333' }),
-    __metadata("design:type", String)
-], AmaFuck2.prototype, "username", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 200 }),
-    __metadata("design:type", String)
-], AmaFuck2.prototype, "pwd", void 0);
-let AmaService2 = class AmaService2 extends SqlService {
-};
-AmaService2 = __decorate([
-    DB({
-        tableName: 'nfc_user', clz: AmaFuck2, dbType: DBType.Postgresql
-    })
-], AmaService2);
-// interface Menu {
-//     resourceid: string;
-//     resourcepid: string;
-//     resourcename: string;
-//     children: Menu[];
-// }
-export async function go2() {
-    await Boot({
-        Postgresql: {
-            database: 'nfc',
-            user: 'postgres',
-            password: 'abcd1234',
-            port: 5432,
-            host: '127.0.0.1'
-        },
-        log: 'info',
-        columnMode: ColumnMode.HUMP,
-        sqlDir: 'E:/pro/baja-lite/xml',
-        sqlMap: {
-            ['test.test']: `SELECT * FROM nfc_user {{#username}} WHERE username = :username {{/username}}`
-        }
-    });
-    const service = new AmaService2();
-    await service.transaction({
-        fn: async (conn) => {
-            const rt5 = await service.select({
-                sqlId: 'test.test',
-                params: { username: '1111' },
-                selectResult: SelectResult.RS_CS,
-                conn
-            });
-            console.log(55, rt5.length);
-            await service.insert({
-                data: {
-                    userid: 22,
-                    username: '222',
-                    pwd: '333'
-                }
-            });
-            return 1;
-        }
-    });
-    // const data = await service.select<Menu>({
-    //     sql: 'SELECT resourceid, resourcepid,resourcename FROM cp_resource ',
-    //     params: {
-    //         site: '1234',
-    //         matchInfo: { reportType: 'yyyy', id: '11' }
-    //     },
-    //     // mapper: [
-    //     //     ['site', ['info', 'bSist'], 989],
-    //     //     ['site', ['info2', 'bSist'], 33],
-    //     //     ['site', ['Bsite'], 0]
-    //     // ]
-    // });
-    // console.log(data);
-}
-go2();
+import { DBType, Field, SqlType } from 'baja-lite-field';
+import 'reflect-metadata';
+import { Boot } from './boot.js';
+import { ColumnMode, DB, SelectResult, SqlService, } from './sql.js';
+class AmaFuck2 {
+    @Field({ type: SqlType.int, length: 200, id: true, uuid: true })
+    userid?: number;
+    @Field({ type: SqlType.varchar, length: 200, def: '333' })
+    username?: string;
+    @Field({ type: SqlType.varchar, length: 200 })
+    pwd?: string;
+}
+
+@DB({
+    tableName: 'nfc_user', clz: AmaFuck2, dbType: DBType.Postgresql
+})
+class AmaService2 extends SqlService<AmaFuck2> {
+
+}
+
+// interface Menu {
+//     resourceid: string;
+//     resourcepid: string;
+//     resourcename: string;
+//     children: Menu[];
+// }
+
+export async function go2() {
+    await Boot({
+        Postgresql: {
+            database: 'nfc',
+            user: 'postgres',
+            password: 'abcd1234',
+            port: 5432,
+            host: '127.0.0.1'
+        },
+        log: 'info',
+        columnMode: ColumnMode.HUMP,
+        sqlDir: 'E:/pro/baja-lite/xml',
+        sqlMap: {
+            ['test.test']: `SELECT * FROM nfc_user {{#username}} WHERE username = :username {{/username}}`
+        }
+    });
+    const service = new AmaService2();
+    await service.transaction<number>({
+        fn: async conn => {
+            const rt5 = await service.select<{ username: string }>({
+                sqlId: 'test.test',
+                params: { username: '1111' },
+                selectResult: SelectResult.RS_CS,
+                conn
+            })
+            console.log(55, rt5.length);
+            await service.insert({
+                data: {
+                    userid: 22,
+                    username: '222',
+                    pwd: '333'
+                }
+            })
+            return 1;
+        }
+    });
+
+    // const data = await service.select<Menu>({
+    //     sql: 'SELECT resourceid, resourcepid,resourcename FROM cp_resource ',
+    //     params: {
+    //         site: '1234',
+    //         matchInfo: { reportType: 'yyyy', id: '11' }
+    //     },
+    //     // mapper: [
+    //     //     ['site', ['info', 'bSist'], 989],
+    //     //     ['site', ['info2', 'bSist'], 33],
+    //     //     ['site', ['Bsite'], 0]
+    //     // ]
+    // });
+    // console.log(data);
+
+}
+go2();

package/{test-sqlite.js → src/test-sqlite.ts}

@@ -1,90 +1,80 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { DBType, Field, SqlType } from 'baja-lite-field';
-import 'reflect-metadata';
-import { Boot } from './boot';
-import { DB, DeleteMode, InsertMode, SqlService, SyncMode } from './sql';
-class AmaFuck {
-}
-__decorate([
-    Field({ type: SqlType.varchar }),
-    __metadata("design:type", String)
-], AmaFuck.prototype, "site", void 0);
-__decorate([
-    Field({ type: SqlType.varchar }),
-    __metadata("design:type", String)
-], AmaFuck.prototype, "SellerSKU2", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, id: true }),
-    __metadata("design:type", String)
-], AmaFuck.prototype, "SellerSKU", void 0);
-let AmaService = class AmaService extends SqlService {
-};
-AmaService = __decorate([
-    DB({
-        tableName: 'ama_fuck2', clz: AmaFuck, dbType: DBType.Sqlite, sqliteVersion: '0.0.3'
-    })
-], AmaService);
-async function go() {
-    await Boot({
-        Sqlite: 'd:1.db',
-        log: 'info'
-    });
-    const service = new AmaService();
-    const ret = service.transaction({
-        sync: SyncMode.Sync,
-        fn: conn => {
-            const list = new Array({
-                SellerSKU: '1',
-                site: '111'
-            }, {
-                SellerSKU: '2',
-                SellerSKU2: '22',
-            }, {
-                SellerSKU2: '33',
-                SellerSKU: '3',
-                site: '333'
-            }, {
-                SellerSKU2: '44',
-                SellerSKU: '4',
-                site: '444'
-            }, {
-                SellerSKU2: '',
-                SellerSKU: '66',
-                site: undefined
-            });
-            const rt = service.insert({
-                sync: SyncMode.Sync,
-                data: list,
-                conn, skipEmptyString: false, mode: InsertMode.InsertWithTempTable
-            });
-            console.log(rt);
-            const rt2 = service.update({
-                sync: SyncMode.Sync,
-                data: list,
-                conn, skipEmptyString: false
-            });
-            console.log(rt2);
-            const rt3 = service.delete({
-                sync: SyncMode.Sync,
-                where: [
-                    { SellerSKU2: '11', SellerSKU: '1' },
-                    { SellerSKU2: '22', SellerSKU: '2' },
-                    { SellerSKU2: '33', SellerSKU: '3' }
-                ],
-                mode: DeleteMode.TempTable
-            });
-            console.log(rt3);
-            return 1;
-        }
-    });
-    return ret;
-}
-go();
+import { DBType, Field, SqlType } from 'baja-lite-field';
+import 'reflect-metadata';
+import { Boot } from './boot';
+import { DB, DeleteMode, InsertMode, SqlService, SyncMode } from './sql';
+class AmaFuck {
+    @Field({ type: SqlType.varchar })
+    site?: string;
+    @Field({ type: SqlType.varchar })
+    SellerSKU2?: string;
+    @Field({ type: SqlType.varchar, id: true })
+    SellerSKU?: string;
+}
+
+@DB({
+    tableName: 'ama_fuck2', clz: AmaFuck, dbType: DBType.Sqlite, sqliteVersion: '0.0.3'
+})
+class AmaService extends SqlService<AmaFuck> {
+
+}
+async function go() {
+    await Boot({
+        Sqlite: 'd:1.db',
+        log: 'info'
+    });
+    const service = new AmaService();
+    const ret = service.transaction<number>({
+        sync: SyncMode.Sync,
+        fn: conn => {
+            const list = new Array<AmaFuck>({
+                SellerSKU: '1',
+                site: '111'
+            }, {
+                SellerSKU: '2',
+                SellerSKU2: '22',
+            }, {
+                SellerSKU2: '33',
+                SellerSKU: '3',
+                site: '333'
+            }, {
+                SellerSKU2: '44',
+                SellerSKU: '4',
+                site: '444'
+            }, {
+                SellerSKU2: '',
+                SellerSKU: '66',
+                site: undefined
+            });
+            const rt = service.insert({
+                sync: SyncMode.Sync,
+                data: list,
+                conn, skipEmptyString: false, mode: InsertMode.InsertWithTempTable
+            });
+            console.log(rt);
+            const rt2 = service.update({
+                sync: SyncMode.Sync,
+                data: list,
+                conn, skipEmptyString: false
+            });
+            console.log(rt2);
+            const rt3 = service.delete({
+                sync: SyncMode.Sync,
+                where: [
+                    { SellerSKU2: '11', SellerSKU: '1' },
+                    { SellerSKU2: '22', SellerSKU: '2' },
+                    { SellerSKU2: '33', SellerSKU: '3' }
+                ],
+                mode: DeleteMode.TempTable
+            });
+            console.log(rt3);
+            return 1;
+        }
+    });
+    return ret;
+}
+
+
+
+
+
+go();

package/{test-xml.js → src/test-xml.ts}

@@ -1,70 +1,70 @@
-import HTML from 'html-parse-stringify';
-console.log((HTML.parse(`
-    <sql id="reportField">
-            a.left_e_foul leftEFoul,
-            a.right_e_foul rightEFoul,
-            a.left_em_foul leftEmFoul,
-            a.right_em_foul rightEmFoul,
-            a.left_s_foul leftSFoul,
-            a.right_s_foul rightSFoul,
-            a.left_sb_foul leftSbFoul,
-            a.right_sb_foul rightSbFoul,
-            a.left_p_foul leftPFoul,
-            a.right_p_foul rightPFoul,
-            a.left_attack_goal leftAttackGoal,
-            a.right_attack_goal rightAttackGoal,
-            a.left_point_goal leftPointGoal,
-            a.right_point_goal rightPointGoal,
-            a.left_over_time_goal leftOverTimeGoal,
-            a.right_over_time_goal rightOverTimeGoal,
-            a.left_normal_goal leftNormalGoal,
-            a.right_normal_goal rightNormalGoal,
-            a.left_own_goal leftOwnGoal,
-            a.right_own_goal rightOwnGoal,
-            a.left_time_out leftTimeOut,
-            a.right_time_out rightTimeOut,
-            a.left_coach_y_card leftCoachYCard,
-            a.right_coach_y_card rightCoachYCard,
-            a.left_player_r_card leftPlayerRCard,
-            a.right_player_r_card rightPlayerRCard,
-            a.left_jump_ball leftJumpBall,
-            a.right_jump_ball rightJumpBall
-    </sql>
-    <select id="matchReport" resultType="org.jeecg.modules.event.entity.EventMatchReport">
-        select
-        b.event_name eventName,
-        a.match_id matchId,
-        a.event_times eventTimes,
-        a.team_left_id teamLeftId,
-        a.team_RIGHt_id teamRightId,
-        a.team_left_name teamLeftName,
-        a.team_right_name teamRightName,
-        a.team_left_image teamLeftImage,
-        a.team_right_image teamRightImage,
-        <include refid="reportField" />
-        <if test="matchInfo.reportType!=null and matchInfo.reportType!=''">
-            from view_match_report a
-        </if>
-        <if test="matchInfo.reportType==null or matchInfo.reportType==''">
-            from event_match_report a
-        </if>
-        left join event_main_info b on a.event_id = b.id
-        <where>
-            <if test="matchInfo.id!=null and matchInfo.id!=''">
-                and a.match_id = #{matchInfo.id}
-            </if>
-            <if test="matchInfo.eventId!=null and matchInfo.eventId!=''">
-                and a.event_id = #{matchInfo.eventId}
-            </if>
-            <if test="matchInfo.teamLeftId!=null and matchInfo.teamLeftId!=''">
-                and (a.team_left_id = #{matchInfo.teamLeftId} OR a.team_right_id = #{matchInfo.teamLeftId})
-            </if>
-            <if test="dataIdList!=null">
-                and a.event_id in
-                <foreach collection="dataIdList" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-    </select>
->`)));
+import HTML from 'html-parse-stringify';
+console.log((HTML.parse(`
+    <sql id="reportField">
+            a.left_e_foul leftEFoul,
+            a.right_e_foul rightEFoul,
+            a.left_em_foul leftEmFoul,
+            a.right_em_foul rightEmFoul,
+            a.left_s_foul leftSFoul,
+            a.right_s_foul rightSFoul,
+            a.left_sb_foul leftSbFoul,
+            a.right_sb_foul rightSbFoul,
+            a.left_p_foul leftPFoul,
+            a.right_p_foul rightPFoul,
+            a.left_attack_goal leftAttackGoal,
+            a.right_attack_goal rightAttackGoal,
+            a.left_point_goal leftPointGoal,
+            a.right_point_goal rightPointGoal,
+            a.left_over_time_goal leftOverTimeGoal,
+            a.right_over_time_goal rightOverTimeGoal,
+            a.left_normal_goal leftNormalGoal,
+            a.right_normal_goal rightNormalGoal,
+            a.left_own_goal leftOwnGoal,
+            a.right_own_goal rightOwnGoal,
+            a.left_time_out leftTimeOut,
+            a.right_time_out rightTimeOut,
+            a.left_coach_y_card leftCoachYCard,
+            a.right_coach_y_card rightCoachYCard,
+            a.left_player_r_card leftPlayerRCard,
+            a.right_player_r_card rightPlayerRCard,
+            a.left_jump_ball leftJumpBall,
+            a.right_jump_ball rightJumpBall
+    </sql>
+    <select id="matchReport" resultType="org.jeecg.modules.event.entity.EventMatchReport">
+        select
+        b.event_name eventName,
+        a.match_id matchId,
+        a.event_times eventTimes,
+        a.team_left_id teamLeftId,
+        a.team_RIGHt_id teamRightId,
+        a.team_left_name teamLeftName,
+        a.team_right_name teamRightName,
+        a.team_left_image teamLeftImage,
+        a.team_right_image teamRightImage,
+        <include refid="reportField" />
+        <if test="matchInfo.reportType!=null and matchInfo.reportType!=''">
+            from view_match_report a
+        </if>
+        <if test="matchInfo.reportType==null or matchInfo.reportType==''">
+            from event_match_report a
+        </if>
+        left join event_main_info b on a.event_id = b.id
+        <where>
+            <if test="matchInfo.id!=null and matchInfo.id!=''">
+                and a.match_id = #{matchInfo.id}
+            </if>
+            <if test="matchInfo.eventId!=null and matchInfo.eventId!=''">
+                and a.event_id = #{matchInfo.eventId}
+            </if>
+            <if test="matchInfo.teamLeftId!=null and matchInfo.teamLeftId!=''">
+                and (a.team_left_id = #{matchInfo.teamLeftId} OR a.team_right_id = #{matchInfo.teamLeftId})
+            </if>
+            <if test="dataIdList!=null">
+                and a.event_id in
+                <foreach collection="dataIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+>`)));

package/{test.js → src/test.ts}

@@ -1,2 +1,3 @@
-import { snowflake } from "snowflake";
-console.log(snowflake.generate());
+import { snowflake } from "snowflake";
+
+console.log(snowflake.generate());

package/src/wx/base.ts

@@ -0,0 +1,77 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+import pino from 'pino';
+import * as rp from 'request-promise';
+import { Throw } from '../error.js';
+const logger =
+  process.env['NODE_ENV'] !== 'production' ? pino({
+    name: 'wx',
+    transport: {
+      target: 'pino-pretty'
+    }
+  }) : pino({ name: 'wx' });
+export abstract class BaseWx {
+  protected authErrorCodes = [40001, 40014, 41001, 42001];
+  protected name: string = '';
+  protected tokenUrl: string = '';
+  private tokenData = '';
+  protected mock = false;
+  protected async getToken(force?: boolean): Promise<string> {
+    let token = '';
+    const now = +new Date();
+    let need = force === true;
+    if (this.tokenData) {
+      const datas = this.tokenData.split('^_^');
+      token = datas[0]!;
+      const lastTime = datas[1]!;
+      const spliceTime = datas[2]!;
+      if (now - parseInt(lastTime, 10) - parseInt(spliceTime, 10) > 0) {
+        need = true;
+      }
+    } else {
+      need = true;
+    }
+    if (need === true) {
+      const data = await this.fetch(() => this.tokenUrl, 'get', {}, false);
+      token = data.access_token;
+      this.tokenData = `${token}^_^${now}^_^${data.expires_in * 1000}`;
+    }
+    return token;
+  }
+  protected async fetch(uri: (token: string) => string, method: 'get' | 'post', data: { [key: string]: any }, needToken = true, buffer = false) {
+    if (this.mock === true) {
+      return {};
+    }
+    let token = needToken ? await this.getToken() : '';
+    if (!needToken || token) {
+      const start = +new Date();
+      let url = uri(token);
+      const param = method === 'get' ? {
+        method,
+        json: buffer ? false : true,
+        qs: data,
+        encoding: buffer ? null : undefined
+      } : {
+        json: data,
+        method,
+        encoding: buffer ? null : undefined
+      };
+
+      let response = await rp.default({
+        uri: url,
+        ...param
+      });
+      if (this.authErrorCodes.includes(response.errcode)) {
+        token = await this.getToken(true);
+        url = uri(token);
+        response = await rp.default({
+          uri: url,
+          ...param
+        });
+        Throw.if(response.errcode && response.errcode - 0 !== 0, `${url}-${response.errcode}-${response.errmsg}`);
+      }
+      Throw.if(response.errcode && response.errcode - 0 !== 0, `${url}-${response.errcode}-${response.errmsg}`);
+      logger.info(`fetch data ${+new Date() - start} ms`);
+      return response;
+    }
+  }
+}