Merge branch 'wvp-28181-2.0'

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/Login.vue

src/main/java/com/genersoft/iot/vmp/vmanager/bean/BatchGBStreamParam.java

@@ -1,10 +1,16 @@
 package com.genersoft.iot.vmp.vmanager.bean;
 
 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.util.List;
 
+/**
+ * @author lin
+ */
+@Schema(description = "多个推流信息")
 public class BatchGBStreamParam {
+    @Schema(description = "推流信息列表")
     private List<GbStream> gbStreams;
 
     public List<GbStream> getGbStreams() {

src/main/java/com/genersoft/iot/vmp/vmanager/bean/ErrorCode.java

@@ -0,0 +1,31 @@
+package com.genersoft.iot.vmp.vmanager.bean;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * 全局错误码
+ */
+public enum ErrorCode {
+    SUCCESS(0, "成功"),
+    ERROR100(100, "失败"),
+    ERROR400(400, "参数不全或者错误"),
+    ERROR403(403, "无权限操作"),
+    ERROR401(401, "请登录后重新请求"),
+    ERROR500(500, "系统异常");
+
+    private final int code;
+    private final String msg;
+
+    ErrorCode(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

src/main/java/com/genersoft/iot/vmp/vmanager/bean/PlayTypeEnum.java

@@ -0,0 +1,23 @@
+package com.genersoft.iot.vmp.vmanager.bean;
+
+public enum PlayTypeEnum {
+
+    PLAY("0", "直播"),
+    PLAY_BACK("1", "回放");
+
+    private String value;
+    private String name;
+
+    PlayTypeEnum(String value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

src/main/java/com/genersoft/iot/vmp/vmanager/bean/WVPResult.java

@@ -1,6 +1,9 @@
 package com.genersoft.iot.vmp.vmanager.bean;
 
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "统一返回结果")
 public class WVPResult<T> {
 
     public WVPResult() {
@@ -13,27 +16,28 @@ public class WVPResult<T> {
     }
 
 
+    @Schema(description = "错误码，0为成功")
     private int code;
+    @Schema(description = "描述，错误时描述错误原因")
     private String msg;
+    @Schema(description = "数据")
     private T data;
 
-    private static final Integer SUCCESS = 200;
-    private static final Integer FAILED = 400;
 
-    public static <T> WVPResult<T> Data(T t, String msg) {
-        return new WVPResult<>(SUCCESS, msg, t);
+    public static <T> WVPResult<T> success(T t, String msg) {
+        return new WVPResult<>(ErrorCode.SUCCESS.getCode(), msg, t);
     }
 
-    public static <T> WVPResult<T> Data(T t) {
-        return Data(t, "成功");
+    public static <T> WVPResult<T> success(T t) {
+        return success(t, ErrorCode.SUCCESS.getMsg());
     }
 
     public static <T> WVPResult<T> fail(int code, String msg) {
         return new WVPResult<>(code, msg, null);
     }
 
-    public static <T> WVPResult<T> fail(String msg) {
-        return fail(FAILED, msg);
+    public static <T> WVPResult<T> fail(ErrorCode errorCode) {
+        return fail(errorCode.getCode(), errorCode.getMsg());
     }
 
     public int getCode() {