Merge remote-tracking branch 'origin/master'

yun-zuoyi
yunhao.wang 7 years ago
commit 97d4ced06e

@ -16,7 +16,7 @@
<dependencies> <dependencies>
<!-- 微服调用 --> <!-- 微服调用 -->
<dependency> <dependency>
<groupId>i3plus.surface</groupId> <groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-core</artifactId> <artifactId>i3plus-icloud-core</artifactId>
</dependency> </dependency>

@ -1,87 +1,87 @@
//package cn.estsh.i3plus.core.apiservice.controller; package cn.estsh.i3plus.core.apiservice.controller;
//
//import cn.estsh.i3plus.icloud.core.controller.DemoCloudInterface; import cn.estsh.i3plus.icloud.core.controller.DemoCoreCloudInterface;
//import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
//import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ResultBean;
//import io.swagger.annotations.Api; import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
//import org.slf4j.Logger; import org.slf4j.Logger;
//import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
//
//@RestController @RestController
//@RequestMapping("/cloud") @RequestMapping("/cloud")
//@Api(description="分布式服务测试") @Api(description="分布式服务测试")
//public class DemoCloudController { public class DemoCloudController {
//
// private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class); private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class);
//
// @Autowired @Autowired
// DemoCloudInterface demoCloudInterface; DemoCoreCloudInterface demoCloudInterface;
//
// @GetMapping(value="/test") @GetMapping(value="/test")
// @ApiOperation(value="测试",notes = "测试") @ApiOperation(value="测试",notes = "测试")
// public ResultBean simpleTest(String test) { public ResultBean simpleTest(String test) {
// LOGGER.info("【接受数据】{}",test); LOGGER.info("【接受数据】{}",test);
//
// try { try {
// demoCloudInterface.testGet("get = " + test); demoCloudInterface.testGet("get = " + test);
// }catch (Exception e){ }catch (Exception e){
// LOGGER.error("XXXX --> get调用出错" + e.getMessage(),e); LOGGER.error("XXXX --> get调用出错" + e.getMessage(),e);
// } }
// try { try {
// demoCloudInterface.testPost("post = " + test); demoCloudInterface.testPost("post = " + test);
// }catch (Exception e){ }catch (Exception e){
// LOGGER.error("XXXX --> post调用出错" + e.getMessage(),e); LOGGER.error("XXXX --> post调用出错" + e.getMessage(),e);
// } }
// try { try {
// demoCloudInterface.testPut("testPut = " + test); demoCloudInterface.testPut("testPut = " + test);
// }catch (Exception e){ }catch (Exception e){
// LOGGER.error("XXXX --> testPut调用出错" + e.getMessage(),e); LOGGER.error("XXXX --> testPut调用出错" + e.getMessage(),e);
// } }
// try { try {
// demoCloudInterface.testDelete("delete = " + test); demoCloudInterface.testDelete("delete = " + test);
// }catch (Exception e){ }catch (Exception e){
// LOGGER.error("XXXX --> delete调用出错" + e.getMessage(),e); LOGGER.error("XXXX --> delete调用出错" + e.getMessage(),e);
// } }
//
// test += "cloud return = "; test += "cloud return = ";
// return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
// } }
//
// @GetMapping(value="/test-get") @GetMapping(value="/test-get")
// @ApiOperation(value="测试get",notes = "测试get") @ApiOperation(value="测试get",notes = "测试get")
// public ResultBean testFeignGet(String test) { public ResultBean testFeignGet(String test) {
// LOGGER.info("【get接受数据】{}" ,test); LOGGER.info("【get接受数据】{}" ,test);
// return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
// } }
//
// @PostMapping(value="/test-post") @PostMapping(value="/test-post")
// @ApiOperation(value="测试post",notes = "测试post") @ApiOperation(value="测试post",notes = "测试post")
// public ResultBean testFeignPost(String test) { public ResultBean testFeignPost(String test) {
// LOGGER.info("【post接受数据】{}" ,test); LOGGER.info("【post接受数据】{}" ,test);
// return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
// } }
//
// @PostMapping(value="/test-put") @PostMapping(value="/test-put")
// @ApiOperation(value="put接受数据",notes = "put接受数据") @ApiOperation(value="put接受数据",notes = "put接受数据")
// public ResultBean testPut(String test) { public ResultBean testPut(String test) {
// LOGGER.info("【put接受数据】{}", test); LOGGER.info("【put接受数据】{}", test);
// return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
// } }
//
// @DeleteMapping(value="/test-delete") @DeleteMapping(value="/test-delete")
// @ApiOperation(value="delete接受数据",notes = "delete接受数据") @ApiOperation(value="delete接受数据",notes = "delete接受数据")
// public ResultBean testDelete(String test) { public ResultBean testDelete(String test) {
// LOGGER.info("【delete接受数据】{}",test); LOGGER.info("【delete接受数据】{}",test);
// return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
// } }
//
// @PutMapping(value="/test-cloud-put") @PutMapping(value="/test-cloud-put")
// @ApiOperation(value="测试cloudput",notes = "测试cloudput") @ApiOperation(value="测试cloudput",notes = "测试cloudput")
// public ResultBean putTestCloud(String test) { public ResultBean putTestCloud(String test) {
// LOGGER.info("【put--->{}",test); LOGGER.info("【put--->{}",test);
// return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
// } }
//} }

@ -102,7 +102,7 @@
<!-- wei'fu微服调用 --> <!-- wei'fu微服调用 -->
<dependency> <dependency>
<groupId>i3plus.surface</groupId> <groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-core</artifactId> <artifactId>i3plus-icloud-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>

Loading…
Cancel
Save