1
0
mirror of https://github.com/beego/bee.git synced 2024-11-23 17:00:56 +00:00
Commit Graph

1114 Commits

Author SHA1 Message Date
astaxie
dcc0fb67d2 Merge pull request #306 from amrfaissal/rewrite-load-conf
Rewrite configuration loading
2016-11-07 22:45:17 +08:00
Faissal Elamraoui
440c5e967c Rewrite configuration loading
Rewrited loadConfig() function to walk the project directory
looking for bee.json and Beefile. If no configuration file
found, it fallbacks to the default configuration. In case
of an error, a log message is printed to the console.
2016-11-03 16:48:09 +01:00
Zhang Qiang
3199a019d7 Swagger: support default value columns for @Param
This patch support default value after 'type' column if total
columns is six.

This enhancement also is compatiable with old five columns.
2016-11-03 23:18:05 +08:00
astaxie
4ff3cf5ce8 Merge pull request #303 from Lao-liu/develop
Update hprose 2.0
2016-11-01 19:50:59 +08:00
Laoliu
0ccc6306b7 Update hprose 2.0 2016-11-01 18:59:32 +08:00
astaxie
50fafd72e8 Merge pull request #296 from amrfaissal/fix-goversion
Fix GoVersion value
2016-10-24 10:20:35 +08:00
Faissal Elamraoui
5cc09e5c6c This fixes #295 2016-10-22 15:44:22 +02:00
astaxie
1d8aa1a48d Merge pull request #292 from ihippik/patch-4
Default values in structure
2016-10-11 10:16:51 +08:00
Konstantin
7c7e75435c Update g_docs.go 2016-10-10 19:49:33 +03:00
Konstantin
e8f85a57c2 Add types error handler (log)
the usual warning not panic
2016-10-10 17:36:51 +03:00
Konstantin
31406ebe5a Default values in structure
Swagger default value for golang stucture.

format: 
doc:"default(my_defaul_value)"

