添加mdp-audit-log-client模块

.idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_base_M_1_0_0_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.qingqinkj.mdp:mdp-audit-base:M.1.0.0-RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/qingqinkj/mdp/mdp-audit-base/M.1.0.0-RELEASE/mdp-audit-base-M.1.0.0-RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/qingqinkj/mdp/mdp-audit-base/M.1.0.0-RELEASE/mdp-audit-base-M.1.0.0-RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/qingqinkj/mdp/mdp-audit-base/M.1.0.0-RELEASE/mdp-audit-base-M.1.0.0-RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.qingqinkj.mdp:mdp-audit-log-client:M.1.0.0-RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/qingqinkj/mdp/mdp-audit-log-client/M.1.0.0-RELEASE/mdp-audit-log-client-M.1.0.0-RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/qingqinkj/mdp/mdp-audit-log-client/M.1.0.0-RELEASE/mdp-audit-log-client-M.1.0.0-RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/qingqinkj/mdp/mdp-audit-log-client/M.1.0.0-RELEASE/mdp-audit-log-client-M.1.0.0-RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_projectlombok_lombok_1_18_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.projectlombok:lombok:1.18.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.2/lombok-1.18.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.2/lombok-1.18.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.2/lombok-1.18.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/xm-server.iml

@@ -24,9 +24,8 @@
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
     <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-common:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.13" level="project" />
-    <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-audit-base:M.1.0.0-RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.59" level="project" />
     <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-tomcat-conf:M.1.0.0-RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-audit-log-client:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
@@ -82,7 +81,7 @@
     <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
@@ -139,8 +138,10 @@
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.4" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.2" level="project" />
   </component>
 </module>

pom.xml

@@ -56,14 +56,15 @@
 		<dependency>
 			<groupId>com.qingqinkj.mdp</groupId>
 			<artifactId>mdp-common</artifactId>
-		</dependency> 
+		</dependency>
 		<dependency>
 			<groupId>com.qingqinkj.mdp</groupId>
-			<artifactId>mdp-audit-base</artifactId>
-		</dependency> 
+			<artifactId>mdp-tomcat-conf</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.qingqinkj.mdp</groupId>
-			<artifactId>mdp-tomcat-conf</artifactId>
+			<artifactId>mdp-audit-log-client</artifactId>
+			<version>${mdp.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>net.coobird</groupId>

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

xm-core/xm-core.iml

@@ -41,9 +41,8 @@
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
     <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-common:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.13" level="project" />
-    <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-audit-base:M.1.0.0-RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.59" level="project" />
     <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-tomcat-conf:M.1.0.0-RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-audit-log-client:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-safe-mybatis:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-common-params:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.0.RELEASE" level="project" />
@@ -85,7 +84,7 @@
     <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
@@ -142,8 +141,10 @@
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.4" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.2" level="project" />
   </component>
 </module>

xm-starter/xm-starter.iml

@@ -152,9 +152,8 @@
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
     <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-common:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.13" level="project" />
-    <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-audit-base:M.1.0.0-RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.59" level="project" />
     <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-tomcat-conf:M.1.0.0-RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.qingqinkj.mdp:mdp-audit-log-client:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
@@ -197,7 +196,7 @@
     <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
     <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
@@ -247,8 +246,10 @@
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.4" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.2" level="project" />
   </component>
 </module>