nestjs-base 1.0.17 → 1.0.19

package/dist/utils/bcrypt.util.d.ts

@@ -1,4 +1,4 @@
 export declare class BcryptUtil {
-    static hash(password: any): any;
-    static compare(password: any, hashedPassword: any): boolean;
+    static hash(password: string): string;
+    static compare(password: string, hashedPassword: string): boolean;
 }

package/dist/utils/bcrypt.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"bcrypt.util.js","sourceRoot":"","sources":["../../src/utils/bcrypt.util.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAEjC,MAAa,UAAU;IACrB,MAAM,CAAC,IAAI,CAAC,QAAQ;QAElB,MAAM,WAAW,GAAG,EAAE,CAAC;QAGvB,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAG7C,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc;QACrC,OAAO,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC;IAC5D,CAAC;CACF;AAfD,gCAeC"}
+{"version":3,"file":"bcrypt.util.js","sourceRoot":"","sources":["../../src/utils/bcrypt.util.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAKjC,MAAa,UAAU;IAOrB,MAAM,CAAC,IAAI,CAAC,QAAgB;QAE1B,MAAM,WAAW,GAAG,EAAE,CAAC;QAGvB,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAG7C,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IASD,MAAM,CAAC,OAAO,CAAC,QAAgB,EAAE,cAAsB;QACrD,OAAO,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC;IAC5D,CAAC;CACF;AA5BD,gCA4BC"}

package/dist/utils/svg-captcha.util.d.ts

@@ -1,13 +1,26 @@
+import { CaptchaObj } from "svg-captcha";
 import Redis from "ioredis";
+interface CaptchaOptions {
+    size?: number;
+    noise?: number;
+    color?: boolean;
+    background?: string;
+}
+interface SendOptions {
+    clientId?: string;
+    options?: CaptchaOptions;
+}
+interface VerifyOptions {
+    clientId: string;
+    captcha: string;
+}
 export declare class SvgCaptchaUtil {
     private readonly redis;
     constructor(redis: Redis);
-    send({ clientId, options }?: {
-        clientId?: string;
-        options?: {};
-    }): Promise<any>;
-    verify({ ip, captchaText }: {
-        ip: any;
-        captchaText: any;
-    }): Promise<any>;
+    send({ clientId, options, }?: SendOptions): Promise<CaptchaObj>;
+    verify({ clientId, captcha, }: VerifyOptions): Promise<{
+        clientId: string;
+        captcha: string;
+    }>;
 }
+export {};

package/dist/utils/svg-captcha.util.js

@@ -23,20 +23,20 @@ let SvgCaptchaUtil = class SvgCaptchaUtil {
     constructor(redis) {
         this.redis = redis;
     }
-    async send({ clientId = "", options = {} } = {}) {
+    async send({ clientId = "", options = {}, } = {}) {
         const captcha = svgCaptcha.create(options);
         await this.redis.setex(`${REDIS_KEY_PREFIX}${clientId}`, REDIS_EXPIRE_SECONDS, captcha.text);
         return captcha;
     }
-    async verify({ ip, captchaText }) {
-        const value = await this.redis.get(`${REDIS_KEY_PREFIX}${ip}`);
+    async verify({ clientId, captcha, }) {
+        const value = await this.redis.get(`${REDIS_KEY_PREFIX}${clientId}`);
         if (!value) {
-            throw new common_1.NotFoundException("验证码不存在");
+            throw new common_1.BadRequestException("验证码不能为空");
         }
-        if (captchaText !== value) {
-            throw new common_1.NotFoundException("验证码错误");
+        if (captcha !== value) {
+            throw new common_1.BadRequestException("验证码错误");
         }
-        return { ip, captchaText };
+        return { clientId, captcha };
     }
 };
 exports.SvgCaptchaUtil = SvgCaptchaUtil;

package/dist/utils/svg-captcha.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"svg-captcha.util.js","sourceRoot":"","sources":["../../src/utils/svg-captcha.util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA+D;AAC/D,0CAA0C;AAC1C,yDAAqD;AACrD,qCAA4B;AAE5B,MAAM,gBAAgB,GAAG,aAAa,CAAC;AACvC,MAAM,oBAAoB,GAAG,EAAE,GAAG,EAAE,CAAC;AAG9B,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAA4C,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;IAAG,CAAC;IAE5D,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,EAAE;QAC7C,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE3C,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CACpB,GAAG,gBAAgB,GAAG,QAAQ,EAAE,EAChC,oBAAoB,EACpB,OAAO,CAAC,IAAI,CACb,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE;QAC9B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,gBAAgB,GAAG,EAAE,EAAE,CAAC,CAAC;QAE/D,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,0BAAiB,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,IAAI,0BAAiB,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC;IAC7B,CAAC;CACF,CAAA;AA5BY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAEE,WAAA,IAAA,0BAAW,GAAE,CAAA;qCAAyB,iBAAK;GAD7C,cAAc,CA4B1B"}
+{"version":3,"file":"svg-captcha.util.js","sourceRoot":"","sources":["../../src/utils/svg-captcha.util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,0CAA0C;AAE1C,yDAAqD;AACrD,qCAA4B;AAE5B,MAAM,gBAAgB,GAAG,aAAa,CAAC;AACvC,MAAM,oBAAoB,GAAG,EAAE,GAAG,EAAE,CAAC;AAoB9B,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAA4C,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;IAAG,CAAC;IAE5D,KAAK,CAAC,IAAI,CAAC,EACT,QAAQ,GAAG,EAAE,EACb,OAAO,GAAG,EAAE,MACG,EAAE;QACjB,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE3C,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CACpB,GAAG,gBAAgB,GAAG,QAAQ,EAAE,EAChC,oBAAoB,EACpB,OAAO,CAAC,IAAI,CACb,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EACX,QAAQ,EACR,OAAO,GACO;QACd,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,gBAAgB,GAAG,QAAQ,EAAE,CAAC,CAAC;QAErE,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,4BAAmB,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;YACtB,MAAM,IAAI,4BAAmB,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IAC/B,CAAC;CACF,CAAA;AAlCY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAEE,WAAA,IAAA,0BAAW,GAAE,CAAA;qCAAyB,iBAAK;GAD7C,cAAc,CAkC1B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestjs-base",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "nestjs base toolkit",
   "author": "zhaojintian",
   "license": "UNLICENSED",