From 6f55b50becefc998e40193f263afb034cbc9a44c Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 12 Dec 2018 13:32:54 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/DemoAuthController.java | 9 +++++---- .../i3plus/core/apiservice/controller/DemoMongoController.java | 3 ++- .../core/apiservice/controller/DemoRedisMqController.java | 3 ++- .../core/apiservice/controller/DemoResourceController.java | 3 ++- .../core/apiservice/controller/DemoScheduleController.java | 3 ++- .../apiservice/controller/DemoTreeAndExceptionController.java | 3 ++- .../core/apiservice/controller/DemoUploadController.java | 3 ++- .../i3plus/core/apiservice/controller/base/AuthController.java | 5 +++-- .../core/apiservice/controller/base/SimpleController.java | 3 ++- .../apiservice/controller/busi/FactoryStoreController.java | 2 +- .../core/apiservice/controller/busi/SysConfigController.java | 3 ++- .../apiservice/controller/busi/SysDepartmentController.java | 3 ++- .../apiservice/controller/busi/SysDictionaryController.java | 3 ++- .../core/apiservice/controller/busi/SysEnumController.java | 3 ++- .../core/apiservice/controller/busi/SysFileController.java | 3 ++- .../controller/busi/SysLocaleLanguageController.java | 3 ++- .../controller/busi/SysLocaleResourceController.java | 3 ++- .../apiservice/controller/busi/SysLogExceptionController.java | 3 ++- .../apiservice/controller/busi/SysLogOperateController.java | 3 ++- .../apiservice/controller/busi/SysLogSystemController.java | 3 ++- .../core/apiservice/controller/busi/SysMenuController.java | 3 ++- .../core/apiservice/controller/busi/SysMessageController.java | 3 ++- .../apiservice/controller/busi/SysOrderNoRuleController.java | 2 +- .../core/apiservice/controller/busi/SysOrganizeController.java | 3 ++- .../core/apiservice/controller/busi/SysPositionController.java | 3 ++- .../core/apiservice/controller/busi/SysRoleController.java | 3 ++- .../core/apiservice/controller/busi/SysTaskTimeController.java | 3 ++- .../controller/busi/SysTaskTimeExpressionController.java | 3 ++- .../core/apiservice/controller/busi/SysToolController.java | 3 ++- .../core/apiservice/controller/busi/SysToolTypeController.java | 3 ++- .../core/apiservice/controller/busi/SysTreeController.java | 3 ++- .../core/apiservice/controller/busi/SysUserController.java | 3 ++- .../core/apiservice/controller/busi/SysUserInfoController.java | 3 ++- .../i3plus/core/apiservice/websocket/MessageWebSocket.java | 4 ++-- .../src/main/resources/application.properties | 10 +++++++++- 35 files changed, 79 insertions(+), 40 deletions(-) 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 2608546..e275354 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; import cn.estsh.i3plus.platform.common.tool.EncryptTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; @@ -32,7 +33,7 @@ import java.util.Map; **/ @RestController @Api(description="登陆授权demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo") public class DemoAuthController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); @@ -45,9 +46,9 @@ public class DemoAuthController extends CoreBaseController { LOGGER.info("用户登陆：{},{},{}",loginName,loginPwd,languageCode); try { SessionUser sUser = systemLoginService.queryUserLogin(loginName,loginPwd,languageCode); - LOGGER.info("会员登陆：{}",sUser); + LOGGER.info("sid:{}, 会员登陆：{}",AuthUtil.getSession().getId(),sUser); AuthUtil.setSessionObject("languageCode",languageCode); - return new ResultBean(true,""); + return new ResultBean(true,AuthUtil.getSession().getId()); } catch (ImppBusiException e) { return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution()); } @@ -74,7 +75,7 @@ public class DemoAuthController extends CoreBaseController { * @return */ @GetMapping(value="/get-user-info") - @ApiOperation(value="登出",notes="登出") + @ApiOperation(value="获取用户信息",notes="获取用户信息") public ResultBean getUserInfo(HttpServletRequest request){ LOGGER.info("获取用户信息...lang:{}",AuthUtil.getSessionAttribute("languageCode")); try { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java index d051389..3b776f9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate; @@ -26,7 +27,7 @@ import java.util.List; **/ @RestController @Api(description="系统服务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo-mongo-service") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo-mongo-service") public class DemoMongoController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoMongoController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java index e16f953..66c918e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; @@ -34,7 +35,7 @@ import java.util.concurrent.TimeoutException; **/ @RestController @Api(description="复杂对象服务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo") public class DemoRedisMqController extends CoreBaseController{ 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/DemoResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java index 321419a..db7542c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.bean.ListPager; @@ -39,7 +40,7 @@ import java.util.Locale; **/ @RestController @Api(description="系统服务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo-system-service") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo-system-service") public class DemoResourceController extends CoreBaseController { 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/DemoScheduleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java index 8cda612..4ed2ae2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.quartz.ScheduleTool; @@ -24,7 +25,7 @@ import java.util.List; **/ @RestController @Api(description="定时任务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/schedule") +@RequestMapping(PlatformConstWords.BASE_URL + "/schedule") public class DemoScheduleController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoScheduleController.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 index 3f8b9f4..b4328fa 100644 --- 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; @@ -32,7 +33,7 @@ import java.net.URLConnection; **/ @RestController @Api(description="树和异常demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo") public class DemoTreeAndExceptionController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoTreeAndExceptionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java index 57161c3..2152b77 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -25,7 +26,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; **/ @RestController @Api(description="复杂对象服务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo-upload") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo-upload") public class DemoUploadController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoUploadController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index 5aab9ca..445c068 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController; import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysLocaleLanguageService; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; @@ -40,7 +41,7 @@ import java.util.List; **/ @RestController @Api(description="用户所有权限操作服务") -@RequestMapping(CoreBaseController.BASE_URL + "/auth") +@RequestMapping(PlatformConstWords.BASE_URL + "/auth") public class AuthController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); @@ -74,7 +75,7 @@ public class AuthController extends CoreBaseController { LOGGER.info("会员登陆：{}",user); AuthUtil.setSessionObject("languageCode",languageCode); - result = new ResultBean(true, "", AuthUtil.getSessionUser()); + result = new ResultBean(true, AuthUtil.getSession().getId().toString(), AuthUtil.getSessionUser()); result.setUrl("/"); } catch (IncorrectCredentialsException e) { // 密码错误 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java index 8b95721..4c62aaa 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.base; import cn.estsh.i3plus.core.api.iservice.base.IDataSimpleService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.i3plus.pojo.mes.MachineFactory; @@ -22,7 +23,7 @@ import java.util.List; **/ @RestController @Api(tags="SimpleController",description="简单服务demo") -@RequestMapping(CoreBaseController.BASE_URL +"/simple-service") +@RequestMapping(PlatformConstWords.BASE_URL +"/simple-service") public class SimpleController extends CoreBaseController{ private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java index e74a533..81f4510 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java @@ -22,7 +22,7 @@ // **/ //@RestController //@Api(description="复杂对象服务demo") -//@RequestMapping(CoreBaseController.BASE_URL +"/factory-store") +//@RequestMapping(PlatformConstWords.BASE_URL +"/factory-store") //public class FactoryStoreController extends CoreBaseController { // private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); // diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java index f0ce24b..150bf5f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; import cn.estsh.i3plus.core.apiservice.util.MailUtil; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; @@ -33,7 +34,7 @@ import java.util.List; **/ @RestController @Api(description = "系统参数管理服务") -@RequestMapping(CoreBaseController.BASE_URL +"/sys-config") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-config") public class SysConfigController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index fbde097..cf5a56f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysDepartmentService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "部门管理服务") -@RequestMapping(CoreBaseController.BASE_URL +"/department") +@RequestMapping(PlatformConstWords.BASE_URL +"/department") public class SysDepartmentController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysDepartmentController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index efd4fc1..c4d7c13 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "字典管理服务") -@RequestMapping(CoreBaseController.BASE_URL +"/sys-dictionary") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-dictionary") public class SysDictionaryController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java index 349dfa6..bb06701 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; @@ -23,7 +24,7 @@ import java.util.List; **/ @RestController @Api(description = "系统枚举服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-enum") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-enum") public class SysEnumController extends CoreBaseController{ @GetMapping("/method-level") diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java index 61cc61c..8f6243a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -50,7 +51,7 @@ import java.util.List; **/ @RestController @Api(description = "文件资源服务") -@RequestMapping(CoreBaseController.BASE_URL +"/sys-file") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-file") public class SysFileController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java index 66c03ab..57fb717 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleLanguageService; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -31,7 +32,7 @@ import java.util.List; **/ @RestController @Api(description = "系统语言服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-locale-language") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-locale-language") public class SysLocaleLanguageController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java index b79e05e..cb6f9d6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "系统语言资源服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-locale-resource") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-locale-resource") public class SysLocaleResourceController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java index 7f866e1..1b53673 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -27,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @Api(description = "系统异常日志服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-log-exception") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-log-exception") public class SysLogExceptionController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index d16a574..0b70c9c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -29,7 +30,7 @@ import java.util.List; **/ @RestController @Api(description = "操作日志") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-log-operate") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-log-operate") public class SysLogOperateController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogOperateController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index 2941e13..4af9408 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -28,7 +29,7 @@ import java.util.List; **/ @RestController @Api(description = "系统日志服务") -@RequestMapping(CoreBaseController.BASE_URL +"/sys-log-system") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-log-system") public class SysLogSystemController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index a926a31..54bdf84 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -3,6 +3,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; + import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -32,7 +33,7 @@ **/ @RestController @Api(description = "系统功能服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-menu") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-menu") public class SysMenuController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java index 1b350ed..3d24a1c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -37,7 +38,7 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping(CoreBaseController.BASE_URL) +@RequestMapping(PlatformConstWords.BASE_URL) @Api(description = "消息管理服务") public class SysMessageController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java index b1a696e..2f9ccf8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java @@ -47,7 +47,7 @@ import java.util.List; **/ @RestController @Api(description = "系统单号规则管理服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-order-no-rule") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-order-no-rule") public class SysOrderNoRuleController extends CoreBaseController { @Autowired diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java index 4720e11..7669312 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -33,7 +34,7 @@ import java.util.List; **/ @RestController @Api(description = "组织") -@RequestMapping(CoreBaseController.BASE_URL +"/organize") +@RequestMapping(PlatformConstWords.BASE_URL +"/organize") public class SysOrganizeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysOrganizeController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index 7db1cf4..5c4ebd5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "岗位管理服务") -@RequestMapping(CoreBaseController.BASE_URL +"/position") +@RequestMapping(PlatformConstWords.BASE_URL +"/position") public class SysPositionController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysPositionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index d14399b..7a242f2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "系统角色服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-role") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-role") public class SysRoleController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java index df606a9..947ffc7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "定时任务服务") -@RequestMapping(CoreBaseController.BASE_URL +"/task-time") +@RequestMapping(PlatformConstWords.BASE_URL +"/task-time") public class SysTaskTimeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java index 808c256..20161d4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -31,7 +32,7 @@ import java.util.List; **/ @RestController @Api(description = "系统时间表达式") -@RequestMapping(CoreBaseController.BASE_URL +"/task-time-expression") +@RequestMapping(PlatformConstWords.BASE_URL +"/task-time-expression") public class SysTaskTimeExpressionController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeExpressionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java index b51cb03..ff28147 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysToolService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -41,7 +42,7 @@ import java.util.List; **/ @RestController @Api(description = "硬件服务") -@RequestMapping(CoreBaseController.BASE_URL +"/tool") +@RequestMapping(PlatformConstWords.BASE_URL +"/tool") public class SysToolController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysToolController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java index 93e00c3..859f9e0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysToolTypeService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "硬件类型服务") -@RequestMapping(CoreBaseController.BASE_URL +"/tool-type") +@RequestMapping(PlatformConstWords.BASE_URL +"/tool-type") public class SysToolTypeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysToolTypeController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java index de029c9..eee7d02 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.model.platform.CommonTreeModel; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; @@ -33,7 +34,7 @@ import java.util.List; **/ @RestController @Api(description = "树服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-tree") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-tree") public class SysTreeController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 4b9dae6..abe288a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.EncryptTool; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -42,7 +43,7 @@ import java.util.List; **/ @RestController @Api(description = "系统用户服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-user") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-user") public class SysUserController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysUserController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index 23895c4..9c3f2ba 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService; import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysOrganizeService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -39,7 +40,7 @@ import java.util.List; **/ @RestController @Api(description = "系统用户服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-user-info") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-user-info") public class SysUserInfoController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysUserInfoController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java index 61ab42d..31aa9a6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.core.apiservice.websocket; -import cn.estsh.impp.framework.base.controller.CoreBaseController; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentMap; * @CreateDate : 2018-11-24 16:57 * @Modify: **/ -@ServerEndpoint(value= CoreBaseController.BASE_URL + "/message-websocket/{userId}") +@ServerEndpoint(value= PlatformConstWords.BASE_URL + "/message-websocket/{userId}") @Component public class MessageWebSocket { diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 58de670..ecf9c9d 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -29,4 +29,12 @@ server.tomcat.uri-encoding=UTF-8 spring.mvc.view.prefix=/upload_demo spring.mvc.view.suffix=.jsp #静态文件访问配置 -spring.resources.static-locations=/static/**,/** \ No newline at end of file +spring.resources.static-locations=/static/**,/** + +########扫包路径######## +#基础包路径 +impp.app.base-packages=cn.estsh.i3plus.core +#对象包路径，可以多个包，逗号分隔 +impp.app.base-pojo=cn.estsh.i3plus.pojo.base,cn.estsh.i3plus.pojo.platform +#微服包路径 +impp.app.icloud-package=cn.estsh.i3plus.icloud \ No newline at end of file From 2e058f91e2ab61eee6852ff0a625dd4261cfaed8 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 12 Dec 2018 17:39:18 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=8A=A8=E6=80=81=20Table=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index f79b292..ab97219 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -1,15 +1,15 @@ #项目端口 server.port=8100 #本机ip -impp.server.ip=192.168.1.56 +impp.server.ip=192.168.1.40 #console控制台服务（zipkin追踪全路径） -impp.console.ip=http://csd.estsh.com +impp.console.ip=http://192.168.1.40:8010 ################ 功能配置1 ################ #若无法连接注册中心，是否需要一直检测加入 impp.cluster.fetch=true #服务注册中心 -impp.cluster.regist.center=http://regd.estsh.com/eureka/ +impp.cluster.regist.center=http://192.168.1.40:8000/eureka/ #多注册中心 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ From 67e4ee245750a9a23ddc6e21781a49de3f1f4d33 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 12 Dec 2018 19:10:33 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/api/iservice/busi/ISysUserInfoService.java | 7 +++++++ .../core/apiservice/controller/busi/SysUserController.java | 2 ++ .../apiservice/serviceimpl/busi/SysUserInfoService.java | 13 +++++++++++++ .../core/apiservice/serviceimpl/busi/SysUserService.java | 5 +++++ 4 files changed, 27 insertions(+) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java index 83f4827..de7897c 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java @@ -57,6 +57,13 @@ public interface ISysUserInfoService { void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName); /** + * 刷新用户账号信息 + * @param userInfoId + */ + @ApiOperation(value = "刷新用户账号信息",notes = "根据UserInfoId 刷新用户账号信息") + void refreshUserInfoUserNum(Long userInfoId); + + /** * 根据Key 删除数据 * @param id */ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index abe288a..4314738 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -103,6 +103,7 @@ public class SysUserController extends CoreBaseController{ // 更新用户关系 sysUserService.refreshSysRefUserRole(user,StringTool.getArrayLong(roleIds),getSessionUser().getUserName()); + sysUserInfoService.refreshUserInfoUserNum(userInfo.getId()); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) @@ -290,6 +291,7 @@ public class SysUserController extends CoreBaseController{ ValidatorBean.checkNotNull(id, "用户id 不能为空"); sysUserService.deleteSysUserById(Long.parseLong(id)); + sysUserInfoService.refreshUserInfoUserNum(Long.parseLong(id)); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index f39319d..2c7e08c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -195,6 +195,19 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override + @ApiOperation(value = "刷新用户账号信息",notes = "根据UserInfoId 刷新用户账号信息") + public void refreshUserInfoUserNum(Long userInfoId) { + LOGGER.info("用户信息 SysUserInfo userInfoId:{}",userInfoId); + SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); + if(userInfo != null){ + int count = sysUserRepository.findByPropertyCount("userInfoId", userInfo.getId()); + userInfo.setUserNum(count); + sysUserInfoRDao.save(userInfo); + + } + } + + @Override public void deleteSysUserInfoById(Long id) { LOGGER.info("用户信息 SysUserInfo id:{}",id); sysUserInfoRDao.deleteById(id); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 9b3a663..31a6c6e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; +import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService; import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao; import cn.estsh.i3plus.platform.common.convert.ConvertBean; @@ -76,6 +77,9 @@ public class SysUserService implements ISysUserService { @Autowired private SysPositionRepository sysPositionRDao; + @Autowired + private ISysUserInfoService sysUserInfoService; + @Override @ApiOperation(value = "用户登录", notes = "用户登录功能实现") public SessionUser queryUserLogin(String loginName, String password, String languageCode) throws AuthenticationException { @@ -260,6 +264,7 @@ public class SysUserService implements ISysUserService { if(null != list && list.size() > 0){ for (SysUser sysUser : list) { sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + sysUserInfoService.refreshUserInfoUserNum(sysUser.getUserInfoId()); } sysUserRDao.saveAll(list); From f15da3db8048dbd7edd0ffea9f643c4e3f5780a1 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 12 Dec 2018 19:58:32 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=8A=A8=E6=80=81=20Table=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index ab97219..f79b292 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -1,15 +1,15 @@ #项目端口 server.port=8100 #本机ip -impp.server.ip=192.168.1.40 +impp.server.ip=192.168.1.56 #console控制台服务（zipkin追踪全路径） -impp.console.ip=http://192.168.1.40:8010 +impp.console.ip=http://csd.estsh.com ################ 功能配置1 ################ #若无法连接注册中心，是否需要一直检测加入 impp.cluster.fetch=true #服务注册中心 -impp.cluster.regist.center=http://192.168.1.40:8000/eureka/ +impp.cluster.regist.center=http://regd.estsh.com/eureka/ #多注册中心 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ From a92d83147598ce3dcd28f5b47a5af530a4c2f28f Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 12 Dec 2018 19:58:49 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=8A=A8=E6=80=81=20Table=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus-core-apiservice/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index cb7f6cd..ecf9c9d 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -2,7 +2,7 @@ spring.application.name=${project.name} #使用配置 -spring.profiles.active=test +spring.profiles.active=dev ######### 自定义参数 ######### #项目描述信息（swagger中显式），中文使用uncode转码 From e336e7e5bbdb9a35d243f1d10057a37fb4fb1802 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 12 Dec 2018 20:00:02 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=8A=A8=E6=80=81=20Table=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index ab97219..f79b292 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -1,15 +1,15 @@ #项目端口 server.port=8100 #本机ip -impp.server.ip=192.168.1.40 +impp.server.ip=192.168.1.56 #console控制台服务（zipkin追踪全路径） -impp.console.ip=http://192.168.1.40:8010 +impp.console.ip=http://csd.estsh.com ################ 功能配置1 ################ #若无法连接注册中心，是否需要一直检测加入 impp.cluster.fetch=true #服务注册中心 -impp.cluster.regist.center=http://192.168.1.40:8000/eureka/ +impp.cluster.regist.center=http://regd.estsh.com/eureka/ #多注册中心 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ From fde15ef528ec6b3b12e19eb94b4e2287949eb3da Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 12 Dec 2018 20:04:48 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8A=A8=E6=80=81=20Table=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus-core-apiservice/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index ecf9c9d..cb7f6cd 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -2,7 +2,7 @@ spring.application.name=${project.name} #使用配置 -spring.profiles.active=dev +spring.profiles.active=test ######### 自定义参数 ######### #项目描述信息（swagger中显式），中文使用uncode转码 From b52cc541a0710f4f1149cade44a5d4e225b37d64 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 12 Dec 2018 20:24:20 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8A=A8=E6=80=81=20Table=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java index 9970802..49a6658 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java @@ -3,7 +3,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.amqp.core.Queue; -import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -33,6 +32,7 @@ public class I3CoreQueueConfig { /*********** 队列demo ***********/ public static final String DEMO_STR_QUEUE = "demo_str_queue"; + @Bean public Queue getStrQueue() { //LOGGER.info("【DEMO_STR_QUEUE队列】"); @@ -40,6 +40,7 @@ public class I3CoreQueueConfig { } public static final String DEMO_OBJ_QUEUE = "demo_obj_queue"; + @Bean public Queue getObjQueue() throws Exception { //LOGGER.info("【DEMO_OBJ_QUEUE队列】"); @@ -47,6 +48,7 @@ public class I3CoreQueueConfig { } public static final String DEMO_HANDLE_QUEUE = "demo_handle_queue"; + @Bean public Queue getHandleQueue() throws Exception { //LOGGER.info("【DEMO_HANDLE_QUEUE队列】"); @@ -54,6 +56,7 @@ public class I3CoreQueueConfig { } public static final String DEMO_ACK_QUEUE = "ack_queue"; + @Bean public Queue getAckQueue() throws Exception { //LOGGER.info("【DEMO_ACK_QUEUE队列】"); @@ -61,6 +64,7 @@ public class I3CoreQueueConfig { } public static final String DEMO_RETURN_QUEUE = "return_queue"; + @Bean public Queue getReturnQueue() throws Exception { //LOGGER.info("【DEMO_RETURN_QUEUE队列】");