fdb2 1.0.16 → 1.0.18

package/dist/server/service/session.service.ts

@@ -0,0 +1,158 @@
+import { Provide, Scope, ScopeEnum, Config, Inject } from '@midwayjs/core';
+import { ISessionService, TencentService } from '@cicctencent/midwayjs-base';
+import { Session, GetLoginSessionReq, GetLoginSessionRes, LogoutReq, LogoutRes, LoginByWxReq, LoginByWxRsp, LoginByAccountReq, LoginByAccountRsp } from '@fefeding/common/dist/models/account/session';
+
+@Provide('session:service')
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
+export class SessionService extends ISessionService { 
+    @Config('loginOption')
+    loginOption: any;
+
+    @Inject()
+    tencentService: TencentService;
+
+    /**
+     * 根据ID获取session
+     * 并判断session是否在有效期
+     * @param id token唯一
+     */
+    async getLoginSession(id: string): Promise<Session> {
+        const req = new GetLoginSessionReq();
+        req.id = id;
+        const res = await this.requestBaseApi<GetLoginSessionRes>(req);
+        return res?.data || null;
+    }
+    /**
+     * 下线
+     * @param id 需要下线的id或者session
+     */
+    async logout(id: string): Promise<any> {
+        const req = new LogoutReq();
+        req.id = id;
+        const res = await this.requestBaseApi<LogoutRes>(req);
+        this.ctx.currentSession = null;
+        return res;
+    }
+
+    /**
+     * 登录接口
+     * @param loginParams 登录参数
+     * @returns 
+     */
+    async loginByWx(loginParams: LoginByWxReq) {
+        const req = new LoginByWxReq();
+        req.fromJSON(loginParams);
+        const res = await this.requestBaseApi<LoginByWxRsp>(req);
+        return res;
+    }
+
+    /**
+     * 帐号登陆
+     * @param loginParams 
+     * @returns 
+     */
+    async loginByAccount(loginParams: LoginByAccountReq) {
+        loginParams.appId = '0';//this.baseServiceOption.appId?.toString() || '0';
+        
+        const req = new LoginByAccountReq();
+        req.fromJSON(loginParams);
+        const res = await this.requestBaseApi<LoginByAccountRsp>(req);
+        return res;
+    }
+
+    /**
+     * 用临时码登陆
+     * @param code 登陆临时码
+     * @returns 
+     */
+    async loginByCode(code: string) {
+        const res = await this.requestBaseApi('/api/session/loginByAuthCode', {
+            data: {
+                code
+            }
+        });
+        return res?.data || null;
+    }
+
+    /**
+     * 生成临时登陆码
+     * @param id 登陆token 
+     * @returns 
+     */
+    async createAuthCode(id: string) {
+        const res = await this.requestBaseApi('/api/session/createAuthCode', {
+            data: {
+                id
+            }
+        });
+        return res;
+    }
+
+    // 生成登陆用公众号二维码
+    // 先生成一个验证码，当用户扫码后，事件回调获取验证码后再生成session
+    async createWxLoginQrcode() {
+
+        const res = await this.requestBaseApi('/api/session/createWxLoginQrcode', {
+            data: {
+                appId: this.loginOption.wxAppId
+            }
+        });
+        //console.log(res);
+        return res;
+    }
+
+    // 验证码登陆
+    async loginByVerifyCode(code: string, appId?: number,prefix?: string) {
+        if(!code) throw Error('code不可为空');
+        appId = appId || this.loginOption.wxAppId;
+
+        const res = await this.requestBaseApi('/api/session/loginByVerifyCode', {
+            data: {
+                appId,
+                code,
+                prefix
+            }
+        });
+        return res;
+    }
+
+    // 更新用户信息
+    async updateUser(user: any) {
+        const userId = this.ctx.currentSession?.userId || 0;
+        if(!userId) return;
+        //console.log(loginParams, req);
+        const res = await this.requestBaseApi('/api/account/updateUser', {
+            data: {
+                user: {
+                    ...user,
+                    id: userId,
+                }
+            },
+            params: {
+                token: this.ctx.currentSession?.id
+            }
+        });
+        console.log('updateUser', res);
+        return res;
+    }
+
+    // 上传头像图片
+    async uploadAvatar(file: any) {
+
+        const userId = this.ctx.currentSession?.userId || 0;
+        if(!userId) return;
+
+        let filename = file['filename'] as string || '1.png';
+
+        const key = `avator/${userId}/${filename}`;
+         
+        const res = await this.tencentService.uploadCosFile(key, file.data);
+        console.log(res);
+        const user = {
+            id: userId,
+            avatar: res.url || key,
+        }
+
+        return await this.updateUser(user);
+    }
+}

