Pre Merge pull request !36 from 阿斌/N/A

fix the bug："cp: target './nginx/dist' is not a directory"

docker/build.sh

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

src/main/resources/civilCode.csv

@@ -861,7 +861,7 @@
 320623,如东县,3206
 320681,启东市,3206
 320682,如皋市,3206
-320684,海门市,3206
+320684,海门区,3206
 320685,海安市,3206
 3207,连云港市,32
 320703,连云区,3207
@@ -918,8 +918,6 @@
 33,浙江省, 
 3301,杭州市,33
 330102,上城区,3301
-330103,下城区,3301
-330104,江干区,3301
 330105,拱墅区,3301
 330106,西湖区,3301
 330108,滨江区,3301
@@ -927,6 +925,8 @@
 330110,余杭区,3301
 330111,富阳区,3301
 330112,临安区,3301
+330113,临平区,3301
+330114,钱塘区,3301
 330122,桐庐县,3301
 330127,淳安县,3301
 330182,建德市,3301