Base Url 修改

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);

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());
 

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());
 //

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);
 

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);
 

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);
 

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")

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);

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);

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

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);

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);
 

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);

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);

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);

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);
 

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);
 

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);

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);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java

@@ -7,6 +7,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;
@@ -38,7 +39,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);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.core.apiservice.websocket;
 
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
+import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,7 +21,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 {
 

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java

@@ -34,7 +34,7 @@
 //        for(int i = 0 ; i < 50 ; i++ ){
 //            Department obj = new Department();
 //            obj.setName("Junit Test " + i);
-//            obj.setDepartmentCode("TEST_JUNIT " + i);
+//            obj.setDepartmentCode("DEV_JUNIT " + i);
 //            obj.setParentId(1057165194242953216L);
 //            obj.setOrganizeId(1057163974900060160L);
 //            obj = departmentService.insertDepartment(obj);

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java

@@ -35,7 +35,7 @@
 //        for(int i = 0 ; i < 50 ; i++ ){
 //            Organize obj = new Organize();
 //            obj.setName("Junit Test " + i);
-//            obj.setOrganizeCode("TEST_JUNIT " + i);
+//            obj.setOrganizeCode("DEV_JUNIT " + i);
 //            obj.setParentId(-1L);
 //            obj = organizeService.insertOrganize(obj);
 //            System.out.println(JSON.toJSONString(obj));

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java

@@ -35,7 +35,7 @@
 //        for(int i = 0 ; i < 50 ; i++ ){
 //            Position position = new Position();
 //            position.setName("Junit Test " + i);
-//            position.setPositionCode("TEST_JUNIT " + i);
+//            position.setPositionCode("DEV_JUNIT " + i);
 //            position = positionService.insertPosition(position);
 //            System.out.println(JSON.toJSONString(position));
 //        }

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java

@@ -53,7 +53,7 @@
 //        SysDictionary sysDictionary = new SysDictionary();
 //        sysDictionary.setName("字典测试");
 //        sysDictionary.setDictionaryCode("dic_test");
-//        sysDictionary.setDictionaryValue("TEST");
+//        sysDictionary.setDictionaryValue("DEV");
 //        sysDictionary.setDictionaryDescription("字典测试");
 //
 //        sysDictionaryService.insertSysDictionary(sysDictionary);

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java

@@ -68,7 +68,7 @@
 //        for(int i = 0 ; i < 50 ; i++ ){
 //            SysMenu obj = new SysMenu();
 //            obj.setName("Junit Test " + i);
-//            obj.setMenuCode("TEST_JUNIT " + i);
+//            obj.setMenuCode("DEV_JUNIT " + i);
 //            obj.setParentId(-1L);
 //            obj = sysMenuService.insertSysMenu(obj);
 //            System.out.println(JSON.toJSONString(obj));