feat: 支持vip转移

packages/libs/lib-iframe/src/lib/iframe.client.ts

@@ -26,10 +26,12 @@ export class IframeClient {
   requestQueue: Record<string, IframeMessageReq> = {};
   //当前客户端是否是父级页面
   iframe?: HTMLIFrameElement;
+  onError?: any;
 
   handlers: Record<string, (data: IframeMessageData<any>) => Promise<void>> = {};
-  constructor(iframe?: HTMLIFrameElement) {
+  constructor(iframe?: HTMLIFrameElement, onError?: (e: any) => void) {
     this.iframe = iframe;
+    this.onError = onError;
     window.addEventListener('message', async (event: MessageEvent<IframeMessageData<any>>) => {
       const data = event.data;
       if (data.action) {
@@ -37,13 +39,12 @@ export class IframeClient {
         try {
           const handler = this.handlers[data.action];
           if (handler) {
-            debugger;
             const res = await handler(data);
             if (data.id && data.action !== 'reply') {
               await this.send('reply', res, data.id);
             }
           } else {
-            throw new Error(`action:${data.action} 未注册处理器`);
+            throw new Error(`action:${data.action} 未注册处理器，可能版本过低`);
           }
         } catch (e: any) {
           console.error(e);
@@ -69,6 +70,17 @@ export class IframeClient {
   }
 
   async send<R = any, T = any>(action: string, data?: T, replyId?: string, errorCode?: number, message?: string): Promise<IframeMessageData<R>> {
+    try {
+      return await this.doSend<R, T>(action, data, replyId, errorCode, message);
+    } catch (e) {
+      if (this.onError) {
+        this.onError(e);
+      }
+      throw e;
+    }
+  }
+
+  async doSend<R = any, T = any>(action: string, data?: T, replyId?: string, errorCode?: number, message?: string): Promise<IframeMessageData<R>> {
     const reqMessageData: IframeMessageData<T> = {
       id: nanoid(),
       action,

packages/ui/certd-client/src/layout/layout-outside.vue

@@ -136,14 +136,15 @@ export default {
       }
 
       .main {
-        min-width: 260px;
+        min-width: 300px;
+        width: 94%;
       }
 
       .footer {
         // position: absolute;
         width: 100%;
         bottom: 0;
-        margin: 48px 0 24px;
+        margin: 24px 0 24px;
         text-align: center;
 
         .links {

packages/ui/certd-client/src/views/certd/history/api.ts

@@ -2,7 +2,7 @@ import { request } from "/src/api/service";
 
 const apiPrefix = "/pi/history";
 
-export function GetList(query: any) {
+export async function GetList(query: any) {
   return await request({
     url: apiPrefix + "/page",
     method: "post",
@@ -10,7 +10,7 @@ export function GetList(query: any) {
   });
 }
 
-export function AddObj(obj: any) {
+export async function AddObj(obj: any) {
   return await request({
     url: apiPrefix + "/add",
     method: "post",
@@ -18,7 +18,7 @@ export function AddObj(obj: any) {
   });
 }
 
-export function UpdateObj(obj: any) {
+export async function UpdateObj(obj: any) {
   return await request({
     url: apiPrefix + "/update",
     method: "post",
@@ -26,7 +26,7 @@ export function UpdateObj(obj: any) {
   });
 }
 
-export function DelObj(id: any) {
+export async function DelObj(id: any) {
   return await request({
     url: apiPrefix + "/delete",
     method: "post",
@@ -34,7 +34,7 @@ export function DelObj(id: any) {
   });
 }
 
-export function GetObj(id: any) {
+export async function GetObj(id: any) {
   return await request({
     url: apiPrefix + "/info",
     method: "post",
@@ -42,7 +42,7 @@ export function GetObj(id: any) {
   });
 }
 
-export function GetDetail(id: any) {
+export async function GetDetail(id: any) {
   return await request({
     url: apiPrefix + "/detail",
     method: "post",
@@ -50,7 +50,7 @@ export function GetDetail(id: any) {
   });
 }
 
-export function DeleteBatch(ids: any[]) {
+export async function DeleteBatch(ids: any[]) {
   return await request({
     url: apiPrefix + "/deleteByIds",
     method: "post",

packages/ui/certd-client/src/views/certd/pipeline/api.ts

@@ -3,7 +3,7 @@ import { request } from "/src/api/service";
 const apiPrefix = "/pi/pipeline";
 const historyApiPrefix = "/pi/history";
 
-export function GetList(query: any) {
+export async function GetList(query: any) {
   return await request({
     url: apiPrefix + "/page",
     method: "post",
@@ -11,7 +11,7 @@ export function GetList(query: any) {
   });
 }
 
-export function AddObj(obj: any) {
+export async function AddObj(obj: any) {
   return await request({
     url: apiPrefix + "/add",
     method: "post",
@@ -19,7 +19,7 @@ export function AddObj(obj: any) {
   });
 }
 
-export function UpdateObj(obj: any) {
+export async function UpdateObj(obj: any) {
   return await request({
     url: apiPrefix + "/update",
     method: "post",
@@ -27,7 +27,7 @@ export function UpdateObj(obj: any) {
   });
 }
 
-export function DelObj(id: any) {
+export async function DelObj(id: any) {
   return await request({
     url: apiPrefix + "/delete",
     method: "post",
@@ -35,7 +35,7 @@ export function DelObj(id: any) {
   });
 }
 
-export function GetObj(id: any) {
+export async function GetObj(id: any) {
   return await request({
     url: apiPrefix + "/info",
     method: "post",
@@ -43,7 +43,7 @@ export function GetObj(id: any) {
   });
 }
 
-export function GetDetail(id: any) {
+export async function GetDetail(id: any) {
   return await request({
     url: apiPrefix + "/detail",
     method: "post",
@@ -51,7 +51,7 @@ export function GetDetail(id: any) {
   });
 }
 
-export function Save(pipelineEntity: any) {
+export async function Save(pipelineEntity: any) {
   return await request({
     url: apiPrefix + "/save",
     method: "post",
@@ -59,7 +59,7 @@ export function Save(pipelineEntity: any) {
   });
 }
 
-export function Trigger(id: any, stepId?: string) {
+export async function Trigger(id: any, stepId?: string) {
   return await request({
     url: apiPrefix + "/trigger",
     method: "post",
@@ -67,7 +67,7 @@ export function Trigger(id: any, stepId?: string) {
   });
 }
 
-export function Cancel(historyId: any) {
+export async function Cancel(historyId: any) {
   return await request({
     url: apiPrefix + "/cancel",
     method: "post",

packages/ui/certd-client/src/views/framework/login/index.vue

@@ -208,7 +208,8 @@ export default defineComponent({
 <style lang="less">
 @import "../../../style/theme/index.less";
 .login-page.main {
-  margin: 20px !important;
+  //margin: 20px !important;
+  margin-bottom: 100px;
   .user-layout-login {
     label {
       font-size: 14px;

packages/ui/certd-client/src/views/sys/account/api.ts

@@ -23,3 +23,11 @@ export async function UnbindUser(userId: number) {
     data: { userId }
   });
 }
+
+export async function UpdateLicense(data: any) {
+  await request({
+    url: "/sys/account/updateLicense",
+    method: "post",
+    data
+  });
+}

packages/ui/certd-client/src/views/sys/account/index.vue

@@ -10,6 +10,7 @@ import { onMounted, ref } from "vue";
 import { useUserStore } from "/@/store/modules/user";
 import { useSettingStore } from "/@/store/modules/settings";
 import * as api from "./api";
+import { notification } from "ant-design-vue";
 const iframeRef = ref();
 
 const userStore = useUserStore();
@@ -21,7 +22,12 @@ type SubjectInfo = {
   expiresTime?: number;
 };
 onMounted(() => {
-  const iframeClient = new IframeClient(iframeRef.value);
+  const iframeClient = new IframeClient(iframeRef.value, (e: any) => {
+    notification.error({
+      message: " error",
+      description: e.message
+    });
+  });
   iframeClient.register("getSubjectInfo", async (req) => {
     const subjectInfo: SubjectInfo = {
       subjectId: settingStore.installInfo.siteId,
@@ -47,6 +53,15 @@ onMounted(() => {
     const userId = req.data.userId;
     await api.UnbindUser(userId);
   });
+
+  iframeClient.register("updateLicense", async (req) => {
+    await api.UpdateLicense(req.data);
+    await userStore.reInit();
+    notification.success({
+      message: "更新成功",
+      description: "专业版已激活"
+    });
+  });
 });
 </script>
 

packages/ui/certd-client/src/views/sys/authority/role/api.ts

@@ -46,7 +46,7 @@ export async function GetObj(id: any) {
  * @returns {*}
  * @constructor
  */
-export function getPermissionIds(roleId: any) {
+export async function getPermissionIds(roleId: any) {
   return await request({
     url: apiPrefix + "/getPermissionIds",
     method: "post",
@@ -61,7 +61,7 @@ export function getPermissionIds(roleId: any) {
  * @returns {*}
  * @constructor
  */
-export function DoAuthz(roleId: any, permissionIds: any) {
+export async function DoAuthz(roleId: any, permissionIds: any) {
   return await request({
     url: apiPrefix + "/authz",
     method: "post",

packages/ui/certd-server/.env.development.yaml

@@ -1,10 +1,8 @@
-koa:
-  port: 7001
 #  key: ./data/ssl/cert.key
 #  cert: ./data/ssl/cert.crt
-#plus:
-#  server:
-#    baseUrl: 'http://127.0.0.1:11007'
 plus:
   server:
-     baseUrl: 'https://api.ai.handsfree.work'
+    baseUrl: 'http://127.0.0.1:11007'
+#plus:
+#  server:
+#     baseUrl: 'https://api.ai.handsfree.work'

packages/ui/certd-server/src/modules/account/account-controller.ts

@@ -26,8 +26,9 @@ export class BasicController extends BaseController {
   public async preBindUser(@Body(ALL) body: PreBindUserReq) {
     const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
     // 设置缓存内容
-    await this.plusService.request({
+    await this.plusService.requestWithoutSign({
       url: '/activation/subject/preBind',
+      method: 'POST',
       data: {
         userId: body.userId,
         appKey: AppKey,
@@ -53,4 +54,11 @@ export class BasicController extends BaseController {
     await this.sysSettingsService.saveSetting(installInfo);
     return this.ok({});
   }
+
+  @Post('/updateLicense', { summary: 'sys:settings:edit' })
+  public async updateLicense(@Body(ALL) body: { license: string }) {
+    const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
+    await this.plusService.updateLicense(installInfo.siteId, body.license);
+    return this.ok(true);
+  }
 }

packages/ui/certd-server/src/modules/basic/service/plus-service.ts

@@ -1,7 +1,7 @@
 import { Config, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { SysSettingsService } from '../../system/service/sys-settings-service.js';
-import { SysInstallInfo } from '../../system/service/models.js';
+import { SysInstallInfo, SysLicenseInfo } from '../../system/service/models.js';
-import { AppKey, getPlusInfo, isPlus } from '@certd/pipeline';
+import { AppKey, getPlusInfo, isPlus, verify } from '@certd/pipeline';
 import * as crypto from 'crypto';
 import { request } from '../../../utils/http.js';
 import { logger } from '../../../utils/logger.js';
@@ -16,6 +16,7 @@ export class PlusService {
 
   async requestWithoutSign(config: any): Promise<any> {
     config.baseURL = this.plusServerBaseUrl;
+    config.method = config.method || 'POST';
     return await request(config);
   }
 
@@ -76,4 +77,24 @@ export class PlusService {
       data: formData,
     });
   }
+
+  async updateLicense(siteId: string, license: string) {
+    let licenseInfo: SysLicenseInfo = await this.sysSettingsService.getSetting(SysLicenseInfo);
+    if (!licenseInfo) {
+      licenseInfo = new SysLicenseInfo();
+    }
+    licenseInfo.license = license;
+    await this.sysSettingsService.saveSetting(licenseInfo);
+
+    const verifyRes = await verify({
+      subjectId: siteId,
+      license,
+    });
+
+    if (!verifyRes.isPlus) {
+      const message = verifyRes.message || '授权码校验失败';
+      logger.error(message);
+      throw new Error(message);
+    }
+  }
 }

packages/ui/certd-server/src/modules/system/controller/plus-controller.ts

@@ -1,8 +1,8 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { SysSettingsService } from '../service/sys-settings-service.js';
 import { BaseController } from '../../../basic/base-controller.js';
-import { AppKey, verify } from '@certd/pipeline';
+import { AppKey } from '@certd/pipeline';
-import { SysInstallInfo, SysLicenseInfo } from '../service/models.js';
+import { SysInstallInfo } from '../service/models.js';
 import { logger } from '../../../utils/logger.js';
 import { PlusService } from '../../basic/service/plus-service.js';
 
@@ -21,10 +21,11 @@ export class SysPlusController extends BaseController {
   async active(@Body(ALL) body) {
     const { code } = body;
     const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
+    const siteId = installInfo.siteId;
     const formData = {
       appKey: AppKey,
       code,
-      subjectId: installInfo.siteId,
+      subjectId: siteId,
     };
 
     const res: any = await this.plusService.active(formData);
@@ -33,26 +34,10 @@ export class SysPlusController extends BaseController {
       logger.error('激活失败', res.message);
       return this.fail(res.message, 1);
     }
-
     const license = res.data.license;
 
-    let licenseInfo: SysLicenseInfo = await this.sysSettingsService.getSetting(SysLicenseInfo);
+    await this.plusService.updateLicense(siteId, license);
-    if (!licenseInfo) {
-      licenseInfo = new SysLicenseInfo();
-    }
-    licenseInfo.license = license;
-    await this.sysSettingsService.saveSetting(licenseInfo);
 
-    const verifyRes = await verify({
+    return this.ok(true);
-      subjectId: installInfo.siteId,
-      license,
-    });
-
-    if (!verifyRes.isPlus) {
-      const message = verifyRes.message || '授权码校验失败';
-      logger.error(message);
-      return this.fail(message, 1);
-    }
-    return this.ok(res.data);
   }
 }