Merge pull request #607 from actiontech/feature/issue-603

[feature](SqlAudit): Support git branch field

Author: LZS911

packages/shared/lib/api/base/index.ts

@@ -3,12 +3,12 @@ export { default as CBOperationLogsService } from './service/CBOperationLogs';
 export { default as CloudBeaverService } from './service/CloudBeaver';
 export { default as CompanyNoticeService } from './service/CompanyNotice';
 export { default as ConfigurationService } from './service/Configuration';
+export { default as DataExportTaskService } from './service/DataExportTask';
+export { default as DataExportWorkflowsService } from './service/DataExportWorkflows';
 export { default as DBServiceService } from './service/DBService';
 export { default as DBServiceSyncTaskService } from './service/DBServiceSyncTask';
 export { default as DMSPluginService } from './service/DMSPlugin';
 export { default as DMSProxyService } from './service/DMSProxy';
-export { default as DataExportTaskService } from './service/DataExportTask';
-export { default as DataExportWorkflowsService } from './service/DataExportWorkflows';
 export { default as MaskingService } from './service/Masking';
 export { default as MemberService } from './service/Member';
 export { default as MemberGroupService } from './service/MemberGroup';
@@ -17,8 +17,8 @@ export { default as OAuth2Service } from './service/OAuth2';
 export { default as OpPermissionService } from './service/OpPermission';
 export { default as ProjectService } from './service/Project';
 export { default as RoleService } from './service/Role';
-export { default as SMSService } from './service/SMS';
 export { default as SessionService } from './service/Session';
+export { default as SMSService } from './service/SMS';
 export { default as UserService } from './service/User';
 export { default as UserGroupService } from './service/UserGroup';
 export { default as WebhookService } from './service/Webhook';

packages/shared/lib/api/sqle/index.ts

@@ -1,7 +1,3 @@
-export { default as OperationRecordService } from './service/OperationRecord';
-export { default as ReportPushConfigService } from './service/ReportPushConfig';
-export { default as SqlDEVRecordService } from './service/SqlDEVRecord';
-export { default as SqlManageService } from './service/SqlManage';
 export { default as AuditPlanService } from './service/audit_plan';
 export { default as AuditWhitelistService } from './service/audit_whitelist';
 export { default as BlacklistService } from './service/blacklist';
@@ -13,8 +9,12 @@ export { default as InstanceService } from './service/instance';
 export { default as InstanceAuditPlanService } from './service/instance_audit_plan';
 export { default as KnowledgeBaseService } from './service/knowledge_base';
 export { default as OperationService } from './service/operation';
+export { default as OperationRecordService } from './service/OperationRecord';
 export { default as PipelineService } from './service/pipeline';
+export { default as ReportPushConfigService } from './service/ReportPushConfig';
 export { default as RuleTemplateService } from './service/rule_template';
+export { default as SqlDEVRecordService } from './service/SqlDEVRecord';
+export { default as SqlManageService } from './service/SqlManage';
 export { default as SqlAnalysisService } from './service/sql_analysis';
 export { default as SqlAuditService } from './service/sql_audit';
 export { default as SqlAuditRecordService } from './service/sql_audit_record';

packages/shared/lib/api/sqle/service/common.d.ts

@@ -3301,6 +3301,30 @@ export interface ITestFeishuConfigurationReqV1 {
   account_type?: TestFeishuConfigurationReqV1AccountTypeEnum;
 }
 
