feat/p2p

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Use pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: ^7.29
+          version: ^8.8.0
           run_install: false
 
       - name: Get pnpm store directory
@@ -57,4 +57,4 @@ jobs:
         # https://nx.dev/recipes/ci/monorepo-ci-github-actions
 
       - name: Run linters and tests
-        run: pnpm ci
+        run: pnpm run ci

.gitignore

@@ -46,3 +46,7 @@ yarn-error.log*
 .env
 
 repo_sync
+
+syncSecretPad.js
+
+.nx

apps/docs/docs/dev-doc/build.md

@@ -8,7 +8,6 @@ mobile: false
 ---
 
 # 构建与前后端集成
-当完成二开或者功能更新后，需要将项目重新构建并放在后端项目中一同部署。
 
 当完成二开或者功能更新后，需要将项目重新构建并放在后端项目中一同部署。
 
@@ -17,11 +16,11 @@ mobile: false
 ```bash
 $ pnpm build
 ```
-构建产物会在 `dist` 目录下生成。
 
 构建产物会在 `dist` 目录下生成。
 
 ## 部署
-如果是与 [SecretPad](https://github.com/secretflow/secretpad/tree/main ) 一同部署，需要先将构建产物放在 SecretPad 项目中，之后执行 SecretPad 镜像构建脚本。
 
-在 SecretPad 下新建 `/secretpad-web/src/main/resources/static` 目录，将  `dist` 目录下的产物放在该目录中（如果已有该目录则进行文件替换），之后运行 SecretPad 的 `bash ./scripts/build.sh` 命令重新构建镜像（注意不是 `make build` 命令，`make build` 会拉取官方 Release 的前端产物构建镜像）。
+如果是与 [SecretPad](https://github.com/secretflow/secretpad/tree/main) 一同部署，需要先将构建产物放在 SecretPad 项目中，之后执行 SecretPad 镜像构建脚本。
+
+在 SecretPad 下新建 `/secretpad-web/src/main/resources/static` 目录，将 `dist` 目录下的产物放在该目录中（如果已有该目录则进行文件替换），之后运行 SecretPad 的 `bash ./scripts/build.sh` 命令重新构建镜像（注意不是 `make build` 命令，`make build` 会拉取官方 Release 的前端产物构建镜像）。

apps/docs/docs/dev-doc/start.md

@@ -9,18 +9,18 @@ mobile: false
 
 ## 环境准备
 
-确保正确安装 [Node.js](https://nodejs.org/en/) 且版本为 14+ 即可。
+确保正确安装 [Node.js](https://nodejs.org/en/) 且版本为 16+ 即可。
 
 ```bash
 $ node -v
-v14.19.1
+v16.14.2
 ```
 
 确保已安装[pnpm](https://pnpm.io/installation#using-npm)
 
 ```bash
 $ pnpm -v
-7.29.1
+8.8.0
 ```
 
 ## 初始化项目

apps/platform/config/routes.ts

@@ -9,23 +9,36 @@ export const routes = [
       {
         path: '/dag',
         component: 'dag',
-        wrappers: ['@/wrappers/center-auth', '@/wrappers/component-wrapper'],
+        wrappers: ['@/wrappers/p2p-center-auth', '@/wrappers/component-wrapper'],
       },
       {
         path: '/record',
         component: 'record',
-        wrappers: ['@/wrappers/center-auth', '@/wrappers/component-wrapper'],
+        wrappers: ['@/wrappers/p2p-center-auth', '@/wrappers/component-wrapper'],
       },
       {
         path: '/node',
         component: 'new-node',
         wrappers: ['@/wrappers/edge-auth', '@/wrappers/component-wrapper'],
       },
-      { path: '/my-node', component: 'my-node', wrappers: ['@/wrappers/edge-auth'] },
+      {
+        path: '/my-node',
+        component: 'my-node',
+        wrappers: ['@/wrappers/basic-node-auth', '@/wrappers/p2p-edge-center-auth'],
+      },
       {
         path: '/message',
         component: 'message',
-        wrappers: ['@/wrappers/edge-auth', '@/wrappers/component-wrapper'],
+        wrappers: [
+          '@/wrappers/basic-node-auth',
+          '@/wrappers/p2p-edge-center-auth',
+          '@/wrappers/component-wrapper',
+        ],
+      },
+      {
+        path: '/edge',
+        component: 'edge',
+        wrappers: ['@/wrappers/basic-node-auth', '@/wrappers/p2p-login-auth'],
       },
       { path: '/*', redirect: '/login' },
     ],

apps/platform/package.json

@@ -8,9 +8,9 @@
     "start": "npm run dev",
     "lint:js": "eslint 'src/**/*.{js,jsx,ts,tsx}'",
     "lint:css": "stylelint --allow-empty-input 'src/**/*.{css,less}'",
-    "lint:format": "prettier --check *.json 'src/**/*.{js,jsx,ts,tsx,css,less,md,json}'",
+    "lint:format": "prettier --check *.json 'src/[^.umi]**/*.{js,jsx,ts,tsx,css,less,md,json}'",
     "lint:typing": "tsc --noEmit",
-    "test": "jest --coverage --passWithNoTests",
+    "test": "jest --coverage",
     "preview": "umi preview",
     "openapi": "node config/openapi.config.js"
   },
@@ -20,6 +20,7 @@
     "@antv/x6": "^2.11.1",
     "@antv/x6-plugin-keyboard": "2.2.1",
     "@antv/x6-plugin-selection": "^2.1.7",
+    "@antv/x6-react-shape": "^2.2.2",
     "@secretflow/dag": "workspace:^",
     "@secretflow/utils": "workspace:^",
     "ahooks": "^3.7.8",

apps/platform/project.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "https://cdn.jsdelivr.net/npm/nx@latest/schemas/project-schema.json",
+  "targets": {
+    "lint": {},
+    "ci": {}
+  }
+}

apps/platform/src/app.ts

@@ -2,6 +2,7 @@ import { history } from 'umi';
 import request from 'umi-request';
 
 request.interceptors.request.use((url, options) => {
+  const token = localStorage.getItem('User-Token') || '';
   return {
     url: `${url}`,
     options: {
@@ -11,14 +12,15 @@ request.interceptors.request.use((url, options) => {
       interceptors: true,
       headers: {
         'Content-Type': 'application/json',
+        'User-Token': token,
       },
     },
   };
 });
 
 request.interceptors.response.use(async (response) => {
   const { status } = await response.clone().json();
-  if (status.code === 202011601 || status.code === 202011602) {
+  if (status.code === 202011602) {
     history.push('/login');
   }
   return response;