Skip to content

Commit

Permalink
[Fix-2832] Fix h2 driver no default packaging problem (DataLinkDC#2831)
Browse files Browse the repository at this point in the history
* Optimization The data source directory tree has two scroll bars

* [Improvement-2809] Improvement result not scroll (DataLinkDC#2819)

* improve-result-scroll

* Spotless Apply

---------

Co-authored-by: Zzm0809 <[email protected]>

* Spotless Apply

* fix-h2-driver

* added developer

* modify domin

* fix year

---------

Co-authored-by: Zzm0809 <[email protected]>
  • Loading branch information
Zzm0809 and Zzm0809 authored Dec 28, 2023
1 parent 39d3a16 commit b73a396
Show file tree
Hide file tree
Showing 13 changed files with 69 additions and 15 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Thanks to [JetBrains](https://www.jetbrains.com/?from=dlink) for providing a fre

1.Create an issue and provide a clear description.

2.Visit the [official website](http://www.dlink.top/#/) website to read the latest documentation manual.
2.Visit the [official website](http://www.dinky.org.cn/#/) website to read the latest documentation manual.

3.It is recommended to scan the code to enter the DingTalk group.

Expand Down
2 changes: 1 addition & 1 deletion README_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ Dinky 是一个 `开箱即用` 、`易扩展` ,以 `Apache Flink` 为基础,

1.创建 issue,并描述清晰

2.访问 [官网](http://www.dlink.top/#/) 网址,阅读最新文档手册
2.访问 [官网](http://www.dinky.org.cn/#/) 网址,阅读最新文档手册

3.推荐扫码进入钉钉群

Expand Down
1 change: 0 additions & 1 deletion dinky-admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>${scope.runtime}</scope>
</dependency>
<!-- postgresql -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private ApiInfo apiInfo() {
.version(dinkyVersion)
.licenseUrl("https://www.apache.org/licenses/LICENSE-2.0")
.license("Apache 2.0")
.contact(new Contact("Dinky 开源", "http://www.dlink.top/", ""))
.contact(new Contact("Dinky 开源", "http://www.dinky.org.cn/", ""))
.build();
}
/** 增加如下配置可解决Spring Boot 6.x 与Swagger 3.0.0 不兼容问题 */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { Catalogue } from '@/types/Studio/data.d';
import { searchTreeNode } from '@/utils/function';
import { l } from '@/utils/intl';
import { Badge, Space } from 'antd';
import { PresetStatusColorType } from 'antd/es/_util/colors';
import { Key } from 'react';

export const generateList = (data: any, list: any[]) => {
Expand Down
4 changes: 2 additions & 2 deletions dinky-web/src/pages/Other/About/components/UsingHelp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ export const UsingHelp = () => {
<br />
<Typography.Text {...TypographyRestProps}>
<LinkOutlined /> Document:{' '}
<a href={'http://www.dlink.top'} target={'_blank'} rel='noreferrer'>
http://www.dlink.top
<a href={'http://www.dinky.org.cn/'} target={'_blank'} rel='noreferrer'>
http://www.dinky.org.cn/
</a>
</Typography.Text>
<br />
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Dinky Website

该项目保留了用于构建 Dinky 官方网站的所有资源,服务于 http://www.dlink.top/
该项目保留了用于构建 Dinky 官方网站的所有资源,服务于 http://www.dinky.org.cn/

## 条件

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/get_started/quick_experience.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ select order_number,price,first_name,last_name,order_time from Orders

## 结束语

至此,FlinkSQL 的丝滑之旅已经开始,还不赶快邀请朋友一起探索这奇妙的 Dinky 实时计算平台。更多用法请看官网文档( www.dlink.top )。
至此,FlinkSQL 的丝滑之旅已经开始,还不赶快邀请朋友一起探索这奇妙的 Dinky 实时计算平台。更多用法请看官网文档( http://www.dinky.org.cn)。
2 changes: 1 addition & 1 deletion docs/docs/user_guide/studio/job_config_submit.md
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ Dinky 将通过暴露的 NodePort 端口提交 FlinkSQL 作业至外部的 Flink

![image-20231220110234858](http://pic.dinky.org.cn/dinky/docs/test/202312201102913.png)

如何注册 Kubernetes Application 的集群配置,详见[集群管理](http://www.dlink.top/docs/next/administrator_guide/register_center/cluster_manage) 的集群配置管理。
如何注册 Kubernetes Application 的集群配置,详见[集群管理](http://www.dinky.org.cn/docs/next/administrator_guide/register_center/cluster_manage) 的集群配置管理。

## 作业提交

Expand Down
2 changes: 1 addition & 1 deletion docs/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const darkCodeTheme = require('prism-react-renderer/themes/dracula');
const config = {
title: 'Dinky', //网站标题 | Site title
tagline: 'Dinky 为 Apache Flink 而生,让 Flink SQL 纵享丝滑', // 网站标语 | Tagline for your website
url: 'http://www.dlink.top/', // 网站网址 | Your website's URL
url: 'http://www.dinky.org.cn/', // 网站网址 | Your website's URL
baseUrl: '/', // 站点的相对路径 可将其视为是主机名后的路径 | Path to your website
staticDirectories: ['static/img', 'blog/blog_img'], // 静态文件目录 | Path to static files
// trailingSlash: true, //此选项允许您自定义 URL/链接后是否添加结尾斜杠 | Whether to append a trailing slash to the URL when rendering URLs
Expand Down
2 changes: 1 addition & 1 deletion docs/versioned_docs/version-0.6/build_deploy/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ mvn clean install -Dmaven.test.skip=true
切换到 Dinky 根目录下得 build 文件夹下,即可出现编译后的安装包。

### 构建 Docker 镜像
基于Dinky每次发布的[ Release ](http://www.dlink.top/download/download)构建:
基于Dinky每次发布的[ Release ](http://www.dinky.org.cn/download/download)构建:
1.`Dockerfile``docker-entrypoint.sh`文件拷贝至release包解压目录
2. 执行下述构建与推送命令,根据需要推送至公共或私有仓库
```bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -767,4 +767,4 @@ Flink官网-HA高可用配置:https://nightlies.apache.org/flink/flink-docs-re

Flink官网-配置参数:https://nightlies.apache.org/flink/flink-docs-release-1.16/zh/docs/deployment/config/

Dinky官网-Dinky快速集成K8S:http://www.dlink.top/docs/0.7/k8s_guide/dinky_k8s_quick_start
Dinky官网-Dinky快速集成K8S:http://www.dinky.org.cn/docs/0.7/k8s_guide/dinky_k8s_quick_start
60 changes: 58 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -848,8 +848,9 @@
</plugin>
</plugins>
</build>
<url>http://www.dlink.top</url>
<inceptionYear>2014</inceptionYear>

<url>http://www.dinky.org.cn/</url>
<inceptionYear>2021</inceptionYear>

<licenses>
<license>
Expand All @@ -859,8 +860,63 @@
</license>
</licenses>

<developers>
<developer>
<id>aiwenmo</id>
<name>aiwenmo</name>
<url>https://github.com/aiwenmo</url>
<organization>DataLinkDC</organization>
<organizationUrl>https://github.com/DataLinkDC</organizationUrl>
<roles>
<role>Owner</role>
<role>Developer</role>
</roles>
</developer>
<developer>
<id>Zzm0809</id>
<name>Zzm0809</name>
<url>https://github.com/Zzm0809</url>
<organization>DataLinkDC</organization>
<organizationUrl>https://github.com/DataLinkDC</organizationUrl>
<roles>
<role>Developer</role>
</roles>
</developer>
<developer>
<id>zackyoungh</id>
<name>zackyoungh</name>
<url>https://github.com/zackyoungh</url>
<organization>DataLinkDC</organization>
<organizationUrl>https://github.com/DataLinkDC</organizationUrl>
<roles>
<role>Developer</role>
</roles>
</developer>
<developer>
<id>gaoyan1998</id>
<name>gaoyan1998</name>
<url>https://github.com/gaoyan1998</url>
<organization>DataLinkDC</organization>
<organizationUrl>https://github.com/DataLinkDC</organizationUrl>
<roles>
<role>Developer</role>
</roles>
</developer>
<developer>
<id>leechor</id>
<name>leechor</name>
<url>https://github.com/leechor</url>
<organization>DataLinkDC</organization>
<organizationUrl>https://github.com/DataLinkDC</organizationUrl>
<roles>
<role>Developer</role>
</roles>
</developer>
</developers>

<scm>
<connection>[email protected]:DataLinkDC/dinky.git</connection>
<developerConnection>https://github.com/DataLinkDC/dinky/graphs/contributors</developerConnection>
<url>https://github.com/DataLinkDC/dinky</url>
</scm>
<repositories>
Expand Down

0 comments on commit b73a396

Please sign in to comment.