diff --git a/src/main/java/com/nis/web/controller/restful/ConfigTestController.java b/src/main/java/com/nis/web/controller/restful/ConfigTestController.java index 8f860d9..22b6068 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigTestController.java +++ b/src/main/java/com/nis/web/controller/restful/ConfigTestController.java @@ -63,7 +63,7 @@ import net.sf.json.JsonConfig; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}") +//@RequestMapping("${servicePath}") @Api(value = "ConfigTestController", description = "配置存储服务,包括管控、监测、白名单的控制类") public class ConfigTestController extends BaseRestController { private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/src/main/java/com/nis/web/controller/restful/DataDictionaryController.java b/src/main/java/com/nis/web/controller/restful/DataDictionaryController.java index 4d072b9..41d7d32 100644 --- a/src/main/java/com/nis/web/controller/restful/DataDictionaryController.java +++ b/src/main/java/com/nis/web/controller/restful/DataDictionaryController.java @@ -24,7 +24,7 @@ import com.nis.web.service.ServicesRequestLogService; import com.nis.web.service.restful.DataDictionaryService; @RestController -@RequestMapping("${servicePath}") +//@RequestMapping("${servicePath}") public class DataDictionaryController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); @Autowired diff --git a/src/main/java/com/nis/web/controller/restful/DfIpPortUdpController.java b/src/main/java/com/nis/web/controller/restful/DfIpPortUdpController.java index 708ce00..786d1ad 100644 --- a/src/main/java/com/nis/web/controller/restful/DfIpPortUdpController.java +++ b/src/main/java/com/nis/web/controller/restful/DfIpPortUdpController.java @@ -43,7 +43,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/cfg/v1") +//@RequestMapping("${servicePath}/cfg/v1") public class DfIpPortUdpController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); @Autowired diff --git a/src/main/java/com/nis/web/controller/restful/DfKeyConvertUrlController.java b/src/main/java/com/nis/web/controller/restful/DfKeyConvertUrlController.java index 6d1a6b2..95d2aaf 100644 --- a/src/main/java/com/nis/web/controller/restful/DfKeyConvertUrlController.java +++ b/src/main/java/com/nis/web/controller/restful/DfKeyConvertUrlController.java @@ -40,7 +40,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/log/v1") +//@RequestMapping("${servicePath}/log/v1") @SuppressWarnings({ "rawtypes" }) public class DfKeyConvertUrlController extends BaseRestController{ protected final Logger logger = Logger.getLogger(this.getClass()); diff --git a/src/main/java/com/nis/web/controller/restful/DfKeyMailAddController.java b/src/main/java/com/nis/web/controller/restful/DfKeyMailAddController.java index 586c251..15d37a3 100644 --- a/src/main/java/com/nis/web/controller/restful/DfKeyMailAddController.java +++ b/src/main/java/com/nis/web/controller/restful/DfKeyMailAddController.java @@ -40,7 +40,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/log/v1") +//@RequestMapping("${servicePath}/log/v1") @SuppressWarnings({ "rawtypes" }) public class DfKeyMailAddController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); diff --git a/src/main/java/com/nis/web/controller/restful/DfLogSearchController.java b/src/main/java/com/nis/web/controller/restful/DfLogSearchController.java index 8ee5df8..8d14ec4 100644 --- a/src/main/java/com/nis/web/controller/restful/DfLogSearchController.java +++ b/src/main/java/com/nis/web/controller/restful/DfLogSearchController.java @@ -69,7 +69,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/log/v1") +//@RequestMapping("${servicePath}/log/v1") @SuppressWarnings({ "rawtypes", "unchecked" }) public class DfLogSearchController extends BaseRestController { protected final Logger logger1 = Logger.getLogger(this.getClass()); diff --git a/src/main/java/com/nis/web/controller/restful/DjLogSearchController.java b/src/main/java/com/nis/web/controller/restful/DjLogSearchController.java index b826a94..6299d5a 100644 --- a/src/main/java/com/nis/web/controller/restful/DjLogSearchController.java +++ b/src/main/java/com/nis/web/controller/restful/DjLogSearchController.java @@ -66,7 +66,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/log/v1") +//@RequestMapping("${servicePath}/log/v1") @SuppressWarnings({ "rawtypes", "unchecked" }) public class DjLogSearchController extends BaseRestController { protected final Logger logger1 = Logger.getLogger(this.getClass()); diff --git a/src/main/java/com/nis/web/controller/restful/DmbCkController.java b/src/main/java/com/nis/web/controller/restful/DmbCkController.java index c62f298..fb1017d 100644 --- a/src/main/java/com/nis/web/controller/restful/DmbCkController.java +++ b/src/main/java/com/nis/web/controller/restful/DmbCkController.java @@ -43,7 +43,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/cfg/v1") +//@RequestMapping("${servicePath}/cfg/v1") public class DmbCkController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); @Autowired diff --git a/src/main/java/com/nis/web/controller/restful/DmbPortController.java b/src/main/java/com/nis/web/controller/restful/DmbPortController.java index 27dfb23..e7d71e6 100644 --- a/src/main/java/com/nis/web/controller/restful/DmbPortController.java +++ b/src/main/java/com/nis/web/controller/restful/DmbPortController.java @@ -43,7 +43,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/cfg/v1") +//@RequestMapping("${servicePath}/cfg/v1") public class DmbPortController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); @Autowired diff --git a/src/main/java/com/nis/web/controller/restful/DnsFakeInfoController.java b/src/main/java/com/nis/web/controller/restful/DnsFakeInfoController.java index 63b25c2..08fdcb1 100644 --- a/src/main/java/com/nis/web/controller/restful/DnsFakeInfoController.java +++ b/src/main/java/com/nis/web/controller/restful/DnsFakeInfoController.java @@ -43,7 +43,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/cfg/v1") +//@RequestMapping("${servicePath}/cfg/v1") public class DnsFakeInfoController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); @Autowired diff --git a/src/main/java/com/nis/web/controller/restful/DnsFakeIpController.java b/src/main/java/com/nis/web/controller/restful/DnsFakeIpController.java index 3bdc1a0..e2cd412 100644 --- a/src/main/java/com/nis/web/controller/restful/DnsFakeIpController.java +++ b/src/main/java/com/nis/web/controller/restful/DnsFakeIpController.java @@ -43,7 +43,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/cfg/v1") +//@RequestMapping("${servicePath}/cfg/v1") public class DnsFakeIpController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); @Autowired diff --git a/src/main/java/com/nis/web/controller/restful/DnsGroupTypeController.java b/src/main/java/com/nis/web/controller/restful/DnsGroupTypeController.java index 990bd63..aa3a5de 100644 --- a/src/main/java/com/nis/web/controller/restful/DnsGroupTypeController.java +++ b/src/main/java/com/nis/web/controller/restful/DnsGroupTypeController.java @@ -42,7 +42,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/cfg/v1") +//@RequestMapping("${servicePath}/cfg/v1") public class DnsGroupTypeController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); @Autowired diff --git a/src/main/java/com/nis/web/controller/restful/DnsResponseStrategyController.java b/src/main/java/com/nis/web/controller/restful/DnsResponseStrategyController.java index 9993e29..75d8829 100644 --- a/src/main/java/com/nis/web/controller/restful/DnsResponseStrategyController.java +++ b/src/main/java/com/nis/web/controller/restful/DnsResponseStrategyController.java @@ -43,7 +43,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/cfg/v1") +//@RequestMapping("${servicePath}/cfg/v1") public class DnsResponseStrategyController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); @Autowired diff --git a/src/main/java/com/nis/web/controller/restful/EncryptProtoRandomController.java b/src/main/java/com/nis/web/controller/restful/EncryptProtoRandomController.java index 8299b99..c96cc29 100644 --- a/src/main/java/com/nis/web/controller/restful/EncryptProtoRandomController.java +++ b/src/main/java/com/nis/web/controller/restful/EncryptProtoRandomController.java @@ -43,7 +43,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/cfg/v1") +//@RequestMapping("${servicePath}/cfg/v1") public class EncryptProtoRandomController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); @Autowired diff --git a/src/main/java/com/nis/web/controller/restful/FwqInfoController.java b/src/main/java/com/nis/web/controller/restful/FwqInfoController.java index c4f9828..97de06a 100644 --- a/src/main/java/com/nis/web/controller/restful/FwqInfoController.java +++ b/src/main/java/com/nis/web/controller/restful/FwqInfoController.java @@ -43,7 +43,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/cfg/v1") +//@RequestMapping("${servicePath}/cfg/v1") public class FwqInfoController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); @Autowired diff --git a/src/main/java/com/nis/web/controller/restful/IntervalTimeSearchController.java b/src/main/java/com/nis/web/controller/restful/IntervalTimeSearchController.java index a1064b0..5ef436f 100644 --- a/src/main/java/com/nis/web/controller/restful/IntervalTimeSearchController.java +++ b/src/main/java/com/nis/web/controller/restful/IntervalTimeSearchController.java @@ -40,7 +40,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/log/v1") +//@RequestMapping("${servicePath}/log/v1") @SuppressWarnings({ "rawtypes" }) public class IntervalTimeSearchController extends BaseRestController{ protected final Logger logger = Logger.getLogger(this.getClass()); diff --git a/src/main/java/com/nis/web/controller/restful/JdjInfoController.java b/src/main/java/com/nis/web/controller/restful/JdjInfoController.java index 6c5498f..26ba91c 100644 --- a/src/main/java/com/nis/web/controller/restful/JdjInfoController.java +++ b/src/main/java/com/nis/web/controller/restful/JdjInfoController.java @@ -43,7 +43,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/cfg/v1") +//@RequestMapping("${servicePath}/cfg/v1") public class JdjInfoController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); @Autowired diff --git a/src/main/java/com/nis/web/controller/restful/SaveConfigTestController.java b/src/main/java/com/nis/web/controller/restful/SaveConfigTestController.java index 026c1a3..229f3db 100644 --- a/src/main/java/com/nis/web/controller/restful/SaveConfigTestController.java +++ b/src/main/java/com/nis/web/controller/restful/SaveConfigTestController.java @@ -42,7 +42,7 @@ import net.sf.json.JSONArray; import net.sf.json.JsonConfig; @RestController -@RequestMapping("${servicePath}") +@RequestMapping("${servicePath}/cfg/v1/test") @Api(value = "SaveConfigTestController", description = "配置存储服务,包括管控、监测、白名单的控制类") public class SaveConfigTestController extends BaseRestController { private long allCount = 0l; @@ -54,7 +54,7 @@ public class SaveConfigTestController extends BaseRestController { @Autowired protected ServicesRequestLogService servicesRequestLogService; - @RequestMapping(value = "/cfg/v1/testSaveByJDBCThread", method = RequestMethod.GET) + @RequestMapping(value = "/testSaveByJDBCThread", method = RequestMethod.GET) @ApiOperation(value = "测试批量业务配置存储", httpMethod = "GET", response = Map.class, notes = "对有效的配置(封堵|监测|白名单)存储") public Map testSaveByJDBCThread(@RequestParam(value = "configCount", required = false) Long configCount, @RequestParam(value = "startNum", required = false) Long startNum, @@ -154,7 +154,7 @@ public class SaveConfigTestController extends BaseRestController { return null; } - @RequestMapping(value = "/cfg/v1/testSaveByMybatis", method = RequestMethod.GET) + @RequestMapping(value = "/testSaveByMybatis", method = RequestMethod.GET) @ApiOperation(value = "测试批量业务配置存储", httpMethod = "GET", response = Map.class, notes = "对有效的配置(封堵|监测|白名单)存储") public Map testSaveByMybatis(@RequestParam(value = "configCount", required = false) Long configCount, @RequestParam(value = "batchSize", required = false) Integer batchSize, @@ -475,7 +475,7 @@ public class SaveConfigTestController extends BaseRestController { } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - @RequestMapping(value = "/cfg/v1/testUpdateByJDBCThread", method = RequestMethod.GET) + @RequestMapping(value = "/testUpdateByJDBCThread", method = RequestMethod.GET) @ApiOperation(value = "测试批量业务配置修改", httpMethod = "GET", response = Map.class, notes = "对有效的配置(封堵|监测|白名单)存储") public Map testUpdateByJDBCThread(@RequestParam(value = "compileId", required = false) Long compileId, HttpServletRequest request, HttpServletResponse response) { @@ -533,7 +533,7 @@ public class SaveConfigTestController extends BaseRestController { } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - @RequestMapping(value = "/cfg/v1/updateConfigSource", method = RequestMethod.GET) + @RequestMapping(value = "/updateConfigSource", method = RequestMethod.GET) @ApiOperation(value = "测试批量业务配置修改", httpMethod = "GET", response = Map.class, notes = "对有效的配置(封堵|监测|白名单)存储") public Map updateConfigSource(@RequestParam(value = "compileId", required = false) Long compileId, HttpServletRequest request, HttpServletResponse response) { @@ -683,7 +683,7 @@ public class SaveConfigTestController extends BaseRestController { return configCompileTest; } - @RequestMapping(value = "/cfg/v1/findCompile", method = RequestMethod.POST) + @RequestMapping(value = "/findCompile", method = RequestMethod.POST) public Map findCompile(ConfigCompileTest configCompileTest, HttpServletRequest request, HttpServletResponse response) { long start = System.currentTimeMillis(); diff --git a/src/main/java/com/nis/web/controller/restful/ServicesRequestLogController.java b/src/main/java/com/nis/web/controller/restful/ServicesRequestLogController.java index fb39721..0f534a9 100644 --- a/src/main/java/com/nis/web/controller/restful/ServicesRequestLogController.java +++ b/src/main/java/com/nis/web/controller/restful/ServicesRequestLogController.java @@ -21,7 +21,7 @@ import com.nis.web.service.SaveRequestLogThread; import com.nis.web.service.ServicesRequestLogService; @RestController -@RequestMapping("${servicePath}") +//@RequestMapping("${servicePath}") public class ServicesRequestLogController extends BaseRestController { @Autowired protected ServicesRequestLogService servicesRequestLogService; diff --git a/src/main/java/com/nis/web/controller/restful/SystemFunStatusController.java b/src/main/java/com/nis/web/controller/restful/SystemFunStatusController.java index 119ea3a..6c2cb9f 100644 --- a/src/main/java/com/nis/web/controller/restful/SystemFunStatusController.java +++ b/src/main/java/com/nis/web/controller/restful/SystemFunStatusController.java @@ -33,7 +33,7 @@ import com.wordnik.swagger.annotations.ApiOperation; * @version V1.0 */ @RestController -@RequestMapping("${servicePath}/cfg/v1") +//@RequestMapping("${servicePath}/cfg/v1") @SuppressWarnings("rawtypes") public class SystemFunStatusController extends BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass());