From e339987634a784ffde4aa8fe8eaf3b2b36fe1162 Mon Sep 17 00:00:00 2001 From: qqkj Date: Mon, 14 Dec 2020 09:35:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 + pom.xml | 32 +- xm-core/pom.xml | 26 +- .../xm/core/ctrl/XmAttachmentController.java | 32 +- .../xm/core/ctrl/XmQuestionController.java | 2 +- .../xm/core/service/XmMenuPlanService.java | 2 +- .../xm/core/service/XmMenuStateService.java | 15 +- .../xm/core/service/XmMyFocusService.java | 2 +- .../service/push/XmMenuPushMsgService.java | 2 +- .../core/service/push/XmPushMsgService.java | 2 +- .../qqkj/xm/push/service/PushMsgService.java | 1 - xm-core/xm-core.iml | 163 ++++++++++ xm-starter/xm-starter.iml | 280 ++++++++++++++++++ 13 files changed, 490 insertions(+), 74 deletions(-) create mode 100644 .gitignore create mode 100644 xm-core/xm-core.iml create mode 100644 xm-starter/xm-starter.iml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..d3f037ae --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/xm-starter/target/ +/target/ +/.idea/ +/xm-core/target/ +/.idea/libraries/ diff --git a/pom.xml b/pom.xml index 7c22cb8f..a38e807e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.qingqinkj.mmcloud - xm + xm-server pom - 项目管理系统 - 项目管理系统 + 唛盟云-项目管理系统 + 唛盟云-项目管理系统 com.qingqinkj.mdp mdp-products @@ -21,9 +21,15 @@ xm-core - xm-push + xm-starter + + com.qingqinkj.mdp + mdp-utils + ${mdp.version} + + com.qingqinkj.mdp mdp-utils @@ -93,17 +99,6 @@ 1.11.3 - - com.deepoove - poi-tl - 1.5.1 - - - - org.springframework.boot - spring-boot-starter-mail - - @@ -111,6 +106,13 @@ org.springframework.boot spring-boot-maven-plugin + + + + repackage + + + com.spotify diff --git a/xm-core/pom.xml b/xm-core/pom.xml index c6fc16ad..b8bcf40c 100644 --- a/xm-core/pom.xml +++ b/xm-core/pom.xml @@ -1,15 +1,14 @@ - 4.0.0 - com.qingqinkj.mmcloud + 4.0.0 xm-core jar - 项目管理系统 - 项目管理系统 + 唛盟云-项目管理系统服务端核心 + 唛盟云-项目管理系统服务端核心 com.qingqinkj.mmcloud - xm + xm-server M.1.0.0-RELEASE @@ -33,12 +32,12 @@ com.qingqinkj.mdp mdp-common ${mdp.version} - + com.qingqinkj.mdp mdp-audit-base ${mdp.version} - + com.qingqinkj.mdp mdp-tomcat-conf @@ -75,25 +74,12 @@ easyexcel 2.1.1 - - org.jsoup jsoup 1.11.3 - - com.deepoove - poi-tl - 1.5.1 - - - - org.springframework.boot - spring-boot-starter-mail - - \ No newline at end of file diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmAttachmentController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmAttachmentController.java index a309416f..6f238277 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmAttachmentController.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmAttachmentController.java @@ -1,37 +1,23 @@ package com.qqkj.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.qqkj.mdp.core.entity.Tips; +import com.qqkj.mdp.core.utils.RequestUtils; +import com.qqkj.mdp.mybatis.PageUtils; +import com.qqkj.xm.core.entity.XmAttachment; +import com.qqkj.xm.core.service.XmAttachmentService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmAttachmentService; -import com.qqkj.xm.core.entity.XmAttachment; /** * url编制采用rest风格,如对XM.xm_attachment xm_attachment的操作有增删改查,对应的url分别为:
* 新增: xm/xmAttachment/add
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 61d9e54a..6dfad238 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 @@ -6,7 +6,7 @@ import java.util.Map; import com.qqkj.xm.core.vo.XmQuestionVo; -import org.apache.commons.lang3.StringUtils; +import org.springframework.util.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuPlanService.java b/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuPlanService.java index 312906ea..706fbe12 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuPlanService.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuPlanService.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.StringUtils; +import org.springframework.util.StringUtils; import org.springframework.stereotype.Service; import com.qqkj.mdp.core.entity.Tips; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuStateService.java b/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuStateService.java index 0379e2de..d44e138c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuStateService.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuStateService.java @@ -1,21 +1,16 @@ package com.qqkj.xm.core.service; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - import com.qqkj.mdp.core.entity.Tips; import com.qqkj.mdp.core.service.BaseService; import com.qqkj.mdp.safe.common.entity.User; import com.qqkj.mdp.safe.common.utils.LoginUtils; import com.qqkj.xm.core.entity.XmMenu; import com.qqkj.xm.core.entity.XmMenuState; -import com.qqkj.xm.core.entity.XmMenuState; +import org.springframework.util.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.*; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMyFocusService.java b/xm-core/src/main/java/com/qqkj/xm/core/service/XmMyFocusService.java index cc89cfd5..398b715e 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMyFocusService.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/service/XmMyFocusService.java @@ -3,7 +3,7 @@ package com.qqkj.xm.core.service; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.StringUtils; +import org.springframework.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmMenuPushMsgService.java b/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmMenuPushMsgService.java index 1c403c19..daf26ad0 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmMenuPushMsgService.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmMenuPushMsgService.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.StringUtils; +import org.springframework.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmPushMsgService.java b/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmPushMsgService.java index eee5e399..21f8a1dc 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmPushMsgService.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmPushMsgService.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.StringUtils; +import org.springframework.util.StringUtils; import org.springframework.stereotype.Service; import com.qqkj.xm.push.service.PushMsgService; diff --git a/xm-core/src/main/java/com/qqkj/xm/push/service/PushMsgService.java b/xm-core/src/main/java/com/qqkj/xm/push/service/PushMsgService.java index 8197a652..76e02cac 100644 --- a/xm-core/src/main/java/com/qqkj/xm/push/service/PushMsgService.java +++ b/xm-core/src/main/java/com/qqkj/xm/push/service/PushMsgService.java @@ -12,7 +12,6 @@ import java.util.concurrent.TimeUnit; import javax.annotation.PostConstruct; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/xm-core/xm-core.iml b/xm-core/xm-core.iml new file mode 100644 index 00000000..abb519c4 --- /dev/null +++ b/xm-core/xm-core.iml @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xm-starter/xm-starter.iml b/xm-starter/xm-starter.iml new file mode 100644 index 00000000..731d4b03 --- /dev/null +++ b/xm-starter/xm-starter.iml @@ -0,0 +1,280 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file