valitydev/openapi-generator
14
0
Fork 0
mirror of https://github.com/valitydev/openapi-generator.git synced 2024-11-08 11:23:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,033 Commits 49 Branches 54 Tags 185 MiB
bbe422947f
Commit Graph

3986 Commits

Author SHA1 Message Date
Christian Loitsch
0d0d353b9d feat dart: mv basePath to ApiClient 
Changing the basePath is pretty annoying otherwise, because
you would need to set the basePath for every Api.
 2016-07-12 17:18:45 +02:00
wing328
394840e352 Add more security samples (#3344) 
* add line break test to petstore-security-test.yaml

* add objc/swift security testing

* add go,scala,qt5cpp for security test

* add security test for typescript

* fix go security issue, fix consumes,produces line break
 2016-07-12 19:51:28 +08:00
wing328
d4951bbf3c Leverage Shipable.io to validate mustache templates (#3333) 
* add run all petstore shell script

* add run all petstore batch file for windows tests

* better output for travis and appveyor

* add shippable config to test all petstore

* show log after test script

* remo all-petstore, update travis build

* update shiippable config

* add run-all-petstore

* failure test using ruby model

* use bash script for run-all-petstore

* update script permission

* fix html batch script

* fix missing doc in jaxrs spec generator

* fix missing api, model test in jaxrs spec generator

* rename licenseInfo for lumen

* remove ruby model failure (for CI test)

* fix "the input line is too long"

* update windows batch file to shorten the commands

* update appveyor config

* update shippable config

* add build script

* update batch file to remove args option

* fix window batch file for spring mvc/boot

* remove logging output to file
 2016-07-11 13:54:18 +08:00
wing328
1c5210581e fix model name "client" issue 2016-07-10 17:42:18 +08:00
wing328
0119a66479 fix https://github.com/swagger-api/swagger-codegen/pull/3313/files#r70178399 2016-07-10 16:55:36 +08:00
christian
8533ca43b4 #3285 replaced setModelNamePrefix by setModelNameSuffix 2016-07-09 23:50:23 +02:00
Christian Loitsch
9a65a5f0db feat: improve / fix deserialization by parsing type String 
* added api_helper.dart for a helper function.
* defaultApiClient is now a variable instead of a static field inside
  ApiClient
* a lot of functions inside ApiClient are no longer static.
* optional params are now named params  (needed to introduce a
  justIgnoreFlag as hack)
* queryParams now support the multi format and are therefore no longer a
  Map<String, String>, but a List<QueryParam>
* renamed apiException.mustache to api_exception.mustache to conform
  with other file names.
* removed unused import: 'dart:html'
* removed 'package:crypto/crypto.dart' dependency.  'dart:convert' has a
  base64 converter now.
* use null-aware operator for apiClient assignment in xxxApi
  constructors.
* enable testStoreApi (which returned a Future nobody waited for)
* fix types in tests.  Some ids were passed as Strings instead of ints.
* adapt tests to use the optional named arguments (for optional query
  args)
* generate random ids in tests.  Otherwise insertion will always succeed
  if the test has been called once.
 2016-07-08 15:02:28 +02:00
wing328
89741c75f7 Merge pull request #3276 from zhenjun115/issue2499 
add more tips about npe;
 2016-07-08 14:01:43 +08:00
tao
638319db09 add DefaultParam annotation 2016-07-07 11:45:22 -07:00
wing328
aaeae3f0d3 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-07-07 22:18:37 +08:00
wing328
89befeb45b fix long issue in python3 2016-07-07 22:17:27 +08:00
wing328
cb71c4ce31 Merge pull request #3313 from lunat/CSharp_documentation_with_anchor_link 
CSharp Documentation with working anchor link within document
 2016-07-07 21:15:58 +08:00
wing328
41e8273cb8 Merge branch 'master' of https://github.com/maneeshsahu/swagger-codegen into maneeshsahu-master 2016-07-07 19:13:29 +08:00
wing328
ef1666dd55 Merge pull request #3319 from wing328/word_full_java_util 
[Java] update wording for fullJavaUtil option
 2016-07-07 18:42:46 +08:00
wing328
1276941cc7 update wording for full util option 2016-07-07 18:31:18 +08:00
wing328
2418448a3c update swagger core to 1.5.9 for java feign client 2016-07-07 17:48:43 +08:00
wing328
6add9acfaf Merge branch 'issue3051' of https://github.com/zhenjun115/swagger-codegen into zhenjun115-issue3051 2016-07-07 17:35:45 +08:00
wing328
7fbe1aee07 Merge pull request #3317 from wing328/retrofit1_wording 
[Java][Retrofit] update wording for java retrofit1
 2016-07-07 17:05:30 +08:00
wing328
9c4d77ed1a update wording for java retrofit1 2016-07-07 16:35:59 +08:00
wing328
c5cc0bbb2a fix issue with java feign client 2016-07-07 15:53:17 +08:00
wing328
3b780e30d8 change java default lib to okhttp-gson 2016-07-07 15:53:16 +08:00
wing328
d402f35711 Merge pull request #3163 from DanGe42/master 
Improve error message for connection failures
 2016-07-07 14:29:27 +08:00
wing328
d621021fb1 Merge branch 'vovan--issue-3193' 2016-07-07 13:51:17 +08:00
wing328
612afe1809 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-07-07 11:38:57 +08:00
wing328
4d76dd24eb Merge branch 'master' of https://github.com/jencodingatwork/swagger-codegen into jencodingatwork-master 
Conflicts:
	modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache
 2016-07-07 11:34:36 +08:00
wing328
d70989c2b3 Merge branch 'issue-3193' of https://github.com/vovan-/swagger-codegen into vovan--issue-3193 2016-07-07 11:06:16 +08:00
wing328
9830e82add Merge pull request #3294 from cbornet/spring_cloud 
[Spring] Add a generator for spring cloud feign clients
 2016-07-07 10:59:56 +08:00
wing328
b997dd15ad Merge pull request #3306 from jimschubert/aspnet5_.NET_Core_1.0 
[aspnet5] update to asp.net core 1.0
 2016-07-07 10:59:01 +08:00
Daniel Ge
b16eda17e8 Improve error message for connection failures 
Previous ApiException message would simply print out the result of the
`curl_getinfo($curl)` call, which might be useful only if the developer
actually wanted very low-level information from curl about why a call
failed. The new message should print out a higher-level but more
informative, human-readable message. If necessary for debugging, the
ApiException's responseObject is set to the `curl_getinfo($curl)`.
 2016-07-06 12:09:41 -07:00
tao
62d06f75b4 use baseName instead of paramName 2016-07-06 10:41:57 -07:00
Christian Loitsch
0466405fa5 fix: verification of requiredParams now works 
other features:
- remove crypto dependency.  base64 encoding is now part of
  dart.convert.
- port Java query param handling to dart. → allows us to use 'multi'
  collectionFormat for queryParams
- use async await where possible.
 2016-07-06 17:45:39 +02:00
lunat
5648c5af88 CSharp Documentation with working anchor link within document 2016-07-06 16:26:59 +02:00
cbornet
e2c7dc0147 don't repackage as a spring boot app 2016-07-06 15:29:54 +02:00
vovan-
01e06c01eb Fixed issue [Spring] Add support for the contextPath in Spring-boot gen #3193 2016-07-06 14:21:13 +03:00
wing328
f7b223e1a9 fix test cases in python 2016-07-06 16:34:09 +08:00
cbornet
412022b852 add petstore samples and fix some issues 2016-07-06 10:30:10 +02:00
cbornet
a761682115 add a generator for spring cloud feign 2016-07-06 10:30:09 +02:00
wing328
3a3461f961 Merge pull request #3299 from wing328/android_volley_license 
[Android][Volley] add Apache v2 license to Android Volley API client
 2016-07-06 11:27:58 +08:00
wing328
c1d835dcfc Merge pull request #3287 from lrimkus/patch-1 
Python vnd content-type header support
 2016-07-06 11:27:20 +08:00
Jim Schubert
ae73bb7553 [aspnet5] Update to ASP.NET Core 1.0.0 
This migrates the server generator for aspnet5 from 1.0.0-rc1-final to
1.0.0.

Changes are fairly significant in how Kestrel hosts the application, as
well as how Swagger finds XML comments for documentation. Changes are
only related to hosting, docker, and configuration.
 2016-07-05 22:17:14 -04:00
jencodingatwork
c3a9d6c9c3 Modified JavaJaxrs resources to fix duplicated variable names. See issue 
#3300 for full description.
 2016-07-05 12:36:08 -04:00
laurynas
560f50ab9a case insensitive search for "json" in content-type headers 2016-07-05 11:31:18 -04:00
wing328
6b4b2025ee add license to android volley 2016-07-05 22:39:38 +08:00
wing328
b699fe57fc add license header to java default client 2016-07-05 22:16:53 +08:00
lunat
43d1c5bffc CSharp client header problem 
CSharp client may cause an error adding an header because the header
list is static.
Added a check and a function tu set up the ApiKey
 2016-07-05 14:42:43 +02:00
wing328
430f49aae6 fix javadoc error 2016-07-05 20:38:04 +08:00
wing328
5e6a6de351 fix javadoc error 2016-07-05 19:38:33 +08:00
wing328
dfc05f4bba fix doc warning in java retrofit2 client 2016-07-05 17:49:50 +08:00
Laurynas
23b81324d1 Python vnd content-type header support 
Adding vendor header support like : "Content-Type: application/vnd.api+json" and "Content-Type: application/vnd.api+json; version=1"
 2016-07-04 15:27:54 -04:00
Laurynas
df695ee2c4 Python vnd content-type header support 
Adding vendor header support like : "Content-Type: application/vnd.api+json" and "Content-Type: application/vnd.api+json; version=1"
 2016-07-04 15:22:54 -04:00
christian
0ada53435c #3284: Made modelNamePrefix and -Suffix available through maven 2016-07-04 19:51:38 +02:00
wing328
785d1a5648 add option to set ssl host setting in ruby client 2016-07-04 22:13:25 +08:00
wing328
7de7c6de43 Merge pull request #3282 from wing328/objc_fix_typo 
[ObjC] fix typo in readme doc
 2016-07-03 22:16:31 +08:00
wing328
e98928a0a5 Merge pull request #3186 from ant3/JSR310-Clients 
[Java] Add support for JSR310 in Jersey Clients (v3)
 2016-07-03 21:56:13 +08:00
wing328
3f6f4bfd86 fix objc readme doc 2016-07-03 21:49:33 +08:00
wing328
82ee6bbb48 Merge pull request #3278 from wing328/escape_unsafe_2 
Better handling of multi-line comments for all generators
 2016-07-03 00:20:39 +08:00
wing328
8a3c2e754b fix python flask to handle comment block 2016-07-02 17:14:13 +08:00
wing328
e2e0af1e6c Merge branch 'master' of https://github.com/arturdzm/swagger-codegen into arturdzm-master 
Conflicts:
	README.md
 2016-07-02 17:00:21 +08:00
wing328
2464633368 better handling of multiline comments for all lang 2016-07-02 16:25:55 +08:00
zhenjun115
4a71a4c290 add more tips about npe; 2016-07-02 16:16:50 +08:00
zhenjun115
0117cbb29a update the dependencies for Java Feign API clients to the latest versions; 2016-07-02 12:14:31 +08:00
wing328
3c9b172996 Merge pull request #3274 from wing328/fix_lumne 
Remove security test from petstore-with-fake-endpoints-models-for-testing
 2016-07-02 11:48:45 +08:00
wing328
393b44dcd2 remove security test from petstore-with-fake-endpoints-models-for-testing 2016-07-02 11:32:25 +08:00
wing328
691957875e Merge pull request #3185 from cbornet/common_jersey 
[Jax-rs][jersey] Mutualize jersey 1 and jersey 2 templates
 2016-07-02 11:19:40 +08:00
Jason Gavris
693c73171e [Swift] Use ISO-8601 date format 
- Also fix up Enum parameter generation for formParams by extracting _param partial
 2016-07-01 09:55:32 -04:00
wing328
f18f81cce9 Merge branch 'fix_resteasy_gradle_definition' of https://github.com/chameleon82/swagger-codegen into chameleon82-fix_resteasy_gradle_definition 2016-07-01 19:54:43 +08:00
wing328
f8bf4387c3 Merge pull request #3252 from alexralko/master 
add getHasExamples() method to support {{hasExamples}} tag in templates
 2016-07-01 17:43:07 +08:00
wing328
33b4afc098 Merge pull request #3267 from wing328/swift_npe 
[Swift] fix NPE for swift API client due to array of enum
 2016-07-01 17:37:48 +08:00
wing328
8c754d234d fix npe for swift due to array of enum 2016-07-01 16:58:18 +08:00
wing328
a18fb4ec8b Merge pull request #3236 from cliffano/master 
Disable path HTML-escaping in Ruby api template
 2016-07-01 14:45:01 +08:00
wing328
021f554a6b Merge pull request #3260 from gokl/format-field 
Issue 3257: Add format field to CodegenParameter and CodegenProperty.…
 2016-07-01 14:05:06 +08:00
Cliffano Subagio
6de6e93bab Move generated ruby client test to java.io.swagger.codegen.ruby package. 2016-07-01 14:41:37 +10:00
gokl
1598fb2657 Issue 3257: Add format field to CodegenParameter and CodegenProperty. Add format to static html template. 2016-06-30 12:10:10 +02:00
wing328
45f13b28a0 Merge pull request #3258 from wing328/ruby_fix_test_case 
[Ruby] minor update to ruby test cases
 2016-06-30 16:48:35 +08:00
wing328
be4f4eb022 Merge pull request #3248 from cbornet/retrofit2_interceptor_issue 
Use okttp builder instead of instance in retrofit2
 2016-06-30 16:45:17 +08:00
wing328
7c5b583751 Merge pull request #3256 from arnested/php-expose-path-to-callapi 
[PHP] Add path without expanded path parameters to callApi
 2016-06-30 16:37:09 +08:00
wing328
4a3d9358ee Merge pull request #3165 from abcsun/lumen 
[PHP Lumen] sort the endpoints in ascending to avoid the route priority issure
 2016-06-30 15:51:32 +08:00
wing328
c2f0397d5c minor fix to ruby test cases 2016-06-30 15:40:35 +08:00
Arne Jørgensen
7d6ac31619 [PHP] Add path without expanded path parameters to callApi 
In continuation of #3117 it could be useful to know the path of an
endpoint (without path parameters expanded) in the `callApi` method of
`ApiClient`.

This is for use cases where you would create a derived class from
`ApiClient` for manipulating responses from the server before further
processing (#3117) or add extended logging of the API calls.
 2016-06-30 07:12:28 +02:00
Cliffano Subagio
8bacbfb691 Only use Content-Disposition's filename as prefix when it exists. 2016-06-30 09:42:25 +10:00
delenius
8a8e9432e1 Generate type annotations in JS model constructors 
Fixes #3207
 2016-06-29 13:53:33 -07:00
wing328
40e497088a Merge pull request #3251 from wing328/fix_slim_path 
[PHP][Slim] fix slim path in Windows
 2016-06-30 00:55:14 +08:00
wing328
9ee10e2397 Merge pull request #3249 from wing328/csharp_security_fix 
[C#] better code injection handling for C# API client
 2016-06-29 23:59:24 +08:00
Alex Ralko
a862601482 add getHasExamples() method to support {{hasExamples}} tag in templates 2016-06-29 18:56:45 +03:00
wing328
cb53ea114a Merge pull request #3246 from wing328/security_fix_javascript_closure 
[Javascript][Closure] better code injection handling for Javascript (closure)API client
 2016-06-29 23:25:04 +08:00
wing328
de6b3cea70 fix slim windows path 2016-06-29 23:24:27 +08:00
cbornet
f54b505704 use okttp builder instead of instance in retrofit2 
Fix #3188
 2016-06-29 17:07:39 +02:00
wing328
7951c06f55 unescape basepath in aspnet 2016-06-29 22:54:16 +08:00
wing328
d79274d548 better code injection handling for c# 2016-06-29 22:52:12 +08:00
wing328
f89333c8c3 better code injection handling for javascript closure client 2016-06-29 22:07:14 +08:00
wing328
73e6626e15 comment out array of enum test case, fix JS enum partial template 2016-06-29 21:40:22 +08:00
wing328
aec2f4e27c better code injection handling for js 2016-06-29 21:18:35 +08:00
wing328
aaf7b99220 comment out test case for map of map of enum as many lang don't support 2016-06-29 17:46:45 +08:00
wing328
fd72409e3b better default value for enum variable declaration 2016-06-29 17:30:33 +08:00
wing328
f88b941d96 fix java okhttp sample 2016-06-29 11:49:40 +08:00
Cliffano Subagio
b6eb81cbef Move path unescaping from DefaultGenerator to Ruby api template. 2016-06-29 09:46:41 +10:00
wing328
77c4164b3c better code injection handling for java 2016-06-29 02:00:43 +08:00
cbornet
ac23b10f7a remove dead code 2016-06-28 18:06:33 +02:00
cbornet
8d8858cc51 mutualize jackson and gson models in java clients 
See #2182
 2016-06-28 18:00:34 +02:00
Cliffano Subagio
344e1b12e4 Disable template data HTML-escaping on generated code files. 2016-06-29 01:57:08 +10:00
wing328
07a852fe78 Merge pull request #3231 from wing328/security_fix_ruby 
[Ruby] better code injection handling for Ruby API client
 2016-06-28 20:09:55 +08:00
wing328
37e1de6d72 Merge pull request #3230 from wing328/security_fix_python 
[Python] better code injection handling for Python
 2016-06-28 20:09:40 +08:00
wing328
9e216c0ca2 better code injection handling for ruby 2016-06-28 17:36:00 +08:00
wing328
3a41da42f0 better code injection handling for python 2016-06-28 17:07:50 +08:00
wing328
02864ed31a better code injectino handling for perl client 2016-06-28 16:37:33 +08:00
wing328
8dc22d2bda Merge pull request #3228 from cliffano/master 
[Ruby] Add params_encoding configuration to be passed to api_client's request options
 2016-06-28 15:31:33 +08:00
wing328
a71c072609 Merge pull request #3224 from wing328/security_fix 
[PHP] Better code injection handling for PHP API client
 2016-06-28 15:19:41 +08:00
wing328
41636ae149 revert petstore-with-fake-endpoints-models-for-testing.yaml 2016-06-28 14:38:50 +08:00
Cliffano Subagio
af77d94750 [Ruby] Add params_encoding configuration to be passed to api_client's request options. 2016-06-28 15:22:34 +10:00
wing328
174222390a Merge pull request #3190 from thebignet/asyncCompletableFuture 
using CompletableFuture instead of Callable for asynchronous controller in Spring Boot
 2016-06-28 12:34:23 +08:00
wing328
ec2abe78e3 apply security fix to php lumne, silex, slim 2016-06-28 12:21:41 +08:00
wing328
f38c8373cc create new spec for security testing 2016-06-28 11:48:52 +08:00
wing328
ebd6ffaa4c better handle of single quote to avoid code injectio in php 2016-06-28 00:54:06 +08:00
wing328
1638adb79e avoid code injection in php api client 2016-06-27 21:51:27 +08:00
wing328
f482132c66 Merge branch 'master' of https://github.com/sdavis-r7/swagger-codegen into sdavis-r7-master 
Conflicts:
	modules/swagger-codegen/src/main/resources/php/model.mustache
	modules/swagger-codegen/src/main/resources/php/model_generic.mustache
 2016-06-27 16:20:44 +08:00
wing328
e26416b351 Merge pull request #3073 from bitcloud/fix-datetime-example 
fix date format in example generator
 2016-06-27 14:39:03 +08:00
wing328
9ec61ba887 Merge pull request #3189 from thebignet/tagName 
add tags with API name to java @Api annotation
 2016-06-27 13:54:06 +08:00
wing328
bee05f0086 Merge pull request #3219 from wing328/android_gradle_update 
[Android][Volley] add http client dependency to android volley
 2016-06-27 11:59:42 +08:00
wing328
b19527d395 Merge pull request #3158 from moanrose/Issue#3096 
Changed check for required parameter to check for null or undefined
 2016-06-27 11:45:46 +08:00
wing328
95eb06e2e9 add http client dependency to android volley 2016-06-27 11:25:15 +08:00
wing328
f3bb4ea872 Merge pull request #3180 from cbornet/feign_java8 
|Feign] Support jsr310 dates in feign client
 2016-06-27 10:47:13 +08:00
wing328
5008de5f83 Merge pull request #3181 from cbornet/retrofit2_java8 
[Retrofit] Add support for jsr310 dates to retrofit2 client
 2016-06-27 10:01:36 +08:00
wing328
f707675e48 Merge pull request #3217 from wing328/php_enum_class 
[PHP] add enum class support, merge test cases
 2016-06-27 09:53:31 +08:00
wing328
f04df9a163 fix #3215 and enum array issue in parameter check 2016-06-26 19:17:25 +08:00
wing328
74239c422b add enum class support, merged test cases for php 2016-06-26 17:41:29 +08:00
Pedro J. Molina
961cbb531e nodejs-server: Added npm start scripts on package.json + update README 2016-06-24 09:13:25 +02:00
wing328
5095fe1018 Merge pull request #3199 from wing328/better_param_enum 
[C#] Add array and map of enum support for C#
 2016-06-23 23:49:49 +08:00
wing328
5047ab3b5c Merge pull request #3182 from cbornet/okhttp_java8 
[Okhttp-gson] Add support for jsr310 dates to okhttp-gson client
 2016-06-23 22:12:29 +08:00
Scott Davis
80666394f6 CVE-2016-5641 2016-06-23 06:06:21 -07:00
wing328
908243b90d fix docstring 2016-06-23 12:24:49 +08:00
wing328
c15992b420 add array and map of enum support for C# 2016-06-23 12:14:32 +08:00
Jean Detoeuf
2b22efcea9 using CompletableFuture instead of Callable for asynchronous controller 2016-06-22 09:19:21 +02:00
wing328
e0d030d33a Merge pull request #3139 from stunney/master 
Issue #3138
 2016-06-22 10:06:37 +08:00
Alex
0506b4ab76 Fix joda dependency in resteasy gradle file 2016-06-22 01:10:48 +06:00
Jean Detoeuf
1b71076c2d add tags with API name to java @Api annotation 2016-06-21 18:08:28 +02:00
wing328
c2f5d83d06 Merge branch 'nancyfx-codegen' of https://github.com/FinderSystems/swagger-codegen into FinderSystems-nancyfx-codegen 
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
 2016-06-21 23:47:49 +08:00
wing328
f9cf78e03d Merge pull request #3133 from cbornet/spring_unite 
[Spring] put spring-mvc and spring-boot under the same language gen
 2016-06-21 22:51:09 +08:00
wing328
7b51522392 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-06-21 22:27:56 +08:00
wing328
321dc0d41c add test case for number (decimal) 2016-06-21 22:22:21 +08:00
cbornet
426cc6b6b4 better enums and dependency update 2016-06-21 16:19:37 +02:00
wing328
fa3aacf4aa Merge branch 'master' of https://github.com/qtstc/swagger-codegen into qtstc-master 2016-06-21 22:13:48 +08:00
wing328
0f32837383 Merge pull request #3187 from swagger-api/model_propert_same_name 
[C#] Fix model with only read-only attributes and model & property using the same name
 2016-06-21 21:59:36 +08:00
wing328
be3eec1e28 Merge pull request #3169 from RowanJKWalker/feature/issue-3168 
Issue-3168: [csharp] Allow additional-properties to set Assembly Info #3168
 2016-06-21 20:46:00 +08:00
wing328
3e30291865 fix #3184 2016-06-21 16:16:05 +08:00
cbornet
10d3716cd1 fix allowableValues test 2016-06-21 09:20:44 +02:00
ant3
8b60a1e144 Merge remote-tracking branch 'refs/remotes/swagger-api/master' into JSR310-Clients 2016-06-21 00:17:01 +01:00
ant3
4ef10aa5ae Upgraded dependency versions 
Also switched from using JSR310Module (Deprecated) to JavaTimeModule.
 2016-06-21 00:14:10 +01:00
cbornet
5a489f334e mutualize jersey 1 and 2 server templates 2016-06-20 22:59:32 +02:00
cbornet
d29a5537bc add support for jsr310 dates to okhttp-gson client 2016-06-20 16:50:08 +02:00
wing328
d7ac136503 Merge pull request #3179 from areiter/dart-missing-dartson-property 
Dart - Java compatibility
 2016-06-20 22:46:43 +08:00