You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by mo...@apache.org on 2022/09/26 09:44:49 UTC

[incubator-streampark] branch dev updated: [improve] official website url improve (#1695)

This is an automated email from the ASF dual-hosted git repository.

monster 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 86c5a9af7 [improve] official website url improve (#1695)
86c5a9af7 is described below

commit 86c5a9af74765fcb275392898b59a2c1a4869020
Author: benjobs <be...@apache.org>
AuthorDate: Mon Sep 26 17:44:41 2022 +0800

    [improve] official website url improve (#1695)
---
 build.sh                                           | 36 ++++++++--------------
 .../streampark/common/conf/ConfigConst.scala       | 19 +++++-------
 .../src/assembly/bin/streampark.sh                 | 35 +++++++--------------
 .../console/StreamParkConsoleBootstrap.java        | 14 ++++-----
 .../console/core/runner/EnvInitializer.java        |  2 +-
 .../resources/alert-template/alert-dingTalk.ftl    |  2 +-
 .../main/resources/alert-template/alert-lark.ftl   |  2 +-
 .../main/resources/alert-template/alert-weCom.ftl  |  2 +-
 .../src/components/tools/UserMenu.vue              |  2 +-
 9 files changed, 43 insertions(+), 71 deletions(-)

diff --git a/build.sh b/build.sh
index 5031c0cee..c96329905 100755
--- a/build.sh
+++ b/build.sh
@@ -34,27 +34,15 @@ fi
 
  # Only use colors if connected to a terminal
 if [[ ${have_tty} -eq 1 ]]; then
-  RAINBOW="
-    $(printf '\033[38;5;196m')
-    $(printf '\033[38;5;202m')
-    $(printf '\033[38;5;082m')
-    $(printf '\033[38;5;163m')
-    $(printf '\033[38;5;093m')
-    $(printf '\033[38;5;100m')
-    $(printf '\033[38;5;255m')
-    $(printf '\033[38;5;110m')
-    $(printf '\033[38;5;085m')
-    $(printf '\033[38;5;226m')
-  "
+  PRIMARY=$(printf '\033[38;5;082m')
   RED=$(printf '\033[31m')
   GREEN=$(printf '\033[32m')
   YELLOW=$(printf '\033[33m')
   BLUE=$(printf '\033[34m')
   BOLD=$(printf '\033[1m')
   RESET=$(printf '\033[0m')
-
 else
-  RAINBOW=""
+  PRIMARY=""
   RED=""
   GREEN=""
   YELLOW=""
@@ -122,15 +110,15 @@ PRG_DIR=`dirname "$PRG"`
 
 print_logo() {
   printf '\n'
-  printf '        ___                     __           %s        %s.+. %s   %s     %s     %s          %s ______ %s     %s      %s __    %s\n' $RAINBOW $RESET
-  printf '       /   |  ____  ____ ______/ /_  ___    %s   _____%s/ /_%s_____%s___  %s____ %s_____ ___ %s , __ \%s____%s ______%s/ /__  %s\n' $RAINBOW $RESET
-  printf '      / /| | / __ \/ __ `/ ___/ __ \/ _ \  %s  / ___/%s __%s/ ___%s/ _ \%s/ __ `%s/ __ `__ \%s  /_/ / %s__ `%s/ ___/ %s//_/   %s\n' $RAINBOW $RESET
-  printf '     / ___ |/ /_/ / /_/ / /__/ / / /  __/ %s  (__  )%s /_%s/ /  %s/  __/%s /_/ %s/ / / / / /%s ____/ %s/_/ %s/ /  / %s,<      %s\n' $RAINBOW $RESET
-  printf '    /_/  |_/ /___/\__,_/\___/_/ /_/\___/  %s /____/%s\__%s/_/   %s\___/%s\__,_%s/_/ /_/ /_/%s_/    %s\__,_%s/_/  /_%s/|_|     %s\n' $RAINBOW $RESET
-  printf '           \/                                                                                                                        %s\n\n' $RESET
-  printf '    WebSite: %s http://streampark.apache.org%s\n'                              $BLUE   $RESET
-  printf '    GitHub : %s http://github.com/apache/streampark%s\n'                       $BLUE   $RESET
-  printf '   %s ──────── Apache StreamPark, Make stream processing easier ô~ô!%s\n\n'    $GREEN  $RESET
+  printf '      %s    _____ __                            ____             __       %s\n'          $PRIMARY $RESET
+  printf '      %s   / ___// /_________  ____ _____ ___  / __ \____ ______/ /__     %s\n'          $PRIMARY $RESET
+  printf '      %s   \__ \/ __/ ___/ _ \/ __ `/ __ `__ \/ /_/ / __ `/ ___/ //_/     %s\n'          $PRIMARY $RESET
+  printf '      %s  ___/ / /_/ /  /  __/ /_/ / / / / / / ____/ /_/ / /  / ,<        %s\n'          $PRIMARY $RESET
+  printf '      %s /____/\__/_/   \___/\__,_/_/ /_/ /_/_/    \__,_/_/  /_/|_|       %s\n\n'        $PRIMARY $RESET
+  printf '      %s   Version:  1.2.4 %s\n'                                                         $BLUE   $RESET
+  printf '      %s   WebSite:  https://streampark.apache.org%s\n'                                   $BLUE   $RESET
+  printf '      %s   GitHub :  http://github.com/apache/streampark%s\n\n'                          $BLUE   $RESET
+  printf '      %s   ──────── Apache StreamPark, Make stream processing easier ô~ô!%s\n\n'         $PRIMARY  $RESET
 }
 
 checkPerm() {
@@ -216,7 +204,7 @@ detachedPackage () {
      2) npm install # or yarn install
      3) npm build   # or yarn build
 
-    please visit: http://streampark.apache.org/docs/user-guide/deployment for more detail. \n"""
+    please visit: https://streampark.apache.org/docs/user-guide/deployment for more detail. \n"""
   fi
 }
 
diff --git a/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala b/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala
index 832c153a9..c2f31e1cd 100644
--- a/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala
+++ b/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala
@@ -273,17 +273,14 @@ object ConfigConst {
   def printLogo(info: String): Unit = {
     // scalastyle:off println
     println("\n")
-    println("        ___                     __                  .+.                         ______             __       ")
-    println("       /   |  ____  ____ ______/ /_  ___      _____/ /_________  ____ _____ ___  , __ \\____ ______/ /__    ")
-    println("      / /| | / __ \\/ __ `/ ___/ __ \\/ _ \\    / ___/ __/ ___/ _ \\/ __ `/ __ `__ \\  /_/ / __ `/ ___/ //_/")
-    println("     / ___ |/ /_/ / /_/ / /__/ / / /  __/   (__  ) /_/ /  /  __/ /_/ / / / / / / ____/ /_/ / /  / ,<        ")
-    println("    /_/  |_/ /___/\\__,_/\\___/_/ /_/\\___/   /____/\\__/_/   \\___/\\__,_/_/ /_/ /_/_/    \\__,_/_/  /_/|_|")
-    println("           \\/                                                                                              ")
-    println("                                                                                                            ")
-    println("")
-    println("    WebSite:  http://streampark.apache.org                                                                  ")
-    println("    GitHub :  https://github.com/apache/streampark                                                          ")
-    println("    Ver    :  1.2.4                                  ")
+    println("       _____ __                            ____             __           ")
+    println("      / ___// /_________  ____ _____ ___  / __ \\____ ______/ /__        ")
+    println("      \\__ \\/ __/ ___/ _ \\/ __ `/ __ `__ \\/ /_/ / __ `/ ___/ //_/     ")
+    println("     ___/ / /_/ /  /  __/ /_/ / / / / / / ____/ /_/ / /  / ,<            ")
+    println("    /____/\\__/_/   \\___/\\__,_/_/ /_/ /_/_/    \\__,_/_/  /_/|_|   \n\n")
+    println("    Version:  1.2.4                                                      ")
+    println("    WebSite:  https://streampark.apache.org                              ")
+    println("    GitHub :  https://github.com/apache/streampark                       ")
     println(s"    Info   :  $info                                 ")
     println(s"    Time   :  ${LocalDateTime.now}              \n\n")
     // scalastyle:on println
diff --git a/streampark-console/streampark-console-service/src/assembly/bin/streampark.sh b/streampark-console/streampark-console-service/src/assembly/bin/streampark.sh
index 5489b9c95..046fd579f 100755
--- a/streampark-console/streampark-console-service/src/assembly/bin/streampark.sh
+++ b/streampark-console/streampark-console-service/src/assembly/bin/streampark.sh
@@ -51,28 +51,15 @@ fi
 
  # Only use colors if connected to a terminal
 if [[ ${have_tty} -eq 1 ]]; then
-  RAINBOW="
-    $(printf '\033[38;5;196m')
-    $(printf '\033[38;5;202m')
-    $(printf '\033[38;5;082m')
-    $(printf '\033[38;5;163m')
-    $(printf '\033[38;5;093m')
-    $(printf '\033[38;5;100m')
-    $(printf '\033[38;5;255m')
-    $(printf '\033[38;5;110m')
-    $(printf '\033[38;5;085m')
-    $(printf '\033[38;5;226m')
-  "
+  PRIMARY=$(printf '\033[38;5;082m')
   RED=$(printf '\033[31m')
   GREEN=$(printf '\033[32m')
   YELLOW=$(printf '\033[33m')
   BLUE=$(printf '\033[34m')
   BOLD=$(printf '\033[1m')
   RESET=$(printf '\033[0m')
-
-
 else
-  RAINBOW=""
+  PRIMARY=""
   RED=""
   GREEN=""
   YELLOW=""
@@ -266,15 +253,15 @@ fi
 
 print_logo() {
   printf '\n'
-  printf '        ___                     __           %s        %s.+. %s   %s     %s     %s          %s ______ %s     %s      %s __    %s\n' $RAINBOW $RESET
-  printf '       /   |  ____  ____ ______/ /_  ___    %s   _____%s/ /_%s_____%s___  %s____ %s_____ ___ %s , __ \%s____%s ______%s/ /__  %s\n' $RAINBOW $RESET
-  printf '      / /| | / __ \/ __ `/ ___/ __ \/ _ \  %s  / ___/%s __%s/ ___%s/ _ \%s/ __ `%s/ __ `__ \%s  /_/ / %s__ `%s/ ___/ %s//_/   %s\n' $RAINBOW $RESET
-  printf '     / ___ |/ /_/ / /_/ / /__/ / / /  __/ %s  (__  )%s /_%s/ /  %s/  __/%s /_/ %s/ / / / / /%s ____/ %s/_/ %s/ /  / %s,<      %s\n' $RAINBOW $RESET
-  printf '    /_/  |_/ /___/\__,_/\___/_/ /_/\___/  %s /____/%s\__%s/_/   %s\___/%s\__,_%s/_/ /_/ /_/%s_/    %s\__,_%s/_/  /_%s/|_|     %s\n' $RAINBOW $RESET
-  printf '           \/                                                                                                                        %s\n\n' $RESET
-  printf '    WebSite: %s http://streampark.apache.org%s\n'                              $BLUE   $RESET
-  printf '    GitHub : %s http://github.com/apache/streampark%s\n'                       $BLUE   $RESET
-  printf '   %s ──────── Apache StreamPark, Make stream processing easier ô~ô!%s\n\n'    $GREEN  $RESET
+  printf '      %s    _____ __                            ____             __       %s\n'          $PRIMARY $RESET
+  printf '      %s   / ___// /_________  ____ _____ ___  / __ \____ ______/ /__     %s\n'          $PRIMARY $RESET
+  printf '      %s   \__ \/ __/ ___/ _ \/ __ `/ __ `__ \/ /_/ / __ `/ ___/ //_/     %s\n'          $PRIMARY $RESET
+  printf '      %s  ___/ / /_/ /  /  __/ /_/ / / / / / / ____/ /_/ / /  / ,<        %s\n'          $PRIMARY $RESET
+  printf '      %s /____/\__/_/   \___/\__,_/_/ /_/ /_/_/    \__,_/_/  /_/|_|       %s\n\n'        $PRIMARY $RESET
+  printf '      %s   Version:  1.2.4 %s\n'                                                         $BLUE   $RESET
+  printf '      %s   WebSite:  https://streampark.apache.org%s\n'                                   $BLUE   $RESET
+  printf '      %s   GitHub :  http://github.com/apache/streampark%s\n\n'                          $BLUE   $RESET
+  printf '      %s   ──────── Apache StreamPark, Make stream processing easier ô~ô!%s\n\n'         $PRIMARY  $RESET
 }
 
 # shellcheck disable=SC2120
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/StreamParkConsoleBootstrap.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/StreamParkConsoleBootstrap.java
index bcd1e0b76..5b23c4b97 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/StreamParkConsoleBootstrap.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/StreamParkConsoleBootstrap.java
@@ -31,14 +31,14 @@ import java.io.File;
 /**
  * <pre>
  *
- *       ___                     __                  .+.                         ______             __
- *      /   |  ____  ____ ______/ /_  ___      _____/ /_________  ____ _____ ___  , __ \____ ______/ /__
- *     / /| | / __ \/ __ `/ ___/ __ \/ _ \    / ___/ __/ ___/ _ \/ __ `/ __ `__ \  /_/ / __ `/ ___/ //_/
- *    / ___ |/ /_/ / /_/ / /__/ / / /  __/   (__  ) /_/ /  /  __/ /_/ / / / / / / ____/ /_/ / /  / ,<
- *   /_/  |_/ /___/\__,_/\___/_/ /_/\___/   /____/\__/_/   \___/\__,_/_/ /_/ /_/_/    \__,_/_/  /_/|_|
- *          \/
+ *      _____ __                            ____             __
+ *     / ___// /_________  ____ _____ ___  / __ \____ ______/ /__
+ *     \__ \/ __/ ___/ _ \/ __ `/ __ `__ \/ /_/ / __ `/ ___/ //_/
+ *    ___/ / /_/ /  /  __/ /_/ / / / / / / ____/ /_/ / /  / ,<
+ *   /____/\__/_/   \___/\__,_/_/ /_/ /_/_/    \__,_/_/  /_/|_|
  *
- *   WebSite:  http://streampark.apache.org
+ *
+ *   WebSite:  https://streampark.apache.org
  *   GitHub :  https://github.com/apache/streampark
  *
  *   [StreamPark] Make stream processing easier ô~ô!
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java
index 88e0580e6..dab0f5d2a 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java
@@ -76,7 +76,7 @@ public class EnvInitializer implements ApplicationRunner {
             throw new ExceptionInInitializerError("[StreamPark] System initialization check failed," +
                 " The system initialization check failed. If started local for development and debugging," +
                 " please ensure the -Dapp.home parameter is clearly specified," +
-                " more detail: http://streampark.apache.org/docs/user-guide/development");
+                " more detail: https://streampark.apache.org/docs/user-guide/development");
         }
 
         // init InternalConfig
diff --git a/streampark-console/streampark-console-service/src/main/resources/alert-template/alert-dingTalk.ftl b/streampark-console/streampark-console-service/src/main/resources/alert-template/alert-dingTalk.ftl
index 7e01a5643..4e4dd7085 100644
--- a/streampark-console/streampark-console-service/src/main/resources/alert-template/alert-dingTalk.ftl
+++ b/streampark-console/streampark-console-service/src/main/resources/alert-template/alert-dingTalk.ftl
@@ -31,6 +31,6 @@
 <#if link??>
 [Details](${link})
 </#if>
-[Website](http://streampark.apache.org)
+[Website](https://streampark.apache.org)
 [GitHub](https://github.com/apache/streampark)
 
diff --git a/streampark-console/streampark-console-service/src/main/resources/alert-template/alert-lark.ftl b/streampark-console/streampark-console-service/src/main/resources/alert-template/alert-lark.ftl
index eb10e72f4..fe01bab50 100644
--- a/streampark-console/streampark-console-service/src/main/resources/alert-template/alert-lark.ftl
+++ b/streampark-console/streampark-console-service/src/main/resources/alert-template/alert-lark.ftl
@@ -147,7 +147,7 @@
             "content": "Website"
           },
           "type": "primary",
-          "url": "http://streampark.apache.org"
+          "url": "https://streampark.apache.org"
         },
         {
           "tag": "button",
diff --git a/streampark-console/streampark-console-service/src/main/resources/alert-template/alert-weCom.ftl b/streampark-console/streampark-console-service/src/main/resources/alert-template/alert-weCom.ftl
index 8fedec119..82d356bf0 100644
--- a/streampark-console/streampark-console-service/src/main/resources/alert-template/alert-weCom.ftl
+++ b/streampark-console/streampark-console-service/src/main/resources/alert-template/alert-weCom.ftl
@@ -27,5 +27,5 @@
 > Best Wishes!
 > Apache StreamPark
 
-<#if link??>[Details](${link})    </#if>[Website](http://streampark.apache.org)    [GitHub](https://github.com/apache/streampark)
+<#if link??>[Details](${link})    </#if>[Website](https://streampark.apache.org)    [GitHub](https://github.com/apache/streampark)
 
diff --git a/streampark-console/streampark-console-webapp/src/components/tools/UserMenu.vue b/streampark-console/streampark-console-webapp/src/components/tools/UserMenu.vue
index 4ebdda9ac..6cd5fb704 100644
--- a/streampark-console/streampark-console-webapp/src/components/tools/UserMenu.vue
+++ b/streampark-console/streampark-console-webapp/src/components/tools/UserMenu.vue
@@ -38,7 +38,7 @@
       </a>
 
       <a
-        href="http://streampark.apache.org/docs/user-guide/quick-start"
+        href="https://streampark.apache.org/docs/user-guide/quick-start"
         title="How to use"
         target="_blank">
         <svg-icon name="question" size="small" class="icon"></svg-icon>