@certd/lib-server 1.39.9 → 1.39.11

package/dist/basic/base-service.d.ts

@@ -84,6 +84,7 @@ export declare abstract class BaseService<T> {
      */
     list(listReq: ListReq<T>): Promise<T[]>;
     checkUserId(ids: number | number[], userId: number, userKey?: string): Promise<void>;
+    filterIds(ids: any[]): any[];
     batchDelete(ids: number[], userId: number, projectId?: number): Promise<void>;
     findOne(options: FindOneOptions<T>): Promise<T>;
 }

package/dist/basic/base-service.js

@@ -60,7 +60,8 @@ export class BaseService {
      * @param where
      */
     async delete(ids, where) {
-        const idArr = this.resolveIdArr(ids);
+        let idArr = this.resolveIdArr(ids);
+        idArr = this.filterIds(idArr);
         if (idArr.length === 0) {
             return;
         }
@@ -78,6 +79,9 @@ export class BaseService {
         if (typeof ids === 'string') {
             return ids.split(',');
         }
+        else if (!Array.isArray(ids)) {
+            return [ids];
+        }
         else {
             return ids;
         }
@@ -192,6 +196,7 @@ export class BaseService {
         if (!Array.isArray(ids)) {
             ids = [ids];
         }
+        ids = this.filterIds(ids);
         const res = await this.getRepository().find({
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
@@ -208,7 +213,16 @@ export class BaseService {
         }
         throw new PermissionException('权限不足');
     }
+    filterIds(ids) {
+        if (!ids) {
+            throw new ValidateException('ids不能为空');
+        }
+        return ids.filter((item) => {
+            return item != null && item != "";
+        });
+    }
     async batchDelete(ids, userId, projectId) {
+        ids = this.filterIds(ids);
         if (userId != null) {
             const list = await this.getRepository().find({
                 where: {

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

@@ -14,10 +14,10 @@ import { SysSettingsEntity } from '../entity/sys-settings.js';
 import { SysInstallInfo, SysPrivateSettings, SysPublicSettings, SysSecret, SysSecretBackup } from './models.js';
 import { getAllSslProviderDomains, setSslProviderReverseProxies } from '@certd/acme-client';
 import { cache, logger, mergeUtils, setGlobalProxy } from '@certd/basic';
+import { isPlus } from '@certd/plus-core';
 import * as dns from 'node:dns';
 import { BaseService, setAdminMode } from '../../../basic/index.js';
 import { executorQueue } from '../../basic/service/executor-queue.js';
-import { isComm, isPlus } from '@certd/plus-core';
 const { merge } = mergeUtils;
 let lastSaveEnvVars = {};
 /**
@@ -113,11 +113,11 @@ let SysSettingsService = class SysSettingsService extends BaseService {
         return await this.getSetting(SysPublicSettings);
     }
     async savePublicSettings(bean) {
-        if (isComm()) {
-            if (bean.adminMode === 'enterprise') {
-                throw new Error("商业版不支持使用企业管理模式");
-            }
-        }
+        // if (isComm()) {
+        //   if (bean.adminMode === 'enterprise') {
+        //     throw new Error("商业版不支持使用企业管理模式")
+        //   }
+        // }
         await this.saveSetting(bean);
         //让设置生效
         await this.reloadPublicSettings();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.39.9",
+  "version": "1.39.11",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -28,11 +28,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.39.9",
-    "@certd/basic": "^1.39.9",
-    "@certd/pipeline": "^1.39.9",
-    "@certd/plugin-lib": "^1.39.9",
-    "@certd/plus-core": "^1.39.9",
+    "@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",
     "@midwayjs/cache": "3.14.0",
     "@midwayjs/core": "3.20.11",
     "@midwayjs/i18n": "3.20.13",
@@ -64,5 +64,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "1c634a702af9298d25542acc270d68f71d9b1049"
+  "gitHead": "ec466dc818eace59825d8ae2ebbc9fc75a94a6b0"
 }