fdb2 1.0.7 → 1.0.9

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

@@ -1,158 +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);
-    }
-}
+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

@@ -1,45 +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> 
+<!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>
+  </head>
+  <body>
+    <div id="app" class="min-vh-100"></div>
+  </body>
 </html>

package/env.d.ts

@@ -1 +1 @@
-/// <reference types="vite/client" />
+/// <reference types="vite/client" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fdb2",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "private": false,
   "type": "commonjs",
   "main": "view/index.html",

package/packages/vscode/.vscodeignore

@@ -1,44 +1,44 @@
-# VSCode Extension Ignore File
-
-# Dependencies
-node_modules
-**/node_modules/**
-
-# Build artifacts
-dist
-out
-
-# Source
-src
-*.ts
-*.js.map
-
-# Test files
-**/test/**
-**/*.test.ts
-**/*.spec.ts
-
-# IDE
-.vscode-test
-.idea
-*.swp
-*.swo
-
-# Logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# OS
-.DS_Store
-Thumbs.db
-
-# Temporary files
-*.tmp
-*.temp
-
-# Package manager files
-package-lock.json
-pnpm-lock.yaml
-yarn.lock
+# VSCode Extension Ignore File
+
+# Dependencies
+node_modules
+**/node_modules/**
+
+# Build artifacts
+dist
+out
+
+# Source
+src
+*.ts
+*.js.map
+
+# Test files
+**/test/**
+**/*.test.ts
+**/*.spec.ts
+
+# IDE
+.vscode-test
+.idea
+*.swp
+*.swo
+
+# Logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Temporary files
+*.tmp
+*.temp
+
+# Package manager files
+package-lock.json
+pnpm-lock.yaml
+yarn.lock

package/packages/vscode/README.md

@@ -1,62 +1,62 @@
-# fdb2 VSCode Extension
-
-fBDB2 的 VSCode 扩展版本，提供强大的数据库管理功能。
-
-## 功能特性
-
-- 📊 支持多种数据库：MySQL、PostgreSQL、SQLite、SQL Server、Oracle 等
-- 🔌 连接管理：添加、编辑、删除、测试数据库连接
-- 💻 SQL 查询：内置 SQL 编辑器，支持快速查询
-- 🗄️ 数据库管理：浏览数据库、表、视图结构
-- 📋 表数据查看：快速浏览表数据
-- 🎨 美观的 UI：基于 Vue 3 的现代化界面
-- ⚡ 高性能：优化的查询和渲染性能
-
-## 快速开始
-
-### 安装扩展
-
-从 VSCode 扩展市场搜索 "fdb2" 或手动安装 `.vsix` 文件。
-
-### 添加连接
-
-1. 点击左侧活动栏的数据库图标
-2. 点击 "+" 按钮添加连接
-3. 填写连接信息
-4. 测试连接
-5. 保存连接
-
-### 执行查询
-
-1. 点击侧边栏的连接
-2. 点击 "打开查询面板"
-3. 输入 SQL 语句
-4. 按 Ctrl+Enter 执行
-
-## 使用说明
-
-详细使用说明请参考 [主项目 README](../../README.md)。
-
-## 开发
-
-### 构建扩展
-
-```bash
-npm run build:all
-```
-
-### 开发模式
-
-```bash
-npm run vscode:dev
-```
-
-### 打包
-
-```bash
-npm run vscode:package
-```
-
-## 许可证
-
-MIT License
+# fdb2 VSCode Extension
+
+fBDB2 的 VSCode 扩展版本，提供强大的数据库管理功能。
+
+## 功能特性
+
+- 📊 支持多种数据库：MySQL、PostgreSQL、SQLite、SQL Server、Oracle 等
+- 🔌 连接管理：添加、编辑、删除、测试数据库连接
+- 💻 SQL 查询：内置 SQL 编辑器，支持快速查询
+- 🗄️ 数据库管理：浏览数据库、表、视图结构
+- 📋 表数据查看：快速浏览表数据
+- 🎨 美观的 UI：基于 Vue 3 的现代化界面
+- ⚡ 高性能：优化的查询和渲染性能
+
+## 快速开始
+
+### 安装扩展
+
+从 VSCode 扩展市场搜索 "fdb2" 或手动安装 `.vsix` 文件。
+
+### 添加连接
+
+1. 点击左侧活动栏的数据库图标
+2. 点击 "+" 按钮添加连接
+3. 填写连接信息
+4. 测试连接
+5. 保存连接
+
+### 执行查询
+
+1. 点击侧边栏的连接
+2. 点击 "打开查询面板"
+3. 输入 SQL 语句
+4. 按 Ctrl+Enter 执行
+
+## 使用说明
+
+详细使用说明请参考 [主项目 README](../../README.md)。
+
+## 开发
+
+### 构建扩展
+
+```bash
+npm run build:all
+```
+
+### 开发模式
+
+```bash
+npm run vscode:dev
+```
+
+### 打包
+
+```bash
+npm run vscode:package
+```
+
+## 许可证
+
+MIT License