From 2c4b04e259fa7ed30a3fb94174a82c8668bd1d80 Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Thu, 22 Nov 2018 09:51:09 +0800 Subject: [PATCH] =?UTF-8?q?eureka=E5=BE=AE=E6=9C=8D=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/auth/ShiroAuthConfiguration.java | 3 +- .../apiservice/controller/DemoCloudController.java | 174 ++++++++++----------- .../controller/DemoEurekaController.java | 77 +++++++++ .../listener/SysResourceBindleListener.java | 5 +- .../src/main/resources/application-dev.properties | 30 ++-- .../src/main/resources/log4j2.xml | 18 ++- 6 files changed, 203 insertions(+), 104 deletions(-) create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoEurekaController.java diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java index 5f98279..2ba0cf6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.apiservice.auth.realm.AdminAuthRealm; import cn.estsh.i3plus.core.apiservice.auth.realm.DefaultModularRealm; import cn.estsh.i3plus.core.apiservice.auth.realm.SaAuthRealm; import cn.estsh.i3plus.core.apiservice.auth.realm.UserAuthRealm; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.impp.framework.boot.auth.filter.AdminFilter; import cn.estsh.impp.framework.boot.auth.filter.SaAdminFilter; @@ -39,7 +40,7 @@ import java.util.Map; @Configuration @AutoConfigureAfter(RedisConfig.class) //2类配置，延后加载 public class ShiroAuthConfiguration { - public static final Logger LOGGER = LoggerFactory.getLogger(ShiroAuthConfiguration.class); + public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); @Value("${filter.shiro.admin.loginuri}") private String adminLoginUri; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java index fa577de..2662f68 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java @@ -1,87 +1,87 @@ -//package cn.estsh.i3plus.core.apiservice.controller; -// -//import cn.estsh.i3plus.icloud.core.controller.DemoCoreCloudInterface; -//import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -//import cn.estsh.impp.framework.boot.util.ResultBean; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.web.bind.annotation.*; -// -//@RestController -//@RequestMapping("/cloud") -//@Api(description="分布式服务测试") -//public class DemoCloudController { -// -// private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class); -// -// @Autowired -// DemoCoreCloudInterface demoCloudInterface; -// -// @GetMapping(value="/test") -// @ApiOperation(value="测试",notes = "测试") -// public ResultBean simpleTest(String test) { -// LOGGER.info("【接受数据】{}",test); -// -// try { -// demoCloudInterface.testGet("get = " + test); -// }catch (Exception e){ -// LOGGER.error("XXXX --> get调用出错：" + e.getMessage(),e); -// } -// try { -// demoCloudInterface.testPost("post = " + test); -// }catch (Exception e){ -// LOGGER.error("XXXX --> post调用出错：" + e.getMessage(),e); -// } -// try { -// demoCloudInterface.testPut("testPut = " + test); -// }catch (Exception e){ -// LOGGER.error("XXXX --> testPut调用出错：" + e.getMessage(),e); -// } -// try { -// demoCloudInterface.testDelete("delete = " + test); -// }catch (Exception e){ -// LOGGER.error("XXXX --> delete调用出错：" + e.getMessage(),e); -// } -// -// test += "cloud return = "; -// return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// } -// -// @GetMapping(value="/test-get") -// @ApiOperation(value="测试get",notes = "测试get") -// public ResultBean testFeignGet(String test) { -// LOGGER.info("【get接受数据】{}" ,test); -// return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// } -// -// @PostMapping(value="/test-post") -// @ApiOperation(value="测试post",notes = "测试post") -// public ResultBean testFeignPost(String test) { -// LOGGER.info("【post接受数据】{}" ,test); -// return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// } -// -// @PostMapping(value="/test-put") -// @ApiOperation(value="put接受数据",notes = "put接受数据") -// public ResultBean testPut(String test) { -// LOGGER.info("【put接受数据】{}", test); -// return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// } -// -// @DeleteMapping(value="/test-delete") -// @ApiOperation(value="delete接受数据",notes = "delete接受数据") -// public ResultBean testDelete(String test) { -// LOGGER.info("【delete接受数据】{}",test); -// return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// } -// -// @PutMapping(value="/test-cloud-put") -// @ApiOperation(value="测试cloudput",notes = "测试cloudput") -// public ResultBean putTestCloud(String test) { -// LOGGER.info("【put--->{}",test); -// return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// } -//} +package cn.estsh.i3plus.core.apiservice.controller; + +import cn.estsh.i3plus.icloud.core.sdk.ICoreDemoCloud; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.impp.framework.boot.util.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/cloud") +@Api(description="分布式服务测试") +public class DemoCloudController { + + private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class); + + @Autowired + ICoreDemoCloud iCoreDemoCloud; + + @GetMapping(value="/test") + @ApiOperation(value="测试",notes = "测试") + public ResultBean simpleTest(String test) { + LOGGER.info("【接受数据】{}",test); + + try { + iCoreDemoCloud.testGet("get = " + test); + }catch (Exception e){ + LOGGER.error("XXXX --> get调用出错：" + e.getMessage(),e); + } + try { + iCoreDemoCloud.testPost("post = " + test); + }catch (Exception e){ + LOGGER.error("XXXX --> post调用出错：" + e.getMessage(),e); + } + try { + iCoreDemoCloud.testPut("testPut = " + test); + }catch (Exception e){ + LOGGER.error("XXXX --> testPut调用出错：" + e.getMessage(),e); + } + try { + iCoreDemoCloud.testDelete("delete = " + test); + }catch (Exception e){ + LOGGER.error("XXXX --> delete调用出错：" + e.getMessage(),e); + } + + test += "cloud return = "; + return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } + + @GetMapping(value="/test-get") + @ApiOperation(value="测试get",notes = "测试get") + public ResultBean testFeignGet(String test) { + LOGGER.info("【get接受数据】{}" ,test); + return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } + + @PostMapping(value="/test-post") + @ApiOperation(value="测试post",notes = "测试post") + public ResultBean testFeignPost(String test) { + LOGGER.info("【post接受数据】{}" ,test); + return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } + + @PostMapping(value="/test-put") + @ApiOperation(value="put接受数据",notes = "put接受数据") + public ResultBean testPut(String test) { + LOGGER.info("【put接受数据】{}", test); + return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } + + @DeleteMapping(value="/test-delete") + @ApiOperation(value="delete接受数据",notes = "delete接受数据") + public ResultBean testDelete(String test) { + LOGGER.info("【delete接受数据】{}",test); + return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } + + @PutMapping(value="/test-cloud-put") + @ApiOperation(value="测试cloudput",notes = "测试cloudput") + public ResultBean putTestCloud(String test) { + LOGGER.info("【put--->{}",test); + return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoEurekaController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoEurekaController.java new file mode 100644 index 0000000..9b9dd0b --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoEurekaController.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.core.apiservice.controller; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.impp.framework.base.controller.CoreBaseController; +import cn.estsh.impp.framework.boot.util.ResultBean; +import com.netflix.appinfo.ApplicationInfoManager; +import com.netflix.appinfo.EurekaInstanceConfig; +import com.netflix.discovery.DiscoveryClient; +import com.netflix.discovery.DiscoveryManager; +import com.netflix.discovery.EurekaClient; +import com.netflix.discovery.EurekaClientConfig; +import com.netflix.discovery.shared.Applications; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Alwaysfrin + * @CreateDate : 2018-11-19 19:56 + * @Modify: + **/ +@RestController +@Api(description="微服功能demo") +@RequestMapping("/demo-eureka-service") +public class DemoEurekaController { + + private static final Logger LOGGER = LoggerFactory.getLogger(DemoEurekaController.class); + + @Autowired + private EurekaClient eurekaClient; + + @Autowired + private ApplicationInfoManager applicationInfoManager; + + /** + * 停止微服 + * @return + */ + @GetMapping(value="/stop") + @ApiOperation(value="停止微服",notes = "停止当前微服") + public ResultBean stopServer() { + LOGGER.info("请求停止微服。。。"); + eurekaClient.shutdown(); + return new ResultBean(true); + } + + /** + * 停止微服 + * @return + */ + @GetMapping(value="/show") + @ApiOperation(value="显示微服",notes = "显示微服") + public ResultBean show() { + LOGGER.info("【加载微服配置】"); + LOGGER.info("applicationInfoManager:{}",applicationInfoManager); + LOGGER.info("getEurekaInstanceConfig:{}",applicationInfoManager.getEurekaInstanceConfig()); + + EurekaInstanceConfig config = applicationInfoManager.getEurekaInstanceConfig(); + LOGGER.info(config.getAppname()); + + Applications app = eurekaClient.getApplications(); + LOGGER.info("spring dc : "+eurekaClient + ",app：" + app); + + EurekaClientConfig eurekaClientConfig = eurekaClient.getEurekaClientConfig(); + LOGGER.info("eurekaClientConfig:{}",eurekaClientConfig); + + return new ResultBean(true); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java index 34fb645..7d8d505 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.listener; import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; import cn.estsh.impp.framework.boot.util.ImppRedis; @@ -22,7 +23,7 @@ import java.util.List; * @Modify: **/ public class SysResourceBindleListener implements ApplicationListener { - private static final Logger LOGGER = LoggerFactory.getLogger(SysResourceBindleListener.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); @Autowired public ISystemResourceService systemResourceService; @@ -65,7 +66,7 @@ public class SysResourceBindleListener implements ApplicationListener - [%-5p] %d{yyyy-MM-dd HH:mm:ss-SSS} %l:%m%n + [%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %l:%m%n + [%p] %d{HH:mm:ss-SSS} (%c:%L)%M ==》 %m%n + [SYS-%p] %m (%F:%M:%L %d{HH:mm:ss-SSS})%n + + + + - + @@ -20,7 +26,13 @@ - ${pattern} + ${info_pattern} + + + + + + ${system_log_pattern}