change website to spring boot application to make less error

liubao68 · liubao68 · commit e019d700a52b · 2020-07-12T16:57:45.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -83,3 +83,6 @@ __pycache__/
 
 # gradle
 .gradle
+
+# maven
+.versionsBackup
diff --git a/porter_springboot/api/common/endpoint/pom.xml b/porter_springboot/api/common/endpoint/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>common-api</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>common-api-endpoint</artifactId>
diff --git a/porter_springboot/api/common/pom.xml b/porter_springboot/api/common/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>porter-api</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>common-api</artifactId>
diff --git a/porter_springboot/api/common/service/pom.xml b/porter_springboot/api/common/service/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>common-api</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>common-api-service</artifactId>
diff --git a/porter_springboot/api/file-service/endpoint/pom.xml b/porter_springboot/api/file-service/endpoint/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>file-service-api</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>file-service-api-endpoint</artifactId>
diff --git a/porter_springboot/api/file-service/pom.xml b/porter_springboot/api/file-service/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>porter-api</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>file-service-api</artifactId>
diff --git a/porter_springboot/api/file-service/service/pom.xml b/porter_springboot/api/file-service/service/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>file-service-api</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>file-service-api-service</artifactId>
diff --git a/porter_springboot/api/pom.xml b/porter_springboot/api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>porter-application</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>porter-api</artifactId>
diff --git a/porter_springboot/api/user-service/endpoint/pom.xml b/porter_springboot/api/user-service/endpoint/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>user-service-api</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>user-service-api-endpoint</artifactId>
diff --git a/porter_springboot/api/user-service/pom.xml b/porter_springboot/api/user-service/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>porter-api</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>user-service-api</artifactId>
diff --git a/porter_springboot/api/user-service/service/pom.xml b/porter_springboot/api/user-service/service/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>user-service-api</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>user-service-api-service</artifactId>
diff --git a/porter_springboot/file-service/pom.xml b/porter_springboot/file-service/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>porter-application</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>porter-file-service</artifactId>
diff --git a/porter_springboot/file-service/src/main/resources/application.yml b/porter_springboot/file-service/src/main/resources/application.yml
@@ -17,7 +17,7 @@
 ## ---------------------------------------------------------------------------
 # spring boot configurations
 server:
-  port: 9091  # should be same with servicecomb.rest.address to use web container
+  port: 9092  # should be same with servicecomb.rest.address to use web container
 
 # override common configurations in common module
 servicecomb-config-order: 10
@@ -36,7 +36,7 @@ servicecomb:
         watch: false
 
   rest:
-    address: 0.0.0.0:9091  # should be same with server.port to use web container
+    address: 0.0.0.0:9092  # should be same with server.port to use web container
 
   uploads:
     directory: tmp_for_upload_file
diff --git a/porter_springboot/gateway-service/pom.xml b/porter_springboot/gateway-service/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>porter-application</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>porter-gateway-service</artifactId>
diff --git a/porter_springboot/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/StaticWebpageDispatcher.java b/porter_springboot/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/StaticWebpageDispatcher.java
diff --git a/porter_springboot/gateway-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher b/porter_springboot/gateway-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher
@@ -15,5 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.servicecomb.samples.porter.gateway.ApiDispatcher
-org.apache.servicecomb.samples.porter.gateway.StaticWebpageDispatcher
+org.apache.servicecomb.samples.porter.gateway.ApiDispatcher
diff --git a/porter_springboot/gateway-service/src/main/resources/application.yml b/porter_springboot/gateway-service/src/main/resources/application.yml
@@ -58,8 +58,16 @@ servicecomb:
       edge:
         default:
           enabled: false
-      rest:
-        pattern: '[/v1/log/|/inspector](.*)'
+        http:
+          enabled: true
+          pattern: /ui/(.*)
+          mappings:
+            website:
+              prefixSegmentCount: 0
+              path: "/ui/.*"
+              microserviceName: website
+              versionRule: 0.0.0+
+
 
 # This is web root for windows server, change this path according to where you put your source code
 gateway:
