diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java index e176021..eace040 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java @@ -94,7 +94,7 @@ public class EnumController { @ApiOperation(value = "操作日志类型", notes = "操作日志类型") public ResultBean getLogType(){ return new ResultBean(true, "操作成功", - Arrays.asList(ImppEnumUtil.LOG_TYPE.values())); + Arrays.asList(ImppEnumUtil.LOG_LEVEL.values())); } @GetMapping("/user-message-status") diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java index 317b297..c787ded 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java @@ -42,7 +42,7 @@ public class LogOperateService implements ILogOperateService { return new ListPager(logOperateRDao.findAll(),pager); }else{ Bson bson = Filters.and(); - BsonPackTool.getStringLikerPack(logOperate.getOperateUserName(),"operateUserName",bson); + BsonPackTool.getStringLikerPack(logOperate.getCreateUser(),"createUser",bson); BsonPackTool.timeBuilder(logOperate.getCreateDateTimeStart(),logOperate.getCreateDateTimeEnd(),"reateDateTime",bson,false); BsonPackTool.getNumEqualPack(logOperate.getOperateModuleId(),"operateModuleId",bson); BsonPackTool.getNumEqualPack(logOperate.getOperateTypeId(),"operateTypeId",bson); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/websocket/DemoWebSocket.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/DemoWebSocket.java similarity index 96% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/websocket/DemoWebSocket.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/DemoWebSocket.java index 47237d0..a342b37 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/websocket/DemoWebSocket.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/DemoWebSocket.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.core.apiservice.controller.websocket; +package cn.estsh.i3plus.core.apiservice.websocket; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,7 +14,7 @@ import java.io.IOException; import java.util.concurrent.CopyOnWriteArraySet; /** - * @Description : + * @Description : websocket演示,后期移出base * @Reference : * @Author : alwaysfrin * @CreateDate : 2018-09-11 12:32 diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index d8d120a..1735ac8 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -6,7 +6,7 @@ spring.profiles.active=dev ######### 自定义参数 ######### #项目描述信息(swagger中显式) -desc.application.name=Intelligent Manufacturing System +desc.application.name=impp管理 #当前项目版本 version=${project.version} diff --git a/modules/i3plus-core-apiservice/src/main/resources/banner.txt b/modules/i3plus-core-apiservice/src/main/resources/banner.txt index 1fc9e98..5554e33 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/banner.txt +++ b/modules/i3plus-core-apiservice/src/main/resources/banner.txt @@ -10,5 +10,5 @@ | || | | | __/| __/ |_____| | |___| |_| | _ <| |___ |___|_| |_|_| |_| \____|\___/|_| \_\_____| ------------------------------------------------------------------->>> - ::::: CORE of i3plus Impp framework :::: (v1.0.0.Build) + :::: CORE of i3plus Impp framework :::: v1.0.0.Build ------------------------------------------------------------------->>> >>> diff --git a/pom.xml b/pom.xml index f532c7d..015ddda 100644 --- a/pom.xml +++ b/pom.xml @@ -22,8 +22,8 @@ - - i3plus-core + + CORE UTF-8 UTF-8 1.8