--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/articlelibrary/SaveUpdateArticleLibraryForm.java

@@ -2,10 +2,6 @@ package com.zrqx.core.form.resource.bg.articlelibrary;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-import java.util.List;
-
 import lombok.Data;
 @Data
 @ApiModel(value="saveUpdateArticleLibraryForm",description="文章库")
@@ -18,16 +14,10 @@ public class SaveUpdateArticleLibraryForm {
 	private String text;
 	@ApiModelProperty("分类")
 	private String type;
-	@ApiModelProperty("定时发布时间")
-	private Date timingTime;
-	@ApiModelProperty("资源类型 1文本，2图文章")
-	private Integer resourceType;
 	//@ApiModelProperty("绑定账号")
 	//private List<String> accountId;
 	@ApiModelProperty("发布状态：0未发布，1已发布，2定时发布")
 	private Integer publishStatus;	
-	@ApiModelProperty("是否删除 0:未删除 1:已删除")
-    private Integer isDelete=0;	
 	@ApiModelProperty("封面")
 	private String cover;
 	@ApiModelProperty("封面类型，1表示单图，3表示三图")

com.zrqx.core/src/main/java/com/zrqx/core/util/https/HttpClientUtil.java

 package com.zrqx.core.util.https;
+import java.net.HttpURLConnection;
+
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
@@ -6,6 +8,7 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.util.EntityUtils;
 public class HttpClientUtil {
+	
 	   @SuppressWarnings("resource")
 	    public static String doPost(String url,String charset){
 	        HttpClient httpClient = null;
@@ -19,6 +22,7 @@ public class HttpClientUtil {
 	            if(response != null){
 	                HttpEntity resEntity = response.getEntity();
 	                if(resEntity != null){
+	                	 // String jsonString = EntityUtils.toString(resEntity,"UTF-8");   
 	                    result = EntityUtils.toString(resEntity,charset);
 	                }
 	            }
@@ -36,11 +40,6 @@ public class HttpClientUtil {
 	            httpClient = new SSLClient();
 	            httpGet = new HttpGet(url);
 	            httpGet.addHeader("Content-Type", "application/json");
-	        /*    StringEntity se = new StringEntity(jsonstr);
-	            se.setContentType("text/json");
-	            se.setContentEncoding(new BasicHeader("Content-Type", "application/json"));
-	            //httpGet.setEntity(se);
-	            httpGet.set*/
 	            HttpResponse response = httpClient.execute(httpGet);
 	            if(response != null){
 	                HttpEntity resEntity = response.getEntity();

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/content/ArticleLibraryController.java

@@ -35,7 +35,6 @@ import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.form.resource.bg.articlelibrary.BatchUpdateArticleLibraryForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.ContetPublishForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.QueryArticleLibraryForm;
-import com.zrqx.core.form.resource.bg.articlelibrary.SaveArticleRelationLibraryForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.SaveUpdateArticleLibraryForm;
 import com.zrqx.core.model.resource.ArticleLibrary;
 import com.zrqx.core.model.resource.ResourceRelation;