package/dist/view/index.html

@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <base href="" />
+    <script type="text/template" id="__INITIAL_STATE__">
+    {{ data | dump | safe }}
+</script>
+<script type="text/template" id="__DEFAULTINITIAL_STATE__">
+  {"config":{"prefix":"","apiUrl":""},"sso":{"baseUrl":"","appId":2}}
+</script>
+<script>
+  function __get_templateJson(id) {
+    try { 
+        var tag = document.getElementById(id);
+        var obj = JSON.parse(tag.innerHTML);
+        return obj;
+    }
+    catch (e) {    
+      return null;
+    }
+  }
+  var __INITIAL_STATE__ = __get_templateJson('__INITIAL_STATE__');
+  if(!__INITIAL_STATE__) __INITIAL_STATE__ = __get_templateJson('__DEFAULTINITIAL_STATE__');        
+</script>   
+    <link rel="icon" href="/public/favicon.ico" />    
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>fdb2-数据库管理</title>
+    <meta name="description" content="{{description}}">
+    <script>
+      window.addEventListener('vite:preloadError', function (event) {
+        console.error(event);
+      });
+    </script> 
+    <script type="module" crossorigin src="/public/index.js"></script>
+    <link rel="modulepreload" crossorigin href="/public/rolldown-runtime.js">
+    <link rel="modulepreload" crossorigin href="/public/_plugin-vue_export-helper.js">
+    <link rel="modulepreload" crossorigin href="/public/bootstrap.js">
+    <link rel="modulepreload" crossorigin href="/public/vue.js">
+    <link rel="modulepreload" crossorigin href="/public/modal.js">
+    <link rel="stylesheet" crossorigin href="/public/bootstrap.css">
+    <link rel="stylesheet" crossorigin href="/public/modal.css">
+    <link rel="stylesheet" crossorigin href="/public/index.css">
+  </head>
+  <body>
+    <div id="app" class="min-vh-100"></div>
+  </body>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fdb2",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "private": false,
   "type": "commonjs",
   "main": "view/index.html",
@@ -8,6 +8,8 @@
     "bin/",
     "public/",
     "view/",
+    "dist/",
+    "scripts/",
     "server.js",
     "package.json",
     "README.md"
