2.0.0项目初始化

datax-common/datax-common-dictionary/src/main/java/cn/datax/common/dictionary/annotation/DictAop.java → datax-common/datax-common-core/src/main/java/cn/datax/common/annotation/DictAop.java

-package cn.datax.common.dictionary.annotation;
+package cn.datax.common.annotation;
 
 import java.lang.annotation.*;
 

datax-common/datax-common-dictionary/src/main/java/cn/datax/common/dictionary/config/DictAnalysis.java

 package cn.datax.common.dictionary.config;
 
+import cn.datax.common.annotation.DictAop;
 import cn.datax.common.core.JsonPage;
 import cn.datax.common.core.R;
-import cn.datax.common.dictionary.annotation.DictAop;
 import cn.datax.common.dictionary.utils.DictUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;

datax-modules/system-service-parent/system-service-api/pom.xml

@@ -41,11 +41,6 @@
             <artifactId>datax-common-core</artifactId>
             <version>2.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>cn.datax</groupId>
-            <artifactId>datax-common-dictionary</artifactId>
-            <version>2.0.0</version>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/ConfigVo.java

 package cn.datax.service.system.api.vo;
 
-import cn.datax.common.dictionary.annotation.DictAop;
+import cn.datax.common.annotation.DictAop;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/DeptVo.java

 package cn.datax.service.system.api.vo;
 
-import cn.datax.common.dictionary.annotation.DictAop;
+import cn.datax.common.annotation.DictAop;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/DictItemVo.java

 package cn.datax.service.system.api.vo;
 
-import cn.datax.common.dictionary.annotation.DictAop;
+import cn.datax.common.annotation.DictAop;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/DictVo.java

 package cn.datax.service.system.api.vo;
 
-import cn.datax.common.dictionary.annotation.DictAop;
+import cn.datax.common.annotation.DictAop;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/MenuVo.java

 package cn.datax.service.system.api.vo;
 
-import cn.datax.common.dictionary.annotation.DictAop;
+import cn.datax.common.annotation.DictAop;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/PostVo.java

 package cn.datax.service.system.api.vo;
 
-import cn.datax.common.dictionary.annotation.DictAop;
+import cn.datax.common.annotation.DictAop;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/RoleVo.java

 package cn.datax.service.system.api.vo;
 
-import cn.datax.common.dictionary.annotation.DictAop;
+import cn.datax.common.annotation.DictAop;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/UserVo.java

 package cn.datax.service.system.api.vo;
 
-import cn.datax.common.dictionary.annotation.DictAop;
+import cn.datax.common.annotation.DictAop;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/WorkflowConfigVo.java

 package cn.datax.service.system.api.vo;
 
-import cn.datax.common.dictionary.annotation.DictAop;
+import cn.datax.common.annotation.DictAop;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

datax-modules/system-service-parent/system-service/pom.xml

@@ -79,6 +79,11 @@
             <artifactId>datax-common-jasperreport</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>cn.datax</groupId>
+            <artifactId>datax-common-dictionary</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>