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

3762 Commits

Author SHA1 Message Date
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