2.0

sop-website/pom.xml

@@ -1,14 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 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">
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
-	<modelVersion>4.0.0</modelVersion>
+    <parent>
-	<groupId>com.gitee.sop</groupId>
+        <groupId>org.springframework.boot</groupId>
-	<artifactId>sop-website</artifactId>
+        <artifactId>spring-boot-starter-parent</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+        <version>2.1.4.RELEASE</version>
-	<packaging>pom</packaging>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.gitee.sop</groupId>
+    <artifactId>sop-website</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <name>sop-website</name>
+    <description>sop-website</description>
 
-	<modules>
+    <properties>
-		<module>website-server</module>
+        <java.version>1.8</java.version>
-	</modules>
+    </properties>
-</project>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-alibaba-nacos-discovery</artifactId>
+            <version>0.9.0.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.14.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.58</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.4</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

sop-website/readme.md

@@ -1,14 +1,9 @@
 # 开放平台网站
 
-包括文档功能，用户注册等，具体业务需要自己实现。
+包括文档功能、沙箱环境。
-
-前后端分离
-
-- website-front: 前端页面
-- website-server: 后台接口
 
 ## 使用方式
 
 - 确保注册中心、网关、微服务正常启动
-- 启动website-server(运行WebsiteServerApplication.java)
+- 运行WebsiteServerApplication.java
-- 找到sop-website/website-front/pages/doc/doc.html，IDEA下右键--Debug
+- 访问http://localhost:8083

sop-website/src/main/java/com/gitee/sop/websiteserver/controller/IndexController.java

@@ -0,0 +1,17 @@
+package com.gitee.sop.websiteserver.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author tanghc
+ */
+@Controller
+public class IndexController {
+
+    @RequestMapping("/")
+    public String index() {
+        return "redirect:index.html";
+    }
+
+}

sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java

@@ -67,7 +67,6 @@ public class DocDiscovery {
             try {
                 List<Instance> allInstances = namingService.getAllInstances(serviceName);
                 if (CollectionUtils.isEmpty(allInstances)) {
-                    log.info("{}服务下线，删除文档信息", serviceName);
                     // 如果没有服务列表，则删除所有路由信息
                     docManager.remove(serviceName);
                 } else {