feat: optimize

DTStack · Jul 11, 2024 · 00e2546 · antongolub · Jul 12, 2024 · liuxy0551
1 parent 0466ffe
commit 00e2546
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/apps/server/src/app.module.ts b/apps/server/src/app.module.ts
@@ -23,7 +23,6 @@ import { ValidationPipe } from './pipe/validation/validation.pipe';
         ConfigModule.forRoot({
             isGlobal: true,
             envFilePath: [
-                join(__dirname, '../../../', '.env.prod'),
                 join(__dirname, '../../../', '.env.local'),
                 join(__dirname, '../../../', '.env'),
             ],

diff --git a/apps/server/src/main.ts b/apps/server/src/main.ts
@@ -41,4 +41,5 @@ async function bootstrap() {
         console.log(`${formatDate()} api docs: http://localhost:${APP_PORT}/docs`);
     });
 }
+
 bootstrap();
diff --git a/apps/web/src/const/index.ts b/apps/web/src/const/index.ts
@@ -37,9 +37,9 @@ export const IS_USEFUL_TEXT = [
 
 /**
  * 得分的颜色
- * 慢 red #FF3333 0 ~ 49
- * 平均值 orange #FFAA33 50 ~ 79
- * 快 green #00CC66 80 ~ 100
+ * 分数较低 red #FF3333
+ * 分数中等 orange #FFAA33
+ * 分数较高 green #00CC66
  */
 const scoreColor = {
     orangeMin: 50,

diff --git a/apps/web/src/views/home/components/taskTable/index.tsx b/apps/web/src/views/home/components/taskTable/index.tsx
@@ -341,6 +341,8 @@ export default function TaskTable(props: IPros) {
                         <span className="title">操作</span>
                         <Tooltip title="每 10 秒自动刷新">
                             <Switch
+                                checkedChildren="自动刷新"
+                                unCheckedChildren="自动刷新"
                                 loading={versionListLoading || loading}
                                 checked={autoRefresh}
                                 onChange={handleAutoRefresh}

diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server
@@ -50,7 +50,8 @@ COPY apps/web/package.json ./apps/web/
 RUN pnpm install
 
 # 复制项目文件
-COPY . .
+COPY apps/ ./apps/
+COPY .env ./
 # 减少 node_modules 的磁盘占用
 RUN pnpm build \
      && find . -name "node_modules" -type d -prune -exec rm -rf '{}' + \

diff --git a/scripts/deploy.mjs b/scripts/deploy.mjs
@@ -22,9 +22,7 @@ $.verbose = false;
     $.verbose = true;
     // 本地应该使用 `.env.prod` 文件
     echo(
-        await $`gtar -czf yice-performance${testStr}.tar.gz apps/server/dist pm2/config${testStr}.* apps/server/yice-report/README.md apps/web/dist scripts package.json apps/server/package.json apps/web/package.json pnpm-lock.yaml pnpm-workspace.yaml turbo.json .env .env.local ${
-            isTest ? '' : '.env.prod'
-        }`
+        await $`gtar -czf yice-performance${testStr}.tar.gz apps/server/dist pm2/config${testStr}.* apps/server/yice-report/README.md apps/web/dist scripts package.json apps/server/package.json apps/web/package.json pnpm-lock.yaml pnpm-workspace.yaml turbo.json .env .env.local`
     );
     $.verbose = false;
     doneLog();
@@ -41,7 +39,7 @@ $.verbose = false;
     infoLog('4. 开始在远程服务器解压、安装依赖并重启服务...');
     $.verbose = true;
     echo(
-        await $`ssh root@${yiceServerIP} "cd /opt/dtstack/yice-performance${testStr}/; tar -xzf yice-performance${testStr}.tar.gz; rm -rf yice-performance${testStr}.tar.gz; find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +; cp scripts/start${testStr}.sh ./; ls -lahS; ./start${testStr}.sh; du -h --max-depth=1 ./apps/server/yice-report"`
+        await $`ssh root@${yiceServerIP} "cd /opt/dtstack/yice-performance${testStr}/; tar -xzf yice-performance${testStr}.tar.gz; rm -rf yice-performance${testStr}.tar.gz; cp scripts/start${testStr}.sh ./; ls -lahS; ./start${testStr}.sh; du -h --max-depth=1 ./apps/server/yice-report;"`
     );
     $.verbose = false;
     doneLog();
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,4 +41,5 @@ async function bootstrap() { @@
             console.log(`${formatDate()} api docs: http://localhost:${APP_PORT}/docs`);
         });
     }
     bootstrap();