Pre Merge pull request !34 from WangXuewen/master

docker/build.sh

@@ -9,7 +9,6 @@ cd wvp-GB28181-pro/web_src && \
     npm run build 
     
 cd ../../
-mkdir -p ./nginx/dist
 cp -r wvp-GB28181-pro/src/main/resources/static/* ./nginx/dist
 
 echo "构建ZLM容器"
@@ -42,4 +41,4 @@ chmod +x ./build.sh
 ./build.sh
 cd ../
 
-./push.sh
+./push.sh

src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java

@@ -39,7 +39,7 @@ public class SpringDocConfig {
                 .info(new Info().title("WVP-PRO 接口文档")
                         .contact(contact)
                         .description("开箱即用的28181协议视频平台。 <br/>" +
-                                "1. 打开http://127.0.0.1:18080/doc.html#/1.%20全部/用户管理/login_1" +
+                                "1. 打开http://127.0.0.1:18080/doc.html#/1.%20全部/用户管理/login_1，" +
                                 " 登录成功后返回AccessToken。 <br/>" +
                                 "2. 填写到AccessToken到参数值 http://127.0.0.1:18080/doc.html#/Authorize/1.%20全部  <br/>" +
                                 "后续接口就可以直接测试了")

src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java

@@ -327,9 +327,8 @@ public class ServerController {
 
         Map<String, String> docmap = new LinkedHashMap<>();
         result.put("文档地址", docmap);
-        docmap.put("部署文档", "https://doc.wvp-pro.cn");
-        docmap.put("接口文档", String.format("%s://%s:%s/doc.html", request.getScheme(), request.getServerName(), request.getServerPort()));
-
+        docmap.put("部署文档", String.format("%s://%s:%s/doc.html", request.getScheme(), request.getServerName(), request.getServerPort()));
+        docmap.put("接口文档", "https://doc.wvp-pro.cn");
 
         return result;
     }