1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-29 22:21:29 +00:00
Commit Graph

3860 Commits

Author SHA1 Message Date
Ming Deng
08cec9178f Orm filter support 2020-08-07 13:45:24 +00:00
IamCathal
63b3fc4a99 Fix retry amount comment 2020-08-06 16:09:06 +01:00
IamCathal
1b4bb43df0 More minor grammar fixes 2020-08-06 16:07:18 +01:00
Phillip Stagnet
ec55edfbc4
Add additional options to redis session prov
Adding option for frequency of checking timed out connections as well as
an option to specify retries.

These changes make redis provider more stable since connection problems
are becoming fewer.

Since redigo does not have this options and since redis_sentinel and
redis_cluster are using go-redis as a client, this commit changes from
redigo to go-redis for redis session provider.

Added tests for redis session provider as well.
2020-08-06 11:14:36 +02:00
Ming Deng
2fce8f9d1b
Merge pull request #4124 from phiphi282/session_exists_return_err
Update session provider interface to return errors on SessionExist
2020-08-06 09:17:49 +08:00
Ming Deng
15489fa76a
Merge pull request #4135 from IamCathal/grammar-fixes
Minor grammar fixes
2020-08-06 09:05:30 +08:00
IamCathal
e7d8bab5d9 Improved definition of DefaultEvery 2020-08-05 17:56:11 +01:00
IamCathal
2f5683610f Minor grammar fixes 2020-08-05 17:50:05 +01:00
Phillip Stagnet
5c8c088684
Revert "Change interface in session README"
This reverts commit 6f5c5bd3a6.
2020-08-05 18:33:17 +02:00
Phillip Stagnet
009074725e
Move interface change to pkg/session/README.md 2020-08-05 18:32:33 +02:00
Phillip Stagnet
ce50ca22d7
Merge branch 'develop-2.0' of github.com:astaxie/beego into session_exists_return_err 2020-08-05 18:30:19 +02:00
Phillip Stagnet
3052c64b6c
Revert "Add error to SessionExist interface"
This reverts commit 28e6b3b924.
2020-08-05 18:29:47 +02:00
Phillip Stagnet
5f2f6e4f86
Add interface change in pkg folder 2020-08-05 18:29:22 +02:00
Ming Deng
3382a5baa1
Merge pull request #4134 from flycash/ftr/ormInterceptor
Deprecated old web module
2020-08-05 22:22:59 +08:00
Ming Deng
882aa9b967 Deprecated old web module 2020-08-05 21:57:20 +08:00
Ming Deng
02972d8702
Merge pull request #4130 from flycash/ftr/prometheuseAndOpentracing
Support prometheus and opentracing by using FilterChainFunc
2020-08-05 15:46:03 +08:00
Ming Deng
261b704d8b Fix UT 2020-08-05 07:25:34 +00:00
Ming Deng
6c6cf91741 Support prometheus and opentracing filter 2020-08-04 23:15:42 +08:00
Ming Deng
ae8461f95d
Merge pull request #4125 from flycash/ftr/middleware
Support FilterChain
2020-08-04 23:06:18 +08:00
Ming Deng
aa3987f816 Merge remote-tracking branch 'origin/develop' into ftr/middleware 2020-08-04 22:26:01 +08:00
Ming Deng
3dc5ec1060
Merge pull request #4129 from astaxie/revert-4128-fix-ci-fail
Revert "fix CI fail for connection log test"
2020-08-04 21:38:50 +08:00
Ming Deng
1961c1e441
Revert "fix CI fail for connection log test" 2020-08-04 21:37:46 +08:00
Ming Deng
787bb60b42
Merge pull request #4128 from AllenX2018/fix-ci-fail
fix CI fail for connection log test
2020-08-04 21:14:45 +08:00
AllenX2018
12b984861d fix CI fail for connection log test 2020-08-04 20:32:07 +08:00
Ming Deng
79ffef90e3 support filter chain 2020-08-04 07:26:51 +00:00
Ming Deng
310161f9d4
Merge pull request #4126 from flycash/fix/secureFlagV1
XSRF add secure and http only flag
2020-08-03 21:24:23 +08:00
Ming Deng
a0d1c42dac XSRF add secure and http only flag 2020-08-03 21:04:33 +08:00
Phillip Stagnet
6f5c5bd3a6
Change interface in session README 2020-08-03 13:33:30 +02:00
Phillip Stagnet
28e6b3b924
Add error to SessionExist interface
Implement changed interface for all default providers as well and change
tests accordingly
2020-08-03 13:31:49 +02:00
Ming Deng
9e1346ef4d
Merge pull request #4113 from flycash/ftr/usingPkg
using pkg module
2020-07-31 13:40:39 +08:00
Ming Deng
9f295067b7 Resolve conflict 2020-07-30 22:44:44 +08:00
Ming Deng
71776e4bef
Merge pull request #4114 from wangle201210/develop-2.0
Add the operator(>,>=,<,<=,=,!=) of orm
2020-07-30 16:51:02 +08:00
Ming Deng
87b40ee9e7
Merge pull request #4116 from livelyRyan/patch-2
添加 BConfig.Listen.ClientAuth 字段及处理逻辑
2020-07-30 16:07:00 +08:00
Mr. Myy
7831638f37
移除多余的条件判断 2020-07-30 14:48:46 +08:00
Mr. Myy
5203804165
调整默认配置中的 ClientAuth 值,使之与原来的行为保持一致 2020-07-30 14:46:17 +08:00
Ming Deng
d4074b5004
Merge pull request #4103 from flycash/ftr/newOrmWithDB
Enhance: NewOrmUsingDB & remove useless methods
2020-07-30 11:43:47 +08:00
Mr. Myy
0815e77f9a
修复笔误产生的拼写错误 2020-07-30 11:20:22 +08:00
Mr. Myy
c46ba86215
修复笔误产生的拼写错误 2020-07-30 11:18:14 +08:00
Mr. Myy
9d23e5a3fb
简化代码写法 2020-07-30 11:03:32 +08:00
Mr. Myy
513a4afff1
对 Listen 结构体增加 ClientAuth 字段
对 Listen 结构体增加 ClientAuth 字段,赋予默认配置对象该字段值为 tls.VerifyClientCertIfGiven,与原代码逻辑的默认值保持一致
2020-07-30 10:59:32 +08:00
Mr. Myy
15e11931fc
添加对 BConfig.Listen.ClientAuth 字段的逻辑处理。当指定了该配置时,使用配置的值来作为验证客户端的方式。如果没指定,使用默认值 tls.RequireAndVerifyClientCert 2020-07-30 10:53:30 +08:00
Ming Deng
7d561607d8
Merge pull request #4111 from liuhaogui/develop
添加配置文件路径环境变量
2020-07-30 09:14:12 +08:00
wangle
22b8cae73b Add the operator(>,>=,<,<=,=,!=) of orm
eg:
qs.Filter("counts__>=","20")
qs.Filter("counts__!=","20")
2020-07-29 23:23:02 +08:00
Ming Deng
aa06a10493 uing pkg module 2020-07-29 14:42:27 +00:00
Ming Deng
9b58c2836c Merge develop-2.0 and resolve confilct 2020-07-29 22:26:29 +08:00
刘豪贵
15f04b8da4 add env BEEGO_CONFIG_PATH 2020-07-29 21:57:16 +08:00
Ming Deng
7312197732
Merge pull request #4098 from jianzhiyao/frt/stmt_config
make stmt cache size configurable & wrap kv
2020-07-29 20:57:07 +08:00
jianzhiyao
e87de70c6d adapt wrapping kv 2020-07-29 00:45:41 +08:00
jianzhiyao
4304b40a82 Merge branch 'frt/wrap_kv' into frt/stmt_config
# Conflicts:
#	pkg/orm/constant.go
#	pkg/orm/db_alias.go
2020-07-28 18:32:24 +08:00
jianzhiyao
e8facd28f5 wrap kv 2020-07-28 17:37:36 +08:00