--no commit message

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

@@ -3,7 +3,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;

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

 package com.zrqx.core.form.resource.bg.articlelibrary;
 
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,4 +24,6 @@ public class SaveUpdateArticleLibraryForm {
 	private String cover;
 	@ApiModelProperty("封面类型，1表示单图，3表示三图")
 	private Integer cover_type;
+	@ApiModelProperty("原创首发作者，1企鹅号，2微信公众账号，3头条号，4大鱼号，5一点号，6百家号，7网易号")
+	private List<String> original_author;
 }

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

 package com.zrqx.core.util.https;
-import java.net.HttpURLConnection;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.params.HttpParams;
+import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
+
+import com.alibaba.fastjson.JSONObject;
 public class HttpClientUtil {
-	
+	 @SuppressWarnings("resource")
+	    public static String doPostW(String url,String charset,JSONObject postData){
+	        HttpClient httpClient = null;
+	        HttpPost httpPost = null;
+	        String result = null;
+	        try{
+	            httpClient = new SSLClient();
+	            httpPost = new HttpPost(url);
+	            httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=GBK");
+	            httpPost.setHeader("Accept", "application/json");
+	            httpPost.setEntity(new StringEntity(postData.toString(), HTTP.UTF_8));
+	            HttpResponse response = httpClient.execute(httpPost);
+	            if(response != null){
+	                HttpEntity resEntity = response.getEntity();
+	                if(resEntity != null){
+	                	 // String jsonString = EntityUtils.toString(resEntity,"UTF-8");   
+	                    result = EntityUtils.toString(resEntity,charset);
+	                }
+	            }
+	        }catch(Exception ex){
+	            ex.printStackTrace();
+	        }
+	        return result;
+	    }
 	   @SuppressWarnings("resource")
-	    public static String doPost(String url,String charset){
+	    public static String doPost(String url,String charset,JSONObject postData){
 	        HttpClient httpClient = null;
 	        HttpPost httpPost = null;
 	        String result = null;
 	        try{
 	            httpClient = new SSLClient();
 	            httpPost = new HttpPost(url);
-	            httpPost.addHeader("Content-Type", "application/json");
+	            httpPost.addHeader("Content-Type", "application/json; charset=UTF-8");
+	            httpPost.setHeader("Accept", "application/json");
 	            HttpResponse response = httpClient.execute(httpPost);
 	            if(response != null){
 	                HttpEntity resEntity = response.getEntity();
@@ -52,4 +83,30 @@ public class HttpClientUtil {
 	        }
 	        return result;
 	    }
+	   
+	   
+	   
+
+	    public static String execCurl(String[] cmds){
+	        ProcessBuilder process = new ProcessBuilder(cmds);
+	        Process p;
+	        try {
+	            p = process.start();
+	            BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+	            StringBuilder builder = new StringBuilder();
+	            String line = null;
+	            while ((line = reader.readLine()) != null) {
+	                builder.append(line);
+	                builder.append(System.getProperty("line.separator"));
+	            }
+	            return builder.toString();
+
+	        } catch (IOException e) {
+	            System.out.print("error");
+	            e.printStackTrace();
+	        }
+	        return null;
+	    }
+	   
+	   
 }

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

@@ -333,24 +333,10 @@ public class ArticleLibraryController {
 				//获取账号名称
 				String user_id = jsonobj_token.getString("user_id");
 				//获取发布内容文章id
-				
-				/*String url_aid = "http://mp.163.com/wemedia/article/status/api/oauth2/publish.do";		
-				
-				JSONObject postData = new JSONObject();
-
-				postData.put("access_token", token);
-				postData.put("title", form.getTitle());
-				postData.put("content", form.getText());
-				postData.put("user_classify", ResourceTypeEnum.getName(form.getType()));
-				postData.put("cover", form.getCover());
-				postData.put("pic_url", ""+form.getCover_type());
-				postData.put("original", "true");*/
-				
 	    		// 第二步：我们发现Entity是一个接口，所以只能找实现类，发现实现类又需要一个集合，集合的泛型是NameValuePair类型
 				String[] cmds = {"curl", "-H","Content-Type: application/x-www-form-urlencoded; charset=GBK", "-d", "access_token="+token+"&title="+form.getTitle()+"&content="+form.getText()+"&user_classify="+ResourceTypeEnum.getName(form.getType())+""
-						+ "&cover="+form.getCover()+"&pic_url="+form.getCover_type()+"&original=true","http://mp.163.com/wemedia/article/status/api/oauth2/publish.do"};
+						+ "&cover=auto&pic_url="+form.getCover_type()+"&original=true","http://mp.163.com/wemedia/article/status/api/oauth2/publish.do"};
 				String excute = HttpClientUtil.execCurl(cmds);
-				System.out.println(excute);
 				JSONObject jsonobj_aid = JSON.parseObject(excute);
 				//{"error": "expired_access_token","error_code": 10010,"error_description": "access_token已过期"} access_token过期格式
 				//判断access_token是否过期
@@ -388,10 +374,6 @@ public class ArticleLibraryController {
 	//企鹅号获取文章信息,返回审核状态
 	public CallBack<String> articleTencent(String access_token,String info,String id,String articleId,String openid) throws ParseException{
 		//通过获取的文章id，取得发布的文章信息
-		Criteria criteria = resourceRelationService.createCriteria();
-		criteria.andEqualTo("objectId", id);
-		criteria.andEqualTo("original_author", 1);
-		ResourceRelation res = resourceRelationService.selectOneByCriteria();
 		if(info==null){
 			//{ "code":"0", "msg": "success", "data": { "access_token":"ACCESS_TOKEN", "expires_in":7200, "refresh_toekn":"REFRESH_TOKEN", "openid":OPENID, "scope":"SCOPE", } } 
 			userAccountRelationService.createCriteria().andEqualTo("original_author", 1);
@@ -413,13 +395,17 @@ public class ArticleLibraryController {
 		//{"code":0,"data":{"article_info":{"article_title":"关于我们关于我们123","article_type":"普通文章","article_abstract":"关于我们123关于我们123关于我们123关于我们123关于我们123关于我们123关于我们123关于我们123关于我们123关于我们123...","article_imgurl":"","article_pub_flag":"发布成功","article_pub_time":"2019-04-18 13:37:06","article_id":"20190418A08XJT","article_url":"http://kuaibao.qq.com/s/20190418A08XJT00","article_video_info":{"vid":"","title":"","desc":"","type":""}}},"msg":"SUCCESS"}
 		//获取文章审核状态
 		JSONObject examineStatus = JSON.parseObject(status);
+		Criteria criteria = resourceRelationService.createCriteria();
+		criteria.andEqualTo("objectId", id);
+		criteria.andEqualTo("original_author", 1);
+		ResourceRelation res = resourceRelationService.selectOneByCriteria();
 		String code = examineStatus.getString("code");
-		if(!code.equals(14230)){
+		if(!code.equals("0")){
 			res.setExamineStatus(2);
 			resourceRelationService.updateByCriteriaSelective(res);
 			throw new BaseException(-7,"发文失败");
 		}
-		if(!code.equals(0)){
+		if(!code.equals("0")){
 			throw new BaseException(-7,"获取返回审核状态失败！");
 		}
 		String article_Status = examineStatus.getJSONObject("data").getJSONObject("article_info").getString("article_pub_flag");
@@ -442,7 +428,7 @@ public class ArticleLibraryController {
 			ArticleLibrary library = articleService.selectByPrimaryKey(id);
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			library.setExamineTime(sdf.parse(pub_time));
-			articleService.updateByCriteriaSelective(library);
+			articleService.updateByPrimaryKeySelective(library);
 		}
 		return CallBack.success();
 	}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/user/UserController.java

@@ -269,9 +269,6 @@ public class UserController {
 	    stringRedisTemplate.opsForValue().set(uuid, objs[0].toString(),60*10,TimeUnit.SECONDS);
 	    //将图片输出给浏览器  
 	    BufferedImage image = (BufferedImage) objs[1];  
-	    /*response.setContentType("image/png");  
-	    OutputStream os = response.getOutputStream();  
-	    ImageIO.write(image, "png", os);*/
 	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
 	    ImageIO.write(image, "png", baos);
 		BASE64Encoder encoder = new BASE64Encoder();