diff --git a/.idea/compiler.xml b/.idea/compiler.xml index a39d095d..ea08156b 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_form_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_form_M_1_0_0_RELEASE.xml deleted file mode 100644 index e7a94354..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_form_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml b/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml deleted file mode 100644 index ff49512a..00000000 --- a/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml deleted file mode 100644 index 059f88ff..00000000 --- a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/xm-server.iml b/.idea/xm-server.iml index 87ca3c57..b43de8c6 100644 --- a/.idea/xm-server.iml +++ b/.idea/xm-server.iml @@ -25,7 +25,6 @@ - @@ -89,8 +88,6 @@ - - diff --git a/pom.xml b/pom.xml index e8aaf16d..164a1b85 100644 --- a/pom.xml +++ b/pom.xml @@ -36,37 +36,26 @@ com.qingqinkj.mdp mdp-utils - ${mdp.version} com.qingqinkj.mdp mdp-core - ${mdp.version} com.qingqinkj.mdp mdp-safe-common - ${mdp.version} com.qingqinkj.mdp mdp-common - ${mdp.version} com.qingqinkj.mdp mdp-audit-base - ${mdp.version} com.qingqinkj.mdp mdp-tomcat-conf - ${mdp.version} - - - com.qingqinkj.mdp - mdp-form - ${mdp.version} net.coobird diff --git a/xm-core/pom.xml b/xm-core/pom.xml index 6c845dc9..dd63ba84 100644 --- a/xm-core/pom.xml +++ b/xm-core/pom.xml @@ -13,41 +13,6 @@ - - com.qingqinkj.mdp - mdp-utils - ${mdp.version} - - - com.qingqinkj.mdp - mdp-core - ${mdp.version} - - - com.qingqinkj.mdp - mdp-safe-common - ${mdp.version} - - - com.qingqinkj.mdp - mdp-common - ${mdp.version} - - - com.qingqinkj.mdp - mdp-audit-base - ${mdp.version} - - - com.qingqinkj.mdp - mdp-tomcat-conf - ${mdp.version} - - - com.qingqinkj.mdp - mdp-form - ${mdp.version} - net.coobird thumbnailator diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmAttachmentService.java b/xm-core/src/main/java/com/qqkj/xm/core/service/XmAttachmentService.java index bd186e70..b55c82aa 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmAttachmentService.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/service/XmAttachmentService.java @@ -1,11 +1,11 @@ package com.qqkj.xm.core.service; -import java.util.List; -import java.util.Map; - -import org.springframework.stereotype.Service; import com.qqkj.mdp.core.service.BaseService; import com.qqkj.xm.core.entity.XmAttachment; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/xm-core.iml b/xm-core/xm-core.iml index 81aa75c3..ef9a7616 100644 --- a/xm-core/xm-core.iml +++ b/xm-core/xm-core.iml @@ -11,6 +11,20 @@ + + + + + + + + + + + + + + @@ -28,21 +42,6 @@ - - - - - - - - - - - - - - - @@ -92,8 +91,6 @@ - - diff --git a/xm-starter/pom.xml b/xm-starter/pom.xml index 8ed1112d..403cad35 100644 --- a/xm-starter/pom.xml +++ b/xm-starter/pom.xml @@ -49,24 +49,6 @@ - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - ${start-class} - - - - - ${start-class} - - org.apache.maven.plugins maven-deploy-plugin diff --git a/xm-starter/xm-starter.iml b/xm-starter/xm-starter.iml index e3cd5cdb..06a4f062 100644 --- a/xm-starter/xm-starter.iml +++ b/xm-starter/xm-starter.iml @@ -153,7 +153,6 @@ - @@ -204,8 +203,6 @@ - -