@@ -26,7 +28,6 @@
     "icon": "public/favicon.ico"
   },
   "scripts": {
-    "preinstall": "node scripts/preinstall.js",
     "start": "pm2 start server.js --name fdb2-server --disable-logs --",
     "restart": "pm2 restart fdb2-server --disable-logs --",
     "stop": "pm2 stop fdb2-server --",

package/scripts/nw-build.js

@@ -0,0 +1,136 @@
+const nwbuilder = require('nw-builder');
+const { resolve, join } = require('path');
+const { copyFileSync, existsSync, readdirSync } = require('fs');
+
+const projectRoot = resolve(__dirname, '..');
+
+const args = process.argv.slice(2);
+const targetPlatform = args.find(arg => arg.startsWith('--platform='))?.split('=')[1];
+
+const supportedPlatforms = ['win', 'osx', 'linux'];
+
+function getCurrentPlatform() {
+  const platform = process.platform;
+  if (platform === 'darwin') return ['osx'];
+  if (platform === 'linux') return ['linux'];
+  return ['win', 'linux'];
+}
+
+function getAppConfig(platform) {
+  const config = {
+    icon: resolve(projectRoot, 'dist', 'public', 'favicon.ico')
+  };
+
+  if (platform === 'osx') {
+    config.LSApplicationCategoryType = 'public.app-category.productivity';
+    config.NSHumanReadableCopyright = 'Copyright © 2025';
+    config.NSLocalNetworkUsageDescription = '需要网络访问以连接数据库';
+    config.CFBundleIdentifier = 'com.fdb.database';
+    config.CFBundleName = '数据库管理工具';
+    config.CFBundleDisplayName = '数据库管理工具';
+    config.CFBundleShortVersionString = '1.0.1';
+    config.CFBundleVersion = '1.0.1';
+  }
+
+  return config;
+}
+
+async function buildPlatform(platform) {
+  const outDir = resolve(projectRoot, `release/fdb2-${platform}`);
+  console.log(`\n========================================`);
+  console.log(`开始构建 ${platform} 平台...`);
+  console.log(`========================================`);
+
+  const buildOptions = {
+    mode: 'build',
+    srcDir: resolve(projectRoot, 'dist'),
+    version: '0.78.1',
+    flavor: 'normal',
+    platform: platform,
+    arch: 'x64',
+    outDir: outDir,
+    cacheDir: resolve(projectRoot, 'nw-cache'),
+    downloadUrl: 'https://github.com/nwjs/nw.js/releases/download/v0.78.1',
+    zip: false,
+    logLevel: 'info',
+    glob: false,
+    app: getAppConfig(platform)
+  };
+
+  await nwbuilder.default(buildOptions);
+
+  const packagedPath = join(outDir, platform, 'x64', 'package.nw', 'node_modules');
+  if (existsSync(packagedPath)) {
+    console.log(`✅ ${platform} 应用程序已包含 node_modules 目录 (${readdirSync(packagedPath).length} 个包)`);
+  } else {
+    console.log(`⚠️  ${platform} 应用程序不包含 node_modules 目录`);
+  }
+
+  console.log(`✅ ${platform} 平台构建完成 -> ${outDir}`);
+}
+
+async function build() {
+  try {
+    console.log('开始构建 NW.js 应用...\n');
+
+    console.log('1. 构建 Vue 应用...');
+    const { execSync } = require('child_process');
+    execSync('npm run build', { stdio: 'inherit', cwd: projectRoot });
+
+    console.log('\n2. 复制 package.json 到 dist 目录...');
+    copyFileSync(
+      join(projectRoot, 'package.json'),
+      join(projectRoot, 'dist', 'package.json')
+    );
+
+    console.log('\n3. 安装 npm 依赖到 dist 目录...');
+    const distPath = resolve(projectRoot, 'dist');
+    execSync('pnpm install --only=production', {
+      stdio: 'inherit',
+      cwd: distPath
+    });
+
+    if (!existsSync(join(distPath, 'node_modules'))) {
+      throw new Error('npm install 失败');
+    }
+    console.log('npm 依赖安装成功\n');
+
+    console.log('4. 配置 NW.js 构建参数...');
+
+    let platformsToBuild = [];
+
+    if (targetPlatform) {
+      if (targetPlatform === 'all') {
+        platformsToBuild = supportedPlatforms;
+        console.log(`构建所有支持平台: ${supportedPlatforms.join(', ')}`);
+      } else if (supportedPlatforms.includes(targetPlatform)) {
+        platformsToBuild = [targetPlatform];
+        console.log(`构建指定平台: ${targetPlatform}`);
+      } else {
+        console.error(`不支持的平台: ${targetPlatform}`);
+        console.log(`支持的平台: ${supportedPlatforms.join(', ')} 或 all`);
+        process.exit(1);
+      }
+    } else {
+      platformsToBuild = getCurrentPlatform();
+      console.log(`未指定平台，自动使用当前平台: ${platformsToBuild}`);
+    }
+
+    console.log(`输出目录: ${resolve(projectRoot, 'release')}`);
+
+    for (const platform of platformsToBuild) {
+      await buildPlatform(platform);
+    }
+
+    console.log('\n========================================');
+    console.log('🎉 所有平台构建完成！');
+    console.log('========================================');
+    console.log(`输出目录: ${resolve(projectRoot, 'release')}`);
+
+  } catch (error) {
+    console.error('构建过程中出错:', error);
+    process.exit(1);
+  }
+}
+
+build();

package/scripts/nw-dev.js

@@ -0,0 +1,67 @@
+const { exec } = require('child_process');
+const { createServer } = require('http');
+const { join, resolve } = require('path');
+
+const projectRoot = resolve(__dirname, '..');
+
+// 启动 Vite 开发服务器
+const viteProcess = exec('npm run dev', { cwd: projectRoot }, (error, stdout, stderr) => {
+  if (error) {
+    console.error(`执行 npm run dev 时出错: ${error}`);
+    return;
+  }
+  console.log(`stdout: ${stdout}`);
+  console.error(`stderr: ${stderr}`);
+});
+
+viteProcess.stdout.on('data', (data) => {
+  console.log(data);
+  // 当 Vite 服务器启动成功后，启动 NW.js
+  if (data.includes('ready')) {
+    setTimeout(() => {
+      console.log('starting NW.js...', 'npx nw . --url=http://localhost:9300');
+      const nwProcess = exec('npx nw . --url=http://localhost:9300', { cwd: projectRoot }, (error, stdout, stderr) => {
+        if (error) {
+          console.error(`启动 NW.js 时出错: ${error}`);
+          return;
+        }
+        console.log(`stdout: ${stdout}`);
+        console.error(`stderr: ${stderr}`);
+      });
+
+      nwProcess.stdout.on('data', (data) => {
+        console.log(data);
+      });
+
+      nwProcess.stderr.on('data', (data) => {
+        console.error(data);
+      });
+
+      nwProcess.on('close', (code) => {
+        console.log(`NW.js 进程退出，代码: ${code}`);
+        viteProcess.kill();
+      });
+
+      // 处理退出信号
+      process.on('SIGINT', () => {
+        nwProcess.kill();
+        viteProcess.kill();
+        process.exit();
+      });
+
+      process.on('SIGTERM', () => {
+        nwProcess.kill();
+        viteProcess.kill();
+        process.exit();
+      });
+    }, 2000);
+  }
+});
+
+viteProcess.stderr.on('data', (data) => {
+  console.error(data);
+});
+
+viteProcess.on('close', (code) => {
+  console.log(`Vite 进程退出，代码: ${code}`);
+});

package/scripts/preinstall.js

@@ -0,0 +1,112 @@
+const { execSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+const os = require('os');
+
+console.log('Checking for running fdb2 instances...');
+
+try {
+  let pid = null;
+
+  // 检查当前目录的 PID 文件
+  const currentDirPidPath = path.join(process.cwd(), 'fdb2.server.pid');
+  if (fs.existsSync(currentDirPidPath)) {
+    try {
+      pid = parseInt(fs.readFileSync(currentDirPidPath, 'utf8'));
+      process.kill(pid, 0);
+      console.log('Found running fdb2 instance with PID:', pid);
+    } catch (error) {
+      if (error.code !== 'ESRCH') {
+        throw error;
+      }
+    }
+  }
+
+  // 如果没有找到，尝试从全局安装目录查找
+  if (!pid) {
+    try {
+      const globalPath = execSync('npm root -g', { encoding: 'utf8' }).trim();
+      const globalPidPath = path.join(globalPath, 'fdb2', 'fdb2.server.pid');
+      
+      if (fs.existsSync(globalPidPath)) {
+        try {
+          pid = parseInt(fs.readFileSync(globalPidPath, 'utf8'));
+          process.kill(pid, 0);
+          console.log('Found running fdb2 instance with PID:', pid);
+        } catch (error) {
+          if (error.code !== 'ESRCH') {
+            throw error;
+          }
+        }
+      }
+    } catch (error) {
+      // 忽略全局路径查找失败
+    }
+  }
+
+  // 如果找到了运行中的进程，尝试停止它
+  if (pid) {
+    console.log('Stopping fdb2...');
+    
+    try {
+      if (os.platform() === 'win32') {
+        // Windows: 使用 taskkill
+        execSync(`taskkill /F /PID ${pid}`, { stdio: 'inherit' });
+      } else {
+        // Unix-like: 使用 kill
+        process.kill(pid, 'SIGTERM');
+        
+        // 等待进程结束
+        let attempts = 0;
+        while (attempts < 10) {
+          try {
+            process.kill(pid, 0);
+            attempts++;
+            // 等待 100ms
+            Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100);
+          } catch (error) {
+            if (error.code === 'ESRCH') {
+              // 进程已结束
+              break;
+            }
+          }
+        }
+        
+        // 如果进程还在运行，强制终止
+        try {
+          process.kill(pid, 0);
+          process.kill(pid, 'SIGKILL');
+        } catch (error) {
+          if (error.code !== 'ESRCH') {
+            throw error;
+          }
+        }
+      }
+      
+      console.log('fdb2 stopped successfully');
+    } catch (stopError) {
+      console.warn('Failed to stop fdb2:', stopError.message);
+      console.warn('Please manually stop the fdb2 process before installation');
+    }
+  } else {
+    console.log('No running fdb2 instance found');
+  }
+
+  // 清理 PID 文件
+  if (fs.existsSync(currentDirPidPath)) {
+    fs.unlinkSync(currentDirPidPath);
+  }
+  
+  try {
+    const globalPath = execSync('npm root -g', { encoding: 'utf8' }).trim();
+    const globalPidPath = path.join(globalPath, 'fdb2', 'fdb2.server.pid');
+    if (fs.existsSync(globalPidPath)) {
+      fs.unlinkSync(globalPidPath);
+    }
+  } catch (error) {
+    // 忽略全局路径清理失败
+  }
+
+} catch (error) {
+  console.warn('Pre-install check failed:', error.message);
+}