This is an automated email from the ASF dual-hosted git repository. tison pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push: new e0ddc5b3b [Improve] improve vue-vben-admin's license issue (#3691) e0ddc5b3b is described below commit e0ddc5b3b708004e384541593c0a6ca261b410e3 Author: benjobs <benj...@apache.org> AuthorDate: Mon Apr 29 20:46:49 2024 +0800 [Improve] improve vue-vben-admin's license issue (#3691) Co-authored-by: benjobs <benj...@gmail.com> Co-authored-by: tison <wander4...@gmail.com> --- .dlc.json | 3 + LICENSE | 2 +- .../ui-licenses/license-vue-vben-admin.txt | 0 .../streampark-console-webapp/LICENSE | 29 ------- .../streampark-console-webapp/README.md | 41 ++-------- .../streampark-console-webapp/README.zh-CN.md | 91 ---------------------- 6 files changed, 9 insertions(+), 157 deletions(-) diff --git a/.dlc.json b/.dlc.json index 99c96f25f..de93d07f2 100644 --- a/.dlc.json +++ b/.dlc.json @@ -20,6 +20,9 @@ }, { "pattern": "^https://twitter.com*" + }, + { + "pattern": "^/" } ], "timeout": "30s", diff --git a/LICENSE b/LICENSE index 18105d527..f55fb591b 100644 --- a/LICENSE +++ b/LICENSE @@ -226,7 +226,7 @@ MIT License The following components are provided under the MIT License These files from https://github.com/vbenjs/vue-vben-admin -The text of the license is included in streampark-console/streampark-console-webapp/LICENSE-vue-vben-admin.txt +The text of the license is included in dist-material/release-docs/licenses/ui-licenses/license-vue-vben-admin.txt streampark-console/streampark-console-webapp/src/App.vue streampark-console/streampark-console-webapp/src/main.ts diff --git a/streampark-console/streampark-console-webapp/LICENSE-vue-vben-admin.txt b/dist-material/release-docs/licenses/ui-licenses/license-vue-vben-admin.txt similarity index 100% rename from streampark-console/streampark-console-webapp/LICENSE-vue-vben-admin.txt rename to dist-material/release-docs/licenses/ui-licenses/license-vue-vben-admin.txt diff --git a/streampark-console/streampark-console-webapp/LICENSE b/streampark-console/streampark-console-webapp/LICENSE deleted file mode 100644 index befa7b56d..000000000 --- a/streampark-console/streampark-console-webapp/LICENSE +++ /dev/null @@ -1,29 +0,0 @@ -streampark-console is a fork of https://github.com/vbenjs/vue-vben-admin - -The following components are provided under the MIT License -The text of the license is included at LICENSE-vue-vben-admin.txt - -* build/** -* src/App.vue -* src/main.ts -* src/locales/helper.ts -* src/locales/setupI18n.ts -* src/locales/useLocale.ts -* src/components/** -* src/directives/** -* src/logics/** -* src/utils/** -* src/views/base/error-log/** -* src/views/base/exception/** -* src/views/base/lock/** -* src/views/base/redirect/** -* src/enums/** -* src/design/** -* src/hooks/** -* src/layouts/** -* src/router/** -* src/settings/** -* src/store/** -* types/** - -Other files are licensed under Apache 2.0 license. diff --git a/streampark-console/streampark-console-webapp/README.md b/streampark-console/streampark-console-webapp/README.md index 85292247e..4c47fbbd2 100644 --- a/streampark-console/streampark-console-webapp/README.md +++ b/streampark-console/streampark-console-webapp/README.md @@ -1,43 +1,12 @@ -<div align="center"> - <br/> - <h1> - <a href="https://streampark.apache.org" target="_blank" rel="noopener noreferrer"> - <img width="600" src="https://streampark.apache.org/image/logo_name.png" alt="StreamPark logo"> - </a> - </h1> - <strong style="font-size: 1.5rem">Make stream processing easier!!!</strong> -</div> +# Apache StreamPark Web UI -<br/> - -<p align="center"> - <img src="https://tokei.rs/b1/github/apache/streampark"> - <img src="https://img.shields.io/github/v/release/apache/streampark.svg"> - <img src="https://img.shields.io/github/stars/apache/streampark"> - <img src="https://img.shields.io/github/forks/apache/streampark"> - <img src="https://img.shields.io/github/issues/apache/streampark"> - <img src="https://img.shields.io/github/downloads/apache/streampark/total.svg"> - <img src="https://img.shields.io/github/languages/count/apache/streampark"> - <a href="https://www.apache.org/licenses/LICENSE-2.0.html"><img src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg"></a> -</p> - -<div align="center"> - -**[Official Website](https://streampark.apache.org)** - -</div> - -#### English | [中文](README.zh-CN.md) - -# Apache StreamPark (Incubating) - -Make stream processing easier - -> A magical framework that make stream processing easier! +> [!NOTE] +> +> This console is a fork to [Vue vben admin](https://github.com/vbenjs/vue-vben-admin). Check [LICENSE](/LICENSE) and [license-vue-vben-admin.txt](/dist-material/release-docs/licenses/ui-licenses/license-vue-vben-admin.txt) for more details. ![](https://streampark.apache.org/image/dashboard.png) -### Use Gitpod +## Use Gitpod Open the project in Gitpod (free online dev environment for GitHub) and start coding immediately. diff --git a/streampark-console/streampark-console-webapp/README.zh-CN.md b/streampark-console/streampark-console-webapp/README.zh-CN.md deleted file mode 100644 index 9532ccdc8..000000000 --- a/streampark-console/streampark-console-webapp/README.zh-CN.md +++ /dev/null @@ -1,91 +0,0 @@ -<div align="center"> - <br/> - <h1> - <a href="https://streampark.apache.org" target="_blank" rel="noopener noreferrer"> - <img width="600" src="https://streampark.apache.org/image/logo_name.png" alt="StreamPark logo"> - </a> - </h1> - <strong style="font-size: 1.5rem">Make stream processing easier!!!</strong> -</div> - -<br/> - -<p align="center"> - <img src="https://tokei.rs/b1/github/apache/streampark"> - <img src="https://img.shields.io/github/v/release/apache/streampark.svg"> - <img src="https://img.shields.io/github/stars/apache/streampark"> - <img src="https://img.shields.io/github/forks/apache/streampark"> - <img src="https://img.shields.io/github/issues/apache/streampark"> - <img src="https://img.shields.io/github/downloads/apache/streampark/total.svg"> - <img src="https://img.shields.io/github/languages/count/apache/streampark"> - <a href="https://www.apache.org/licenses/LICENSE-2.0.html"><img src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg"></a> -</p> - -<div align="center"> - -**[官网](https://streampark.apache.org)** - -</div> - -#### [English](README.md) | 中文 - -# Apache StreamPark (Incubating) - -Make stream processing easier - -> 一个神奇的框架,让流处理更简单。 - -![](https://streampark.apache.org/image/dashboard.png) - -### 使用 Gitpod - -在 Gitpod(适用于 GitHub 的免费在线开发环境)中打开项目,并立即开始编码. - -[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://github.com/apache/incubator-streampark) - -## 本地开发 - -### 前提条件 - -- [Node.js 16.0+](https://nodejs.org/en/download/) -- [pnpm](https://pnpm.io/installation) - -> **Note** -> -> 如果你遇到依赖下载缓慢需要配置 npm 镜像源,方法为在用户文件夹下找到 .npmrc 将以下内容写入: -> -> ```bash -> strict-peer-dependencies=false -> save-workspace-protocol = rolling -> registry = 'http://registry.npmmirror.com' -> ``` - -### 构建并运行 - -1. 安装依赖: - -```bash -pnpm install -``` - -2. 运行: - -```bash -pnpm serve -``` - -3. 打包 - -```bash -pnpm build -``` - -## 浏览器支持 - -本地开发推荐使用`Chrome 80+` 浏览器 - -支持现代浏览器, 不支持 IE - -| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefo [...] -| :-: | :-: | :-: | :-: | :-: | -| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |