--no commit message

app/live/src/main/java/com/zrqx/live/commons/util/HttpsUtils.java

@@ -5,7 +5,10 @@
 package com.zrqx.live.commons.util;
 
 import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
@@ -13,9 +16,17 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpStatus;
 import org.apache.http.NameValuePair;
@@ -35,6 +46,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.zrqx.core.util.datatype.StringUtils;
+import com.zrqx.live.commons.model.ConfUtil;
 
  /** java模拟 post get请求发送
  * @author ray
@@ -259,4 +271,83 @@ public class HttpsUtils {
 
     }
     
+    public static Map<String, String> reciveImageAndParams(HttpServletRequest request) throws Exception {
+		
+		Map<String, String> uri = new HashMap<String, String>();
+
+		String tempPathDir = "";
+		File tempPathDirFile = new File(tempPathDir);
+
+		// 创建工厂
+		DiskFileItemFactory factory = new DiskFileItemFactory();
+		// 设置缓冲区大小，这里是400kb
+		factory.setSizeThreshold(4096 * 100);
+		// 设置缓冲区目录
+		factory.setRepository(tempPathDirFile);
+		// Create a new file upload handler
+		ServletFileUpload upload = new ServletFileUpload(factory);
+		// 设置上传文件的大小 12M
+		upload.setSizeMax(4194304 * 3);
+		// 创建解析器
+		// 得到所有的文件
+		List<FileItem> items = upload.parseRequest(request);
+		Iterator<FileItem> i = items.iterator();
+		//图片地址拼接
+		StringBuffer buf=new StringBuffer();
+		String img_urls="";
+		int j=0;//防止重名
+		while (i.hasNext()) {
+			FileItem fi = i.next();
+			// false表示文件 否则字段
+			if (!fi.isFormField()) {
+				String fileName = fi.getName();
+				if (fileName != null) {
+					// 这里加一个限制，如果不是图片格式，则提示错误. (gif,jpg,jpeg,bmp,png)
+					String suffixName = FilenameUtils.getExtension(fileName);
+					if ("jpg".equalsIgnoreCase(suffixName) || "jpeg".equalsIgnoreCase(suffixName)
+							|| "png".equalsIgnoreCase(suffixName) || "gif".equalsIgnoreCase(suffixName)) {
+						
+						j++;
+						String imageName = System.currentTimeMillis()+j+ "." + suffixName;
+						//String imgPath = "e:" + imageName;// 本机
+						ConfUtil cf = new ConfUtil();
+						String imgPath = cf.getConfig("imgconfig.properties", "imgPath") + imageName;//服务器
+
+						//图片地址拼接
+						String img_url=cf.getConfig("imgconfig.properties", "imgurl") + imageName;
+						img_urls=buf.append(img_url).append(",").toString();
+						// 定义图片流
+						InputStream fin = fi.getInputStream();
+						// 定义图片输出流
+						FileOutputStream fout = new FileOutputStream(imgPath);
+						// 写文件
+						byte[] b = new byte[1024];
+						int length = 0;
+						while ((length = fin.read(b)) > 0) {
+							fout.write(b, 0, length);
+						}
+						// 关闭数据流
+						fin.close();
+						fout.close();
+
+					} else {
+						// throw new ProcureException("文件格式不正确");
+					}
+				}
+			} else {
+				fi.getString("UTF-8");
+				uri.put(new String(fi.getFieldName()),
+						new String(fi.getString()));
+			}
+		}
+		if(img_urls!="") {
+			
+			img_urls=img_urls.substring(0,img_urls.length()-1);
+		}
+		uri.put("img_urls", img_urls);
+		return uri;
+
+	}
+
+
 }

app/live/src/main/java/com/zrqx/live/commons/vo/LiveInfoVo.java

+package com.zrqx.live.commons.vo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/** 
+ * @author chyj
+ * @date 2019年12月18日上午8:56:51
+ */
+@Data
+public class LiveInfoVo {
+
+	@ApiModelProperty("直播id，新增时不需填写")
+	private Integer id;
+	@ApiModelProperty("直播标题")
+	private String title;
+	@ApiModelProperty("直播时间")
+	private String liveTime;
+	@ApiModelProperty("简介")
+	private String introduction;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("直播模式")
+	private String model;
+	@ApiModelProperty("上传资源")
+	private Integer fileId;
+	@ApiModelProperty("直播类别")
+	private String type;
+	@ApiModelProperty("延时")
+	private String delay;
+	@ApiModelProperty("直播话题")
+	private String topic;
+	@ApiModelProperty("人数是否显示 1 显示0不显示")
+	private String peopNum;
+	@ApiModelProperty("隐私是否开启 1开启 0不开启")
+	private String privacy;
+	@ApiModelProperty("活动是否推荐  1推荐 0不推荐")
+	private String activity;
+	@ApiModelProperty("扩展包是否开启 1开启 0不开启")
+	private String pack;
+	@ApiModelProperty("售卖方式  0免费 1付费 2密码")
+	private String sell;
+	
+	@ApiModelProperty("售价")
+	private BigDecimal sellPrice;
+	@ApiModelProperty("划线价格")
+	private BigDecimal linePrice;
+	@ApiModelProperty("是否试看 0是 1否")
+	private String proved;
+	@ApiModelProperty("试看时长")
+	private Integer tryTime;
+	@ApiModelProperty("密码")
+	private String password;
+	
+	@ApiModelProperty("推荐卡片 1开启0关闭")
+	private String recommend;
+	@ApiModelProperty("回放 1开启 0关闭")
+	private String playback;
+	@ApiModelProperty("状态  0上架 1下架")
+	private String status;
+	@ApiModelProperty("直播状态  0预告 1直播中 2回放 3结束 4点播")
+	private String liveStatus;
+	@ApiModelProperty("直播类型")
+	private String typeName;
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+	@ApiModelProperty("修改时间")
+	private Date updateTime;
+	
+	@ApiModelProperty("直播播放器 1代表flash播放器，2代表H5播放器")
+	private Integer player;
+	
+
+	@ApiModelProperty("微吼直播id")
+	private Integer whId;
+	
+}

app/live/src/main/java/com/zrqx/live/commons/vo/LiveVo.java

@@ -19,7 +19,9 @@ public class LiveVo {
 	private String  statusZh;;
 	@ApiModelProperty("直播状态")
 	private String liveStatus;
-	private String  liveStatusZh;;
+	private String  liveStatusZh;
 	@ApiModelProperty("封面")
 	private String cover;
+	@ApiModelProperty("微吼id")
+	private Integer whId;
 }

app/live/src/main/java/com/zrqx/live/commons/vo/ShareVo.java

+package com.zrqx.live.commons.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/** 
+ * @author chyj
+ * @date 2019年12月18日下午3:49:29
+ */
+@Data
+public class ShareVo {
+
+	@ApiModelProperty("直播主题")
+	private String title;
+	@ApiModelProperty("直播时间")
+	private String liveTime;
+	@ApiModelProperty("状态")
+	private String statusZh;
+	@ApiModelProperty("嘉宾助理设置")
+	private String install;
+	@ApiModelProperty("观看路径")
+	private String url;
+}