Merge branch 'v2-dev' into v2-dev-buy

packages/ui/certd-server/src/controller/sys/access/access-controller.ts

@@ -1,7 +1,6 @@
-import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { AccessService, Constants } from '@certd/lib-server';
-import { AccessController } from '../../user/pipeline/access-controller.js';
-import { checkComm } from '@certd/plus-core';
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
+import { AccessService, Constants } from "@certd/lib-server";
+import { AccessController } from "../../user/pipeline/access-controller.js";
 
 /**
  * 授权
@@ -17,7 +16,7 @@ export class SysAccessController extends AccessController {
   }
 
   getUserId() {
-    checkComm();
+    // checkComm();
     return 0;
   }
 

packages/ui/certd-server/src/controller/sys/nettest/nettest-controller.ts

@@ -0,0 +1,47 @@
+import { BaseController } from '@certd/lib-server';
+import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
+import { NetTestService } from '../../../modules/sys/nettest/nettest-service.js';
+
+
+@Provide()
+@Controller('/api/sys/nettest/')
+export class SysNetTestController extends BaseController {
+  
+  @Inject()
+  netTestService: NetTestService;
+
+
+  @Post('/domainResolve', { summary: 'sys:settings:view' })
+  public async domainResolve(@Body(ALL) body: { domain: string }) {
+
+    const { domain } = body;
+    const result = await this.netTestService.domainResolve(domain);
+    return this.ok(result);
+  }
+
+  // ping
+  @Post('/ping', { summary: 'sys:settings:view' })
+  public async ping(@Body(ALL) body: { domain: string }) {
+
+    const { domain } = body;
+    const result = await this.netTestService.ping(domain);
+    return this.ok(result);
+  }
+
+  // telnet 
+  @Post('/telnet', { summary: 'sys:settings:view' })
+  public async telnet(@Body(ALL) body: { domain: string, port: number }) {
+
+    const { domain, port } = body;
+    const result = await this.netTestService.telnet(domain, port);
+    return this.ok(result);
+  }
+
+    // telnet 
+  @Post('/serverInfo', { summary: 'sys:settings:view' })
+  public async serverInfo() {
+
+    const result = await this.netTestService.serverInfo();
+    return this.ok(result);
+  }
+}

packages/ui/certd-server/src/controller/sys/settings/sys-settings-controller.ts

@@ -192,4 +192,11 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
     await this.service.saveSetting(blankSetting);
     return this.ok({});
   }
+
+
+  @Post("/captchaTest", { summary: "sys:settings:edit" })
+  async captchaTest(@Body(ALL) body: any) {
+    await this.codeService.checkCaptcha(body)
+    return this.ok({});
+  }
 }