+export interface ITestGitConnectionReqV1 {
+  git_http_url?: string;
+
+  git_user_name?: string;
+
+  git_user_password?: string;
+}
+
+export interface ITestGitConnectionResDataV1 {
+  branches?: string[];
+
+  error_message?: string;
+
+  is_connected_success?: boolean;
+}
+
+export interface ITestGitConnectionResV1 {
+  code?: number;
+
+  data?: ITestGitConnectionResDataV1;
+
+  message?: string;
+}
+
 export interface ITestWechatConfigResDataV1 {
   error_message?: string;
 

packages/shared/lib/api/sqle/service/configuration/index.d.ts

@@ -12,6 +12,8 @@ import {
   IUpdateFeishuConfigurationReqV1,
   ITestFeishuConfigurationReqV1,
   ITestFeishuConfigResV1,
+  ITestGitConnectionReqV1,
+  ITestGitConnectionResV1,
   IGetLicenseResV1,
   ICheckLicenseResV1,
   IGetSystemVariablesResV1,
@@ -62,6 +64,10 @@ export interface ITestFeishuAuditConfigV1Params
 export interface ITestFeishuAuditConfigV1Return
   extends ITestFeishuConfigResV1 {}
 
+export interface ITestGitConnectionV1Params extends ITestGitConnectionReqV1 {}
+
+export interface ITestGitConnectionV1Return extends ITestGitConnectionResV1 {}
+
 export interface IGetSQLELicenseV1Return extends IGetLicenseResV1 {}
 
 export interface ISetSQLELicenseV1Params {

packages/shared/lib/api/sqle/service/configuration/index.ts

@@ -22,6 +22,8 @@ import {
   IUpdateFeishuAuditConfigurationV1Return,
   ITestFeishuAuditConfigV1Params,
   ITestFeishuAuditConfigV1Return,
+  ITestGitConnectionV1Params,
+  ITestGitConnectionV1Return,
   IGetSQLELicenseV1Return,
   ISetSQLELicenseV1Params,
   ISetSQLELicenseV1Return,
@@ -139,6 +141,18 @@ class ConfigurationService extends ServiceBase {
     );
   }
 
+  public TestGitConnectionV1(
+    params: ITestGitConnectionV1Params,
+    options?: AxiosRequestConfig
+  ) {
+    const paramsData = this.cloneDeep(params);
+    return this.post<ITestGitConnectionV1Return>(
+      '/v1/configurations/git/test',
+      paramsData,
+      options
+    );
+  }
+
   public getSQLELicenseV1(options?: AxiosRequestConfig) {
     return this.get<IGetSQLELicenseV1Return>(
       '/v1/configurations/license',

packages/shared/lib/api/sqle/service/sql_audit_record/index.d.ts

@@ -54,6 +54,8 @@ export interface ICreateSQLAuditRecordV1Params {
 
   git_user_name?: string;
 
+  git_branch_name?: string;
+
   git_user_password?: string;
 }
 

packages/shared/lib/api/sqle/service/sql_audit_record/index.ts

@@ -92,6 +92,10 @@ class SqlAuditRecordService extends ServiceBase {
       paramsData.append('git_user_name', params.git_user_name as any);
     }
 
+    if (params.git_branch_name != undefined) {
+      paramsData.append('git_branch_name', params.git_branch_name as any);
+    }
+
     if (params.git_user_password != undefined) {
       paramsData.append('git_user_password', params.git_user_password as any);
     }

packages/sqle/src/locale/zh-CN/sqlAudit.ts

@@ -86,7 +86,11 @@ export default {
         zipFile: 'ZIP文件',
         gitUrl: 'GIT地址',
         gitUrlTips:
-          '请输入git仓库的HTTP(S)克隆地址，若为私有GIT仓库，则必须输入有读权限的账号密码'
+          '请输入git仓库的HTTP(S)克隆地址，若为私有GIT仓库，则必须输入有读权限的账号密码',
+        gitBranch: '代码分支',
+        verifyConnection: '验证连接',
+        connectSuccess: '连接成功',
+        pleaseVerifyConnection: '请先验证仓库连通性'
       },
       uploadFileTip: {
         sqlFile: '点击选择SQL文件或将文件拖拽到此区域',

packages/sqle/src/page/SqlAudit/Create/SQLInfoForm/index.type.ts

@@ -34,6 +34,7 @@ export type SQLInfoFormFields = {
   gitHttpUrl: string;
   gitUserName: string;
   gitUserPassword: string;
+  gitBranch: string;
 };
 
 export type SQLInfoFormProps = {