-
Notifications
You must be signed in to change notification settings - Fork 829
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #413 from KamToHung/feature/395_simple_webhook
[ISSUE #395] Simplify notifiy Webhook
- Loading branch information
Showing
15 changed files
with
343 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
...est-common/src/test/java/org/dromara/dynamictp/test/common/notifier/DingNotifierTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.dromara.dynamictp.test.common.notifier; | ||
|
|
||
| import org.dromara.dynamictp.common.entity.NotifyPlatform; | ||
| import org.dromara.dynamictp.common.notifier.DingNotifier; | ||
| import org.junit.Test; | ||
| import org.junit.jupiter.api.Assertions; | ||
|
|
||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.lang.reflect.Method; | ||
|
|
||
| /** | ||
| * @author <a href = "mailto:[email protected]">KamTo Hung</a> | ||
| */ | ||
| public class DingNotifierTest { | ||
|
|
||
| @Test | ||
| public void buildUrlWithWebhook() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { | ||
| NotifyPlatform notifyPlatform = new NotifyPlatform(); | ||
| notifyPlatform.setWebhook("https://oapi.dingtalk.com/robot/send?access_token=123"); | ||
| // notifyPlatform.setUrlKey("123"); | ||
| // notifyPlatform.setSecret("456"); | ||
| DingNotifier dingNotifier = new DingNotifier(); | ||
| Method privateMethod = DingNotifier.class.getDeclaredMethod("getTargetUrl", String.class, String.class, String.class); | ||
| privateMethod.setAccessible(true); | ||
| String result = (String) privateMethod.invoke(dingNotifier, notifyPlatform.getSecret(), notifyPlatform.getUrlKey(), notifyPlatform.getWebhook()); | ||
| Assertions.assertEquals("https://oapi.dingtalk.com/robot/send?access_token=123", result); | ||
| } | ||
|
|
||
| @Test | ||
| public void buildUrlWithUrlKey() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { | ||
| NotifyPlatform notifyPlatform = new NotifyPlatform(); | ||
| notifyPlatform.setWebhook("https://oapi.dingtalk.com/robot/send?access_token=123"); | ||
| notifyPlatform.setUrlKey("123"); | ||
| // notifyPlatform.setSecret("456"); | ||
| DingNotifier dingNotifier = new DingNotifier(); | ||
| Method privateMethod = DingNotifier.class.getDeclaredMethod("getTargetUrl", String.class, String.class, String.class); | ||
| privateMethod.setAccessible(true); | ||
| String result = (String) privateMethod.invoke(dingNotifier, notifyPlatform.getSecret(), notifyPlatform.getUrlKey(), notifyPlatform.getWebhook()); | ||
| Assertions.assertEquals("https://oapi.dingtalk.com/robot/send?access_token=123", result); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void buildUrlWithSecret() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { | ||
| NotifyPlatform notifyPlatform = new NotifyPlatform(); | ||
| notifyPlatform.setWebhook("https://oapi.dingtalk.com/robot/send?access_token=123"); | ||
| // notifyPlatform.setUrlKey("123"); | ||
| notifyPlatform.setSecret("456"); | ||
| DingNotifier dingNotifier = new DingNotifier(); | ||
| Method privateMethod = DingNotifier.class.getDeclaredMethod("getTargetUrl", String.class, String.class, String.class); | ||
| privateMethod.setAccessible(true); | ||
| String result = (String) privateMethod.invoke(dingNotifier, notifyPlatform.getSecret(), notifyPlatform.getUrlKey(), notifyPlatform.getWebhook()); | ||
| System.out.println(result); | ||
| Assertions.assertTrue(result.contains("timestamp=")); | ||
| Assertions.assertTrue(result.contains("sign=")); | ||
| } | ||
|
|
||
| } |
59 changes: 59 additions & 0 deletions
59
...est-common/src/test/java/org/dromara/dynamictp/test/common/notifier/LarkNotifierTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.dromara.dynamictp.test.common.notifier; | ||
|
|
||
| import org.dromara.dynamictp.common.constant.LarkNotifyConst; | ||
| import org.dromara.dynamictp.common.entity.NotifyPlatform; | ||
| import org.dromara.dynamictp.common.notifier.LarkNotifier; | ||
| import org.junit.Test; | ||
| import org.junit.jupiter.api.Assertions; | ||
|
|
||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.lang.reflect.Method; | ||
|
|
||
| /** | ||
| * @author <a href = "mailto:[email protected]">KamTo Hung</a> | ||
| */ | ||
| public class LarkNotifierTest { | ||
|
|
||
| @Test | ||
| public void buildUrlWithWebhook() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { | ||
| NotifyPlatform notifyPlatform = new NotifyPlatform(); | ||
| notifyPlatform.setWebhook(LarkNotifyConst.LARK_WEBHOOK + "/123"); | ||
| // notifyPlatform.setUrlKey("123"); | ||
| // notifyPlatform.setSecret("456"); | ||
| LarkNotifier larkNotifier = new LarkNotifier(); | ||
| Method privateMethod = LarkNotifier.class.getDeclaredMethod("buildUrl", NotifyPlatform.class); | ||
| privateMethod.setAccessible(true); | ||
| String result = (String) privateMethod.invoke(larkNotifier, notifyPlatform); | ||
| Assertions.assertEquals("https://open.feishu.cn/open-apis/bot/v2/hook/123", result); | ||
| } | ||
|
|
||
| @Test | ||
| public void buildUrlWithUrlKey() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { | ||
| NotifyPlatform notifyPlatform = new NotifyPlatform(); | ||
| notifyPlatform.setWebhook(LarkNotifyConst.LARK_WEBHOOK + "/123"); | ||
| notifyPlatform.setUrlKey("123"); | ||
| // notifyPlatform.setSecret("456"); | ||
| LarkNotifier larkNotifier = new LarkNotifier(); | ||
| Method privateMethod = LarkNotifier.class.getDeclaredMethod("buildUrl", NotifyPlatform.class); | ||
| privateMethod.setAccessible(true); | ||
| String result = (String) privateMethod.invoke(larkNotifier, notifyPlatform); | ||
| Assertions.assertEquals("https://open.feishu.cn/open-apis/bot/v2/hook/123", result); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.