[Feature] add default welcome page.

apache · Jun 25, 2021 · f0a4237 · f0a4237
1 parent fbd80be
commit f0a4237
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 15 deletions.
diff --git a/...service/src/main/java/com/streamxhub/streamx/console/core/controller/IndexController.java b/...service/src/main/java/com/streamxhub/streamx/console/core/controller/IndexController.java
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2019 The StreamX Project
+ *
+ * <p>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
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>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 com.streamxhub.streamx.console.core.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * @author benjobs
+ */
+@RequestMapping
+@Controller
+public class IndexController {
+
+    @RequestMapping("/")
+    public ModelAndView index() {
+        return new ModelAndView("/index.html");
+    }
+}
diff --git a/streamx-console/streamx-console-service/src/main/resources/application-prod.yml b/streamx-console/streamx-console-service/src/main/resources/application-prod.yml
@@ -7,6 +7,9 @@ server:
       io: 4
       worker: 20
 
+logging:
+  level: debug
+
 spring:
   application.name: streamx
   devtools:
@@ -34,7 +37,7 @@ spring:
         # 数据源-1，名称为 primary
         primary:
           username: root
-          password: 123322242
+          password: 123456
           driver-class-name: com.mysql.cj.jdbc.Driver
           url: jdbc:mysql://localhost:3306/streamx?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
   aop.proxy-target-class: true
@@ -85,5 +88,6 @@ streamx:
       /*.js,
       /*.png,
       /*.jpg,
-      /*.less
+      /*.less,
+      /
 
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/app/Detail.vue b/streamx-console/streamx-console-webapp/src/views/flink/app/Detail.vue
@@ -516,6 +516,7 @@
       <div
         id="startExp"
         class="startExp"
+        ref="startExp"
         style="height: 100%"/>
     </a-modal>
 
@@ -1197,6 +1198,8 @@ export default {
           theme: 'log',
           value: this.execOption.content,
           language: 'log',
+          readOnly: true,
+          inherit: true,
           scrollBeyondLastLine: false,
           overviewRulerBorder: false, // 不要滚动条边框
           autoClosingBrackets: true,
@@ -1267,6 +1270,11 @@ export default {
     myTheme() {
       this.$refs.confEdit.theme()
       this.$refs.different.theme()
+      if(this.editor.exception !== null) {
+        this.editor.exception.updateOptions({
+          theme: this.ideTheme()
+        })
+      }
     }
   },
 }

diff --git a/streamx-console/streamx-console-webapp/src/views/flink/app/Monaco.log.js b/streamx-console/streamx-console-webapp/src/views/flink/app/Monaco.log.js
@@ -31,7 +31,7 @@ monaco.languages.setMonarchTokensProvider('log', {
       [/.*Exception.*/,'log-error'],
       [/.*Caused\s+by:.*/,'log-error'],
       [/\s+at\s+.*/, 'log-info'],
-      [/\[[a-zA-Z 0-9:]+\]/, 'log-date'],
+      [/\[[a-zA-Z 0-9:]+]/, 'log-date'],
     ]
   }
 })

diff --git a/streamx-parent/pom.xml b/streamx-parent/pom.xml
@@ -106,12 +106,6 @@
                 <artifactId>vertx-core</artifactId>
                 <version>${vertx.version}</version>
             </dependency>
-
-            <dependency>
-                <groupId>io.vertx</groupId>
-                <artifactId>vertx-lang-scala_2.12</artifactId>
-                <version>${vertx.version}</version>
-            </dependency>
             <!--mysql async end-->
 
             <dependency>
@@ -256,12 +250,6 @@
                 <version>${flink.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.flink</groupId>
-                <artifactId>flink-connector-filesystem_${scala.binary.version}</artifactId>
-                <version>1.11.3</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.flink</groupId>
                 <artifactId>flink-connector-jdbc_${scala.binary.version}</artifactId>