fdb2 1.0.2 → 1.0.4

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,45 @@
+<!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.png" />    
+    <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/vue.js">
+    <link rel="modulepreload" crossorigin href="/public/bootstrap.js">
+    <link rel="stylesheet" crossorigin href="/public/vue.css">
+    <link rel="stylesheet" crossorigin href="/public/bootstrap.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.2",
+  "version": "1.0.4",
   "private": false,
   "type": "commonjs",
   "main": "view/index.html",
@@ -16,6 +16,7 @@
     "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/preinstall.js

@@ -0,0 +1,38 @@
+const { execSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+
+console.log('Checking for running fdb2 instances...');
+
+try {
+  const projectRoot = path.resolve(__dirname, '..');
+  const pidFilePath = path.join(projectRoot, 'server.pid');
+
+  if (fs.existsSync(pidFilePath)) {
+    try {
+      const pid = parseInt(fs.readFileSync(pidFilePath, 'utf8'));
+      process.kill(pid, 0);
+      console.log('Found running fdb2 instance with PID:', pid);
+      console.log('Stopping fdb2...');
+
+      try {
+        execSync('node bin/fdb2.js stop', {
+          cwd: projectRoot,
+          stdio: 'inherit'
+        });
+        console.log('fdb2 stopped successfully');
+      } catch (stopError) {
+        console.warn('Failed to stop fdb2:', stopError.message);
+      }
+    } catch (error) {
+      if (error.code === 'ESRCH') {
+        console.log('Cleaning up stale PID file...');
+        fs.unlinkSync(pidFilePath);
+      }
+    }
+  } else {
+    console.log('No running fdb2 instance found');
+  }
+} catch (error) {
+  console.warn('Pre-install check failed:', error.message);
+}

package/server.pid

@@ -1 +0,0 @@
-7684