1.添加图标，修改标题 2.apikey配置修改为pawsql用户名密码配置

Author: rqaefaqa

package.json

@@ -8,7 +8,12 @@
     "vscode": "^1.80.0"
   },
   "categories": [
-    "Data Science",  "Programming Languages",  "Other",  "Linters",  "Snippets",  "Testing"
+    "Data Science",
+    "Programming Languages",
+    "Other",
+    "Linters",
+    "Snippets",
+    "Testing"
   ],
   "activationEvents": [
     "onStartupFinished"
@@ -103,28 +108,42 @@
             "default": "",
             "description": "%config.initialization.apiKey.description%",
             "markdownDescription": "%config.initialization.apiKey.markdownDescription%",
-            "order": 1
+            "order": 5
+          },
+          "pawsql.email": {
+            "type": "string",
+            "default": "",
+            "description": "%config.initialization.email.description%",
+            "markdownDescription": "%config.initialization.email.markdownDescription%",
+            "order": 3
+          },
+          "pawsql.password": {
+            "type": "string",
+            "markdownDescription": "%config.initialization.password.markdownDescription%",
+            "description": "%config.initialization.password.description%",
+            "order": 4,
+            "scope": "user",
+            "secret": true
           },
           "pawsql.backendUrl": {
             "type": "string",
             "default": "",
             "description": "%config.initialization.backendUrl.description%",
             "markdownDescription": "%config.initialization.backendUrl.markdownDescription%",
-            "order": 2
+            "order": 1
           },
           "pawsql.frontendUrl": {
             "type": "string",
             "default": "",
             "description": "%config.initialization.frontendUrl.description%",
             "markdownDescription": "%config.initialization.frontendUrl.markdownDescription%",
-            "order": 3
+            "order": 2
           }
         }
       },
       {
         "id": "pawsqlWorkspace",
         "title": "%config.workspace.title%",
-        "description": "%config.workspace.description%",
         "properties": {
           "pawsql.defaultWorkspace": {
             "type": "object",
@@ -169,6 +188,11 @@
         }
       }
     ],
