From 437978b4345f4e5977824f1cf542ca85ebafc4f3 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 4 May 2022 06:19:01 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=80=20=E9=87=8D=E6=9E=84=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=A1=86=E6=9E=B6=E8=BF=9B=E8=A1=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...KiccAuthenticationFailureEventHandler.java | 6 +--- ...KiccAuthenticationSuccessEventHandler.java | 6 +--- .../KiccLogoutSuccessEventHandler.java | 6 +--- kicc-common/kicc-common-log/pom.xml | 4 +-- .../kicc/common/log/LogAutoConfiguration.java | 2 +- .../kicc/common/log/aspect/SysLogAspect.java | 2 +- .../kicc/common/log/event/SysLogEvent.java | 2 +- .../kicc/common/log/event/SysLogListener.java | 4 +-- .../kicc/common/log/util/SysLogUtils.java | 2 +- .../kicc/monitor}/api/entity/OperLog.java | 2 +- .../monitor}/api/feign/RemoteLogService.java | 6 ++-- .../api/feign/RemoteTokenService.java | 4 +-- .../main/resources/META-INF/spring.factories | 2 ++ .../main/resources/META-INF/spring.factories | 6 ++-- .../controller/OperLogController.java | 36 +++++++++---------- .../monitor}/controller/TokenController.java | 6 ++-- .../kicc/monitor}/mapper/OperLogMapper.java | 4 +-- .../kicc/monitor}/service/OperLogService.java | 4 +-- .../service/impl/OperLogServiceImpl.java | 8 ++--- .../main/resources/mapper/OperLogMapper.xml | 2 +- 20 files changed, 50 insertions(+), 64 deletions(-) rename kicc-platform/kicc-platform-api/{kicc-system-api/src/main/java/com/cloud/kicc/system => kicc-monitor-api/src/main/java/com/cloud/kicc/monitor}/api/entity/OperLog.java (97%) rename kicc-platform/kicc-platform-api/{kicc-system-api/src/main/java/com/cloud/kicc/system => kicc-monitor-api/src/main/java/com/cloud/kicc/monitor}/api/feign/RemoteLogService.java (91%) rename kicc-platform/kicc-platform-api/{kicc-system-api/src/main/java/com/cloud/kicc/system => kicc-monitor-api/src/main/java/com/cloud/kicc/monitor}/api/feign/RemoteTokenService.java (96%) rename kicc-platform/kicc-platform-biz/{kicc-system-biz/src/main/java/com/cloud/kicc/system => kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor}/controller/OperLogController.java (64%) rename kicc-platform/kicc-platform-biz/{kicc-system-biz/src/main/java/com/cloud/kicc/system => kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor}/controller/TokenController.java (96%) rename kicc-platform/kicc-platform-biz/{kicc-system-biz/src/main/java/com/cloud/kicc/system => kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor}/mapper/OperLogMapper.java (72%) rename kicc-platform/kicc-platform-biz/{kicc-system-biz/src/main/java/com/cloud/kicc/system => kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor}/service/OperLogService.java (72%) rename kicc-platform/kicc-platform-biz/{kicc-system-biz/src/main/java/com/cloud/kicc/system => kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor}/service/impl/OperLogServiceImpl.java (63%) rename kicc-platform/kicc-platform-biz/{kicc-system-biz => kicc-monitor-biz}/src/main/resources/mapper/OperLogMapper.xml (70%) diff --git a/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/KiccAuthenticationFailureEventHandler.java b/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/KiccAuthenticationFailureEventHandler.java index 98f6fd53..7f32556c 100644 --- a/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/KiccAuthenticationFailureEventHandler.java +++ b/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/KiccAuthenticationFailureEventHandler.java @@ -1,21 +1,17 @@ package com.cloud.kicc.auth.handler; -import com.cloud.kicc.system.api.entity.OperLog; import com.cloud.kicc.common.core.util.SpringContextHolderUtil; -import com.cloud.kicc.common.data.entity.KiccUser; import com.cloud.kicc.common.log.event.SysLogEvent; import com.cloud.kicc.common.log.util.LogTypeEnum; import com.cloud.kicc.common.log.util.SysLogUtils; import com.cloud.kicc.common.security.handler.AbstractAuthenticationFailureEventHandler; -import com.cloud.kicc.common.security.util.SecurityUtils; +import com.cloud.kicc.monitor.api.entity.OperLog; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; -import java.util.Optional; - /** *

* 登录失败处理 diff --git a/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/KiccAuthenticationSuccessEventHandler.java b/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/KiccAuthenticationSuccessEventHandler.java index 1a9c3f1a..f88eb118 100644 --- a/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/KiccAuthenticationSuccessEventHandler.java +++ b/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/KiccAuthenticationSuccessEventHandler.java @@ -1,19 +1,15 @@ package com.cloud.kicc.auth.handler; -import com.cloud.kicc.system.api.entity.OperLog; import com.cloud.kicc.common.core.util.SpringContextHolderUtil; -import com.cloud.kicc.common.data.entity.KiccUser; import com.cloud.kicc.common.log.event.SysLogEvent; import com.cloud.kicc.common.log.util.SysLogUtils; import com.cloud.kicc.common.security.handler.AbstractAuthenticationSuccessEventHandler; -import com.cloud.kicc.common.security.util.SecurityUtils; +import com.cloud.kicc.monitor.api.entity.OperLog; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; -import java.util.Optional; - /** *

* 登录成功处理 diff --git a/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/KiccLogoutSuccessEventHandler.java b/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/KiccLogoutSuccessEventHandler.java index fd46e8ab..05b1d86b 100644 --- a/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/KiccLogoutSuccessEventHandler.java +++ b/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/KiccLogoutSuccessEventHandler.java @@ -1,13 +1,11 @@ package com.cloud.kicc.auth.handler; -import com.cloud.kicc.system.api.entity.OperLog; import com.cloud.kicc.common.core.util.SpringContextHolderUtil; import com.cloud.kicc.common.core.util.WebUtil; -import com.cloud.kicc.common.data.entity.KiccUser; import com.cloud.kicc.common.log.event.SysLogEvent; import com.cloud.kicc.common.log.util.SysLogUtils; import com.cloud.kicc.common.security.handler.AbstractLogoutSuccessEventHandler; -import com.cloud.kicc.common.security.util.SecurityUtils; +import com.cloud.kicc.monitor.api.entity.OperLog; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpHeaders; import org.springframework.security.core.Authentication; @@ -15,8 +13,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.stereotype.Component; -import java.util.Optional; - /** *

* 注销成功处理 diff --git a/kicc-common/kicc-common-log/pom.xml b/kicc-common/kicc-common-log/pom.xml index 2331474c..10d104b8 100644 --- a/kicc-common/kicc-common-log/pom.xml +++ b/kicc-common/kicc-common-log/pom.xml @@ -15,10 +15,10 @@ - + com.cloud - kicc-system-api + kicc-monitor-api diff --git a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/LogAutoConfiguration.java b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/LogAutoConfiguration.java index 308e78a2..accbaac3 100644 --- a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/LogAutoConfiguration.java +++ b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/LogAutoConfiguration.java @@ -1,8 +1,8 @@ package com.cloud.kicc.common.log; -import com.cloud.kicc.system.api.feign.RemoteLogService; import com.cloud.kicc.common.log.aspect.SysLogAspect; import com.cloud.kicc.common.log.event.SysLogListener; +import com.cloud.kicc.monitor.api.feign.RemoteLogService; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Bean; diff --git a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/aspect/SysLogAspect.java b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/aspect/SysLogAspect.java index 21c35c9a..015e717f 100644 --- a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/aspect/SysLogAspect.java +++ b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/aspect/SysLogAspect.java @@ -1,11 +1,11 @@ package com.cloud.kicc.common.log.aspect; -import com.cloud.kicc.system.api.entity.OperLog; import com.cloud.kicc.common.core.util.SpringContextHolderUtil; import com.cloud.kicc.common.log.annotation.SysLog; import com.cloud.kicc.common.log.event.SysLogEvent; import com.cloud.kicc.common.log.util.LogTypeEnum; import com.cloud.kicc.common.log.util.SysLogUtils; +import com.cloud.kicc.monitor.api.entity.OperLog; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogEvent.java b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogEvent.java index 30343176..ebb8a0b6 100644 --- a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogEvent.java +++ b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogEvent.java @@ -1,6 +1,6 @@ package com.cloud.kicc.common.log.event; -import com.cloud.kicc.system.api.entity.OperLog; +import com.cloud.kicc.monitor.api.entity.OperLog; import org.springframework.context.ApplicationEvent; /** diff --git a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogListener.java b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogListener.java index 95192fb2..202a5fc7 100644 --- a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogListener.java +++ b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogListener.java @@ -1,8 +1,8 @@ package com.cloud.kicc.common.log.event; -import com.cloud.kicc.system.api.entity.OperLog; -import com.cloud.kicc.system.api.feign.RemoteLogService; import com.cloud.kicc.common.core.constant.SecurityConstants; +import com.cloud.kicc.monitor.api.entity.OperLog; +import com.cloud.kicc.monitor.api.feign.RemoteLogService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; diff --git a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/util/SysLogUtils.java b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/util/SysLogUtils.java index 85967e08..9132b208 100644 --- a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/util/SysLogUtils.java +++ b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/util/SysLogUtils.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.HttpUtil; -import com.cloud.kicc.system.api.entity.OperLog; import com.cloud.kicc.common.data.entity.KiccUser; +import com.cloud.kicc.monitor.api.entity.OperLog; import lombok.experimental.UtilityClass; import org.springframework.http.HttpHeaders; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/OperLog.java b/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/entity/OperLog.java similarity index 97% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/OperLog.java rename to kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/entity/OperLog.java index ad314540..0a7080d9 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/OperLog.java +++ b/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/entity/OperLog.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.api.entity; +package com.cloud.kicc.monitor.api.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteLogService.java b/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/feign/RemoteLogService.java similarity index 91% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteLogService.java rename to kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/feign/RemoteLogService.java index 66812f55..370de396 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteLogService.java +++ b/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/feign/RemoteLogService.java @@ -1,10 +1,10 @@ -package com.cloud.kicc.system.api.feign; +package com.cloud.kicc.monitor.api.feign; -import com.cloud.kicc.system.api.entity.OperLog; +import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; import com.cloud.kicc.common.core.constant.ServiceNameConstants; -import com.cloud.kicc.common.core.api.R; +import com.cloud.kicc.monitor.api.entity.OperLog; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteTokenService.java b/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/feign/RemoteTokenService.java similarity index 96% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteTokenService.java rename to kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/feign/RemoteTokenService.java index 1123bc50..e13db1ef 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteTokenService.java +++ b/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/feign/RemoteTokenService.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.system.api.feign; +package com.cloud.kicc.monitor.api.feign; +import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.SecurityConstants; import com.cloud.kicc.common.core.constant.ServiceNameConstants; -import com.cloud.kicc.common.core.api.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/resources/META-INF/spring.factories b/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/resources/META-INF/spring.factories index 9d486397..6ae22908 100644 --- a/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/resources/META-INF/spring.factories +++ b/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/resources/META-INF/spring.factories @@ -1 +1,3 @@ com.cloud.kicc.common.feign.KiccFeignAutoConfiguration=\ + com.cloud.kicc.monitor.api.feign.RemoteLogService,\ + com.cloud.kicc.monitor.api.feign.RemoteTokenService diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/resources/META-INF/spring.factories b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/resources/META-INF/spring.factories index 5cb38710..b54ea42d 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/resources/META-INF/spring.factories +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/resources/META-INF/spring.factories @@ -1,5 +1,3 @@ com.cloud.kicc.common.feign.KiccFeignAutoConfiguration=\ - com.cloud.kicc.system.api.feign.RemoteDictService,\ - com.cloud.kicc.system.api.feign.RemoteLogService,\ - com.cloud.kicc.system.api.feign.RemoteTokenService,\ - com.cloud.kicc.system.api.feign.RemoteUserService + com.cloud.kicc.system.api.feign.RemoteDictService,\ + com.cloud.kicc.system.api.feign.RemoteUserService diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OperLogController.java b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/OperLogController.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OperLogController.java rename to kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/OperLogController.java index a035cd03..d28d7c04 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OperLogController.java +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/OperLogController.java @@ -1,15 +1,17 @@ -package com.cloud.kicc.system.controller; +package com.cloud.kicc.monitor.controller; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.system.api.entity.OperLog; -import com.cloud.kicc.system.service.OperLogService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.log.annotation.SysLog; import com.cloud.kicc.common.security.annotation.Inner; +import com.cloud.kicc.monitor.api.entity.OperLog; +import com.cloud.kicc.monitor.service.OperLogService; import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -32,14 +34,14 @@ public class OperLogController { private final OperLogService operLogService; - private QueryWrapper getQueryWrapper(OperLog operLog) { - return new QueryWrapper() - .like(StrUtil.isNotBlank(operLog.getOperName()), "oper_name", operLog.getOperName()) - .like(StrUtil.isNotBlank(operLog.getTitle()), "title", operLog.getTitle()) - .eq(!StrUtil.isEmptyIfStr(operLog.getStatus()), "status", operLog.getStatus()) - .eq(!StrUtil.isEmptyIfStr(operLog.getType()), "type", operLog.getType()) - .between(StrUtil.isNotBlank(operLog.getBeginTime()) && StrUtil.isNotBlank(operLog.getEndTime()), "oper_time", operLog.getBeginTime(), operLog.getEndTime()) - .orderByDesc("id"); + private LambdaQueryWrapper getQueryWrapper(OperLog operLog) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(operLog.getOperName()), OperLog::getOperName, operLog.getOperName()) + .like(StrUtil.isNotBlank(operLog.getTitle()), OperLog::getTitle, operLog.getTitle()) + .eq(ObjectUtil.isNotEmpty(operLog.getStatus()), OperLog::getStatus, operLog.getStatus()) + .eq(StrUtil.isNotBlank(operLog.getType()), OperLog::getType, operLog.getType()) + .between(StrUtil.isNotBlank(operLog.getBeginTime()) && StrUtil.isNotBlank(operLog.getEndTime()), OperLog::getOperTime, operLog.getBeginTime(), operLog.getEndTime()) + .orderByDesc(OperLog::getId); } @GetMapping("/list") @@ -58,20 +60,16 @@ public class OperLogController { @SysLog("操作日志删除") @DeleteMapping("/remove/{id:[\\w,]+}") @PreAuthorize("@pms.hasPermission('operLog_del')") - public R remove(@PathVariable String[] id) { - try { - operLogService.removeByIds(Arrays.asList(id)); - return R.ok(); - } catch (Exception e) { - return R.error(e.getMessage()); - } + public R remove(@PathVariable String[] ids) { + operLogService.removeByIds(Arrays.asList(ids)); + return R.ok(); } @SysLog("操作日志清空") @DeleteMapping("/clean") @PreAuthorize("@pms.hasPermission('operLog_del')") public R clean() { - operLogService.remove(new QueryWrapper<>()); + operLogService.remove(new QueryWrapper()); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TokenController.java b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/TokenController.java similarity index 96% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TokenController.java rename to kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/TokenController.java index e3df0d2c..d45eb7e1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TokenController.java +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/TokenController.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.controller; +package com.cloud.kicc.monitor.controller; -import com.cloud.kicc.system.api.feign.RemoteTokenService; +import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; -import com.cloud.kicc.common.core.api.R; +import com.cloud.kicc.system.api.feign.RemoteTokenService; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/OperLogMapper.java b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/mapper/OperLogMapper.java similarity index 72% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/OperLogMapper.java rename to kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/mapper/OperLogMapper.java index 6de4a44c..b26c6e9b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/OperLogMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/mapper/OperLogMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.mapper; +package com.cloud.kicc.monitor.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.system.api.entity.OperLog; +import com.cloud.kicc.monitor.api.entity.OperLog; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/OperLogService.java b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/service/OperLogService.java similarity index 72% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/OperLogService.java rename to kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/service/OperLogService.java index 31721fdb..47669ef7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/OperLogService.java +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/service/OperLogService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.service; +package com.cloud.kicc.monitor.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.OperLog; +import com.cloud.kicc.monitor.api.entity.OperLog; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/OperLogServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/service/impl/OperLogServiceImpl.java similarity index 63% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/OperLogServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/service/impl/OperLogServiceImpl.java index 0742e054..7e438920 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/OperLogServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/service/impl/OperLogServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.service.impl; +package com.cloud.kicc.monitor.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.system.api.entity.OperLog; -import com.cloud.kicc.system.mapper.OperLogMapper; -import com.cloud.kicc.system.service.OperLogService; +import com.cloud.kicc.monitor.api.entity.OperLog; +import com.cloud.kicc.monitor.mapper.OperLogMapper; +import com.cloud.kicc.monitor.service.OperLogService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/OperLogMapper.xml b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/mapper/OperLogMapper.xml similarity index 70% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/OperLogMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/mapper/OperLogMapper.xml index 28019b1c..49598038 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/OperLogMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/mapper/OperLogMapper.xml @@ -1,5 +1,5 @@ - +