1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-27 18:51:28 +00:00
Commit Graph

3967 Commits

Author SHA1 Message Date
Ming Deng
96658121dc
Merge pull request #3818 from dbt4516/develop
Get the real location of the log directory before using filepath.Walk function when remove old logs
2020-06-23 21:17:14 +08:00
Ming Deng
43a3623f51
Merge pull request #3803 from yinggaozhen/fix-statistics
GetMapData change to read lock
2020-06-23 21:08:32 +08:00
Ming Deng
089dfbdbee
Merge pull request #4016 from huija/develop
Update redis.go
2020-06-23 20:41:42 +08:00
Ming Deng
526a5463d6
Merge pull request #4025 from jianzhiyao/develop
Fix: Too Many Prepare Statement
2020-06-23 20:33:04 +08:00
jianzhiyao
a28d294a83 upgrade acquire method return *sql.Stmt 2020-06-23 13:46:19 +08:00
huija
f70fd5babf add comments on Scan func 2020-06-23 12:32:26 +08:00
qiantao
a764e17fbf check ci 2020-06-23 10:43:51 +08:00
Ming Deng
f5c580a403
Merge pull request #3739 from nuczzz/develop
fix graceful bug: old process didn't exist when graceful restart
2020-06-23 00:10:53 +08:00
Ming Deng
7210dc24b6
Merge pull request #3743 from Colstuwjx/fix/orm-end-printstack
Fix/orm end printstack
2020-06-22 23:59:16 +08:00
Ming Deng
1060dc7df8
Merge pull request #4026 from flycash/develop
fix UT
2020-06-22 23:36:25 +08:00
Ming Deng
3ab1e48217 fix UT 2020-06-22 23:24:15 +08:00
jianzhiyao
a5e8344a0a add stmt garbage recycle 2020-06-22 23:23:52 +08:00
Ming Deng
e1386c448c
Merge pull request #4022 from jianzhiyao/develop
stmt: fix bug of non concurrent security & add double check
2020-06-21 18:01:14 +08:00
askuy
6e4d0917b2
Merge pull request #4023 from flycash/feature/prometheus
Change prometheus patter
2020-06-21 17:39:02 +08:00
Ming Deng
9b43a90138 Change prometheus patter 2020-06-21 17:36:13 +08:00
askuy
b7833fb297
Merge pull request #4021 from flycash/feature/prometheus
Add prometheus support
2020-06-21 17:11:00 +08:00
Ming Deng
16b81d09a7 Add prometheus support 2020-06-21 17:10:34 +08:00
Ming Deng
0056b92d0b
Merge pull request #4007 from flycash/fix3949
Store RouterPattern before filter execute
2020-06-21 17:05:04 +08:00
jianzhiyao
decc75e025 fix bug of non concurrent security & add double check 2020-06-21 16:25:32 +08:00
huija
f2bae3e367 add UT for Scan function 2020-06-19 22:55:40 +08:00
askuy
6eeea141d8
Merge pull request #4018 from flycash/fix/xss
Using HTMLEscapeString in adminui.go to avoid XSS attack
2020-06-19 22:21:51 +08:00
Ming Deng
6c0db4db3d Using HTMLEscapeString in adminui.go to avoid XSS attack 2020-06-19 21:49:17 +08:00
Ming Deng
b9fbcbd906
Merge pull request #4014 from jianzhiyao/develop
over size file do not run openFile
2020-06-19 20:19:16 +08:00
huija
40181c1042 Update redis.go
use `scan` instead of `keys`
2020-06-19 14:21:12 +08:00
qiantao
3879fd9c34 修改测试用例 2020-06-18 17:25:48 +08:00
qiantao
af238ee047 Merge remote-tracking branch 'origin/develop' into go_modules_route_compatibility
# Conflicts:
#	go.mod
#	go.sum
2020-06-18 16:41:03 +08:00
Ming Deng
86935ada01
Merge pull request #3943 from zhlicen/master
#3942 fix encoded url(with slash) router match problem
2020-06-18 16:04:16 +08:00
jianzhiyao
8160059182 big size file lead to memory leak 2020-06-16 14:56:58 +08:00
harry890829
dc70e9fc47 update go test 2020-06-15 18:16:40 +08:00
Ming Deng
bac2b31afe
Merge pull request #3975 from nicowaisman/patch-2
Change permission mask
2020-06-13 23:40:13 +08:00
harry890829
a134cb8d17 update go test 2020-06-11 23:45:06 +08:00
Ming Deng
4ad699b7b8
Merge pull request #3981 from zwei0526/develop
Update parser.go
2020-06-10 16:38:15 +08:00
Ming Deng
14fc935cb6
Merge pull request #4005 from keminar/develop
fix graceful bug
2020-06-10 16:34:32 +08:00
harry890829
d9f262e277 update go test 2020-06-10 12:31:38 +08:00
harry890829
131748bb3d update go.mod&go.sum 2020-06-10 11:34:58 +08:00
harry890829
2c3c66ccea Merge remote-tracking branch 'origin/develop' into develop 2020-06-10 11:16:17 +08:00
harry890829
71cb1379b4 update support bit operation 2020-06-10 11:15:23 +08:00
harry890829
b351f02525 Merge branch 'develop' of https://github.com/astaxie/beego into develop
 Conflicts:
	go.sum
2020-06-10 11:05:57 +08:00
liminggui
8e29300f85 fix graceful bug 2020-06-09 12:20:08 +08:00
flycash
5f31bf45d4 Fix #3949 : store RouterPattern before filter execute so that filter can use the pattern 2020-06-07 23:16:26 +08:00
askuy
3e30f37172
Merge pull request #4006 from flycash/develop
fix CI and UT
2020-06-06 21:16:08 +08:00
flycash
ce4ce74c8d Fix validation test 2020-06-06 20:50:48 +08:00
flycash
ce0e7525ad Fix ES client 2020-06-06 20:14:01 +08:00
flycash
d0b7244d57 Fix ledis 2020-06-06 19:21:57 +08:00
Ming Deng
5100a8c396 fix CI and UT 2020-06-06 18:16:36 +08:00
Ming Deng
b8efb3ef45
Merge pull request #3984 from jianzhiyao/develop
fix bug:static can not real hit cache & memory leak
2020-06-06 13:10:58 +08:00
Ming Deng
ae15b54f83
Merge pull request #3992 from maxshine/fix-3991
[Fix-Issue-3991] Fix Read with SQLite not supporting SELECT FOR UPDAT…
2020-06-06 13:10:08 +08:00
Ming Deng
0dab959c95
Merge pull request #4004 from gokangaroo/develop
avoid `panic: send on closed channel` after closing logger.
2020-06-06 13:09:36 +08:00
Ming Deng
ee615dd08f
Merge pull request #3985 from leapsea/develop
修复多线程下数据库连接异常问题
2020-06-06 12:40:50 +08:00
huija
b879a07b3a avoid panic: send on closed channel after closing logger. 2020-06-04 14:52:54 +08:00