gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、对比release1.1和develop分支的配置文件，将未合并部分手动添加到develop；

Browse Source 
2、修改分组复用传给redis接口数据的结构
This commit is contained in:
zhangdongxu
2018-08-27 15:01:16 +08:00
parent a574c207a3
commit 0c33fe7c98
5 changed files with 65 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java
View File

@@ -376,7 +376,7 @@ public class ConfigSourcesController extends BaseRestController {
@RequestMapping(value = "/cfg/v1/groupReuseSources", method = RequestMethod.POST)
@ApiOperation(value = "分组复用域配置新增接口", httpMethod = "POST", response = Map.class, notes = "接收分组复用域配置，增加到对应的分组中")
@ApiParam(value = "分组复用域配置对象", name = "configSource", required = true)
@ApiParam(value = "分组复用域配置对象", name = "groupReuseSource", required = true)
public Map addGroupReuseSources(@RequestBody GroupReuseSource groupReuseSource, HttpServletRequest request,
HttpServletResponse response) {
@@ -419,7 +419,7 @@ public class ConfigSourcesController extends BaseRestController {
@RequestMapping(value = "/cfg/v1/groupReuseSources", method = RequestMethod.PUT)
@ApiOperation(value = "分组复用域配置删除接口", httpMethod = "PUT", response = Map.class, notes = "接收分组复用域配置，并从对应分组中删除")
@ApiParam(value = "分组复用域配置对象", name = "configSource", required = true)
@ApiParam(value = "分组复用域配置对象", name = "groupReuseSource", required = true)
public Map delGroupReuseSources(@RequestBody GroupReuseSource groupReuseSource, HttpServletRequest request,
HttpServletResponse response) {
long start = System.currentTimeMillis();