diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/CoreTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/CoreTreeController.java deleted file mode 100644 index 01a95a3..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/CoreTreeController.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.controller; - -import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; -import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService; -import cn.estsh.i3plus.platform.common.convert.ConvertBean; -import cn.estsh.i3plus.pojo.base.bean.ListPager; -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.Department; -import cn.estsh.i3plus.pojo.platform.bean.SessionUser; -import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; -import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; -import cn.estsh.impp.framework.boot.auth.AuthUtil; -import cn.estsh.impp.framework.boot.exception.ImppBusiException; -import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; -import cn.estsh.impp.framework.boot.util.ImppRedis; -import cn.estsh.impp.framework.boot.util.ResultBean; -import cn.estsh.impp.framework.boot.util.ValidatorBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.i18n.LocaleContextHolder; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Locale; - -/** - * @Description : 系统资源服务demo - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-26 10:34 - * @Modify: - **/ -@RestController -@RequestMapping("/demo/tree") -@Api(description="系统服务demo") -public class CoreTreeController { - private static final Logger LOGGER = LoggerFactory.getLogger(CoreTreeController.class); - - @Autowired - private ICoreTreeService coreTreeService; - - @GetMapping(value="/department") - @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树，-1为根节点") - public ResultBean listDepartmentTree(long depParentId) { - try { - Department department = coreTreeService.getDepartmentTreeByParentId(depParentId); - - return ResultBean.success("查询部门树成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultObject(department); - }catch(ImppBusiException busExcep){ - LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); - return ResultBean.fail(busExcep.getErrorShow()); - }catch(Exception e){ - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); - } - } - -} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java index 978a0cb..fd0bd2f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java @@ -16,6 +16,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; /** * @Description : @@ -72,11 +76,18 @@ public class DemoAuthController { */ @GetMapping(value="/get-user-info") @ApiOperation(value="登出",notes="登出") - public ResultBean getUserInfo(){ + public ResultBean getUserInfo(HttpServletRequest request){ LOGGER.info("获取用户信息...lang:{}",AuthUtil.getSessionAttribute("languageCode")); try { SessionUser sUser = AuthUtil.getSessionUser(); LOGGER.info("用户：{}",sUser); + Map map = new HashMap(); + Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()) { + String key = (String) headerNames.nextElement(); + String value = request.getHeader(key); + System.out.println("k : "+key + " , v : " + value); + } return new ResultBean(true,"",sUser); } catch (ImppBusiException e) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRestController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java similarity index 99% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRestController.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java index 81a08d5..d1f5473 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRestController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java @@ -34,8 +34,8 @@ import java.util.concurrent.TimeoutException; @RestController @RequestMapping("/demo") @Api(description="复杂对象服务demo") -public class DemoRestController { - private static final Logger LOGGER = LoggerFactory.getLogger(DemoRestController.class); +public class DemoRedisMqController { + private static final Logger LOGGER = LoggerFactory.getLogger(DemoRedisMqController.class); /** * 缓存 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java similarity index 99% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoSystemController.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java index 300ab1b..93939b5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java @@ -38,8 +38,8 @@ import java.util.Locale; @RestController @RequestMapping("/demo-system-service") @Api(description="系统服务demo") -public class DemoSystemController { - private static final Logger LOGGER = LoggerFactory.getLogger(DemoSystemController.class); +public class DemoResourceController { + private static final Logger LOGGER = LoggerFactory.getLogger(DemoResourceController.class); /** * 缓存 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java new file mode 100644 index 0000000..00b5686 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java @@ -0,0 +1,98 @@ +package cn.estsh.i3plus.core.apiservice.controller; + +import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.Department; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +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.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URL; +import java.net.URLConnection; + +/** + * @Description : 系统资源服务demo + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-09-26 10:34 + * @Modify: + **/ +@RestController +@RequestMapping("/demo") +@Api(description="树和异常demo") +public class DemoTreeAndExceptionController { + private static final Logger LOGGER = LoggerFactory.getLogger(DemoTreeAndExceptionController.class); + + @Autowired + private ICoreTreeService coreTreeService; + + @GetMapping(value="/tree/department") + @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树，-1为根节点") + public ResultBean listDepartmentTree(long depParentId) { + try { + Department department = coreTreeService.getDepartmentTreeByParentId(depParentId); + + return ResultBean.success("查询部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(department); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + + @GetMapping(value="/excep") + @ApiOperation(value="异常处理",notes="异常处理") + public ResultBean excepTest(int num) { + try { + if(num == 1){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()) + .setErrorDetail("测试异常") + .setErrorSolution("测试异常解决方案") + .build(); + }else if(num == 2){ + throw new RuntimeException("运行中异常"); + }else if(num == 3){ + System.out.println("分母0异常"); + int i = 0/0; + }else if(num == 4){ + System.out.println("连接异常"); + URLConnection urlCon = new URLConnection(new URL("192.168.1.0")) { + @Override + public void connect() throws IOException { + + } + }; + }else{ + System.out.println("文件异常"); + throw new FileNotFoundException(); + } + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + //业务异常 + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + //其他异常 + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java similarity index 96% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java index 9fb17c6..db23f58 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java @@ -20,8 +20,8 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; @Controller @RequestMapping("/upload_demo") @Api(description="复杂对象服务demo") -public class DemoController { - private static final Logger LOGGER = LoggerFactory.getLogger(DemoController.class); +public class DemoUploadController { + private static final Logger LOGGER = LoggerFactory.getLogger(DemoUploadController.class); /********************** 文件上传 ***********************/ diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 1735ac8..e351311 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -9,6 +9,8 @@ spring.profiles.active=dev desc.application.name=impp管理 #当前项目版本 version=${project.version} +#解决程序读配置文件乱码问题 +spring.message.encoding = UTF-8 #日志默认使用log4j2 logging.config=classpath:log4j2.xml