diff --git a/porter_springboot/pom.xml b/porter_springboot/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.apache.servicecomb.samples.porter</groupId>
   <artifactId>porter-application</artifactId>
-  <version>2.0.0</version>
+  <version>2.1.0</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -62,13 +62,18 @@
       <groupId>org.apache.servicecomb</groupId>
       <artifactId>solution-basic</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.servicecomb</groupId>
+      <artifactId>registry-service-center</artifactId>
+    </dependency>
   </dependencies>
 
   <modules>
     <module>api</module>
     <module>file-service</module>
     <module>user-service</module>
     <module>gateway-service</module>
+    <module>website</module>
   </modules>
 
   <build>
diff --git a/porter_springboot/user-service/pom.xml b/porter_springboot/user-service/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.servicecomb.samples.porter</groupId>
     <artifactId>porter-application</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>porter-user-service</artifactId>
diff --git a/porter_springboot/website/pom.xml b/porter_springboot/website/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.apache.servicecomb.samples.porter</groupId>
+    <artifactId>porter-application</artifactId>
+    <version>2.1.0</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>porter-website</artifactId>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.servicecomb</groupId>
+      <artifactId>java-chassis-spring-boot-starter-servlet</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/porter_springboot/website/src/main/java/org/apache/servicecomb/samples/porter/user/WebsiteApplication.java b/porter_springboot/website/src/main/java/org/apache/servicecomb/samples/porter/user/WebsiteApplication.java
@@ -0,0 +1,13 @@
+package org.apache.servicecomb.samples.porter.user;
+
+import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+@EnableServiceComb
+public class WebsiteApplication {
+  public static void main(String[] args) throws Exception {
+    SpringApplication.run(WebsiteApplication.class, args);
+  }
+}
diff --git a/porter_springboot/website/src/main/resources/application.yml b/porter_springboot/website/src/main/resources/application.yml
@@ -0,0 +1,26 @@
+## Spring Boot configurations
+server:
+  port: 9091
+  # servlet.path: /
+
+APPLICATION_ID: porter-application
+service_description:
+  version: 0.0.1
+  name: website
+
+servicecomb:
+  service:
+    registry:
+      address: http://localhost:30100
+      instance:
+        watch: false
+
+  rest:
+    address: 0.0.0.0:9091 # should be same with server.port to use web container
+    ## static web site will token root
+    servlet:
+      urlPattern: /api/*
+
+  metrics:
+    publisher.defaultLog:
+      enabled: false
diff --git a/porter_springboot/website/src/main/resources/static/ui/css/style.css b/porter_springboot/website/src/main/resources/static/ui/css/style.css
diff --git a/porter_springboot/website/src/main/resources/static/ui/js/jquery-1.11.1.min.js b/porter_springboot/website/src/main/resources/static/ui/js/jquery-1.11.1.min.js
diff --git a/porter_springboot/website/src/main/resources/static/ui/js/login.js b/porter_springboot/website/src/main/resources/static/ui/js/login.js
diff --git a/porter_springboot/website/src/main/resources/static/ui/js/upload.js b/porter_springboot/website/src/main/resources/static/ui/js/upload.js
diff --git a/porter_springboot/website/src/main/resources/static/ui/login.html b/porter_springboot/website/src/main/resources/static/ui/login.html
diff --git a/porter_springboot/website/src/main/resources/static/ui/upload.html b/porter_springboot/website/src/main/resources/static/ui/upload.html

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,4 @@`
`15`	`15`	`# limitations under the License.`
`16`	`16`	`#`
`17`	`17`
`18`		`-org.apache.servicecomb.samples.porter.gateway.ApiDispatcher`
`19`		`-org.apache.servicecomb.samples.porter.gateway.StaticWebpageDispatcher`
	`18`	`+org.apache.servicecomb.samples.porter.gateway.ApiDispatcher`