1
0
mirror of https://github.com/astaxie/beego.git synced 2025-04-02 02:55:58 +00:00

Compare commits

...

336 Commits

Author SHA1 Message Date
Ming Deng
56d89cc55c
Merge pull request #8 from flycash/fix4734-1x
do not reset id to 0
2021-08-20 19:54:42 +08:00
Ming Deng
e048377594 do not reset id to 0 2021-08-20 19:53:51 +08:00
Ming Deng
34334a52be
Merge pull request #7 from flycash/fix4734-1x
Fix 4734: we don't need to reset the id to 0
2021-08-19 21:52:16 +08:00
Ming Deng
7cdf96d21a Fix 4734: we don't need to reset the id to 0 2021-08-19 21:49:37 +08:00
Ming Deng
fad897346f
Merge pull request #4325 from flycash/revert1
Revert "Merge pull request #4254 from astaxie/develop-2.0"
2020-11-26 20:18:35 +08:00
Ming Deng
650fde66aa Revert "Merge pull request #4254 from astaxie/develop-2.0"
This reverts commit e284b0ddae072311617a6fdd8393eb04aba873d2, reversing
changes made to 8ef8fd26068a7b70865acbabee89f6691ae553a9.
2020-11-26 17:48:29 +08:00
Ming Deng
e284b0ddae
Merge pull request #4254 from astaxie/develop-2.0
Prepare Release v2.0.0-beta
2020-11-07 21:20:18 +08:00
Ming Deng
20a0de6bd0
Merge pull request #4290 from flycash/develop-2.0
fix init error of global instance
2020-11-05 23:51:52 +08:00
Ming Deng
b4396c97bb fix init error of global instance 2020-11-05 22:00:43 +08:00
Ming Deng
471ebba64d
Merge pull request #4281 from flycash/httplibTest
Add test for httplib
2020-10-27 22:08:35 +08:00
Ming Deng
d07a1eaa8e Add test for httplib 2020-10-27 21:58:39 +08:00
Ming Deng
9524036aab
Merge pull request #4278 from flycash/defaultCfg
Add global instance for config module
2020-10-24 22:27:12 +08:00
Ming Deng
45260e4119 Add global instance for config module 2020-10-24 22:13:15 +08:00
Ming Deng
02234dc503
Merge pull request #4277 from flycash/session
support using json string to init session
2020-10-22 09:53:55 +08:00
Ming Deng
05f4e0c146 support using json string to init session 2020-10-21 22:24:53 +08:00
Ming Deng
ae108ec826
Merge pull request #4276 from flycash/newHttpServer
Change NewHttpServer API
2020-10-21 21:59:45 +08:00
Ming Deng
7c61eb058f Change NewHttpServer API 2020-10-21 20:54:33 +08:00
Ming Deng
03ba495b7f
Merge pull request #4275 from flycash/fix-4224
add MaxUploadFile to provide more safety uploading controll
2020-10-21 10:04:32 +08:00
Ming Deng
d26683799a add MaxUploadFile to provide more safety uploading controll 2020-10-20 23:36:34 +08:00
Ming Deng
f9075e8274
Merge pull request #4272 from jianzhiyao/fix-4224
fix 4224:form entity too large casue run out of memory
2020-10-20 20:53:19 +08:00
Ming Deng
022ad862ac
Merge pull request #4274 from flycash/loadCfg
Fix ini Unmarshall method
2020-10-19 21:51:37 +08:00
Ming Deng
93bdf97068 Fix ini Unmarshall method 2020-10-19 21:04:57 +08:00
Anker Jam
3c48719999 complete condition 2020-10-19 00:22:55 +08:00
Anker Jam
cbb3de741d fix application/x-www-form-urlencoded request body oversize 2020-10-18 23:38:08 +08:00
Anker Jam
c510926cb8 fix 4224:form entity too large casue run out of memory 2020-10-18 23:18:13 +08:00
Ming Deng
140a4b90a3
Merge pull request #4266 from flycash/loadCfg
Using unmarshaler to parse config in web module
2020-10-14 22:26:12 +08:00
Ming Deng
c07acaebbc Support unmarshaler 2020-10-14 22:20:25 +08:00
Ming Deng
105b874477
Merge pull request #4265 from flycash/rft/configCtx
Upgrade toml version
2020-10-14 00:28:30 +08:00
Ming Deng
3fc21ae6ec Upgrade toml version 2020-10-14 00:25:31 +08:00
Ming Deng
ccf873fa8b
Merge pull request #4264 from flycash/rft/configCtx
remove config API's context parameter
2020-10-13 22:52:46 +08:00
Ming Deng
2572094a8d remove config API's context parameter 2020-10-13 22:33:39 +08:00
Ming Deng
568626cd57
Merge pull request #4262 from flycash/ftr/toml
Support toml config
2020-10-12 22:55:55 +08:00
Ming Deng
34d6a733e9 Support toml config 2020-10-11 23:26:48 +08:00
Ming Deng
e44f16c672
Merge pull request #4257 from flycash/fix/adapter
Remove scripts directory & update readme
2020-10-09 08:48:08 +08:00
Ming Deng
d41abdb5e4 Remove scripts directory; update readme 2020-10-08 23:18:10 +08:00
Ming Deng
f1358cf78d
Merge pull request #4255 from flycash/fix/adapter
Reorganize packages
2020-10-08 18:37:42 +08:00
Ming Deng
14c1b76569 remove pkg directory;
remove build directory;
remove githook directory;
2020-10-08 18:29:36 +08:00
Ming Deng
2708916f96
Merge pull request #4252 from flycash/fix/adapter
Reset func call depth & add adapter.sh
2020-10-06 18:33:45 +08:00
Ming Deng
034cb3222e Add adapter script which is used to replace v1 package with v2 adapter package 2020-10-06 16:43:16 +08:00
Ming Deng
66804324f2 Fix: Set func call depth as 3 2020-10-06 11:52:24 +08:00
Ming Deng
dc65055cf6
Merge pull request #4250 from flycash/adt/logs
logs Adapter
2020-10-05 23:26:55 +08:00
Ming Deng
8cc74652a2 Fix: adapter's controller must implement ControllerInterface 2020-10-05 23:00:20 +08:00
Ming Deng
6aa6c55f07 logs Adapter 2020-10-05 21:55:26 +08:00
Ming Deng
ff762b561c
Merge pull request #4249 from flycash/rft/moveSession
move core/session to web/session
2020-10-05 19:45:38 +08:00
Ming Deng
d8e8f41230 move core/session to web/session 2020-10-05 19:04:57 +08:00
Ming Deng
9e6b8fcf34
Merge pull request #4248 from flycash/rft/renameInfra
rename infrastructure to core
2020-10-05 18:40:20 +08:00
Ming Deng
48e98482f7 rename infrastructure to core 2020-10-05 18:14:01 +08:00
Ming Deng
ff7a8b966b
Merge pull request #4247 from flycash/adt/cache
Adapter: cache API
2020-10-05 14:46:13 +08:00
Ming Deng
f9bef68aa9 Adapter: cache API 2020-10-05 14:35:12 +08:00
Ming Deng
484beb8bad
Merge pull request #4245 from flycash/ftr/cache-ctx
Add context to cache API
2020-10-05 14:25:09 +08:00
Ming Deng
43560dede4
Merge pull request #4246 from jianzhiyao/frt/seperate_orm_alone
seperate orm alone & deadlock in task module
2020-10-05 14:24:51 +08:00
Anker Jam
c435d231ab complete check 2020-10-05 10:38:14 +08:00
Anker Jam
b838683731 add api for testing 2020-10-05 10:33:23 +08:00
Anker Jam
70cca5e298 make code testable in task module 2020-10-05 10:13:29 +08:00
Anker Jam
f1cca45d8d fix deadlock about changed sign 2020-10-05 01:31:27 +08:00
Anker Jam
4dc694411f fix deadlock in task module 2020-10-05 00:16:58 +08:00
Ming Deng
3364c609de Add context to cache API 2020-10-04 23:12:29 +08:00
Anker Jam
c5d43e87fe seperate orm alone 2020-10-04 22:16:19 +08:00
Ming Deng
b89d9511ab
Merge pull request #4237 from flycash/rft/cache-decup
Decouple web module from cache module
2020-10-04 19:01:31 +08:00
Ming Deng
325a0821c1
Merge pull request #4239 from flycash/rft/httplib
decouple httplib module from web module and config module
2020-09-29 22:22:27 +08:00
Ming Deng
dd3f1ce9be decouple httplib from config 2020-09-27 00:44:02 +08:00
Ming Deng
463e96447a decouple httplib from web module 2020-09-27 00:37:46 +08:00
Ming Deng
03498529b9 Decouple web module from cache module 2020-09-22 22:58:58 +08:00
Ming Deng
9a7c43c404
Merge pull request #4235 from flycash/ftr/adminCommand
decouple web module and task module
2020-09-21 22:50:08 +08:00
Ming Deng
44127edefc design Command for governor module & decouple web module from task module 2020-09-20 14:52:29 +00:00
Ming Deng
089006525e
Merge pull request #4234 from flycash/ftr/multi-sever
Multi server support
2020-09-20 22:44:32 +08:00
Ming Deng
2846043f2a Fix UT 2020-09-20 14:27:30 +00:00
Ming Deng
e6a257f987 Fix BUG 2020-09-20 12:02:28 +00:00
Ming Deng
2473e69417 Rewrite admin service by using multiple server feature 2020-09-20 15:36:53 +08:00
Ming Deng
d455805a0a Multiple server refactor 2020-09-20 15:36:53 +08:00
Ming Deng
bd1cfefec7 rft: Move build info to pkg 2020-09-20 15:36:53 +08:00
Ming Deng
7effdb0e7d
Merge pull request #4233 from flycash/esIndexName
Add IndexNaming interface
2020-09-20 14:22:32 +08:00
Ming Deng
b027968c0b
Merge pull request #4231 from flycash/ut/log
Add tests for log module
2020-09-20 13:50:22 +08:00
Ming Deng
961f300c14 Fix JL tests 2020-09-20 13:15:48 +08:00
Ming Deng
7570abd310
Merge pull request #4232 from flycash/stale-workflows
Add stale.yml
2020-09-19 23:57:40 +08:00
Ming Deng
7c8136710c Add stale.yml 2020-09-19 23:54:33 +08:00
Ming Deng
a3ece98cec Add IndexNaming interface so users can custom the index name when they use es as the logger 2020-09-19 23:49:52 +08:00
Ming Deng
a31dce6216
Merge pull request #4230 from jianzhiyao/frt/movement_for_4198
movement for 4198
2020-09-19 23:24:57 +08:00
Ming Deng
a1782cc22d Add tests for log module 2020-09-19 23:14:17 +08:00
Anker Jam
67f64afa85 movement for 4198 2020-09-19 21:45:37 +08:00
Ming Deng
2539fe3831
Merge pull request #4229 from wangle201210/develop-2.0
Provides a quick format method by PatternLogFormatter struct
2020-09-19 21:25:12 +08:00
wangle
05c125ec2d change to pointer receiver 2020-09-19 20:18:09 +08:00
wangle
6e638ef6c8 Provides a quick format method by PatternLogFormatter struct 2020-09-19 18:28:53 +08:00
Ming Deng
df043f22fc
Merge pull request #4225 from HITWHTigerLiu/develop-2.0
Empty field in validator.Error when label struct tag is not declared #4222
2020-09-17 21:27:18 +08:00
Ming Deng
fbaf3380c6
Merge pull request #4203 from jianzhiyao/frt/proposal_4105
warpping for global modelCache
2020-09-17 21:11:33 +08:00
jianzhiyao
b7bc57c4d1 delete interface 2020-09-16 19:46:14 +08:00
Ming Deng
32cdda96bd
Merge pull request #4205 from AllenX2018/postgres-query-builder
PostgresQueryBuilder
2020-09-14 21:21:59 +08:00
jianzhiyao
5995b00fa2 Merge branch 'develop-2.0' into frt/proposal_4105 2020-09-14 19:16:09 +08:00
l00427301
5618df8c76 Empty field in validator.Error when label struct tag is not declared #4222 2020-09-14 16:18:24 +08:00
AllenX2018
c6c9ad46f9 PostgresQueryBuilder 2020-09-14 09:50:28 +08:00
Ming Deng
5973ef107c
Merge pull request #4221 from flycash/ftr/log_format
fix 4219
2020-09-12 00:02:51 +08:00
Ming Deng
b575fa1ebe fix 4219 2020-09-11 23:48:45 +08:00
Ming Deng
6bbca96c6c
Merge pull request #4220 from flycash/ftr/log_format
refactor log module
2020-09-11 22:08:05 +08:00
Ming Deng
63cd8e4e15 refactor log module 2020-09-11 21:47:22 +08:00
Ming Deng
93736a8e66
Merge pull request #4216 from flycash/ftr/log_format
Log format support
2020-09-11 00:11:27 +08:00
Ming Deng
654d87b210 Merge log_format 2020-09-10 23:31:49 +08:00
Ming Deng
0048b7d158
Merge pull request #4188 from IamCathal/custom-log-formatter-third-pr
Custom logging format PR#3
2020-09-10 22:40:48 +08:00
jianzhiyao
00e44952ff optimize modelCache 2020-09-09 19:04:34 +08:00
IamCathal
8982f5d702 Add unit tests for custom log formatter
Also moved is Colorful check to WriteMsg function to make the interface for user's using the custom logging formatting simpler. The user does not have to check if the text is colorful now, the WriteMsg function handles it.
2020-09-09 00:23:57 +01:00
Ming Deng
6612bc4c2a
Merge pull request #4214 from flycash/rft/dbOption
Optimize orm by using BDOption rather than hints
2020-09-09 00:06:44 +08:00
Ming Deng
f580a714d5 Optimize orm by using BDOption rather than hints 2020-09-08 21:44:14 +08:00
Ming Deng
9ccd58bfff
Merge pull request #4211 from flycash/adt/all
allow users to ignore some table when run orm commands
2020-09-07 21:52:39 +08:00
Ming Deng
0f50b07a20 allow users to ignore some table when run orm commands 2020-09-07 21:40:44 +08:00
Ming Deng
b86cf22fc4
Merge pull request #4210 from flycash/adt/all
Move pr 3784
2020-09-07 20:53:45 +08:00
Ming Deng
6bf01eaeca Move pr 3784 here 2020-09-07 20:37:05 +08:00
Ming Deng
8e015deee5
Merge pull request #4208 from flycash/adt/all
Adapter: all module
2020-09-06 19:58:46 +08:00
Ming Deng
3acda41bc7 Fix UT 2020-09-06 10:39:20 +00:00
Ming Deng
5b3dd7e50f Adapter: orm 2020-09-06 13:33:52 +08:00
Ming Deng
f4a43814be Adapter: utils 2020-09-05 18:07:42 +08:00
Ming Deng
35f1bd2119 Adapter: testing 2020-09-05 16:58:49 +08:00
Ming Deng
f6c95ad534 Adapter: swagger module 2020-09-05 16:56:56 +08:00
Ming Deng
f1950482c2 Adapter: plugin 2020-09-05 16:54:22 +08:00
Ming Deng
1dae2c9eb3 Adapter: web module 2020-09-05 16:24:19 +08:00
Ming Deng
8ef9965eef Adapter: session module 2020-09-03 23:37:07 +08:00
Ming Deng
3530457ff9 Adapter: toolbox module 2020-09-03 21:34:57 +08:00
Ming Deng
cbd51616f1 adapter: validation module 2020-09-02 23:23:48 +08:00
Ming Deng
bdd8df6751 adapt migration 2020-09-02 21:01:54 +08:00
Ming Deng
8fc4f8847c adapt grace and metric 2020-09-02 20:43:35 +08:00
Ming Deng
3bf5cde38c adapt context 2020-09-02 20:36:53 +08:00
Anker Jam
7a53baaf9b rename modelRegister to modelCacheHandler 2020-09-02 00:33:46 +08:00
Anker Jam
7574b91760 add type modelRegister interface into Ormer 2020-09-02 00:26:25 +08:00
Ming Deng
78d91062c9 Adapt new API to old API: httplib 2020-09-01 22:16:49 +08:00
Ming Deng
23792401b5
Merge pull request #4201 from jianzhiyao/frt/proposal_4105
WIP:supports for proposal 4105
2020-09-01 22:05:15 +08:00
Anker Jam
e54dbabf0b movement for global modelCache 2020-09-01 21:56:48 +08:00
Ming Deng
cdc8110ea4
Merge pull request #4202 from flycash/adt/config
Using new API to adapt to old API
2020-09-01 21:50:08 +08:00
Ming Deng
185d55eb46 adapt config 2020-09-01 21:29:26 +08:00
Ming Deng
8e879726fe
Merge pull request #4200 from flycash/ftr/config-sub
Implement Sub, Unmarshaler and OnChange methods for yaml, json, xml
2020-08-31 22:29:14 +08:00
Ming Deng
33b052bc7a support json 2020-08-31 14:15:01 +00:00
Ming Deng
087399c44a support xml 2020-08-31 13:57:26 +00:00
Ming Deng
f4f200cf04 enhance yaml 2020-08-31 13:02:38 +00:00
Ming Deng
0a58428220
Merge pull request #4199 from flycash/rft/task-api
Add ctx to Task module API
2020-08-31 19:43:53 +08:00
Ming Deng
c0462f75bf Add ctx to Task module API 2020-08-30 16:18:59 +00:00
Ming Deng
5cf33f2655
Merge pull request #4197 from flycash/rft/session-api
Add ctx to session API
2020-08-31 00:14:52 +08:00
Ming Deng
670064686e Add ctx to session API 2020-08-30 15:39:07 +00:00
Ming Deng
0019e0fc1b
Merge pull request #4195 from flycash/ftr/etcd
Add contect as first parameter for all config method
2020-08-30 00:42:15 +08:00
Ming Deng
03bec05714 Add contect as first parameter for all config method 2020-08-29 16:25:20 +00:00
Ming Deng
e831b97eb8
Merge pull request #4194 from flycash/ftr/etcd
Support etcd
2020-08-29 22:44:55 +08:00
Ming Deng
81b9a1382a Fix UT 2020-08-29 14:27:06 +00:00
IamCathal
0189e6329a Add global logging override 2020-08-28 18:47:28 +01:00
IamCathal
6684924e99 empty commit to restart CI again 2020-08-28 18:30:41 +01:00
IamCathal
e0a934af1d empty commit to restart CI 2020-08-28 18:24:57 +01:00
IamCathal
8178f035a0 Custom formatting opts implementation 2020-08-28 18:18:28 +01:00
IamCathal
2b39ff7837 New opts formatter working for console 2020-08-28 18:00:45 +01:00
Ming Deng
c2361170b3 Support etcd 2020-08-29 00:07:33 +08:00
Ming Deng
5b35bf6065
Merge pull request #4192 from AllenX2018/supplement-datetimePrecision-UT
supplement datetime precision UT
2020-08-26 19:52:19 +08:00
Ming Deng
14c911e9d7
Merge pull request #4190 from flycash/ftr/time-precision
Support precision
2020-08-26 12:45:17 +08:00
Ming Deng
9472cba6c9 Fix UT 2020-08-26 04:16:09 +00:00
AllenX2018
b83094ac1e supplement datetime precision UT 2020-08-26 11:51:05 +08:00
Ming Deng
1cb0ff560d Support precision 2020-08-25 13:07:21 +00:00
Ming Deng
cceecad8c2
Merge pull request #4186 from AllenX2018/Feature-datetime-precision
Feature: implement the time precison for time.Time type
2020-08-25 21:05:08 +08:00
IamCathal
d24f861629 empty commit to restart CI 2020-08-24 21:00:58 +01:00
IamCathal
c2471b22ad Remove ineffectual assignments
Removed 3 lines due to warning from test suite saying these lines had innefectual assignments
2020-08-24 20:54:55 +01:00
IamCathal
c5970766a3 Add init to es.go 2020-08-24 20:41:39 +01:00
IamCathal
48a98ec1a5 Fix init for alils.go 2020-08-24 20:39:53 +01:00
IamCathal
ed1d2c7f6e Add custom logging format functionality and global formatter functionality 2020-08-24 20:22:38 +01:00
AllenX2018
7a94996e22 Feature: implement the time precison for time.Time type 2020-08-24 20:23:54 +08:00
Ming Deng
597c55d547
Merge pull request #4183 from flycash/rft/module-2
Reorganize package
2020-08-23 21:43:48 +08:00
Ming Deng
026e8bc55a Merge branch 'develop-2.0' of https://github.com/astaxie/beego into rft/module-2 2020-08-23 21:25:15 +08:00
Ming Deng
581e48679e Merge pull request #4173 from AllenX2018/fix-bug-queryRow
Fix issue 3866
2020-08-23 21:04:34 +08:00
Ming Deng
09afe0ae8e
Merge pull request #4179 from IamCathal/custom-log-formatter-secondpr
Custom log formatter secondpr
2020-08-22 21:36:50 +08:00
IamCathal
08e49ca323 Test empty commit 2020-08-20 19:32:42 +01:00
IamCathal
e1da804b2b Add format func to alils 2020-08-20 19:20:30 +01:00
IamCathal
705e091593 Add format call before logging 2020-08-20 19:06:51 +01:00
IamCathal
6bdedff457 LogFormatter Implementation 2020-08-20 19:00:35 +01:00
Ming Deng
f3be6dd2e9
Merge pull request #4173 from AllenX2018/fix-bug-queryRow
Fix issue 3866
2020-08-20 22:25:37 +08:00
AllenX2018
9fe353dd0b Fix issue 3886 2020-08-20 10:00:49 +08:00
Ming Deng
9003ca3eef
Merge pull request #4174 from IamCathal/custom-log-formatter-firstpr
Custom Log Formatter PR#1
2020-08-19 23:37:44 +08:00
IamCathal
ff5ac3adf4 Update signature of WriteMsg in es.go 2020-08-19 16:20:19 +01:00
IamCathal
ca4a217783 Merge branch 'develop-2.0' into custom-log-formatter-firstpr 2020-08-19 16:05:42 +01:00
Ming Deng
e6ea307549
Merge pull request #4175 from flycash/ftr/config
Add more methods to Configer
2020-08-19 22:44:43 +08:00
Ming Deng
2c16c7b917 Add more methods to Configer 2020-08-19 22:09:05 +08:00
IamCathal
77ddc3338f Fix file path logging for enableFullFilePath 2020-08-19 15:07:46 +01:00
IamCathal
ac3a549187 Fix test with new parameters 2020-08-19 14:21:29 +01:00
IamCathal
fe56de06b5 Add enableFullFilePath field to BeeLogger 2020-08-18 21:30:39 +01:00
IamCathal
6c002a3124 Update WriteMsg signatures for custom log formatting update 2020-08-18 21:30:11 +01:00
Ming Deng
cead72c6df
Merge pull request #4170 from flycash/rft/ormFilter
Refactor orm filter
2020-08-18 22:46:45 +08:00
Ming Deng
7fe4eaef50 Refactor orm filter 2020-08-18 14:31:06 +00:00
Ming Deng
63599c0032
Merge pull request #4168 from flycash/ftr/layout
Add git hooks
2020-08-18 21:08:56 +08:00
Ming Deng
4db256c9fb Add git hooks 2020-08-18 20:56:15 +08:00
Ming Deng
c548764c8e
Merge pull request #4163 from flycash/ftr/rmFiles
Remove files
2020-08-16 23:17:05 +08:00
Ming Deng
b4a85c8f13 Remove files 2020-08-16 23:09:19 +08:00
Ming Deng
94f476fa39
Merge pull request #4158 from jianzhiyao/frt/fix_spk_upsert
fix:return error when calling ``InsertOrUpdate`` is successful with string primary key
2020-08-16 21:21:25 +08:00
Ming Deng
8574e30b3a
Merge pull request #4160 from AllenX2018/Improve-orm.Fielder-function
fix issue #3776
2020-08-14 22:20:07 +08:00
AllenX2018
7442919f5a fix issue #3776 2020-08-14 17:11:52 +08:00
Ming Deng
f6ec4efc70
Merge pull request #4156 from flycash/ftr/bean
Supporting default value by using filter
2020-08-14 15:47:50 +08:00
jianzhiyao
7b899aa9af add ErrLastInsertIdUnavailable 2020-08-14 15:09:47 +08:00
Ming Deng
f73eee75ff Merge develop-2.0 2020-08-14 14:34:59 +08:00
jianzhiyao
739b8bab0c fix UT 2020-08-14 10:31:08 +08:00
jianzhiyao
139c393f08 add const ErrLastInsertIdUnavailable 2020-08-14 09:59:11 +08:00
Ming Deng
bdec93986b Bean: Support autowire by tag
Orm: Support default value filter
2020-08-13 21:26:39 +08:00
jianzhiyao
7ce0fde171 fix:return error when calling `InsertOrUpdate` is successful with string primary key 2020-08-13 19:14:00 +08:00
Ming Deng
d6a2621b3c
Merge pull request #4137 from phiphi282/change_redis_provider
Add additional options to redis session prov
2020-08-12 13:38:44 +08:00
Phillip Stagnet
813a4df3c5
Make sure expiry time is in seconds 2020-08-11 16:21:43 +02:00
Phillip Stagnet
7267f5e573
Add new config option into provider struct 2020-08-11 16:09:29 +02:00
Ming Deng
5bc8d90d7f
Merge pull request #4150 from jianzhiyao/frt/fix_3830
fix:return error after inserting data when primary key is string
2020-08-11 21:22:17 +08:00
jianzhiyao
2d1c02e1c1 Merge branch 'develop-2.0' of https://github.com/astaxie/beego into frt/fix_3830
# Conflicts:
#	pkg/orm/orm_test.go
2020-08-11 17:37:24 +08:00
jianzhiyao
9ca9535c48 fix:return error after inserting data when primary key is string 2020-08-11 16:53:31 +08:00
Phillip Stagnet
d1d9df74c7
Merge branch 'develop-2.0' of github.com:astaxie/beego into change_redis_provider 2020-08-11 10:47:06 +02:00
Ming Deng
d326d74c34
Merge pull request #4148 from flycash/fix/end2end
Fix prometheus and opentracing bug found in end2end tests
2020-08-11 16:33:54 +08:00
Ming Deng
82178a487b Merge develop-2.0 and resolve conflict 2020-08-11 08:16:04 +00:00
Ming Deng
a1b7fd3c93
Merge pull request #4147 from jianzhiyao/frt/specify_index_2
specify index
2020-08-11 16:13:13 +08:00
Phillip Stagnet
0813471202
Merge branch 'develop-2.0' of github.com:astaxie/beego into change_redis_provider 2020-08-11 09:52:53 +02:00
jianzhiyao
ce698aacf6 rm some methods 2020-08-11 12:06:02 +08:00
Ming Deng
c22af4c611 Fix Tracing and prometheus bug 2020-08-11 03:23:38 +00:00
Anker Jam
f8c0e6fec5 fix UT 2020-08-11 00:06:36 +08:00
Anker Jam
882f1273c8 add UT for specifying indexes 2020-08-10 23:27:03 +08:00
jianzhiyao
5a1fa4e1ec specify index 2020-08-10 18:46:16 +08:00
Ming Deng
d05460237c
Merge pull request #4145 from flycash/ftr/ormTracing
Support prometheus and opentracing for ORM and httplib module
2020-08-10 13:53:23 +08:00
Ming Deng
75107f735e Support opentracing filter 2020-08-09 14:59:41 +00:00
Ming Deng
2e891152dd deprecated httplib and then support prometheus for httplib 2020-08-09 14:59:41 +00:00
Ming Deng
dec98f004c Support opentracing filter for Orm 2020-08-09 14:59:41 +00:00
Ming Deng
26b016a3a4
Merge pull request #4143 from flycash/fix/moveIni
Move init so it will be default implementation of config
2020-08-09 22:51:47 +08:00
Ming Deng
19aae0b7e1
Merge pull request #4107 from AllenX2018/fix-comment-router-issue
add comment router path configuration
2020-08-09 19:23:05 +08:00
Ming Deng
2e192e1ed0 Depracated config module and recommend using pkg/config 2020-08-08 13:26:30 +00:00
Ming Deng
f9a3eae9d5 Move init so it will be default implementation of config 2020-08-08 13:17:49 +00:00
Ming Deng
7fc1e4de96
Merge pull request #4141 from flycash/ftr/ormInterceptor
Orm filter support
2020-08-08 20:52:37 +08:00
AllenX2018
993ccac2bd fix comment router generate issue 2020-08-08 16:17:12 +08:00
Ming Deng
2fd65a469c Support prometheus 2020-08-07 14:14:07 +00:00
Ming Deng
a2fa073072
Merge pull request #4139 from IamCathal/coc-grammar-fixes
More minor grammar fixes
2020-08-07 22:00:22 +08:00
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 6f5c5bd3a65561db56aca26eae4a50abef8fa5b4.
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 28e6b3b92450b0ca0e9c1342d400f8810e4d5e5a.
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
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
playHing
b50fb44950 Add bench test on context input query 2020-07-15 20:44:59 +08:00
Ming Deng
9d936c58bf
Merge pull request #4070 from flycash/develop-2.0
Move orm to pkg/orm
2020-07-15 10:50:05 +08:00
Ming Deng
ffe1d52120 Move orm to pkg/orm 2020-07-15 10:05:11 +08:00
Ming Deng
1c0714405a
Merge pull request #4068 from jianzhiyao/fix_3898
fix `index out of range` when sid len = 1
2020-07-15 00:03:59 +08:00
jianzhiyao
678b90385b add log 2020-07-14 09:57:13 +08:00
jianzhiyao
5940ae33c2 fix index out of range when sid len = 1
add unit test for sess_file.go
2020-07-13 19:14:53 +08:00
Ming Deng
3db31385cf
Merge pull request #4065 from Acmefocus/develop
update README.md
2020-07-11 23:16:36 +08:00
Acmefocus
2b9aaa5b0d update README.md
Signed-off-by: Acmefocus <107723772@qq.com>
2020-07-10 09:58:06 +08:00
Acmefocus
dced745d55 Merge branch 'develop' of https://github.com/Acmefocus/beego into develop 2020-07-09 18:15:25 +08:00
Acmefocus
25ba78ea72 update README.md
Signed-off-by: Acmefocus <107723772@qq.com>
2020-07-09 18:14:31 +08:00
Acmefocus
863b5bd0f4 Merge branch 'develop' of https://github.com/Acmefocus/beego into develop
Signed-off-by: Acmefocus <107723772@qq.com>
2020-07-09 17:59:07 +08:00
Acmefocus
ba3153621a Merge branch 'develop' of https://github.com/Acmefocus/beego into develop 2020-07-09 17:47:46 +08:00
Acmefocus
40cdc877b6 Update README.md
Signed-off-by: Acmefocus <107723772@qq.com>
2020-07-09 17:38:08 +08:00
Acmefocus
76debb1899
Update README.md 2020-07-09 17:18:01 +08:00
Ming Deng
35dcc3df7c
Merge pull request #4058 from a631807682/fix/issues/4054
Fix response payload too large
2020-07-09 16:41:11 +08:00
Chenrui
c3f14a0ad6
refactor: log error when payload too large 2020-07-09 09:45:40 +08:00
Ming Deng
8ee167bc7b
Merge pull request #4051 from gmelodie/sleep-on-reconnect-3972
Add sleep on reconnect
2020-07-09 09:41:04 +08:00
Cathal
2eccb23461 Add sleep on reconnect functionality 2020-07-08 17:30:34 +01:00
Ming Deng
28d3f624a3
Merge pull request #4055 from tayoogunbiyi/develop
Allow Healthcheck endpoint return JSON for Kubernetes
2020-07-08 23:51:03 +08:00
Ming Deng
926b80d1d8
Merge pull request #4061 from flycash/race-condition
Fix 4059
2020-07-08 23:49:54 +08:00
Ming Deng
c08b27111c Fix 4059 2020-07-08 23:32:18 +08:00
Chenrui
03f78b2e4a
fix: add error code support 2020-07-08 18:09:01 +08:00
Chenrui
946a42c021
fix: response http 413 when body size larger then MaxMemory. 2020-07-08 17:14:52 +08:00
Eyitayo Ogunbiyi
d7b0d55357 added extra check for same response lengths 2020-07-07 17:23:52 +01:00
Eyitayo Ogunbiyi
728bf34006 refacted cache health check from toolbox 2020-07-07 16:46:59 +01:00
Eyitayo Ogunbiyi
e0f8c6832d added test for buildingHealthCheckResponse 2020-07-07 16:28:16 +01:00
Eyitayo Ogunbiyi
469dc7bea9 refactored the building of healthcheck response map 2020-07-07 16:09:22 +01:00
Eyitayo Ogunbiyi
ca0c64b69e refactored tests for health check endpoint 2020-07-07 15:21:38 +01:00
Eyitayo Ogunbiyi
5a4a082af0 renamed functions for clarity 2020-07-07 14:54:21 +01:00
Ming Deng
9dc660c1da
Merge pull request #4056 from gmelodie/reconn-bug-3971
Fix reconnection bug in logs/conn.go
2020-07-07 20:25:44 +08:00
Gabriel Cruz
d8724cb122
Add error returning to writeln 2020-07-06 21:38:47 +02:00
Gabriel Cruz
fc56c562db
Fix logger reconnection 2020-07-06 21:38:47 +02:00
Eyitayo Ogunbiyi
8d1a9bc92e added tests for health check endpoints 2020-07-06 19:34:48 +01:00
Eyitayo Ogunbiyi
db547a7c84 added test for execJson 2020-07-06 16:04:29 +01:00
Eyitayo Ogunbiyi
7c575585e9 added conditional json flag when trying to view healthchecks 2020-07-06 15:27:12 +01:00
Ming Deng
289f86247e
Merge pull request #4053 from flycash/ftr/test-docker
Add docker-compose to support running unit test locally
2020-07-05 22:08:20 +08:00
Ming Deng
ca9b21bb30 Add docker-compose to support running test 2020-07-04 13:42:20 +00:00
2 changed files with 1 additions and 14 deletions

View File

@ -702,13 +702,6 @@ func (d *dbBase) Delete(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time.
return 0, err
}
if num > 0 {
if mi.fields.pk.auto {
if mi.fields.pk.fieldType&IsPositiveIntegerField > 0 {
ind.FieldByIndex(mi.fields.pk.fieldIndex).SetUint(0)
} else {
ind.FieldByIndex(mi.fields.pk.fieldIndex).SetInt(0)
}
}
err := d.deleteRels(q, mi, args, tz)
if err != nil {
return num, err

View File

@ -242,13 +242,7 @@ func (o *orm) Update(md interface{}, cols ...string) (int64, error) {
func (o *orm) Delete(md interface{}, cols ...string) (int64, error) {
mi, ind := o.getMiInd(md, true)
num, err := o.alias.DbBaser.Delete(o.db, mi, ind, o.alias.TZ, cols)
if err != nil {
return num, err
}
if num > 0 {
o.setPk(mi, ind, 0)
}
return num, nil
return num, err
}
// create a models to models queryer