diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java index dfefcb0..3e6b8e1 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java @@ -154,7 +154,7 @@ public class PushHandler extends BaseHandler implements Handler { SendPushParam param = SendPushParam.builder() .requestId(String.valueOf(IdUtil.getSnowflake().nextId())) .pushMessage(SendPushParam.PushMessageVO.builder().notification(SendPushParam.PushMessageVO.NotificationVO.builder() - .title(pushContentModel.getTitle()).body(pushContentModel.getContent()).clickType("startapp").build()) + .title(pushContentModel.getTitle()).body(pushContentModel.getContent()).clickType("startapp").build()) .build()) .build(); if (CollUtil.isNotEmpty(cid)) { diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/springeventbus/SpringEventBusReceiverListener.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/springeventbus/SpringEventBusReceiverListener.java index e4f329d..f57ecff 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/springeventbus/SpringEventBusReceiverListener.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/springeventbus/SpringEventBusReceiverListener.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.support.constans.MessageQueuePipeline; import com.java3y.austin.support.domain.MessageTemplate; -import com.java3y.austin.support.mq.springeventbus.SpringEventBusEvent; +import com.java3y.austin.support.mq.springeventbus.AustinSpringEventBusEvent; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; */ @Service @ConditionalOnProperty(name = "austin.mq.pipeline", havingValue = MessageQueuePipeline.SPRING_EVENT_BUS) -public class SpringEventBusReceiverListener implements ApplicationListener { +public class SpringEventBusReceiverListener implements ApplicationListener { @Autowired private SpringEventBusReceiver springEventBusReceiver; @@ -30,9 +30,9 @@ public class SpringEventBusReceiverListener implements ApplicationListenercom.github.binarywang weixin-java-miniapp - + + com.qiniu + qiniu-java-sdk + \ No newline at end of file diff --git a/austin-support/src/main/java/com/java3y/austin/support/constans/MessageQueuePipeline.java b/austin-support/src/main/java/com/java3y/austin/support/constans/MessageQueuePipeline.java index 247b4eb..9b3c69f 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/constans/MessageQueuePipeline.java +++ b/austin-support/src/main/java/com/java3y/austin/support/constans/MessageQueuePipeline.java @@ -11,7 +11,6 @@ public interface MessageQueuePipeline { String KAFKA = "kafka"; String ROCKET_MQ = "rocketMq"; String RABBIT_MQ = "rabbitMq"; - - String SPRING_EVENT_BUS ="springEventBus"; + String SPRING_EVENT_BUS = "springEventBus"; } diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/AustinSpringEventBusEvent.java b/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/AustinSpringEventBusEvent.java new file mode 100644 index 0000000..961a6ce --- /dev/null +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/AustinSpringEventBusEvent.java @@ -0,0 +1,22 @@ +package com.java3y.austin.support.mq.springeventbus; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 描述：消息 + * + * @author tony + * @date 2023/2/6 19:59 + */ +@Getter +public class AustinSpringEventBusEvent extends ApplicationEvent { + + private AustinSpringEventSource austinSpringEventSource; + + public AustinSpringEventBusEvent(Object source, AustinSpringEventSource austinSpringEventSource) { + super(source); + this.austinSpringEventSource = austinSpringEventSource; + } + +} diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/AustinSpringEventSource.java b/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/AustinSpringEventSource.java new file mode 100644 index 0000000..a9daf7c --- /dev/null +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/AustinSpringEventSource.java @@ -0,0 +1,15 @@ +package com.java3y.austin.support.mq.springeventbus; + +import lombok.Builder; +import lombok.Data; + +/** + * @author 3y + */ +@Data +@Builder +public class AustinSpringEventSource { + public String topic; + public String jsonValue; + public String tagId; +} diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/SpringEventBusEvent.java b/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/SpringEventBusEvent.java index 6ab6397..e69de29 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/SpringEventBusEvent.java +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/SpringEventBusEvent.java @@ -1,36 +0,0 @@ -package com.java3y.austin.support.mq.springeventbus; - -import lombok.Data; -import org.springframework.context.ApplicationEvent; - -/** - * 描述：消息 - * - * @author tony - * @date 2023/2/6 19:59 - */ -@Data -public class SpringEventBusEvent extends ApplicationEvent { - public String topic; - public String jsonValue; - public String tagId; - - public SpringEventBusEvent(Object source, String topic, String jsonValue, String tagId) { - super(source); - this.topic = topic; - this.jsonValue = jsonValue; - this.tagId = tagId; - } - - public String getTopic() { - return topic; - } - - public String getJsonValue() { - return jsonValue; - } - - public String getTagId() { - return tagId; - } -} diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/SpringEventBusSendMqServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/SpringEventBusSendMqServiceImpl.java index 3703192..64a338b 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/SpringEventBusSendMqServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/SpringEventBusSendMqServiceImpl.java @@ -25,11 +25,13 @@ public class SpringEventBusSendMqServiceImpl implements SendMqService { @Override public void send(String topic, String jsonValue, String tagId) { - applicationContext.publishEvent(new SpringEventBusEvent(this, topic, jsonValue, tagId)); + AustinSpringEventSource source = AustinSpringEventSource.builder().topic(topic).jsonValue(jsonValue).tagId(tagId).build(); + AustinSpringEventBusEvent austinSpringEventBusEvent = new AustinSpringEventBusEvent(this, source); + applicationContext.publishEvent(austinSpringEventBusEvent); } @Override public void send(String topic, String jsonValue) { - send(topic,jsonValue,null); + send(topic, jsonValue, null); } } diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java index 10699f4..1117e38 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java @@ -70,9 +70,9 @@ public class AccountUtils { if (optionalChannelAccount.isPresent()) { ChannelAccount channelAccount = optionalChannelAccount.get(); if (clazz.equals(WxMaService.class)) { - return (T)ConcurrentHashMapUtils.computeIfAbsent(miniProgramServiceMap, channelAccount, account -> initMiniProgramService(JSON.parseObject(account.getAccountConfig(), WeChatMiniProgramAccount.class))); + return (T) ConcurrentHashMapUtils.computeIfAbsent(miniProgramServiceMap, channelAccount, account -> initMiniProgramService(JSON.parseObject(account.getAccountConfig(), WeChatMiniProgramAccount.class))); } else if (clazz.equals(WxMpService.class)) { - return (T)ConcurrentHashMapUtils.computeIfAbsent(officialAccountServiceMap, channelAccount, account -> initOfficialAccountService(JSON.parseObject(account.getAccountConfig(), WeChatOfficialAccount.class))); + return (T) ConcurrentHashMapUtils.computeIfAbsent(officialAccountServiceMap, channelAccount, account -> initOfficialAccountService(JSON.parseObject(account.getAccountConfig(), WeChatOfficialAccount.class))); } else { return JSON.parseObject(channelAccount.getAccountConfig(), clazz); } @@ -143,5 +143,4 @@ public class AccountUtils { } - } diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/ConcurrentHashMapUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/ConcurrentHashMapUtils.java index f4bd3ac..056f3a7 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/ConcurrentHashMapUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/ConcurrentHashMapUtils.java @@ -24,8 +24,8 @@ public class ConcurrentHashMapUtils { /** * Java 8 ConcurrentHashMap#computeIfAbsent 存在性能问题的临时解决方案 - * @see https://bugs.openjdk.java.net/browse/JDK-8161372 * + * @see https://bugs.openjdk.java.net/browse/JDK-8161372 */ public static V computeIfAbsent(ConcurrentMap map, K key, Function func) { if (IS_JAVA8) { diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/OssUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/OssUtils.java new file mode 100644 index 0000000..7fba986 --- /dev/null +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/OssUtils.java @@ -0,0 +1,72 @@ +package com.java3y.austin.support.utils; + +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSON; +import com.qiniu.common.QiniuException; +import com.qiniu.http.Response; +import com.qiniu.storage.Configuration; +import com.qiniu.storage.Region; +import com.qiniu.storage.UploadManager; +import com.qiniu.storage.model.DefaultPutRet; +import com.qiniu.util.Auth; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + +/** + * @author 3y + * @description 对象存储（七牛云） + */ +public class OssUtils { + + public static void main(String[] args) throws UnsupportedEncodingException { + //upload(); + String fmnBLE4QtkwlErXIAh9pYS029GZk = getFileUrl("FmnBLE4QtkwlErXIAh9pYS029GZk"); + System.out.println(fmnBLE4QtkwlErXIAh9pYS029GZk); + } + + private static void upload() { + //构造一个带指定 Region 对象的配置类 + Configuration cfg = new Configuration(Region.autoRegion()); + cfg.resumableUploadAPIVersion = Configuration.ResumableUploadAPIVersion.V2;// 指定分片上传版本 +//...其他参数参考类注释 + + UploadManager uploadManager = new UploadManager(cfg); +//...生成上传凭证，然后准备上传 + String accessKey = "123"; + String secretKey = "123"; + String bucket = "austin3y"; +//如果是Windows情况下，格式是 D:\\qiniu\\test.png + String localFilePath = "C:\\Users\\zhongfucheng\\Desktop\\1201.jpg"; +//默认不指定key的情况下，以文件内容的hash值作为文件名 + String key = IdUtil.fastSimpleUUID(); + + Auth auth = Auth.create(accessKey, secretKey); + String upToken = auth.uploadToken(bucket); + + try { + Response response = uploadManager.put(localFilePath, key, upToken); + DefaultPutRet putRet = JSON.parseObject(response.bodyString(), DefaultPutRet.class); + //解析上传成功的结果 + System.out.println(putRet.key); + System.out.println(putRet.hash); + } catch (QiniuException ex) { + Response r = ex.response; + System.err.println(r.toString()); + try { + System.err.println(r.bodyString()); + } catch (QiniuException ex2) { + //ignore + } + } + } + + public static String getFileUrl(String fileName) throws UnsupportedEncodingException { + + String domainOfBucket = "http://devtools.qiniu.com/austin3y"; + String encodedFileName = URLEncoder.encode(fileName, "utf-8").replace("+", "%20"); + String finalUrl = String.format("%s/%s", domainOfBucket, encodedFileName); + System.out.println(finalUrl); + return finalUrl; + } +} diff --git a/pom.xml b/pom.xml index 027e5d6..17ba787 100644 --- a/pom.xml +++ b/pom.xml @@ -210,12 +210,19 @@ 2.0.0 + org.apache.rocketmq rocketmq-spring-boot-starter 2.2.2 + + + com.qiniu + qiniu-java-sdk + [7.7.0, 7.10.99] +