merge 2309 #1957

LordofAvernus · 2023-10-26T09:00:14Z

No description provided.

Feishu 5

feat:dingtalk support execution

fix spelling

fix:git commit error

Slowlog filter

fix spelling

@LinXiaoTao

username in jwt token will be check when http request go throuth middleware and use username to check if user exist, if using md5 algorithm to resize username, the middleware cannot find user by token. @LinXiaoTao

hot-fix: cannot using hash algo in generate token

fix issue 1743 7

api definitions

fix parameter of api definitions

Fix 1878

optimize index suggestion

fix:error delete syntax in mysql5.7

@winfredLIN

@winfredLIN

fix: extract sqls from xml file only save one

fix rule description

sjjian · 2023-10-27T03:21:57Z

Makefile

-test: swagger
-	cd $(PROJECT_NAME) && GOOS=$(GOOS) GOARCH=amd64 go test -v ./...
+test: 
+	cd $(PROJECT_NAME) && GOOS=$(GOOS) GOARCH=amd64 go test -v ./... -count 1


-count 1 目的是啥

禁用测试缓存，避免本地用缓存跑测试

sjjian · 2023-10-27T03:24:01Z

README.md

@@ -184,6 +184,18 @@ SQLE 提供了多种安装部署的方式，用户可以结合自己的环境和

 # 📞 商业支持
 如果您想获得 SQLE 的商业支持, 您可以联系我们：
+|渠道 | 链接 |


readme 的内容以v3的为准

使用了最新的v3文档

sjjian · 2023-10-27T03:25:55Z

sqle/api/app.go

