Skip to content

Move "api-boot-plugin-message-push" to "api-boot" #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2020
Merged

Move "api-boot-plugin-message-push" to "api-boot" #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions api-boot-project/api-boot-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,6 @@
<optional>true</optional>
</dependency>

<!--ApiBoot Plugin Message Push-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>api-boot-plugin-message-push</artifactId>
<optional>true</optional>
</dependency>

<!--ApiBoot Mybatis Pageable-->
<dependency>
<groupId>com.gitee.hengboy</groupId>
Expand Down Expand Up @@ -258,7 +251,11 @@
<artifactId>minbox-mongo-client-settings</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>cn.jpush.api</groupId>
<artifactId>jpush-client</artifactId>
<optional>true</optional>
</dependency>
<!--apiboot tools-->
<dependency>
<groupId>org.minbox.framework</groupId>
Expand Down
10 changes: 5 additions & 5 deletions ...org/minbox/framework/api/boot/autoconfigure/push/ApiBootMessagePushAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
package org.minbox.framework.api.boot.autoconfigure.push;

import cn.jpush.api.JPushClient;
import org.minbox.framework.api.boot.plugin.message.push.ApiBootMessagePushService;
import org.minbox.framework.api.boot.plugin.message.push.aop.advistor.ApiBootMessagePushClientSwitchAdvisor;
import org.minbox.framework.api.boot.plugin.message.push.aop.interceptor.ApiBootMessagePushSwitchAnnotationInterceptor;
import org.minbox.framework.api.boot.plugin.message.push.model.PushClientConfig;
import org.minbox.framework.api.boot.plugin.message.push.support.ApiBootMessagePushJiGuangServiceImpl;
import org.minbox.framework.api.boot.push.ApiBootMessagePushService;
import org.minbox.framework.api.boot.push.aop.advistor.ApiBootMessagePushClientSwitchAdvisor;
import org.minbox.framework.api.boot.push.aop.interceptor.ApiBootMessagePushSwitchAnnotationInterceptor;
import org.minbox.framework.api.boot.push.model.PushClientConfig;
import org.minbox.framework.api.boot.push.support.ApiBootMessagePushJiGuangServiceImpl;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/minbox/framework/api/boot/autoconfigure/push/ApiBootMessagePushProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.minbox.framework.api.boot.autoconfigure.push;

import lombok.Data;
import org.minbox.framework.api.boot.plugin.message.push.model.PushClientConfig;
import org.minbox.framework.api.boot.push.model.PushClientConfig;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;

