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

3982 Commits

Author SHA1 Message Date
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
Ming Deng
54ef476600 add tag interfaces and remove log.go 2020-07-28 06:28:51 +00:00
jianzhiyao
756df9385f make stmt cache size configurable 2020-07-28 12:57:19 +08:00
Ming Deng
21f281655d remove QueryRelated and QueryRelatedCtx 2020-07-27 21:22:40 +08:00
Ming Deng
2e7fb81348 deprecated orm.go and add NewOrmUsingDB method 2020-07-27 21:19:34 +08:00
Ming Deng
ebc0207909
Merge pull request #4096 from jianzhiyao/request_context
fix memory leak of request context
2020-07-27 18:04:37 +08:00
jianzhiyao
2386c9c80d delete useless if-stmt 2020-07-26 22:37:42 +08:00
Ming Deng
b9f9fcca5f
Merge pull request #4099 from jianzhiyao/fix_3869
orm.rawPrepare support FlatParams
2020-07-26 21:01:39 +08:00
jianzhiyao
16d71893cd orm.rawPrepare support FlatParams 2020-07-26 19:40:13 +08:00
jianzhiyao
cfff0f3b46 fix memory leak of request context 2020-07-25 00:00:34 +08:00
Ming Deng
93eb7c6b83
Merge pull request #4091 from flycash/ftr/moveToPkg
Ftr: move to pkg
2020-07-23 09:36:29 +08:00
Ming Deng
79c2157ad4 Fix UT 2020-07-22 15:46:29 +00:00
Ming Deng
30eb889a91 Format code 2020-07-22 23:00:06 +08:00
Ming Deng
9c51952db4 Move package 2020-07-22 22:55:59 +08:00
Ming Deng
16b66509f6
Merge pull request #4083 from IamCathal/content-length
Add Content-length field for logging
2020-07-21 15:47:58 +08:00
Ming Deng
d5695060c5
Merge pull request #4082 from flycash/ftr/newOrm
Refactor RegisterDatabase
2020-07-21 15:47:40 +08:00
Ming Deng
af2143f8fb
Merge pull request #4084 from astaxie/develop
Align develop-2.0
2020-07-21 09:36:54 +08:00
IamCathal
a66b9950e7 Add Content-length field for logging 2020-07-20 21:23:21 +01:00
Ming Deng
44460bc457 Refactor RegisterDatabase 2020-07-20 15:52:40 +00:00
Ming Deng
41feb3a711
Merge pull request #4078 from jianzhiyao/frt/orm_merge
refactor orm
2020-07-20 23:50:40 +08:00
jianzhiyao
b6f7d30f9f fix unit test 2020-07-20 19:10:57 +08:00
jianzhiyao
4aad313de7 do not judge tx status in txOrm 2020-07-20 17:34:58 +08:00
jianzhiyao
aefe21b63a complete error log 2020-07-20 17:25:27 +08:00
jianzhiyao
32da446eb1 refactor orm 2020-07-19 23:46:42 +08:00
Ming Deng
d9c016ed98
Merge pull request #4076 from flycash/ftr/taskLog
Store nearest error info
2020-07-19 23:23:13 +08:00
Ming Deng
7258ef113a Store nearest error info 2020-07-19 14:34:57 +00:00
Ming Deng
d6779c4a90
Merge pull request #4075 from flycash/fix/stable-ut
Fix orm test when using Driver = mysql
2020-07-19 21:22:36 +08:00
Ming Deng
192a278a2a Fix orm test when using Driver = mysql 2020-07-19 12:56:58 +00:00
Ming Deng
7a48fbb698
Merge pull request #4066 from playHing/self-dev
Fix concurrent issue of context/input Query method
2020-07-16 13:52:11 +08:00
playHing
3e2c795410 Rlock for form query 2020-07-15 20:44:59 +08:00
playHing
55e6298f29 Fix concurrent form parsing and getting 2020-07-15 20:44:59 +08:00