4096 Commits

Author SHA1 Message Date
Ming Deng
95e998e36e sonar ignore test 2021-01-10 18:25:01 +08:00
Ming Deng
f70a22ff9e
Merge pull request #4432 from flycash/sonar-check
Add sonar check action
2021-01-10 13:57:51 +08:00
Ming Deng
eed869a296 Remove sonar 2021-01-10 13:20:55 +08:00
Ming Deng
d9dd6d2784 Merge branch 'develop' of https://github.com/beego/beego into sonar-check 2021-01-10 13:13:54 +08:00
Ming Deng
2590fbd5cb Fix sonar check 2021-01-10 13:13:28 +08:00
Ming Deng
0139564cf0
Merge pull request #4294 from jianzhiyao/frt/supports_for_4144
Frt/supports for issue 4144
2021-01-10 12:08:16 +08:00
Anker Jam
25bf1259c6 add change log 2021-01-09 23:55:18 +08:00
Anker Jam
791c28b1d4 fix imports 2021-01-09 22:16:21 +08:00
Ming Deng
31af4fbd03 Merge branch 'develop' of https://github.com/beego/beego into sonar-check 2021-01-09 21:29:27 +08:00
Ming Deng
0d487e37a0
Merge pull request #4427 from flycash/changelog
update changelog.yml
2021-01-09 21:28:49 +08:00
Anker Jam
3150285542 fix imports 2021-01-09 21:27:30 +08:00
Ming Deng
0cf3b035eb update changelog 2021-01-09 21:17:46 +08:00
Anker Jam
db4f978982 Merge branch 'develop' into frt/supports_for_4144
# Conflicts:
#	client/orm/orm_queryset.go
2021-01-09 21:16:27 +08:00
Ming Deng
d7b79f23a6 Add sonar check action 2021-01-09 21:15:48 +08:00
Allen
7d2c5486be
Merge pull request #4420 from AllenX2018/Fix-ORM-many2many-generated-table-error
Fix orm many2many generated table bug
2021-01-07 14:29:46 +08:00
AllenX2018
d29b0a589c Fix orm many2many generated table error 2021-01-07 11:40:32 +08:00
Allen
9b3a79772b
Merge pull request #4412 from AllenX2018/support-aggregate-func
support dynamic registration model and aggregate func
2021-01-05 10:55:52 +08:00
Ming Deng
80e23698ef
Merge pull request #4413 from flycash/golint
Add more golint action parameter
2021-01-04 21:13:17 +08:00
Ming Deng
5575cc1a5c Add more golint action parameter 2021-01-04 20:44:04 +08:00
AllenX2018
30dbf8fc3a 1.support dynamic registration model
2.support aggregete func
2021-01-04 16:29:03 +08:00
Ming Deng
c1b7fa5381
Merge pull request #4408 from flycash/golint
Add golint action
2021-01-03 23:03:30 +08:00
Ming Deng
c51a81222b Add golint action 2021-01-03 22:24:04 +08:00
Ming Deng
c1d7534d53
Merge pull request #4409 from flycash/fix-conflict
Make compatible: Router method in server.go
2021-01-03 22:16:21 +08:00
Ming Deng
babf0dfc14 Make compatible 2021-01-03 22:00:47 +08:00
Ming Deng
384364e2f2
Merge pull request #4390 from jianzhiyao/fix-3928
fix-3928
2021-01-03 20:12:25 +08:00
Ming Deng
cb330fbb99
Merge pull request #4406 from wangle201210/fix/log-format
fix log level
2021-01-03 19:24:01 +08:00
王厚伟
4b2bd716b6 fix log level 2021-01-03 17:52:48 +08:00
Ming Deng
65f8590910
Merge pull request #4403 from flycash/http-mock
Move mock to mock directory
2021-01-03 17:07:14 +08:00
Ming Deng
b89dc5068a Add tests 2021-01-03 16:46:59 +08:00
Ming Deng
44ffb29c55 Move mock to mock directory 2021-01-02 20:21:09 +08:00
Ming Deng
57004d4a7c
Merge pull request #4303 from AllenX2018/fix-issue-3430
fix issue #3430: reverse sequence of generating leaves of router prefix tree
2021-01-02 19:31:28 +08:00
Ming Deng
f6b7543478
Merge pull request #4318 from AllenX2018/fix-issue-4176
Fix issue #4176
2021-01-02 19:10:40 +08:00
Allen
1f6f503dbf
Merge pull request #8 from flycash/tmp-1
resolve conflict
2021-01-02 09:13:25 +08:00
Ming Deng
adb4dabb24
Merge pull request #4392 from flycash/http-mock
Optimize mock
2021-01-02 00:02:27 +08:00
Ming Deng
94019c1e1d Optimize mock 2021-01-01 23:50:54 +08:00
Ming Deng
2ffb177868 resolve conflict 2021-01-01 22:34:02 +08:00
Ming Deng
32557769fc
Merge pull request #4401 from changsongl/fix-any-route-logic
fix router:AddMethod logic error, remove unreachable code
2020-12-31 20:59:59 +08:00
Jason li
b82eea08bf fix router:AddMethod logic error, remove unreachable code 2020-12-30 11:19:45 +08:00
Ming Deng
73c0c6d8f7
Merge pull request #4398 from flycash/fix4396
fix 4396
2020-12-29 00:20:00 +08:00
Ming Deng
e25f3c0920 fix 4396 2020-12-28 23:11:19 +08:00
Ming Deng
8570c035fd
Merge pull request #4391 from flycash/develop
Remove duration from prometheus label
2020-12-27 12:26:39 +08:00
Anker Jam
6e4398f7ec add UT for issue 3928 2020-12-26 22:45:56 +08:00
Ming Deng
73d81bafd9 Remove duration from prometheus label 2020-12-26 22:16:17 +08:00
Anker Jam
e597b05c93 fix-3928 2020-12-26 18:38:52 +08:00
AllenX2018
dd35e4b1b2 move route sessionOn calculate to router adding 2020-12-26 17:56:49 +08:00
AllenX2018
3783847dce modify cfg reference 2020-12-26 17:12:42 +08:00
AllenX2018
75849b6d6a Merge branch 'develop' of https://github.com/beego/beego into fix-issue-4176 2020-12-26 16:57:22 +08:00
AllenX2018
0d890d6129 Merge branch 'develop' of https://github.com/astaxie/beego into fix-issue-4176 2020-12-26 16:33:09 +08:00
Ming Deng
b0406f107a
Merge pull request #4387 from flycash/http-mock
Support httplib mock
2020-12-25 22:21:28 +08:00
Ming Deng
ef258a0988 Support httplib mock 2020-12-25 22:11:40 +08:00