221 Commits

Author	SHA1	Message	Date
tanghc	62f49eb404	Merge branch 'develop' into registry-nacos	2019-08-09 17:32:20 +08:00
tanghc	130d843e42	1.14.0	2019-08-09 17:20:04 +08:00
tanghc	c5ce01208f	Merge branch 'master' into registry-nacos	2019-08-07 15:18:20 +08:00
tanghc	d188faf621	Merge branch 'develop' ... # Conflicts: # changelog.md # sop-admin/sop-admin-server/pom.xml # sop-common/pom.xml # sop-common/sop-gateway-common/pom.xml # sop-common/sop-registry-api/pom.xml # sop-common/sop-service-common/pom.xml # sop-example/sop-auth/pom.xml # sop-example/sop-book/sop-book-web/pom.xml # sop-example/sop-easyopen/pom.xml # sop-example/sop-springmvc/pom.xml # sop-example/sop-story/sop-story-web/pom.xml # sop-gateway/pom.xml # sop-website/website-server/pom.xml	2019-08-07 15:15:54 +08:00
tanghc	06e0608130	1.14.0	2019-08-07 15:12:56 +08:00
tanghc	774515ccc1	1.13.7	2019-08-07 10:49:28 +08:00
tanghc	734265601c	Merge branch 'master' into registry-nacos	2019-08-07 10:00:00 +08:00
tanghc	22409fc3cc	1.13.6	2019-08-06 20:16:26 +08:00
tanghc	8718284dc3	Merge branch 'master' into develop ... # Conflicts: # changelog.md # sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/ParamNames.java # sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/bean/HttpTool.java # sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingRequestCondition.java # sop-test/src/main/java/com/gitee/sop/test/HttpTool.java # sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java	2019-08-05 18:36:16 +08:00
tanghc	43bb2efb6a	1.13.5	2019-08-05 18:30:05 +08:00
tanghc	6125625b87	支持预发布	2019-07-31 20:00:25 +08:00
tanghc	01c4fda639	Merge branch 'master' into registry-nacos	2019-07-28 10:56:19 +08:00
tanghc	17de022e3c	1.13.4	2019-07-28 10:55:43 +08:00
tanghc	47f621837a	Merge branch 'master' into registry-nacos	2019-07-26 12:23:33 +08:00
tanghc	d42c9e9ba4	1.13.3	2019-07-26 12:23:04 +08:00
tanghc	49fb6bf15f	Merge branch 'master' into registry-nacos	2019-07-25 20:34:58 +08:00
tanghc	9f78eceded	1.13.2	2019-07-25 20:34:29 +08:00
tanghc	7a7a3b7c8c	Merge branch 'master' into registry-nacos	2019-07-24 18:46:36 +08:00
tanghc	064e5188ce	1.13.1	2019-07-24 18:45:48 +08:00
tanghc	3e49780fa2	Merge branch 'master' into registry-nacos	2019-07-24 17:05:33 +08:00
tanghc	bdbd716aac	1.13.1	2019-07-24 17:04:04 +08:00
tanghc	6bc3da3fa8	代码优化	2019-07-24 17:01:42 +08:00
tanghc	fb4108e980	Merge branch 'master' into registry-nacos	2019-07-19 20:16:39 +08:00
tanghc	a5a0b5c476	1.13.0	2019-07-19 20:15:52 +08:00
tanghc	ef28db6a1d	Merge branch 'master' into registry-nacos ... # Conflicts: # sop-gateway/src/main/resources/application-dev.properties	2019-07-19 10:14:32 +08:00
tanghc	bea7348dc8	1.12.4	2019-07-19 10:13:02 +08:00
tanghc	7c90239ef3	Merge branch 'master' into registry-nacos	2019-07-18 17:44:12 +08:00
tanghc	29ecaec4bd	1.12.4	2019-07-18 17:43:37 +08:00
tanghc	8876cb1fa0	1.12.4	2019-07-18 17:37:34 +08:00
tanghc	9adfe58b0d	配置文件优化	2019-07-18 15:46:37 +08:00
tanghc	167d0a77f7	配置文件优化	2019-07-18 15:28:48 +08:00
tanghc	fce0b4d242	Merge branch 'develop' into registry-nacos	2019-07-18 14:34:38 +08:00
tanghc	194a39a042	配置文件优化	2019-07-18 14:34:12 +08:00
tanghc	7a97b0ff9d	Merge branch 'master' into registry-nacos	2019-07-16 08:46:09 +08:00
tanghc	fd1a779e0b	1.12.3	2019-07-16 08:45:45 +08:00
tanghc	306523511c	Merge branch 'master' into registry-nacos	2019-07-13 15:29:33 +08:00
tanghc	222e722f75	优化沙箱环境	2019-07-13 15:27:08 +08:00
tanghc	d25e1de3d9	Merge branch 'master' into registry-nacos	2019-07-12 18:12:56 +08:00
tanghc	15a0119ccd	升级fastjson到1.2.58	2019-07-12 18:11:59 +08:00
tanghc	459f04a459	Merge branch 'master' into registry-nacos	2019-07-12 18:08:17 +08:00
tanghc	4b80ddfd29	沙箱环境优化	2019-07-12 18:06:57 +08:00
tanghc	83627f1b2f	Merge branch 'master' into registry-nacos	2019-07-11 16:47:49 +08:00
tanghc	ec050db29a	1.12.2	2019-07-11 16:47:20 +08:00
tanghc	22d87f7791	沙盒功能支持文件上传	2019-07-11 16:44:47 +08:00
tanghc	d9bd18f72e	Merge branch 'master' into registry-nacos	2019-07-09 17:34:36 +08:00
tanghc	c3fa384d00	1.12.1	2019-07-09 13:39:55 +08:00
tanghc	dad2fa7de3	nacos	2019-07-02 14:06:38 +08:00
tanghc	6882ef5415	1.12.0	2019-07-01 20:53:47 +08:00
tanghc	fa9ffa88c2	1.12.0	2019-07-01 18:24:32 +08:00
tanghc	6fc49f2699	nacos注册中心	2019-07-01 16:41:37 +08:00