From 8aefe2f51f18e1a495d3f1087306f711e238ad29 Mon Sep 17 00:00:00 2001 From: wangkang Date: Fri, 2 Mar 2018 16:09:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1=E7=9A=84?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AFAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/itkk/udf/core/domain/weixin/mp}/BaseResult.java | 2 +- .../java/org/itkk/udf/core/domain/weixin/mp}/Miniprogram.java | 2 +- .../udf/core/domain/weixin/mp}/SendMessageTemplateDataVo.java | 2 +- .../udf/core/domain/weixin/mp}/SendMessageTemplateResult.java | 2 +- .../udf/core/domain/weixin/mp}/SendMessageTemplateVo.java | 2 +- .../src/main/java/org/itkk/udf/weixin/mp/api/Menu.java | 2 +- .../main/java/org/itkk/udf/weixin/mp/api/MessageTemplate.java | 4 ++-- .../src/main/java/org/itkk/udf/weixin/mp/api/Oauth2.java | 2 +- .../main/java/org/itkk/udf/weixin/mp/api/WeixinMpConsont.java | 2 +- .../java/org/itkk/udf/weixin/mp/api/domain/AccessToken.java | 1 + .../java/org/itkk/udf/weixin/mp/api/domain/Oauth2Token.java | 1 + .../org/itkk/udf/weixin/mp/api/domain/Oauth2UserInfo.java | 1 + .../main/java/org/itkk/udf/weixin/mp/api/domain/UserInfo.java | 1 + 13 files changed, 14 insertions(+), 10 deletions(-) rename {udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain => udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp}/BaseResult.java (93%) rename {udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain => udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp}/Miniprogram.java (95%) rename {udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain => udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp}/SendMessageTemplateDataVo.java (94%) rename {udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain => udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp}/SendMessageTemplateResult.java (92%) rename {udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain => udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp}/SendMessageTemplateVo.java (96%) diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/BaseResult.java b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/BaseResult.java similarity index 93% rename from udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/BaseResult.java rename to udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/BaseResult.java index 162a390..6827f58 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/BaseResult.java +++ b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/BaseResult.java @@ -1,4 +1,4 @@ -package org.itkk.udf.weixin.mp.api.domain; +package org.itkk.udf.core.domain.weixin.mp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/Miniprogram.java b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/Miniprogram.java similarity index 95% rename from udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/Miniprogram.java rename to udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/Miniprogram.java index 0afd2f3..feb3bf5 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/Miniprogram.java +++ b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/Miniprogram.java @@ -1,4 +1,4 @@ -package org.itkk.udf.weixin.mp.api.domain; +package org.itkk.udf.core.domain.weixin.mp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/SendMessageTemplateDataVo.java b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/SendMessageTemplateDataVo.java similarity index 94% rename from udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/SendMessageTemplateDataVo.java rename to udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/SendMessageTemplateDataVo.java index 8bf4577..8c10782 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/SendMessageTemplateDataVo.java +++ b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/SendMessageTemplateDataVo.java @@ -1,4 +1,4 @@ -package org.itkk.udf.weixin.mp.api.domain; +package org.itkk.udf.core.domain.weixin.mp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/SendMessageTemplateResult.java b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/SendMessageTemplateResult.java similarity index 92% rename from udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/SendMessageTemplateResult.java rename to udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/SendMessageTemplateResult.java index 9e3449b..a47167a 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/SendMessageTemplateResult.java +++ b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/SendMessageTemplateResult.java @@ -1,4 +1,4 @@ -package org.itkk.udf.weixin.mp.api.domain; +package org.itkk.udf.core.domain.weixin.mp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/SendMessageTemplateVo.java b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/SendMessageTemplateVo.java similarity index 96% rename from udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/SendMessageTemplateVo.java rename to udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/SendMessageTemplateVo.java index dd9c6e0..a45589e 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/SendMessageTemplateVo.java +++ b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/weixin/mp/SendMessageTemplateVo.java @@ -1,4 +1,4 @@ -package org.itkk.udf.weixin.mp.api.domain; +package org.itkk.udf.core.domain.weixin.mp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/Menu.java b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/Menu.java index 6520c2a..ce3f6c8 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/Menu.java +++ b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/Menu.java @@ -1,6 +1,6 @@ package org.itkk.udf.weixin.mp.api; -import org.itkk.udf.weixin.mp.api.domain.BaseResult; +import org.itkk.udf.core.domain.weixin.mp.BaseResult; import org.itkk.udf.weixin.mp.api.domain.MenuGroup; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/MessageTemplate.java b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/MessageTemplate.java index 391f359..1233e76 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/MessageTemplate.java +++ b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/MessageTemplate.java @@ -1,7 +1,7 @@ package org.itkk.udf.weixin.mp.api; -import org.itkk.udf.weixin.mp.api.domain.SendMessageTemplateResult; -import org.itkk.udf.weixin.mp.api.domain.SendMessageTemplateVo; +import org.itkk.udf.core.domain.weixin.mp.SendMessageTemplateResult; +import org.itkk.udf.core.domain.weixin.mp.SendMessageTemplateVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/Oauth2.java b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/Oauth2.java index b9e27e3..83f4e3a 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/Oauth2.java +++ b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/Oauth2.java @@ -1,7 +1,7 @@ package org.itkk.udf.weixin.mp.api; import com.fasterxml.jackson.databind.ObjectMapper; -import org.itkk.udf.weixin.mp.api.domain.BaseResult; +import org.itkk.udf.core.domain.weixin.mp.BaseResult; import org.itkk.udf.weixin.mp.api.domain.Oauth2Token; import org.itkk.udf.weixin.mp.api.domain.Oauth2UserInfo; import org.itkk.udf.weixin.mp.api.meta.WeixinMpApiAuthMeta; diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/WeixinMpConsont.java b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/WeixinMpConsont.java index 22fe93d..ea4f418 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/WeixinMpConsont.java +++ b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/WeixinMpConsont.java @@ -1,6 +1,6 @@ package org.itkk.udf.weixin.mp.api; -import org.itkk.udf.weixin.mp.api.domain.BaseResult; +import org.itkk.udf.core.domain.weixin.mp.BaseResult; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/AccessToken.java b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/AccessToken.java index e7aae53..cfa0902 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/AccessToken.java +++ b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/AccessToken.java @@ -2,6 +2,7 @@ package org.itkk.udf.weixin.mp.api.domain; import lombok.Data; import lombok.EqualsAndHashCode; +import org.itkk.udf.core.domain.weixin.mp.BaseResult; /** * AccessToken diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/Oauth2Token.java b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/Oauth2Token.java index f7f8c17..4b11f20 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/Oauth2Token.java +++ b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/Oauth2Token.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.itkk.udf.core.domain.weixin.mp.BaseResult; /** * Oauth2Token diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/Oauth2UserInfo.java b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/Oauth2UserInfo.java index ead4fb0..fceb1a3 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/Oauth2UserInfo.java +++ b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/Oauth2UserInfo.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.itkk.udf.core.domain.weixin.mp.BaseResult; import java.util.List; diff --git a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/UserInfo.java b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/UserInfo.java index 8b1001e..1c499b2 100644 --- a/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/UserInfo.java +++ b/udf-starter-weixin-mp-api/src/main/java/org/itkk/udf/weixin/mp/api/domain/UserInfo.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.itkk.udf.core.domain.weixin.mp.BaseResult; import java.util.List;