Expand Down
5 changes: 0 additions & 5 deletions api-boot-project/api-boot-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,6 @@
<artifactId>jpush-client</artifactId>
<version>${jpush-client.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>api-boot-plugin-message-push</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>api-boot-starter-message-push</artifactId>
Expand Down
54 changes: 0 additions & 54 deletions api-boot-project/api-boot-plugins/api-boot-plugin-message-push/pom.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion api-boot-project/api-boot-plugins/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<module>api-boot-plugin-oauth</module>
<module>api-boot-plugin-quartz</module>
<module>api-boot-plugin-resource-load</module>
<module>api-boot-plugin-message-push</module>
<module>api-boot-plugin-rate-limiter</module>
<module>api-boot-plugin-sequence</module>
</modules>
Expand Down
9 changes: 6 additions & 3 deletions api-boot-project/api-boot-starters/api-boot-starter-message-push/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,13 @@
<groupId>org.minbox.framework</groupId>
<artifactId>api-boot-starter</artifactId>
</dependency>
<!--ApiBoot Plugin Message Push-->
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>api-boot-plugin-message-push</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>cn.jpush.api</groupId>
<artifactId>jpush-client</artifactId>
</dependency>
</dependencies>
</project>
9 changes: 9 additions & 0 deletions api-boot-project/api-boot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
<artifactId>spring-boot-starter-jdbc</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
<optional>true</optional>
</dependency>

<!--Others-->
<dependency>
Expand Down Expand Up @@ -78,6 +83,10 @@
<artifactId>fastjson</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>cn.jpush.api</groupId>
<artifactId>jpush-client</artifactId>
</dependency>
</dependencies>

</project>
6 changes: 3 additions & 3 deletions ...ssage/push/ApiBootMessagePushService.java → .../boot/push/ApiBootMessagePushService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*
*/

package org.minbox.framework.api.boot.plugin.message.push;
package org.minbox.framework.api.boot.push;

import org.minbox.framework.api.boot.common.exception.ApiBootException;
import org.minbox.framework.api.boot.plugin.message.push.model.MessagePushBody;
import org.minbox.framework.api.boot.plugin.message.push.model.PushClientConfig;
import org.minbox.framework.api.boot.push.model.MessagePushBody;
import org.minbox.framework.api.boot.push.model.PushClientConfig;

/**
* ApiBoot Message Push Service
Expand Down
2 changes: 1 addition & 1 deletion ...ge/push/annotation/MessagePushSwitch.java → ...ot/push/annotation/MessagePushSwitch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

package org.minbox.framework.api.boot.plugin.message.push.annotation;
package org.minbox.framework.api.boot.push.annotation;

import java.lang.annotation.*;

Expand Down
6 changes: 3 additions & 3 deletions ...piBootMessagePushClientSwitchAdvisor.java → ...piBootMessagePushClientSwitchAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*
*/

package org.minbox.framework.api.boot.plugin.message.push.aop.advistor;
package org.minbox.framework.api.boot.push.aop.advistor;

import org.aopalliance.aop.Advice;
import org.minbox.framework.api.boot.plugin.message.push.annotation.MessagePushSwitch;
import org.minbox.framework.api.boot.plugin.message.push.aop.interceptor.ApiBootMessagePushSwitchAnnotationInterceptor;
import org.minbox.framework.api.boot.push.annotation.MessagePushSwitch;
import org.minbox.framework.api.boot.push.aop.interceptor.ApiBootMessagePushSwitchAnnotationInterceptor;
import org.springframework.aop.Pointcut;
import org.springframework.aop.support.AbstractPointcutAdvisor;
import org.springframework.aop.support.annotation.AnnotationMatchingPointcut;
Expand Down
2 changes: 1 addition & 1 deletion .../aop/holder/MessagePushContextHolder.java → .../aop/holder/MessagePushContextHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

package org.minbox.framework.api.boot.plugin.message.push.aop.holder;
package org.minbox.framework.api.boot.push.aop.holder;

import org.springframework.util.Assert;

Expand Down
6 changes: 3 additions & 3 deletions ...ssagePushSwitchAnnotationInterceptor.java → ...ssagePushSwitchAnnotationInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*
*/

package org.minbox.framework.api.boot.plugin.message.push.aop.interceptor;
package org.minbox.framework.api.boot.push.aop.interceptor;

import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.minbox.framework.api.boot.plugin.message.push.annotation.MessagePushSwitch;
import org.minbox.framework.api.boot.plugin.message.push.aop.holder.MessagePushContextHolder;
import org.minbox.framework.api.boot.push.annotation.MessagePushSwitch;
import org.minbox.framework.api.boot.push.aop.holder.MessagePushContextHolder;
import org.springframework.aop.support.AopUtils;
import org.springframework.core.BridgeMethodResolver;
import org.springframework.util.ClassUtils;
Expand Down
3 changes: 1 addition & 2 deletions ...n/message/push/model/MessagePushBody.java → .../api/boot/push/model/MessagePushBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@
*
*/

package org.minbox.framework.api.boot.plugin.message.push.model;
package org.minbox.framework.api.boot.push.model;

import lombok.Builder;
import lombok.Data;
import org.springframework.util.StringUtils;

import java.util.Collections;
import java.util.List;
import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion .../message/push/model/PushClientConfig.java → ...api/boot/push/model/PushClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

package org.minbox.framework.api.boot.plugin.message.push.model;
package org.minbox.framework.api.boot.push.model;

import lombok.Data;

Expand Down
2 changes: 1 addition & 1 deletion ...in/message/push/model/PusherPlatform.java → ...k/api/boot/push/model/PusherPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

package org.minbox.framework.api.boot.plugin.message.push.model;
package org.minbox.framework.api.boot.push.model;

/**
* Target platform enumeration for message push
Expand Down
8 changes: 4 additions & 4 deletions ...piBootAbstractMessagePushServiceImpl.java → ...piBootAbstractMessagePushServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*
*/

package org.minbox.framework.api.boot.plugin.message.push.support;
package org.minbox.framework.api.boot.push.support;

import org.minbox.framework.api.boot.common.exception.ApiBootException;
import org.minbox.framework.api.boot.plugin.message.push.ApiBootMessagePushService;
import org.minbox.framework.api.boot.plugin.message.push.aop.holder.MessagePushContextHolder;
import org.minbox.framework.api.boot.plugin.message.push.model.PushClientConfig;
import org.minbox.framework.api.boot.push.ApiBootMessagePushService;
import org.minbox.framework.api.boot.push.aop.holder.MessagePushContextHolder;
import org.minbox.framework.api.boot.push.model.PushClientConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
Expand Down
6 changes: 3 additions & 3 deletions ...ApiBootMessagePushJiGuangServiceImpl.java → ...ApiBootMessagePushJiGuangServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

package org.minbox.framework.api.boot.plugin.message.push.support;
package org.minbox.framework.api.boot.push.support;

import cn.jiguang.common.ClientConfig;
import cn.jpush.api.JPushClient;
Expand All @@ -25,8 +25,8 @@
import cn.jpush.api.push.model.audience.Audience;
import cn.jpush.api.push.model.notification.*;
import org.minbox.framework.api.boot.common.exception.ApiBootException;
import org.minbox.framework.api.boot.plugin.message.push.model.MessagePushBody;
import org.minbox.framework.api.boot.plugin.message.push.model.PushClientConfig;
import org.minbox.framework.api.boot.push.model.MessagePushBody;
import org.minbox.framework.api.boot.push.model.PushClientConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.ObjectUtils;
Expand Down
2 changes: 1 addition & 1 deletion api-boot-samples/api-boot-sample-message-push/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>api-boot-dependencies</artifactId>
<version>2.2.2.RELEASE</version>
<version>${api-boot.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions ...main/java/org/minbox/framework/api/boot/sample/message/push/MessagePushSampleService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

package org.minbox.framework.api.boot.sample.message.push;

import org.minbox.framework.api.boot.plugin.message.push.ApiBootMessagePushService;
import org.minbox.framework.api.boot.plugin.message.push.annotation.MessagePushSwitch;
import org.minbox.framework.api.boot.plugin.message.push.model.MessagePushBody;
import org.minbox.framework.api.boot.plugin.message.push.model.PusherPlatform;
import org.minbox.framework.api.boot.push.ApiBootMessagePushService;
import org.minbox.framework.api.boot.push.annotation.MessagePushSwitch;
import org.minbox.framework.api.boot.push.model.MessagePushBody;
import org.minbox.framework.api.boot.push.model.PusherPlatform;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

Expand Down Expand Up @@ -49,7 +49,7 @@ public class MessagePushSampleService {
* 注解 @MessagePushSwitch 添加时配置value，则使用配置的value配置
* 对应api.boot.push.multiple的key
*
* @see org.minbox.framework.api.boot.plugin.message.push.model.PushClientConfig
* @see org.minbox.framework.api.boot.push.model.PushClientConfig
*/
//@MessagePushSwitch
//@MessagePushSwitch("user")
Expand Down