Skip to content

D
dlink
Unverified Commit 76e3ad81 authored by xiaoguaiguai's avatar xiaoguaiguai Committed by GitHub
Browse files
Options

Merge pull request #335 from zhu-mingye/dev 

[Optimization-334][doc, alert] Optimizati关于 doc 在dex && Optimization Misspelled words
parents 9e378a1e 8938fea5
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 24 deletions
dlink-alert/dlink-alert-dingtalk/src/test/java/com/dlink/alert/dingtalk/DingTalkTest.java
View file @ 76e3ad81
...@@ -43,7 +43,7 @@ public class DingTalkTest { ...@@ -43,7 +43,7 @@ public class DingTalkTest {
@Before @Before
public void initDingTalkConfig() { public void initDingTalkConfig() {
config.put(DingTalkConstants.KEYWORD, "Dlinky-Fink 钉钉告警测试"); config.put(DingTalkConstants.KEYWORD, "Dinky-Fink 钉钉告警测试");
config.put(DingTalkConstants.WEB_HOOK, "url"); config.put(DingTalkConstants.WEB_HOOK, "url");
config.put(DingTalkConstants.MSG_TYPE, ShowType.MARKDOWN.getValue()); config.put(DingTalkConstants.MSG_TYPE, ShowType.MARKDOWN.getValue());
...@@ -57,7 +57,7 @@ public class DingTalkTest { ...@@ -57,7 +57,7 @@ public class DingTalkTest {
public void sendMarkDownMsgTest() { public void sendMarkDownMsgTest() {
AlertConfig config = AlertConfig.build("MarkDownTest", "DingTalk", DingTalkTest.config); AlertConfig config = AlertConfig.build("MarkDownTest", "DingTalk", DingTalkTest.config);
Alert alert = Alert.build(config); Alert alert = Alert.build(config);
AlertResult result = alert.send("Dlinky钉钉告警测试", contentTest); AlertResult result = alert.send("Dinky钉钉告警测试", contentTest);
Assert.assertEquals(true, result.getSuccess()); Assert.assertEquals(true, result.getSuccess());
} }
...@@ -66,7 +66,7 @@ public class DingTalkTest { ...@@ -66,7 +66,7 @@ public class DingTalkTest {
config.put(DingTalkConstants.MSG_TYPE, ShowType.TEXT.getValue()); config.put(DingTalkConstants.MSG_TYPE, ShowType.TEXT.getValue());
AlertConfig config = AlertConfig.build("TextMsgTest", "DingTalk", DingTalkTest.config); AlertConfig config = AlertConfig.build("TextMsgTest", "DingTalk", DingTalkTest.config);
Alert alert = Alert.build(config); Alert alert = Alert.build(config);
AlertResult result = alert.send("Dlinky钉钉告警测试", contentTest); AlertResult result = alert.send("Dinky钉钉告警测试", contentTest);
Assert.assertEquals(true, result.getSuccess()); Assert.assertEquals(true, result.getSuccess());
} }
......
dlink-alert/dlink-alert-email/src/main/java/com/dlink/alert/email/EmailConstants.java
View file @ 76e3ad81
...@@ -78,7 +78,7 @@ public final class EmailConstants { ...@@ -78,7 +78,7 @@ public final class EmailConstants {
public static final String HTML_HEADER_PREFIX = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>" public static final String HTML_HEADER_PREFIX = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>"
+ "<html>" + "<html>"
+ "<head>" + "<head>"
+ "<title>Dlinky</title>" + "<title>Dinky</title>"
+ "<meta name='Keywords' content=''>" + "<meta name='Keywords' content=''>"
+ "<meta name='Description' content=''>" + "<meta name='Description' content=''>"
+ "<style type=\"text/css\">" + "<style type=\"text/css\">"
......
dlink-alert/dlink-alert-email/src/test/java/com/dlink/alert/email/EmailSenderTest.java
View file @ 76e3ad81
...@@ -19,7 +19,7 @@ public class EmailSenderTest { ...@@ -19,7 +19,7 @@ public class EmailSenderTest {
private static Map<String, String> emailConfig = new HashMap<>(); private static Map<String, String> emailConfig = new HashMap<>();
private static AlertTemplate alertTemplate; private static AlertTemplate alertTemplate;
String title = "Dlinky Email Alert"; String title = "Dinky Email Alert";
String content = "[{\"id\":\"69\"," String content = "[{\"id\":\"69\","
+ "\"name\":\"UserBehavior-0--1193959466\"," + "\"name\":\"UserBehavior-0--1193959466\","
+ "\"Job name\": \"Start workflow\"," + "\"Job name\": \"Start workflow\","
......
dlink-alert/dlink-alert-feishu/src/test/java/com.dlink.alert.feishu/FeiShuSenderTest.java
View file @ 76e3ad81
...@@ -40,7 +40,7 @@ public class FeiShuSenderTest { ...@@ -40,7 +40,7 @@ public class FeiShuSenderTest {
@Before @Before
public void initFeiShuConfig() { public void initFeiShuConfig() {
feiShuConfig.put(FeiShuConstants.WEB_HOOK, "https://open.feishu.cn/open-apis/bot/v2/hook/aea3cd7f13154854541dsadsadas08f2a9"); feiShuConfig.put(FeiShuConstants.WEB_HOOK, "https://open.feishu.cn/open-apis/bot/v2/hook/aea3cd7f13154854541dsadsadas08f2a9");
feiShuConfig.put(FeiShuConstants.KEY_WORD, "Dlinky 飞书WebHook 告警测试"); feiShuConfig.put(FeiShuConstants.KEY_WORD, "Dinky 飞书WebHook 告警测试");
feiShuConfig.put(FeiShuConstants.MSG_TYPE,"text"); feiShuConfig.put(FeiShuConstants.MSG_TYPE,"text");
feiShuConfig.put(FeiShuConstants.AT_ALL, "false"); feiShuConfig.put(FeiShuConstants.AT_ALL, "false");
feiShuConfig.put(FeiShuConstants.AT_USERS, "user1,user2,user3"); feiShuConfig.put(FeiShuConstants.AT_USERS, "user1,user2,user3");
...@@ -49,7 +49,7 @@ public class FeiShuSenderTest { ...@@ -49,7 +49,7 @@ public class FeiShuSenderTest {
@Test @Test
public void testTextTypeSend() { public void testTextTypeSend() {
AlertMsg alertMsg = new AlertMsg(); AlertMsg alertMsg = new AlertMsg();
alertMsg.setName("Dlinky 飞书WebHook 告警测试"); alertMsg.setName("Dinky 飞书WebHook 告警测试");
alertMsg.setContent(alertMsgContentTemplate); alertMsg.setContent(alertMsgContentTemplate);
FeiShuSender feiShuSender = new FeiShuSender(feiShuConfig); FeiShuSender feiShuSender = new FeiShuSender(feiShuConfig);
AlertResult alertResult = feiShuSender.send(alertMsg.getName(),alertMsg.getContent()); AlertResult alertResult = feiShuSender.send(alertMsg.getName(),alertMsg.getContent());
...@@ -60,7 +60,7 @@ public class FeiShuSenderTest { ...@@ -60,7 +60,7 @@ public class FeiShuSenderTest {
public void testPostTypeSend() { public void testPostTypeSend() {
feiShuConfig.put(FeiShuConstants.MSG_TYPE,"post"); feiShuConfig.put(FeiShuConstants.MSG_TYPE,"post");
AlertMsg alertMsg = new AlertMsg(); AlertMsg alertMsg = new AlertMsg();
alertMsg.setName("Dlinky 飞书WebHook 告警测试"); alertMsg.setName("Dinky 飞书WebHook 告警测试");
alertMsg.setContent(alertMsgContentTemplate); alertMsg.setContent(alertMsgContentTemplate);
FeiShuSender feiShuSender = new FeiShuSender(feiShuConfig); FeiShuSender feiShuSender = new FeiShuSender(feiShuConfig);
AlertResult alertResult = feiShuSender.send(alertMsg.getName(),alertMsg.getContent()); AlertResult alertResult = feiShuSender.send(alertMsg.getName(),alertMsg.getContent());
......
dlink-alert/dlink-alert-wechat/src/test/java/com/dlink/alert/wechat/WeChatSenderTest.java
View file @ 76e3ad81
...@@ -79,7 +79,7 @@ public class WeChatSenderTest { ...@@ -79,7 +79,7 @@ public class WeChatSenderTest {
@Test @Test
public void testSendAPPMarkDownMsg() { public void testSendAPPMarkDownMsg() {
WeChatSender weChatSender = new WeChatSender(weChatConfig); WeChatSender weChatSender = new WeChatSender(weChatConfig);
AlertResult alertResult = weChatSender.send("Dlinky企微APP MarkDown方式 告警测试", contentTest); AlertResult alertResult = weChatSender.send("Dinky企微APP MarkDown方式 告警测试", contentTest);
Assert.assertEquals(true, alertResult.getSuccess()); Assert.assertEquals(true, alertResult.getSuccess());
} }
...@@ -87,7 +87,7 @@ public class WeChatSenderTest { ...@@ -87,7 +87,7 @@ public class WeChatSenderTest {
public void testSendAPPTextMsg() { public void testSendAPPTextMsg() {
weChatConfig.put(WeChatConstants.SHOW_TYPE, ShowType.TEXT.getValue()); weChatConfig.put(WeChatConstants.SHOW_TYPE, ShowType.TEXT.getValue());
WeChatSender weChatSender = new WeChatSender(weChatConfig); WeChatSender weChatSender = new WeChatSender(weChatConfig);
AlertResult alertResult = weChatSender.send("Dlinky企微APP TEXT方式 告警测试", contentTest); AlertResult alertResult = weChatSender.send("Dinky企微APP TEXT方式 告警测试", contentTest);
Assert.assertEquals(true, alertResult.getSuccess()); Assert.assertEquals(true, alertResult.getSuccess());
} }
...@@ -97,7 +97,7 @@ public class WeChatSenderTest { ...@@ -97,7 +97,7 @@ public class WeChatSenderTest {
weChatConfig.put(WeChatConstants.SEND_TYPE, WeChatType.CHAT.getValue()); weChatConfig.put(WeChatConstants.SEND_TYPE, WeChatType.CHAT.getValue());
weChatConfig.put(WeChatConstants.USER_SEND_MSG,WeChatConstants.WEBHOOK_TEMPLATE); weChatConfig.put(WeChatConstants.USER_SEND_MSG,WeChatConstants.WEBHOOK_TEMPLATE);
weChatConfig.put(WeChatConstants.SHOW_TYPE, ShowType.MARKDOWN.getValue()); weChatConfig.put(WeChatConstants.SHOW_TYPE, ShowType.MARKDOWN.getValue());
weChatConfig.put(WeChatConstants.KEYWORD, "Dlinky企微WEBHOOK MarkDown方式 告警测试"); weChatConfig.put(WeChatConstants.KEYWORD, "Dinky企微WEBHOOK MarkDown方式 告警测试");
WeChatSender weChatSender = new WeChatSender(weChatConfig); WeChatSender weChatSender = new WeChatSender(weChatConfig);
AlertResult alertResult = weChatSender.send("TEXT-TEST", contentTest); AlertResult alertResult = weChatSender.send("TEXT-TEST", contentTest);
Assert.assertEquals(true, alertResult.getSuccess()); Assert.assertEquals(true, alertResult.getSuccess());
...@@ -110,7 +110,7 @@ public class WeChatSenderTest { ...@@ -110,7 +110,7 @@ public class WeChatSenderTest {
weChatConfig.put(WeChatConstants.SEND_TYPE, WeChatType.CHAT.getValue()); weChatConfig.put(WeChatConstants.SEND_TYPE, WeChatType.CHAT.getValue());
weChatConfig.put(WeChatConstants.USER_SEND_MSG,WeChatConstants.WEBHOOK_TEMPLATE); weChatConfig.put(WeChatConstants.USER_SEND_MSG,WeChatConstants.WEBHOOK_TEMPLATE);
weChatConfig.put(WeChatConstants.SHOW_TYPE, ShowType.TEXT.getValue()); weChatConfig.put(WeChatConstants.SHOW_TYPE, ShowType.TEXT.getValue());
weChatConfig.put(WeChatConstants.KEYWORD, "Dlinky企微WEBHOOK TEXT方式 告警测试"); weChatConfig.put(WeChatConstants.KEYWORD, "Dinky企微WEBHOOK TEXT方式 告警测试");
WeChatSender weChatSender = new WeChatSender(weChatConfig); WeChatSender weChatSender = new WeChatSender(weChatConfig);
AlertResult alertResult = weChatSender.send("TEXT-TEST", contentTest); AlertResult alertResult = weChatSender.send("TEXT-TEST", contentTest);
Assert.assertEquals(true, alertResult.getSuccess()); Assert.assertEquals(true, alertResult.getSuccess());
......
dlink-doc/sql/dlink.sql
View file @ 76e3ad81
...@@ -105,7 +105,6 @@ CREATE TABLE `dlink_database` ( ...@@ -105,7 +105,6 @@ CREATE TABLE `dlink_database` (
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `db_index`(`name`) USING BTREE UNIQUE INDEX `db_index`(`name`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
# This PR is mainly to execute only the JJ file when the user installs dlinky for the first time
-- ---------------------------- -- ----------------------------
......
docs/index.html
View file @ 76e3ad81
...@@ -9,6 +9,13 @@ ...@@ -9,6 +9,13 @@
<link rel="icon" type="image/x-ico" href="./_media/dinky.png" /> <link rel="icon" type="image/x-ico" href="./_media/dinky.png" />
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css"> <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css">
</head> </head>
<style>
.footer {
background-color: rgba(245, 245, 245, 0.31);
color: #424549;
padding: 1rem 1rem 1rem 1rem;
}
</style>
<body> <body>
<div id="app">加载中</div> <div id="app">加载中</div>
<script> <script>
...@@ -60,6 +67,19 @@ ...@@ -60,6 +67,19 @@
} }
}, },
sidebarDisplayLevel: 4, sidebarDisplayLevel: 4,
plugins: [
function pageFooter(hook, vm) {
var footer = [
'<footer class="footer" style="text-align: center">',
'<span ><a href="https://github.com/DataLinkDC/dlink">Dinky</a></span>&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://github.com/DataLinkDC/dlink.git"><image src="_media/github.png"></image></a><br><br>',
'<span>&copy;2022 Produced by DataLink Community .</span>',
'</footer>',
].join('');
hook.afterEach(function (html) {
return html + footer;
});
},
],
} }
</script> </script>
<!-- Docsify v4 --> <!-- Docsify v4 -->
......
docs/zh-CN/administrator-guide/registerCenter/warning.md
View file @ 76e3ad81
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
首先要进入**注册中心** > **报警管理**，然后选择左侧的报警实例管理，创建一个告警实例。然后选择对应的报警插件。然后选择报警组管理，创建一个报警组。 首先要进入**注册中心** > **报警管理**，然后选择左侧的报警实例管理，创建一个告警实例。然后选择对应的报警插件。然后选择报警组管理，创建一个报警组。
目前Dlinky支持的报警插件有： 目前Dinky支持的报警插件有：
- **[钉钉](#钉钉)方式告警 :** WebHook - **[钉钉](#钉钉)方式告警 :** WebHook
- **[企业微信](#企业微信)方式告警 :** 包含 **应用** **群聊** - **[企业微信](#企业微信)方式告警 :** 包含 **应用** **群聊**
- **[飞书](#飞书)方式告警 :** WebHook - **[飞书](#飞书)方式告警 :** WebHook
......
docs/zh-CN/extend/hive.md
View file @ 76e3ad81
## 前言 ## 前言
最近有很多小伙伴问，Dlinky 如何连接 Hive 进行数据开发？ 最近有很多小伙伴问，Dinky 如何连接 Hive 进行数据开发？
关于 Dlinky 连接 Hive 的步骤同 Flink 的 `sql-client ` ，只不过它没有默认加载的配置文件。下文将详细讲述对 Hive 操作的全过程。 关于 Dinky 连接 Hive 的步骤同 Flink 的 `sql-client ` ，只不过它没有默认加载的配置文件。下文将详细讲述对 Hive 操作的全过程。
## 准备工作 ## 准备工作
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
| 组件 | 版本 | | 组件 | 版本 |
|:------:| :----: | |:------:| :----: |
| Dlinky | 0.3.2 | | Dinky | 0.3.2 |
| Flink | 1.12.4 | | Flink | 1.12.4 |
| Hadoop | 2.7.7 | | Hadoop | 2.7.7 |
| Hive | 2.3.6 | | Hive | 2.3.6 |
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
再来梳理下本教程的各个插件版本： 再来梳理下本教程的各个插件版本：
| 所属组件 | 插件 | 版本 | | 所属组件 | 插件 | 版本 |
|:--------------:| :------------------------: | :-------------------: | |:-------------:| :------------------------: | :-------------------: |
| Dlinky | dlink-client | 1.12 | | Dinky | dlink-client | 1.12 |
| Dlinky & Flink | flink-sql-connector-hive | 2.3.6_2.11-1.12.3 | | Dinky & Flink | flink-sql-connector-hive | 2.3.6_2.11-1.12.3 |
| Dlinky & Flink | flink-shaded-hadoop-3-uber | 3.1.1.7.2.8.0-224-9.0 | | Dinky & Flink | flink-shaded-hadoop-3-uber | 3.1.1.7.2.8.0-224-9.0 |
## 部署扩展 ## 部署扩展
...@@ -45,7 +45,7 @@ USE CATALOG myhive; ...@@ -45,7 +45,7 @@ USE CATALOG myhive;
select * from htest select * from htest
``` ```
在 Dlinky 编辑器中输入以上 sql ，创建 Hive Catalog，并查询一张表。 在 Dinky 编辑器中输入以上 sql ，创建 Hive Catalog，并查询一张表。
其中，`hive-conf-dir` 需要指定 `hive-site.xml` 的路径，其他同 Flink 官方解释。 其中，`hive-conf-dir` 需要指定 `hive-site.xml` 的路径，其他同 Flink 官方解释。
......
docs/zh-CN/practice/yarnsubmit.md
View file @ 76e3ad81
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
### 执行 Hello World ### 执行 Hello World
万物都具有 Hello World 的第一步，当然 Dlinky 也是具有的。我们选取了基于 datagen 的流查询作为第一行 Flink Sql。具体如下： 万物都具有 Hello World 的第一步，当然 Dinky 也是具有的。我们选取了基于 datagen 的流查询作为第一行 Flink Sql。具体如下：
```sql ```sql
CREATE TABLE Orders ( CREATE TABLE Orders (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment