lbsadmin
/
Beego
mirror of https://github.com/astaxie/beego.git
1
0
Fork 0
Code Issues Releases Activity
3,595 Commits 3 Branches 32 Tags 9.4 MiB
Commit Graph

3595 Commits

Author SHA1 Message Date
Ming Deng 8ef8fd2606
Merge pull request #4036 from astaxie/develop 
V1.12.2
 2020-06-30 23:25:29 +08:00
Ming Deng d6ef33feee
Merge pull request #4045 from flycash/preprare-1.12.2 
Remove tidb dependency
 2020-06-30 23:16:41 +08:00
Ming Deng 2f5ed5b433 Remove tidb dependency 2020-06-30 21:04:37 +08:00
Ming Deng 9c18dbe7dc
Merge pull request #4044 from flycash/upgrade_version 
upgrade version
 2020-06-30 20:58:14 +08:00
Ming Deng 01219944a4 upgrade version 2020-06-30 20:55:31 +08:00
Ming Deng 4fac6ceb3f
Merge pull request #4039 from flycash/fixbug 
Fix ES bug
 2020-06-30 13:18:13 +08:00
Ming Deng 1c4085e7ea
Update es.go 2020-06-30 10:12:10 +08:00
Ming Deng 2117562113
Update es.go 2020-06-30 10:09:36 +08:00
Ming Deng 1f9da8d75b Fix ES bug 2020-06-29 22:25:22 +08:00
Ming Deng 9dea9f9ae7
Merge pull request #3994 from HarryWang29/develop 
update support bit operation
 2020-06-29 20:27:36 +08:00
harry890829 0f6735e20d Merge branch 'develop' of https://github.com/astaxie/beego into develop 
 Conflicts:
	go.mod
	go.sum
 2020-06-29 16:48:03 +08:00
Ming Deng ad68e8d866
Merge pull request #4033 from jianzhiyao/develop 
make redis client idle timeout configurable
 2020-06-28 23:14:28 +08:00
Ming Deng 26beef756f
Merge pull request #4038 from flycash/fixbug 
Fix ES index problem
 2020-06-28 23:14:07 +08:00
jianzhiyao 5c9cc805a1 make redis client idle timeout configurable 2020-06-28 22:20:46 +08:00
Ming Deng de51bd28d7 Fix ES index problem 2020-06-28 21:12:12 +08:00
Ming Deng 6b6a0e8a56
Merge pull request #4032 from jianzhiyao/develop 
fix strings.Repeat panic
 2020-06-26 17:51:47 +08:00
Ming Deng 8039cc8e59
Merge pull request #4017 from guhan121/fix#4000 
Prohibit multiple calls SetDefaultMessage.
 2020-06-26 17:49:36 +08:00
jianzhiyao b88b7d2899 fix strings.Repeat panic 2020-06-25 23:48:07 +08:00
qiantao e725192072 fix #4000 2020-06-25 22:11:32 +08:00
Ming Deng 469f2c226d
Merge pull request #3998 from guhan121/go_modules_route_compatibility 
for go modules, generate route by `GO111MODULE=on`
 2020-06-25 20:30:27 +08:00
Ming Deng 828b20163d
Merge pull request #4029 from flycash/feature/buildInfo 
Add build info for prometheus
 2020-06-25 18:37:11 +08:00
Ming Deng 9c5eab4834 Add build info for prometheus 2020-06-25 17:44:40 +08:00
Ming Deng 1813d414ae
Merge pull request #4027 from flycash/develop 
Move many PR's change here since the original authors are responseless
 2020-06-25 02:17:49 +08:00
Ming Deng 6052524a28
Merge pull request #4028 from jianzhiyao/develop 
acquire() in Lock
 2020-06-23 23:58:42 +08:00
Ming Deng 3ce68d6a30 Move many PR's change here since the original authors are responseless 2020-06-23 23:14:51 +08:00
jianzhiyao 89420eacd0 go destroy 2020-06-23 23:05:58 +08:00
jianzhiyao 6d9862b924 acquire() in Lock 2020-06-23 22:29:41 +08:00
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