perf: 登录支持极验验证码

packages/libs/lib-server/src/index.ts

@@ -1,8 +1,9 @@
 import { SysSettingsEntity } from './system/index.js';
 import { AccessEntity } from './user/access/entity/access.js';
+import { AddonEntity } from "./user/index.js";
 export * from './basic/index.js';
 export * from './system/index.js';
 export * from './user/index.js';
 export { LibServerConfiguration as Configuration } from './configuration.js';
 
-export const libServerEntities = [SysSettingsEntity, AccessEntity];
+export const libServerEntities = [SysSettingsEntity, AccessEntity,AddonEntity];

packages/libs/lib-server/src/system/settings/service/models.ts

@@ -36,6 +36,7 @@ export class SysPublicSettings extends BaseSettings {
   captchaEnabled = false;
   //验证码类型
   captchaType?: string;
+  captchaAddonId?:string;
 }
 
 export class SysPrivateSettings extends BaseSettings {
@@ -50,9 +51,6 @@ export class SysPrivateSettings extends BaseSettings {
   dnsResultOrder? = '';
   commonCnameEnabled?: boolean = true;
 
-  //验证码配置id
-  captchaAddonId?: number;
-
   sms?: {
     type?: string;
     config?: any;

packages/libs/lib-server/src/user/addon/entity/addon.ts

@@ -12,7 +12,7 @@ export class AddonEntity {
   name: string;
 
 
-  @Column({ comment: 'addon类型', length: 100 })
+  @Column({ name: 'addon_type', comment: 'addon类型', length: 100 })
   addonType: string;
 
 

packages/libs/lib-server/src/user/addon/service/addon-service.ts

@@ -39,6 +39,11 @@ export class AddonService extends BaseService<AddonEntity> {
         throw new ValidateException('您无权查看该Addon配置');
       }
     }
+    if (!param.userId){
+      param.isSystem = true
+    }else{
+      param.isSystem = false
+    }
     delete param._copyFrom
     return await super.add(param);
   }
@@ -65,6 +70,8 @@ export class AddonService extends BaseService<AddonEntity> {
       id: entity.id,
       name: entity.name,
       userId: entity.userId,
+      addonType: entity.addonType,
+      type: entity.type,
     };
   }
 
@@ -197,7 +204,7 @@ export class AddonService extends BaseService<AddonEntity> {
 
    const addonDefine =  this.getDefineByType( type,addonType)
 
-    const defaultConfig = await this.getDefault(userId);
+    const defaultConfig = await this.getDefault(userId,addonType);
     if (defaultConfig) {
       return defaultConfig;
     }