@@ -268,6 +271,18 @@ func StartApi(net *gracenet.Net, exitChan chan struct{}, config *config.SqleOpti
 		v1ProjectRouter.POST("/:project_name/audit_plans/:audit_plan_name/sqls/full", v1.FullSyncAuditPlanSQLs, sqleMiddleware.ScannerVerifier())
 		v1ProjectRouter.POST("/:project_name/audit_plans/:audit_plan_name/sqls/partial", v1.PartialSyncAuditPlanSQLs, sqleMiddleware.ScannerVerifier())

+		// sql manager
+		v1ProjectRouter.GET("/projects/:project_name/sql_manages", v1.GetSqlManageList)


v1ProjectRouter 里的url不需要再带/projects

sjjian · 2023-10-27T03:26:50Z

sqle/api/app.go

@@ -357,7 +371,7 @@ func StartApi(net *gracenet.Net, exitChan chan struct{}, config *config.SqleOpti
 	v1Router.GET("/custom_rules/:db_type/rule_types", v1.GetRuleTypeByDBType)

 	// task
-	v1Router.POST("/projects/:project_name/tasks/audits", v1.CreateAndAuditTask)
+	v1ProjectRouter.POST("/projects/:project_name/tasks/audits", v1.CreateAndAuditTask)


v1ProjectRouter 里的url不需要再带/projects

sjjian · 2023-10-27T05:58:32Z

sqle/api/controller/v1/sql_audit_record.go

+	if err != nil {
+		return controller.JSONBaseErrorReq(c, fmt.Errorf("check project manager failed: %v", err))
+	}
+	if !up.IsProjectAdmin() {


原始的权限是成员即可访问

已处理，移除管理员校验

sjjian · 2023-10-27T06:00:03Z

sqle/api/controller/v1/sql_audit_record.go

+	}
+
+	data := map[string]interface{}{
+		"filter_project_name":     projectUid,


调整为filter_project_id？

sjjian · 2023-10-27T06:22:19Z

sqle/model/sql_audit_record_list.go

+var sqlAuditRecordQueryBodyTpl = `
+{{ define "body" }}
+FROM sql_audit_records
+LEFT JOIN projects AS p ON sql_audit_records.project_id = p.id


projects 表已经没有了

sjjian · 2023-10-27T06:38:58Z

sqle/model/sql_manage.go

+FROM sql_manages sm
+         LEFT JOIN sql_audit_records sar ON sm.sql_audit_record_id = sar.id
+         LEFT JOIN audit_plans ap ON ap.id = sm.audit_plan_id
+         LEFT JOIN projects p ON p.id = sm.project_id


projects 表没有了

taolx0 and others added 30 commits September 7, 2023 18:40

fix:spell

091be2c

Merge pull request #1793 from actiontech/feishu-5

c54e165

Feishu 5

chore:forbid dingtalk approval

439dcd3

Merge pull request #1796 from actiontech/feat/dingtalk-execution

b1c63ff

feat:dingtalk support execution

fix spelling

8a01721

Merge pull request #1797 from actiontech/fix-spelling

97b3712

fix spelling

support slow log filter

c98e762

support slow log filter

106579d

fix:git commit error

2148e34

Merge pull request #1799 from actiontech/fix-git

4994f85

fix:git commit error

Merge pull request #1798 from actiontech/slowlog-filter

cc2e273

Slowlog filter

fix spelling

5f9c2fc

Merge pull request #1800 from actiontech/fix-ee-933

21eb365

fix spelling

api definitions

e690c95

compatible with dml sql that does not use where

1e6fac3

hot-fix: cannot using hash algo in generate token

3daab8b

username in jwt token will be check when http request go throuth middleware and use username to check if user exist, if using md5 algorithm to resize username, the middleware cannot find user by token. @LinXiaoTao

return creator to front-end

931cd3c

change unit test

279f59b

Merge pull request #1804 from winfredLIN/hot-fix-scanner-token-gen

5b2a774

hot-fix: cannot using hash algo in generate token

Merge pull request #1803 from actiontech/fix-issue1743-7

1b8fe58

fix issue 1743 7

avoid text field

6a909b0

update sqle community info

1488803

fix descriptions

0255d36

add instance name

8c89f71

Merge pull request #1802 from actiontech/issue-ee-918

a86ff4e

api definitions

check union index

f3d3fe3

fix parameter of api definitions

8f45e3c

Merge pull request #1808 from actiontech/issue-ee-918

0747844

fix parameter of api definitions

chore:sql manage list api define

51776e5

add api for detail info

2d7b94a

ColdWaterLW and others added 10 commits September 28, 2023 10:39

Merge pull request #1879 from actiontech/fix-1878

3ab4761

Fix 1878

Merge pull request #1877 from actiontech/issue-1876

a0d6cda

optimize index suggestion

fix:error delete syntax in mysql5.7

eb954b5

Merge pull request #1882 from actiontech/version-sql-fix

11500b2

fix:error delete syntax in mysql5.7

perf: put judgment and add ; outside of for block

d53acfa

@winfredLIN

Merge pull request #1880 from winfredLIN/issue1027

411a3b0

fix: extract sqls from xml file only save one

fix rule description

8dfff9a

Merge pull request #1883 from actiontech/issue-1743

1b4c062

fix rule description

merge release-2.2309

573c38e

Merge remote-tracking branch 'sqle-ce/release-2.2309.x' into merge-2309

d29159e

LordofAvernus self-assigned this Oct 26, 2023

fix golint & fix unit test

48b10da

LordofAvernus requested a review from sjjian October 26, 2023 09:30

sjjian reviewed Oct 27, 2023

View reviewed changes

LordofAvernus added 2 commits October 27, 2023 04:56

adjustment projectid type

4a5bec2

fix wrong url && update readme

b2a429c

LordofAvernus force-pushed the merge-2309 branch from 0429cf8 to b2a429c Compare October 27, 2023 05:03

sjjian reviewed Oct 27, 2023

View reviewed changes

LordofAvernus added 2 commits November 2, 2023 05:06

fix: field type causing query errors & get inst/user by dms server

d1dc01f

fix review: wrong url

abce285

sjjian approved these changes Nov 2, 2023

View reviewed changes

sjjian merged commit a739386 into release-3.2311.x Nov 2, 2023
2 checks passed

sjjian deleted the merge-2309 branch November 2, 2023 06:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge 2309 #1957

merge 2309 #1957

LordofAvernus commented Oct 26, 2023

sjjian Oct 27, 2023

LordofAvernus Oct 27, 2023

sjjian Oct 27, 2023

LordofAvernus Oct 27, 2023

sjjian Oct 27, 2023

LordofAvernus Oct 27, 2023

sjjian Oct 27, 2023

LordofAvernus Oct 27, 2023

sjjian Oct 27, 2023

LordofAvernus Nov 2, 2023

sjjian Oct 27, 2023

LordofAvernus Nov 2, 2023

sjjian Oct 27, 2023

LordofAvernus Nov 2, 2023

sjjian Oct 27, 2023

LordofAvernus Nov 2, 2023

merge 2309 #1957

merge 2309 #1957

Conversation

LordofAvernus commented Oct 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment