fix: 优化

Author: galaxy-s10

.gitignore

@@ -2,4 +2,7 @@ node_modules
 dist
 components.d.ts
 .DS_Store
+.eslintcache
 deploy/index.js
+electron-release
+electron-dist

.vscode/settings.json

@@ -38,5 +38,6 @@
     "ts",
     "tsx",
     "vue"
-  ]
+  ],
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

CHANGELOG.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <a href="https://desk.hsslive.cn" target="_blank">
+  <a href="https://live.hsslive.cn/remoteDesktop" target="_blank">
     <img
       width="200"
       src="https://github.com/galaxy-s10/billd-desk/blob/main/src/assets/img/logo.png?raw=true"
@@ -10,22 +10,10 @@
 <h1 align="center">
   BilldDesk
 </h1>
-
 <p align="center">
  基于WebRTC + Vue3 + Electron + Nodejs搭建的远程桌面
 </p>
 
-<div align="center">
-
-![stars](https://img.shields.io/github/stars/billd-project/desk)
-![forks](https://img.shields.io/github/forks/billd-project/desk)
-
-![version](https://img.shields.io/github/package-json/v/billd-project/desk)
-![License](https://img.shields.io/github/license/billd-project/desk)
-![language](https://img.shields.io/github/languages/top/billd-project/desk)
-
-</div>
-
 ## 简介
 
 BilldDesk远程桌面控制，目前实现了类似ToDesk、向日葵等远程桌面的功能。
@@ -49,7 +37,6 @@ BilldDesk远程桌面控制，目前实现了类似ToDesk、向日葵等远程
 - [x] 支持Macos系统
 - [x] 支持Windows系统
 - [ ] 支持Linux系统
-- [x] 组合键
 - [ ] 文件传输
 - [ ] 移动客户端
 - [ ] 后台管理
@@ -206,21 +193,12 @@ npm config set registry https://registry.npmmirror.com
    ```
 3. 在node_modules/electron目录下执行node install
 
+## 交流群🔥
+
+![WechatIMG1417](https://github.com/user-attachments/assets/d0743ee0-4545-4618-863e-13c40f717119)
+
 ## 兼容性
 
 - [x] Windows
 - [x] Macos
 - [ ] Linux
-
-## 交流
-
-- 暂不开放官方交流群
-- 遇到有问题，请提[Issue](https://github.com/billd-project/desk/issues)
-
-## 商务合作
-
-- [付费咨询](https://live.hsslive.cn/support)
-
-## 私有化部署
-
-- [付费咨询](https://live.hsslive.cn/support)

LICENSE

@@ -7,7 +7,7 @@ import trash from 'trash';
 
 const allFile = [];
 const ignore = ['.DS_Store', '.git', 'node_modules', 'dist'];
-const localDir = '/Users/huangshuisheng/Desktop/hss/galaxy-s10/billd-desk';
+const localDir = '/Users/huangshuisheng/Desktop/hss/galaxy-s10/desk';
 const giteeDir = '/Users/huangshuisheng/Desktop/hss/jenkins/billd-desk';
 
 const dir = fs.readdirSync(localDir).filter((item) => {
@@ -71,6 +71,25 @@ async function clearOld() {
   await Promise.all(queue);
 }
 
+const newPkgStr = fs.readFileSync(
+  path.resolve(localDir, 'package.json'),
+  'utf-8'
+);
+const viteConfigStr = fs.readFileSync(
+  path.resolve(localDir, './deploy/vite.config.ts'),
+  'utf-8'
+);
+const tsconfigStr = fs.readFileSync(
+  path.resolve(localDir, './deploy/tsconfig.json'),
+  'utf-8'
+);
+const newPkg = JSON.parse(newPkgStr);
+delete newPkg['devDependencies']['@electron-toolkit/preload'];
+delete newPkg['devDependencies']['@electron/rebuild'];
+delete newPkg['devDependencies']['electron'];
+delete newPkg['devDependencies']['electron-builder'];
+delete newPkg['devDependencies']['electron-icon-builder'];
+
 if (process.cwd().indexOf('jenkins') !== -1) {
   console.log('当前目录错误');
 } else {
@@ -80,6 +99,21 @@ if (process.cwd().indexOf('jenkins') !== -1) {
     const gitignoreTxt =
       'node_modules\ndist\ncomponents.d.ts\n.eslintcache\n.DS_Store\n';
     fs.writeFileSync(path.resolve(giteeDir, './.gitignore'), gitignoreTxt);
+    fs.writeFileSync(
+      path.resolve(giteeDir, 'package.json'),
+      // @ts-ignore
+      JSON.stringify({ ...newPkg }, {}, 2)
+    );
+    fs.writeFileSync(
+      path.resolve(giteeDir, 'vite.config.ts'),
+      // @ts-ignore
+      viteConfigStr
+    );
+    fs.writeFileSync(
+      path.resolve(giteeDir, 'tsconfig.json'),
+      // @ts-ignore
+      tsconfigStr
+    );
     execSync(`pnpm i`, { cwd: giteeDir });
     execSync(`git add .`, { cwd: giteeDir });
     execSync(`git commit -m 'feat: ${new Date().toLocaleString()}'`, {

README.md

@@ -0,0 +1,39 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "skipLibCheck": true,
+    "noImplicitAny": false,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "preserve",
+
+    "baseUrl": "./",
+    "paths": {
+      "@/*": ["src/*"]
+    },
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true
+  },
+
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.d.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
+    "config/**/*.ts",
+    "components.d.ts"
+  ], // 仅仅匹配这些文件，除了src以外的文件都不会被匹配
+  "references": [{ "path": "./tsconfig.node.json" }]
+}

build/icons/1024x1024.png

@@ -0,0 +1,150 @@
+import vue from '@vitejs/plugin-vue';
+import BilldHtmlWebpackPlugin, { logData } from 'billd-html-webpack-plugin';
+import path from 'path';
+import AutoImport from 'unplugin-auto-import/vite';
+import { NaiveUiResolver } from 'unplugin-vue-components/resolvers';
+import Components from 'unplugin-vue-components/vite';
+import { defineConfig } from 'vite';
+import checker from 'vite-plugin-checker';
+import { createHtmlPlugin } from 'vite-plugin-html';
+
+import pkg from './package.json';
+
+const isWeb = process.env['VITE_APP_RELEASE_PROJECT_ISWEB'] === 'true';
+
+// https://vitejs.dev/config/
+export default defineConfig(({ mode }) => {
+  const isProduction = mode === 'production';
+
+  const outputStaticUrl = () => {
+    if (isWeb) {
+      if (isProduction) {
+        return 'https://resource.hsslive.cn/billd-desk/dist/';
+      } else {
+        return './';
+      }
+    } else {
+      if (isProduction) {
+        return 'dist';
+      } else {
+        return './';
+      }
+    }
+  };
+
+  return {
+    base: outputStaticUrl(),
+    css: {
+      preprocessorOptions: {
+        scss: {
+          additionalData: `@use 'billd-scss/src/index.scss' as *;@import "@/assets/css/constant.scss";`,
+        },
+      },
+    },
+    resolve: {
+      alias: { '@': path.resolve(__dirname, 'src') },
+      /**
+       * 不建议省略.vue后缀
+       * https://cn.vitejs.dev/config/shared-options.html#resolve-extensions
+       */
+      // extensions: ['.js', '.ts', '.jsx', '.tsx', '.vue'],
+    },
+    build: {
+      outDir: 'dist',
+    },
+    plugins: [
+      // legacy(),
+      // isProduction && legacy(),
+      vue(),
+      createHtmlPlugin({
+        inject: {
+          data: {
+            // @ts-ignore
+            title: pkg.productName,
+          },
+        },
+      }),
+      // renderer({
+      //   resolve: {
+      //     '@nut-tree/nut-js': { type: 'cjs' },
+      //   },
+      // }),
+      checker({
+        // typescript: true,
+        vueTsc: true,
+        eslint: {
+          lintCommand: 'eslint "./src/**/*.{ts,tsx}"', // for example, lint .ts & .tsx
+        },
+      }),
+      // eslint({
+      //   failOnError: false,
+      //   failOnWarning: false,
+      //   cache: false,
+      // }),
+      AutoImport({
+        imports: [
+          {
+            'naive-ui': ['useMessage', 'useNotification'],
+          },
+        ],
+      }),
+      Components({
+        resolvers: [NaiveUiResolver()],
+      }),
+      new BilldHtmlWebpackPlugin({ env: 'vite4' }).config,
+    ],
+    define: {
+      'process.env': {
+        BilldHtmlWebpackPlugin: logData(),
+        NODE_ENV: JSON.stringify(isProduction ? 'production' : 'development'),
+        PUBLIC_PATH: outputStaticUrl(),
+        VUE_APP_RELEASE_PROJECT_NAME: JSON.stringify(
+          process.env.VUE_APP_RELEASE_PROJECT_NAME
+        ),
+        VUE_APP_RELEASE_PROJECT_ENV: JSON.stringify(
+          process.env.VUE_APP_RELEASE_PROJECT_ENV
+        ),
+        VUE_APP_RELEASE_PROJECT_VERSION: JSON.stringify(pkg.version),
+      },
+    },
+
+    server: {
+      host: '0.0.0.0',
+      proxy: {
+        '/api': {
+          target: 'http://localhost:4300',
+          secure: false, // 默认情况下（secure: true），不接受在HTTPS上运行的带有无效证书的后端服务器。设置secure: false后，后端服务器的HTTPS有无效证书也可运行
+          /**
+           * changeOrigin，是否修改请求地址的源
+           * 默认changeOrigin: false，即发请求即使用devServer的localhost:port发起的，如果后端服务器有校验源，就会有问题
+           * 设置changeOrigin: true，就会修改发起请求的源，将原本的localhost:port修改为target，这样就可以通过后端服务器对源的校验
+           */
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/api/, '/'),
+        },
+        '/betaapi': {
+          target: 'http://localhost:4300',
+          secure: false, // 默认情况下（secure: true），不接受在HTTPS上运行的带有无效证书的后端服务器。设置secure: false后，后端服务器的HTTPS有无效证书也可运行
+          /**
+           * changeOrigin，是否修改请求地址的源
+           * 默认changeOrigin: false，即发请求即使用devServer的localhost:port发起的，如果后端服务器有校验源，就会有问题
+           * 设置changeOrigin: true，就会修改发起请求的源，将原本的localhost:port修改为target，这样就可以通过后端服务器对源的校验
+           */
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/betaapi/, '/'),
+        },
+        '/prodapi': {
+          target: 'http://localhost:4200',
+          secure: false, // 默认情况下（secure: true），不接受在HTTPS上运行的带有无效证书的后端服务器。设置secure: false后，后端服务器的HTTPS有无效证书也可运行
+          /**
+           * changeOrigin，是否修改请求地址的源
+           * 默认changeOrigin: false，即发请求即使用devServer的localhost:port发起的，如果后端服务器有校验源，就会有问题
+           * 设置changeOrigin: true，就会修改发起请求的源，将原本的localhost:port修改为target，这样就可以通过后端服务器对源的校验
+           */
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/prodapi/, '/'),
+        },
+      },
+    },
+  };
+});