+    "capabilities": {
+      "untrustedWorkspaces": {
+        "supported": true
+      }
+    },
     "menus": {
       "view/title": [
         {

package.nls.en.json

@@ -10,12 +10,17 @@
   "config.initialization.description": "Set up the URL of PawSQL Engine and ApiKey for user",
   "config.initialization.apiKey.description": "ApiKey for this user to use PawSQL Engine",
   "config.initialization.apiKey.markdownDescription": "ApiKey for this user to use PawSQL Engine. You can find it in your PawSQL account settings menu.",
+  "config.initialization.email.description": "Email address used for authentication with the PawSQL optimization engine service",
+  "config.initialization.email.markdownDescription": "The email address used to authenticate with the PawSQL service. Please use the email linked to your PawSQL account.",
+  "config.initialization.password.description": "Password used for authentication with the PawSQL optimization engine service",
+  "config.initialization.password.markdownDescription": "The password used to authenticate with the PawSQL service. Please use the password set in your PawSQL account.",
+
   "config.initialization.backendUrl.description": "URL of the PawSQL Engine service",
   "config.initialization.backendUrl.markdownDescription": "The URL for PawSQL Engine service.",
   "config.initialization.frontendUrl.description": "URL of the PawSQL front page",
   "config.initialization.frontendUrl.markdownDescription": "The base URL for PawSQL front page to display result of SQL optimization.",
 
-
+  "config.workspace.title": "Workspace Setup",
   "config.workspace.default.title": "Default Workspace",
   "config.workspace.default.description": "Default workspace configuration settings",
   "config.workspace.default.markdownDescription": "Configure the default workspace that will be used when opening new files",

package.nls.json

@@ -10,11 +10,16 @@
   "config.initialization.description": "配置 PawSQL 优化引擎的地址和用户的ApiKey",
   "config.initialization.apiKey.description": "用于 PawSQL 优化引擎服务认证的ApiKey",
   "config.initialization.apiKey.markdownDescription": "用于 PawSQL 服务认证的ApiKey。您可以在 PawSQL 账户设置中获取此密钥。",
+  "config.initialization.email.description": "用于 PawSQL 优化引擎服务认证的电子邮箱地址",
+  "config.initialization.email.markdownDescription": "用于 PawSQL 服务认证的电子邮箱地址。请使用您的 PawSQL 账户绑定的邮箱地址。",
+  "config.initialization.password.description": "用于 PawSQL 优化引擎服务认证的密码",
+  "config.initialization.password.markdownDescription": "用于 PawSQL 服务认证的密码。请使用您在 PawSQL 账户中设置的密码。",
   "config.initialization.backendUrl.description": "PawSQL 优化引擎的后端服务地址",
   "config.initialization.backendUrl.markdownDescription": "PawSQL 优化引擎的后端服务地址，用于提供SQL优化能力",
   "config.initialization.frontendUrl.description": "PawSQL 优化引擎的前端服务地址",
   "config.initialization.frontendUrl.markdownDescription": "PawSQL 优化引擎的前端服务地址，用于展示优化结果",
 
+  "config.workspace.title": "工作空间配置",
   "config.workspace.default.title": "默认工作空间",
   "config.workspace.default.description": "默认工作空间配置设置",
   "config.workspace.default.markdownDescription": "配置打开新文件时将使用的默认工作空间",

src/PasswordManager.ts

@@ -0,0 +1,21 @@
+// 在扩展代码中使用 SecretStorage
+import * as vscode from "vscode";
+
+export class PasswordManager {
+  constructor(private context: vscode.ExtensionContext) {}
+
+  // 存储密码
+  async storePassword(password: string) {
+    await this.context.secrets.store("pawsql-password", password);
+  }
+
+  // 获取密码
+  async getPassword(): Promise<string | undefined> {
+    return await this.context.secrets.get("pawsql-password");
+  }
+
+  // 删除密码
+  async deletePassword() {
+    await this.context.secrets.delete("pawsql-password");
+  }
+}

src/PawSQLSidebarProvider.ts

@@ -12,7 +12,10 @@ import { getUrls } from "./constants";
 // Previous classes remain unchanged...
 class WorkspaceManagerItem extends vscode.TreeItem {
   constructor() {
-    const iconPath = path.join(__dirname, "../resources/icon/paw.svg"); // 向上移动到 src 同级
+    const iconPath = path.join(
+      __dirname,
+      "../resources/icon/pawsql-black-icon.svg"
+    ); // 向上移动到 src 同级
 
     super(
       // LanguageService.getMessage("sidebar.workspace.manager"),
@@ -133,6 +136,7 @@ class StatementItem extends vscode.TreeItem {
     public readonly label: string,
     public readonly statementId: string,
     public readonly analysisId: string,
+    public readonly analysisName: string,
     public readonly workspaceId: string,
     public readonly sql: string
   ) {
@@ -145,6 +149,7 @@ class StatementItem extends vscode.TreeItem {
       arguments: [
         this.statementId,
         this.analysisId,
+        this.analysisName,
         this.workspaceId,
         this.sql,
       ],
@@ -673,6 +678,7 @@ export class PawSQLTreeProvider
               `${stmt.stmtName}`,
               stmt.analysisStmtId,
               analysis.analysisId,
+              analysis.analysisName,
               analysis.workspaceId,
               stmt.stmtText
             );
@@ -689,6 +695,7 @@ export class PawSQLTreeProvider
               arguments: [
                 firstStatement.statementId,
                 firstStatement.analysisId,
+                analysis.analysisName,
                 firstStatement.workspaceId,
                 firstStatement.sql,
               ],
@@ -759,6 +766,7 @@ export class PawSQLTreeProvider
             `${stmt.stmtName}`,
             stmt.analysisStmtId,
             analysis.analysisId,
+            analysis.label,
             analysis.workspaceId,
             stmt.sql
           )
@@ -822,4 +830,22 @@ export class PawSQLTreeProvider
     // 刷新 Tree View
     this._onDidChangeTreeData.fire(undefined);
   }
+
+  async updateApikey(config: {
+    email: string;
+    password: string;
+    backendUrl: string;
+    frontendUrl: string;
+  }) {
+    const apiKey = await ApiService.getUserKey(config.email, config.password);
+    console.log(apiKey);
+    if (!apiKey) {
+      throw Error("error.login.invalidCredentials");
+    }
+    await vscode.workspace
+      .getConfiguration("pawsql")
+      .update("apiKey", apiKey, true);
+
+    return apiKey;
+  }
 }

src/apiService.ts

@@ -183,6 +183,7 @@ export const createAnalysis = async (
 
 export interface AnalysisSummaryRead {
   status: string; // 分析状态
+  analysisName: string;
   basicSummary: AnalysisSummary; // AnalysisSummary 信息
   analysisRuleInfo: RuleQueries[]; // 规则信息
   analysisIndexInfo: string[]; // 索引推荐信息
@@ -308,6 +309,28 @@ export const validateUserKey = async (userKey: string): Promise<boolean> => {
   }
 };
 
+export const getUserKey = async (
+  email: string,
+  password: string
+): Promise<string | null> => {
+  const { DOMAIN } = getUrls();
+  const url = `${DOMAIN.Backend}/api/v1/getUserKey`;
+
+  try {
+    // 发送请求以验证 userKey
+    const response = await axios.post(
+      url,
+      { email, password },
+      { timeout: 3000 }
+    );
+
+    return response.data.data; // 假设返回码 200 表示有效
+  } catch (error: any) {
+    console.log(error);
+    return null;
+  }
+};
+
 interface ValidationResult {
   isAvailable: boolean;
   error?: string;
@@ -517,4 +540,5 @@ export const ApiService = {
   getAnalysisSummary,
   getStatementDetails,
   validateUserKey,
+  getUserKey,
 };

src/i18n/en.json

@@ -26,6 +26,7 @@
   "CONFIG_FILE_DEFAULT_WORKSPACE_PLACEHOLDER": "Setup a default workspace for PawSQL.",
   "OPTIMIZING_SQL": "$(sync~spin) Optimizing SQL...",
   "error.create.analysis.failed": "Fail to optimize",
+  "error.login.invalidCredentials": "PawSQL registration email or password is incorrect. Please check your PawSQL configuration to ensure that the information is correct.",
   "error.backendUrl.invalid": "The PawSQL engine is not responding.",
   "error.frontendUrl.invalid": "The PawSQL website is not responding.",
   "license.code.not.valid": "The license code is invalid. Please contact the administrator.",
@@ -46,10 +47,16 @@
   "webview.anlysis.result.title": "PawSQL Result",
   "webview.settings.save.config.success": "PawSQL Setup Completed",
   "webview.settings.save.config.failed": "PawSQL Setup Failded",
-  "form.config.title": "PawSQL Client",
+  "form.config.title": "PawSQL Setup",
+  "form.config.email.label": "PawSQL Email",
+  "form.config.password.label": "Password",
+  "form.config.backendUrl.label": "PawSQL Engine",
+  "form.config.frontendUrl.label": "PawSQL Website",
   "form.config.description": "PawSQL Client enables developers to access core capabilities of the PawSQL directly within their VS Code development environment. PawSQL provides sophisticated SQL optimization features including smart index recommendations and query rewriting suggestions. More about PawSQL's capabilities, please visit ",
   "form.config.documentation.link": "docs.pawsql.com",
   "form.config.save": "Save",
   "workspaces.isLoading": "Loading Workspaces",
-  "analyses.isLoading": "Loading Analyses"
+  "analyses.isLoading": "Loading Analyses",
+  "nonexistent": "Email not exist.",
+  "unactive": "Sorry, your email address has not been activated yet. Please log in with your registered email address to complete the activation."
 }

src/i18n/zh-cn.json

@@ -26,6 +26,7 @@
   "CONFIG_FILE_DEFAULT_WORKSPACE_PLACEHOLDER": "请选择一个工作空间作为当前SQL文件的默认工作空间",
   "OPTIMIZING_SQL": "$(sync~spin) 正在优化SQL...",
   "error.create.analysis.failed": "SQL优化失败",
+  "error.login.invalidCredentials": "PawSQL注册邮箱或密码错误。请检查您的PawSQL配置，确保信息正确无误。",
   "error.backendUrl.invalid": "请检查 backendUrl 是否正确配置或服务器是否运行",
   "error.frontendUrl.invalid": "请检查 frontendUrl 是否正确配置或服务器是否运行",
   "license.code.not.valid": "许可证代码无效，请联系管理员获取",
@@ -45,11 +46,17 @@
   "codelens.optimize.sql.with.selected.workspace": "⚡Optimize in ...",
   "webview.anlysis.result.title": "SQL优化结果",
   "webview.settings.save.config.success": "保存成功",
-  "webview.settings.save.config.failed": "保存配失败",
+  "webview.settings.save.config.failed": "保存配置失败",
   "form.config.title": "PawSQL 配置",
+  "form.config.email.label": "PawSQL注册邮箱",
+  "form.config.password.label": "密码",
+  "form.config.backendUrl.label": "PawSQL 引擎地址",
+  "form.config.frontendUrl.label": "PawSQL 前端地址",
   "form.config.description": "PawSQL Client让开发者能够在VS Code开发环境中直接使用PawSQL优化引擎的强大功能，包括智能索引推荐、查询重写建议、自动化性能验证等。想要了解更详细的PawSQL的SQL优化能力，请参考",
   "form.config.documentation.link": "PawSQL官方文档",
   "form.config.save": "保存",
   "workspaces.isLoading": "工作空间列表加载中...",
-  "analyses.isLoading": "优化列表加载中..."
+  "analyses.isLoading": "优化列表加载中...",
+  "nonexistent": "邮箱不存在.",
+  "unactive": "很抱歉，您的邮箱尚未激活，请登录您的注册邮箱完成激活。"
 }

src/main.ts

@@ -96,8 +96,8 @@ export class PawSQLExtension {
     this.context.subscriptions.push(
       vscode.commands.registerCommand(
         "pawsql.showStatementDetail",
-        async (statementId: string) => {
-          await this.showStatementResult(statementId);
+        async (statementId, analysisId, analysisName) => {
+          await this.showStatementResult(statementId, analysisName);
         }
       )
     );
@@ -220,8 +220,11 @@ export class PawSQLExtension {
     const { URLS } = getUrls();
     await vscode.env.openExternal(vscode.Uri.parse(URLS.NEW_WORKSPACE));
   }
-  private async showStatementResult(analysisStmtId: string): Promise<void> {
-    this.webviewProvider.createResultPanel(analysisStmtId);
+  private async showStatementResult(
+    analysisStmtId: string,
+    analysisName: string
+  ): Promise<void> {
+    this.webviewProvider.createResultPanel(analysisStmtId, analysisName);
   }
 
   private async handleConfigurationChange(
@@ -354,14 +357,20 @@ export class PawSQLExtension {
       const statementId =
         result.analysisSummary.data.summaryStatementInfo[0]?.analysisStmtId;
       if (statementId) {
-        this.webviewProvider.createResultPanel(statementId);
+        this.webviewProvider.createResultPanel(
+          statementId,
+          result.analysisSummary.data.analysisName
+        );
         await this.treeProvider.revealAnalysis(result.analysis.data.analysisId);
       }
     } else {
       const statementId =
         result.analysisSummary.data.summaryStatementInfo[0]?.analysisStmtId;
       if (statementId) {
-        this.webviewProvider.createResultPanel(statementId);
+        this.webviewProvider.createResultPanel(
+          statementId,
+          result.analysisSummary.data.analysisName
+        );
         await this.treeProvider.revealStatement(statementId);
       }
     }