From 9d4857bb6d408687fc876dc356cf14acec04925b Mon Sep 17 00:00:00 2001 From: qqkj Date: Wed, 30 Dec 2020 16:36:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0mdp-audit-log-client=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...9.xml => Maven__com_alibaba_fastjson_1_2_47.xml} | 8 ++++---- ...qingqinkj_mdp_mdp_audit_base_M_1_0_0_RELEASE.xml | 13 ------------- ...nkj_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml | 13 +++++++++++++ .../Maven__org_projectlombok_lombok_1_18_2.xml | 13 +++++++++++++ .idea/xm-server.iml | 9 +++++---- pom.xml | 9 +++++---- .../com/qqkj/xm/core/ctrl/XmEnvListController.java | 4 ++-- .../com/qqkj/xm/core/ctrl/XmFileController.java | 4 ++-- .../com/qqkj/xm/core/ctrl/XmProjectController.java | 4 ++-- .../xm/core/ctrl/XmProjectEnvListController.java | 4 ++-- .../ctrl/XmProjectMBudgetCostNouserController.java | 4 ++-- .../ctrl/XmProjectMBudgetCostUserController.java | 4 ++-- .../core/ctrl/XmProjectMCostNouserController.java | 4 ++-- .../xm/core/ctrl/XmProjectMCostUserController.java | 4 ++-- .../com/qqkj/xm/core/ctrl/XmQuestionController.java | 4 ++-- .../com/qqkj/xm/core/ctrl/XmTaskController.java | 4 ++-- .../qqkj/xm/core/ctrl/XmTaskExecuserController.java | 4 ++-- xm-core/xm-core.iml | 9 +++++---- xm-starter/xm-starter.iml | 9 +++++---- 19 files changed, 72 insertions(+), 55 deletions(-) rename .idea/libraries/{Maven__com_alibaba_fastjson_1_2_59.xml => Maven__com_alibaba_fastjson_1_2_47.xml} (64%) delete mode 100644 .idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_base_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_18_2.xml diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_59.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml similarity index 64% rename from .idea/libraries/Maven__com_alibaba_fastjson_1_2_59.xml rename to .idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml index e189ffde..dcd6ee59 100644 --- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_59.xml +++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_base_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_base_M_1_0_0_RELEASE.xml deleted file mode 100644 index b504f2a6..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_base_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..6bf07c9a --- /dev/null +++ b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_2.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_2.xml new file mode 100644 index 00000000..638f01ba --- /dev/null +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/xm-server.iml b/.idea/xm-server.iml index a8647537..416afa96 100644 --- a/.idea/xm-server.iml +++ b/.idea/xm-server.iml @@ -24,9 +24,8 @@ - - + @@ -82,7 +81,7 @@ - + @@ -139,8 +138,10 @@ - + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index f7dc9816..63d6dd94 100644 --- a/pom.xml +++ b/pom.xml @@ -56,14 +56,15 @@ com.qingqinkj.mdp mdp-common - + com.qingqinkj.mdp - mdp-audit-base - + mdp-tomcat-conf + com.qingqinkj.mdp - mdp-tomcat-conf + mdp-audit-log-client + ${mdp.version} net.coobird diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmEnvListController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmEnvListController.java index 2b54689a..27c049f3 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmEnvListController.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmEnvListController.java @@ -5,8 +5,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.qqkj.audit.base.annotation.AuditLog; -import com.qqkj.audit.base.annotation.OperType; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; import com.qqkj.mdp.core.context.ContextHolder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmFileController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmFileController.java index 3bbbab17..68e8ffd0 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmFileController.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmFileController.java @@ -23,8 +23,8 @@ import io.swagger.annotations.ApiResponses; import com.qqkj.mdp.mybatis.PageUtils; import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.audit.base.annotation.AuditLog; -import com.qqkj.audit.base.annotation.OperType; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; import com.qqkj.mdp.core.entity.Tips; import com.qqkj.mdp.core.err.BizException; import com.qqkj.xm.core.service.XmFileService; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectController.java index cb9108ff..c5d2267b 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectController.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectController.java @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.qqkj.audit.base.annotation.AuditLog; -import com.qqkj.audit.base.annotation.OperType; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; import com.qqkj.mdp.core.entity.Tips; import com.qqkj.mdp.core.err.BizException; import com.qqkj.mdp.core.utils.RequestUtils; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectEnvListController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectEnvListController.java index fa9fa658..3e723aa3 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectEnvListController.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectEnvListController.java @@ -5,8 +5,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.qqkj.audit.base.annotation.AuditLog; -import com.qqkj.audit.base.annotation.OperType; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; import com.qqkj.mdp.core.context.ContextHolder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostNouserController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostNouserController.java index 5621eaf1..1c9a14ab 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostNouserController.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostNouserController.java @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.alibaba.fastjson.JSON; -import com.qqkj.audit.base.annotation.AuditLog; -import com.qqkj.audit.base.annotation.OperType; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; import com.qqkj.mdp.core.entity.Tips; import com.qqkj.mdp.core.err.BizException; import com.qqkj.mdp.core.utils.NumberUtil; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostUserController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostUserController.java index fdb718b9..672240a5 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostUserController.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostUserController.java @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.alibaba.fastjson.JSON; -import com.qqkj.audit.base.annotation.AuditLog; -import com.qqkj.audit.base.annotation.OperType; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; import com.qqkj.mdp.core.entity.Tips; import com.qqkj.mdp.core.err.BizException; import com.qqkj.mdp.core.utils.NumberUtil; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostNouserController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostNouserController.java index fd36259f..1943d35f 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostNouserController.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostNouserController.java @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.alibaba.fastjson.JSON; -import com.qqkj.audit.base.annotation.AuditLog; -import com.qqkj.audit.base.annotation.OperType; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; import com.qqkj.mdp.core.entity.Tips; import com.qqkj.mdp.core.err.BizException; import com.qqkj.mdp.core.utils.NumberUtil; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostUserController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostUserController.java index fcebe6a3..7d2cb48a 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostUserController.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostUserController.java @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.alibaba.fastjson.JSON; -import com.qqkj.audit.base.annotation.AuditLog; -import com.qqkj.audit.base.annotation.OperType; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; import com.qqkj.mdp.core.entity.Tips; import com.qqkj.mdp.core.err.BizException; import com.qqkj.mdp.core.utils.NumberUtil; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionController.java index 6dfad238..97182a51 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionController.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionController.java @@ -27,8 +27,8 @@ import com.qqkj.mdp.mybatis.PageUtils; import com.qqkj.mdp.safe.common.entity.User; import com.qqkj.mdp.safe.common.utils.LoginUtils; import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.audit.base.annotation.AuditLog; -import com.qqkj.audit.base.annotation.OperType; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; import com.qqkj.mdp.core.entity.Tips; import com.qqkj.mdp.core.err.BizException; import com.qqkj.xm.core.service.XmQuestionService; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskController.java index 1cd665a4..894781d1 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskController.java @@ -29,8 +29,8 @@ import com.qqkj.mdp.safe.common.entity.User; import com.qqkj.mdp.safe.common.utils.LoginUtils; import com.qqkj.mdp.core.utils.NumberUtil; import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.audit.base.annotation.AuditLog; -import com.qqkj.audit.base.annotation.OperType; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; import com.qqkj.mdp.core.entity.Tips; import com.qqkj.mdp.core.err.BizException; import com.qqkj.xm.core.service.XmProjectGroupService; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskExecuserController.java index 681c165b..7cd17b00 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskExecuserController.java @@ -5,8 +5,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.qqkj.audit.base.annotation.AuditLog; -import com.qqkj.audit.base.annotation.OperType; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; import com.qqkj.mdp.core.context.ContextHolder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/xm-core/xm-core.iml b/xm-core/xm-core.iml index cf88a592..a527fe7e 100644 --- a/xm-core/xm-core.iml +++ b/xm-core/xm-core.iml @@ -41,9 +41,8 @@ - - + @@ -85,7 +84,7 @@ - + @@ -142,8 +141,10 @@ - + + + \ No newline at end of file diff --git a/xm-starter/xm-starter.iml b/xm-starter/xm-starter.iml index 53fc310c..fca528f4 100644 --- a/xm-starter/xm-starter.iml +++ b/xm-starter/xm-starter.iml @@ -152,9 +152,8 @@ - - + @@ -197,7 +196,7 @@ - + @@ -247,8 +246,10 @@ - + + + \ No newline at end of file