From 1cf8d4e5e72f5a3a4e5408d2bbc153e79c0fc6f9 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 2 Aug 2024 23:59:08 +0800
Subject: [PATCH] chore:

---
 packages/core/pipeline/.gitignore                          | 3 ++-
 packages/core/pipeline/src/core/license.spec.ts            | 7 +++----
 packages/core/pipeline/src/core/license.ts                 | 7 +++----
 .../src/modules/basic/controller/settings-controller.ts    | 4 +---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/core/pipeline/.gitignore b/packages/core/pipeline/.gitignore
index 92686f43..c90f5f96 100644
--- a/packages/core/pipeline/.gitignore
+++ b/packages/core/pipeline/.gitignore
@@ -24,4 +24,5 @@ dist-ssr
 *.sw?
 
 test/user.secret.*
-test/**/*.js
\ No newline at end of file
+test/**/*.js
+src/**/*.spec.ts
diff --git a/packages/core/pipeline/src/core/license.spec.ts b/packages/core/pipeline/src/core/license.spec.ts
index 81b50b92..4f3c2543 100644
--- a/packages/core/pipeline/src/core/license.spec.ts
+++ b/packages/core/pipeline/src/core/license.spec.ts
@@ -3,10 +3,9 @@ import { equal } from "assert";
 describe("license", function () {
   it("#license", async function () {
     const req = {
-      appKey: "Certd",
-      subjectId: "dev_xiao_001",
-      license:
-        "65794a7a64574a715a574e30535751694f694a6b5a585a6665476c68623138774d4445694c434a686348424c5a586b694f694a485233527953314a58556d7475526d524a53555177636c63694c434a6b64584a6864476c76626949364d7a59314c434a6859335270646d56556157316c496a6f784e7a49794e5459794e7a49334f4455344c434a325a584a7a61573975496a6f784c434a6a6232526c496a6f69516e464d4d335a754e5670564e457830527a6c685557785754544d7764454532636c5a6b563251334e474a664d534973496d563463476c795a565270625755694f6a45334e5451774f5467334d6a63344e546773496e4e6c59334a6c6443493649694973496e4e705a323568644856795a534936496d3535637a564461557475556b74614d31426b5231524c4e6b6f76513342334c7a523052334e7263537443624867784f4552534d556c3256314e5752545534565746365744465a546b706164575a4d5455706863474a356347704c557a4a6b53576f7a546d45344e47645553553434646b5236544568504e5570744f467051576d316d4c335236566d4653595556694f4768494f45706a53307777547a424353573530596d3133616d78595454645352544e344f44497963464d796432646c536d6b34556c64344d6b7832546a68715230394762546c535330644e596c5678556b4e7355305a6f59306c59596b5249615538786156425655305a5053484a7a6333646f4d6e70425a564654576a4276566b74464c316331556d5a745253387a5446517a646b68734f573951656e687161314a79553068794e55466c646d784a4c7a5647526b5a71526b4d76626b356a5a454a705a485a68616e51726556425a5458464e5a33466a616c6c78566a4a6e597939586145744b5a46464d53587035645856614b7a56335554684f64464e6851545272616a464d526d55775a574e4352306c50625751335132464e645774445a3235555644464f5233525a5a6e4650646c706965555636647a3039496e303d",
+      appKey: "z4nXOeTeSnnpUpnmsV",
+      subjectId: "999",
+      license: "",
     };
     const plus = isPlus();
     equal(plus, false);
diff --git a/packages/core/pipeline/src/core/license.ts b/packages/core/pipeline/src/core/license.ts
index ac4ce632..f67fa33c 100644
--- a/packages/core/pipeline/src/core/license.ts
+++ b/packages/core/pipeline/src/core/license.ts
@@ -2,7 +2,7 @@ import { createVerify } from "node:crypto";
 import { logger } from "../utils/index.js";
 
 const SecreteKey =
-  "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQkNnS0NBUUVBMjdoZDM0NjRYbyt3TkpmTTNCWjE5MXlQK2NLaTd3ck9CbXdjTWJPZUdsNlJOMUVtTGhyMgplOFdvOGpmMW9IVXc5RFV6L2I2ZHU3Q3ZXMXZNUDA1Q3dSS3lNd2U3Q1BYRGQ2U01mSkwxRFZyUkw5Ylh0cEYzCjJkQVA5UENrakFJcFMvRE5jVkhLRXk1QW8yMnFFenpTKzlUT0JVY2srREdZcmo4KzI5U3h2aEZDRE5ZbEE2d1EKbEkyRWc5TWNBV2xDU3p1S1JWa2ZWUWdYVlU3SmE5OXp1Um1oWWtYZjFxQzBLcVAwQkpDakdDNEV6ZHorMmwyaAo2T3RxVHVVLzRkemlYYnRMUS8vU0JqNEgxdi9PZ3dUZjJkSVBjUnRHOXlWVTB2ZlQzVzdUTkdlMjU3em5ESDBYCkd6Wm4zdWJxTXJuL084b2ltMHRrS3ZHZXZ1V2ZraWNwVVFJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg==";
+  "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJDZ0tDQVFFQXY3TGtMaUp1dGM0NzhTU3RaTExjajVGZXh1YjJwR2NLMGxwa0hwVnlZWjhMY29rRFhuUlAKUGQ5UlJSTVRTaGJsbFl2Mzd4QUhOV1ZIQ0ZsWHkrQklVU001bUlBU1NDQTV0azlJNmpZZ2F4bEFDQm1BY0lGMwozKzBjeGZIYVkrVW9YdVluMkZ6YUt2Ym5GdFZIZ0lkMDg4a3d4clZTZzlCT3BDRVZIR1pxR2I5TWN5MXVHVXhUClFTVENCbmpoTWZlZ0p6cXVPYWVOY0ZPSE5tbmtWRWpLTythbTBPeEhNS1lyS3ZnQnVEbzdoVnFENlBFMUd6V3AKZHdwZUV4QXZDSVJxL2pWTkdRK3FtMkRWOVNJZ3U5bmF4MktmSUtFeU50dUFFS1VpekdqL0VmRFhDM1cxMExhegpKaGNYNGw1SUFZU1o3L3JWVmpGbExWSVl0WDU1T054L1Z3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K";
 
 export type LicenseVerifyReq = {
   appKey: string;
@@ -60,8 +60,7 @@ class LicenseVerifier {
       logger.warn("授权已过期");
       return this.setPlus(false);
     }
-
-    const content = `${this.licenseReq.appKey},${this.licenseReq.subjectId},${json.code},${json.secret}${json.activeTime},${json.duration},${json.expireTime},${json.version}`;
+    const content = `${this.licenseReq.appKey},${this.licenseReq.subjectId},${json.code},${json.secret},${json.activeTime},${json.duration},${json.expireTime},${json.version}`;
     const publicKey = Buffer.from(SecreteKey, "base64").toString();
     const res = this.verifySignature(content, json.signature, publicKey);
     this.checked = true;
@@ -73,7 +72,7 @@ class LicenseVerifier {
   }
 
   verifySignature(content: string, signature: any, publicKey: string) {
-    const verify = createVerify("RSA-SHA1");
+    const verify = createVerify("RSA-SHA256");
     verify.update(content);
     return verify.verify(publicKey, signature, "base64");
   }
diff --git a/packages/ui/certd-server/src/modules/basic/controller/settings-controller.ts b/packages/ui/certd-server/src/modules/basic/controller/settings-controller.ts
index 7e6976e9..173775b8 100644
--- a/packages/ui/certd-server/src/modules/basic/controller/settings-controller.ts
+++ b/packages/ui/certd-server/src/modules/basic/controller/settings-controller.ts
@@ -29,9 +29,7 @@ export class BasicSettingsController extends BaseController {
 
   @Get('/public', { summary: Constants.per.guest })
   public async getSysPublic() {
-    const settings = await this.sysSettingsService.getSetting(
-      SysPublicSettings
-    );
+    const settings = await this.sysSettingsService.getSetting(SysPublicSettings);
     return this.ok(settings);
   }
 }