@certd/lib-server 1.39.11 → 1.39.13

package/dist/system/settings/service/models.d.ts

@@ -21,8 +21,10 @@ export declare class SysPublicSettings extends BaseSettings {
     managerOtherUserPipeline: boolean;
     icpNo?: string;
     mpsNo?: string;
+    customFooter?: string;
     robots?: boolean;
     aiChatEnabled: boolean;
+    homePageEnabled: boolean;
     captchaEnabled: boolean;
     captchaType?: string;
     captchaAddonId?: number;
@@ -54,6 +56,7 @@ export declare class SysPrivateSettings extends BaseSettings {
     httpRequestTimeout?: number;
     pipelineMaxRunningCount?: number;
     environmentVars?: string;
+    acmeWalkFromAuthoritative?: boolean;
     sms?: {
         type?: string;
         config?: any;

package/dist/system/settings/service/models.js

@@ -24,8 +24,10 @@ export class SysPublicSettings extends BaseSettings {
     managerOtherUserPipeline = false;
     icpNo;
     mpsNo;
+    customFooter;
     robots = true;
     aiChatEnabled = true;
+    homePageEnabled = true;
     //验证码是否开启
     captchaEnabled = false;
     //验证码类型
@@ -61,6 +63,7 @@ export class SysPrivateSettings extends BaseSettings {
     httpRequestTimeout = 30;
     pipelineMaxRunningCount;
     environmentVars = '';
+    acmeWalkFromAuthoritative = true;
     sms = {
         type: 'aliyun',
         config: {},

package/dist/system/settings/service/sys-settings-service.js

@@ -12,7 +12,7 @@ import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
 import { SysSettingsEntity } from '../entity/sys-settings.js';
 import { SysInstallInfo, SysPrivateSettings, SysPublicSettings, SysSecret, SysSecretBackup } from './models.js';
-import { getAllSslProviderDomains, setSslProviderReverseProxies } from '@certd/acme-client';
+import { getAllSslProviderDomains, setSslProviderReverseProxies, setWalkFromAuthoritative } from '@certd/acme-client';
 import { cache, logger, mergeUtils, setGlobalProxy } from '@certd/basic';
 import { isPlus } from '@certd/plus-core';
 import * as dns from 'node:dns';
@@ -163,6 +163,7 @@ let SysSettingsService = class SysSettingsService extends BaseService {
         setSslProviderReverseProxies(privateSetting.reverseProxies);
         //加载环境变量
         this.setEnvironmentVars(privateSetting.environmentVars);
+        setWalkFromAuthoritative(privateSetting.acmeWalkFromAuthoritative);
     }
     setEnvironmentVars(vars) {
         const envVars = {};

package/dist/user/access/service/access-service.d.ts

@@ -24,6 +24,7 @@ export declare class AccessService extends BaseService<AccessEntity> {
      * @param param 数据
      */
     update(param: any): Promise<void>;
+    updateAccess(access: any): Promise<void>;
     getSimpleInfo(id: number): Promise<{
         id: number;
         name: string;

package/dist/user/access/service/access-service.js

@@ -119,6 +119,24 @@ let AccessService = class AccessService extends BaseService {
         delete param.keyId;
         return await super.update(param);
     }
+    async updateAccess(access) {
+        const oldEntity = await this.info(access.id);
+        if (oldEntity == null) {
+            throw new ValidateException('该授权配置不存在,请确认是否已被删除');
+        }
+        const setting = this.decryptAccessEntity(oldEntity);
+        for (const key of Object.keys(access)) {
+            if (key === 'id') {
+                continue;
+            }
+            setting[key] = access[key];
+        }
+        return await this.update({
+            id: access.id,
+            type: oldEntity.type,
+            setting: JSON.stringify(setting),
+        });
+    }
     async getSimpleInfo(id) {
         const entity = await this.info(id);
         if (entity == null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.39.11",
+  "version": "1.39.13",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -12,6 +12,7 @@
     "build": "npm run before-build && tsc --skipLibCheck",
     "dev-build": "npm run build",
     "test": "midway-bin test --ts -V",
+    "test:unit": "cross-env NODE_ENV=unittest mocha --no-config --node-option no-warnings --node-option loader=ts-node/esm \"src/**/*.test.ts\"",
     "test1": "midway-bin test --ts -V -f test/blank.test.ts -t 'hash-check'",
     "cov": "midway-bin cov --ts",
     "lint": "mwts check",
@@ -28,11 +29,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.39.11",
-    "@certd/basic": "^1.39.11",
-    "@certd/pipeline": "^1.39.11",
-    "@certd/plugin-lib": "^1.39.11",
-    "@certd/plus-core": "^1.39.11",
+    "@certd/acme-client": "^1.39.13",
+    "@certd/basic": "^1.39.13",
+    "@certd/pipeline": "^1.39.13",
+    "@certd/plugin-lib": "^1.39.13",
+    "@certd/plus-core": "^1.39.13",
     "@midwayjs/cache": "3.14.0",
     "@midwayjs/core": "3.20.11",
     "@midwayjs/i18n": "3.20.13",
@@ -43,7 +44,6 @@
     "@midwayjs/upload": "3.20.13",
     "@midwayjs/validate": "3.20.13",
     "better-sqlite3": "^11.1.2",
-    "cross-env": "^7.0.3",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
     "mwts": "^1.3.0",
@@ -52,17 +52,22 @@
   },
   "devDependencies": {
     "@types/chai": "^4.3.3",
+    "@types/mocha": "^10.0.1",
     "@types/node": "^18",
     "@typescript-eslint/eslint-plugin": "^8.26.1",
     "@typescript-eslint/parser": "^8.26.1",
+    "cross-env": "^7.0.3",
     "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
+    "esmock": "^2.7.5",
+    "mocha": "^10.2.0",
     "prettier": "^2.8.8",
     "rimraf": "^5.0.5",
+    "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ec466dc818eace59825d8ae2ebbc9fc75a94a6b0"
+  "gitHead": "9f7d766cb386b299d4098141f4a47d23e16975e3"
 }