Merge branch 'master' into branch-0.3.0

build.gradle

@@ -55,10 +55,6 @@ apply plugin: 'application'
 
 mainClassName = 'org.apache.pulsar.manager.PulsarManagerApplication'
 
-startScripts {
-    classpath  = files('$APP_HOME/lib/*')
-}
-
 task licenseFormatNode(type: com.hierynomus.gradle.license.tasks.LicenseFormat) {
     source = fileTree(dir: "src").include("**/*")
     source = fileTree(dir: "front-end/src").include("**/*")

front-end/docker/conf.d/default.conf

@@ -0,0 +1,11 @@
+server {
+    listen 80;
+    server_name localhost;
+    root  /usr/share/nginx/html;
+    location / {
+        index index.html index.htm;
+    }
+	location /pulsar-manager/ {
+	    proxy_pass http://host.docker.internal:7750;
+    }
+}

front-end/docker/docker.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+ROOT_DIR=$(git rev-parse --show-toplevel)
+CONTAINER_NAME="pulsar-manager-ui"
+CONTAINER_ID=$(docker ps | grep $CONTAINER_NAME | awk '{print $1}')
+
+if [ -n "$CONTAINER_ID" ]; then
+    docker exec -it $CONTAINER_NAME nginx -s reload
+else
+    docker run --name $CONTAINER_NAME -p 80:80 -v $ROOT_DIR/front-end/dist:/usr/share/nginx/html -v $ROOT_DIR/front-end/docker/conf.d:/etc/nginx/conf.d nginx:1.18.0-alpine
+fi
+
+echo "Website is running: http://localhost"

front-end/src/router/index.js

@@ -77,7 +77,7 @@ export const constantRouterMap = [
 ]
 
 export default new Router({
-  mode: 'history', // require service support
+  // mode: 'history', // require service support
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRouterMap
 })