Commit Graph

303 Commits

Author SHA1 Message Date
tanghc
5d23eeb1d1 支持预发布、灰度发布 2019-08-06 10:28:48 +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
2e9e3c7ca7 支持预发布、灰度发布 2019-08-05 14:48:41 +08:00
tanghc
202267b686 支持预发布、灰度发布 2019-08-02 20:16:14 +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
33f00bbc62 1.13.4 2019-07-28 10:55:23 +08:00
tanghc
2d5a65e525 Merge branch 'master' into registry-nacos 2019-07-26 17:36:38 +08:00
tanghc
fdf9f341fd 1.13.3 2019-07-26 17:36:09 +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
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
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
32ea08c78b 1.13.0 2019-07-19 20:13:22 +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
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
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
bf5b1f37aa Merge branch 'master' into registry-nacos 2019-07-10 17:38:34 +08:00
tanghc
70a8aacd9b 代码优化 2019-07-10 17:37:50 +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
2dd0f19328 Merge branch 'develop' into registry-nacos 2019-07-05 09:26:45 +08:00
tanghc
6c60a48e40 优化admin功能 2019-07-05 09:25:55 +08:00
tanghc
0341491dd5 Merge branch 'develop' into registry-nacos 2019-07-04 17:39:15 +08:00
tanghc
42a868b769 优化admin功能 2019-07-04 17:35:44 +08:00
tanghc
adb9d9fcf1 Merge branch 'develop' into registry-nacos 2019-07-02 14:56:35 +08:00
tanghc
8d8e39eadf 修复日志监控显示问题 2019-07-02 14:55:55 +08:00
tanghc
dad2fa7de3 nacos 2019-07-02 14:06:38 +08:00
tanghc
f0a0c04581 1.12.0 2019-07-01 20:51:40 +08:00
tanghc
fa9ffa88c2 1.12.0 2019-07-01 18:24:32 +08:00
tanghc
4bc76f497d update 2019-07-01 17:49:45 +08:00
tanghc
6fc49f2699 nacos注册中心 2019-07-01 16:41:37 +08:00
tanghc
de85e5aef9 新增角色管理,优化服务列表 2019-06-30 19:08:48 +08:00
tanghc
21792d39b1 新增角色管理 2019-06-28 18:16:32 +08:00
tanghc
36133adf62 新增ISV修复 2019-06-28 15:09:11 +08:00
tanghc
8b8b88709b 1.11.0 2019-06-28 10:33:37 +08:00