type MyStruct struct {
	Template string `json:"template" doc:"default(<h1>Hello, {{ name }}! </h1>)"`
	Name string `json:"name"`
	MyNumber int64 `json:"temp"  doc:"default(10)"`
	MyBool bool `json:"bl"  doc:"default(true)"`
	MyFloat float64 `json:"fl"  doc:"default(12.1234)"`
}
2016-10-08 11:35:26 +03:00
astaxie
244e9ccdc9 Merge pull request #286 from sergeylanzman/swagger-support-multi-package
Swaager - add support multi package with golang way myPackage.struct
2016-09-28 07:44:55 +08:00
Sergey Lanzman
d93e9a4271 Update g_docs.go 2016-09-27 18:20:01 +03:00
astaxie
178e74db40 Merge pull request #287 from amrfaissal/fix-multiple-main
Fix & Tweaks
2016-09-27 10:04:17 +08:00
Faissal Elamraoui
56568f4d2c tweak: Exit with message instead of a panic
In case no application is found in GOPATH(s), exit with a friendly
message instead of a panic. Also removed useless else block in watch.go.
2016-09-26 20:32:14 +02:00
Faissal Elamraoui
287af20d1a fix: This fixes #247
Moved isBeegoProject(app) method from pack.go to util.go. Rewrite it
to walk the application folder tree looking for main files.
2016-09-26 20:25:15 +02:00
Sergey Lanzman
4ebf7eab65 add support multi package with gaoling way myPackage.struct 2016-09-25 01:34:26 +03:00
astaxie
f7d2e04e07 change to 1.5.2 2016-09-22 23:12:55 +08:00
astaxie
b368f2b16a Merge branch 'master' into develop 2016-09-22 23:12:06 +08:00
astaxie
29c9e1bab7 fix the map type generate 2016-09-22 23:04:58 +08:00
astaxie
205428abce fix the licence issue 2016-09-22 22:26:39 +08:00
astaxie
9e856ecb33 Merge pull request #284 from filiphaftek/master
Fix incorrect generation of postgres table id type
2016-09-18 09:07:37 +08:00
Filip
465115c28e Fix incorrect generation of postgres table id type 2016-09-17 21:54:00 +02:00
astaxie
8191997cbf Merge pull request #282 from oter/develop
Fix .exe postfix issue on Windows platform.
2016-09-16 10:47:51 +08:00
OTER
b282761292 Fix .exe postfix issue on Windows platform. 2016-09-15 22:40:03 +03:00
astaxie
77f3b13fc3 Merge pull request #281 from sergeylanzman/develop
Improve swagger
2016-09-15 08:57:24 +08:00
Sergey Lanzman
1b75ccb9fe Improve swagger (Main params,yaml 2016-09-15 00:09:54 +03:00
Sergey Lanzman
6189e101c9 Merge pull request #4 from beego/develop
Develop update
2016-09-14 22:59:52 +03:00
astaxie
e296e96e70 Merge pull request #276 from ZetaChow/develop
Develop
2016-09-09 15:52:22 +08:00
ZetaChow
0d0bea81bf 去掉offset(int64)赋0值,去掉query (map[...]...)定义,以符合Lint 2016-09-09 15:38:44 +08:00
ZetaChow
411aa43080 修改PUT和Get One 错误的注释 2016-09-09 15:27:36 +08:00
ZetaChow
ad34b7be2a 修改函数注释,以符合Lint规范 2016-09-09 15:20:59 +08:00
astaxie
6f5df78d45 Merge pull request #271 from CodyGuo/master
Fix to issue #270
2016-09-07 13:43:33 +08:00
CodyGuo
ed67ef47e6 Fix to issue #270 2016-09-04 20:45:11 +08:00
CodyGuo
f6a219fb3a Fix to issue #270 2016-09-04 13:53:45 +08:00
astaxie
f453885864 update to 1.5.1 2016-08-30 00:18:17 +08:00
astaxie
eb64d25e4a Merge pull request #264 from beego/master
Develop update
2016-08-30 00:15:44 +08:00
astaxie
3d7a532567 Merge pull request #263 from sergeylanzman/swagger-add-embedded-struct
Swagger add embedded struct
2016-08-29 22:09:11 +08:00
Sergey Lanzman
004778c662 swagger add embedded struct 2016-08-29 11:04:47 +02:00
Sergey Lanzman
abb3443c01 Merge pull request #3 from beego/develop
Develop update
2016-08-29 10:56:12 +02:00
astaxie
cff303a528 Merge pull request #261 from ihippik/patch-2
Separate "Description" with "Summary" params
2016-08-27 13:08:31 +08:00
Konstantin
7e60509231 Separate and add @Description with @Summary params
@Description -> is "descriptions" in swagger
@Summary -> is "summary" in swagger

this different options.
2016-08-25 19:32:39 +03:00
astaxie
28f6abc3a0 merge master 2016-08-24 11:07:57 +08:00
astaxie
f813e990c0 hotfix: schema init 2016-08-24 10:54:54 +08:00
astaxie
a58931fd82 Merge pull request #253 from amrfaissal/readme-v1.5.0
Updated README.md
2016-08-23 01:16:41 +08:00
Faissal Elamraoui
98f4ff83c1 docs: Updated README.md
The README.md is updated to include the latest changes in bee and
Beego. New submission guidelines are added to organize contributions
to the project.
2016-08-22 18:29:11 +02:00
astaxie
a985ff0a06 Merge pull request #252 from tnextday/develop
add todo
2016-08-22 19:31:49 +08:00
tnextday
07ca4481b0 add todo 2016-08-22 16:11:06 +08:00
astaxie
eed820ab62 Merge pull request #251 from kyawmyintthein/master
Add runmode flag on bee run command to set BEEGO_RUNMODE
2016-08-22 15:53:57 +08:00
astaxie
73c3b3beaa Merge pull request #249 from tnextday/develop
Add array type support in comment param
2016-08-22 11:47:44 +08:00