--no commit message

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

@@ -22,8 +22,10 @@ public class ContetPublishForm {
 	private String cover;
 	@ApiModelProperty("封面类型，1表示单图，3表示三图")
 	private String cover_type;
-	@ApiModelProperty("原创首发作者，1企鹅号，2微信公众账号，3头条号，4大鱼号，5一点号，6百家号，7网易号")
-	private List<String> original_author;
 	@ApiModelProperty("资源类型 1文本，2图文章 (申请原创文章填1（需要用户具有发表图文原创文章资格否则无效))")
 	private Integer resourceType;
+	@ApiModelProperty("授权码")
+	private List<clientForm> client;
+
+
 }

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

+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="clientForm",description="授权码")
+public class clientForm {
+	@ApiModelProperty("原创首发作者，1企鹅号，2微信公众账号，3头条号，4大鱼号，5一点号，6百家号，7网易号")
+	private String original_author;
+	@ApiModelProperty("client_id")
+	private String client_id="96439997a8d291011cd2128ff063f95c";
+	@ApiModelProperty("client_secret")
+	private String client_secret="bb242ee7c2335944feca3c2989affd33e8e73573";
+}

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

@@ -220,26 +220,27 @@ public class ArticleLibraryController {
 	}
 
 	@ApiOperation(value = "同步内容接口", notes = "同步内容接口")
-	@GetMapping(value = ResourceRequestPath.PUNLISH_CONENT)
-	public CallBack<String> publishConent(ContetPublishForm form) throws ParseException {
-		if(form.getOriginal_author().size()>0){
-			for (int i = 0; i < form.getOriginal_author().size(); i++) {
-				System.out.println(form.getOriginal_author().get(i));
-				if(form.getOriginal_author().get(i).equals("1")){//企鹅号
+	@PostMapping(value = ResourceRequestPath.PUNLISH_CONENT)
+	public CallBack<String> publishConent(@RequestBody ContetPublishForm form) throws ParseException {
+		if(form.getClient().size()>0){
+			for (int i = 0; i < form.getClient().size(); i++) {
+				if(form.getClient().get(i).getOriginal_author().equals("1")){//企鹅号
 				//企鹅号授权
-				String url = "https://auth.om.qq.com/omoauth2/accesstoken?grant_type=clientcredentials&client_id=96439997a8d291011cd2128ff063f95c&client_secret=bb242ee7c2335944feca3c2989affd33e8e73573";
+				String url = "https://auth.om.qq.com/omoauth2/accesstoken?grant_type=clientcredentials&client_id="+form.getClient().get(i).getClient_id()+"&client_secret="+form.getClient().get(i).getClient_secret()+"";
 				String access_token = HttpClientUtil.doPost(url, "utf-8");
 				JSONObject jsonobj = JSON.parseObject(access_token);
 				String token = jsonobj.getJSONObject("data").getString("access_token");
 				//获取发布内容文章id
-				String url_id = "https://api.om.qq.com/articlev2/clientpubpic?access_token="+token+"&title="+form.getTitle()+"&content="+form.getText()+"&category="+form.getType()+"&cover_pic="+form.getCover()+"&cover_type="+form.getCover_type()+"&original_platform="+form.getOriginal_author().get(i)+"&original_author=null";		
+				String url_id = "https://api.om.qq.com/articlev2/clientpubpic?access_token="+token+"&title="+form.getTitle()+"&content="+form.getText()+"&category="+form.getType()+"&cover_pic="+form.getCover()+"&cover_type="+form.getCover_type()+"&original_platform="+form.getClient().get(i).getOriginal_author()+"&original_author=null";		
 				String info = HttpClientUtil.doPost(url_id,"utf-8");
 				//{"code":0,"data":{"article_id":"20190418A06JIK","transaction_id":8130865293090544362},"msg":"SUCCESS"}
 				//获取文章信息
 				articleTencent(token,info,form.getId());
-			}else if(form.getOriginal_author().get(i).equals("7")){//网易号
+			}else if(form.getClient().get(i).getOriginal_author().equals("7")){//网易号
 				//网易号授权
-				String url = "https://mp.163.com/oauth2/access_token?client_id="+1+"&client_secret="+2+"&grant_type="+3+"&code="+4+"";
+				String url1="https://mp.163.com/oauth2/authorize?client_id=3vo8XswFtc&response_type=code&redirect_uri=";
+				String access_token1 = HttpClientUtil.doPost(url1, "utf-8");
+				String url = "https://mp.163.com/oauth2/access_token?client_id=aPK90GmkYt&client_secret=FM2ExxkxhNUALYKp&grant_type=authorization_code&code=YOUR_CODE";
 				String access_token = HttpClientUtil.doPost(url, "utf-8");
 				JSONObject jsonobj = JSON.parseObject(access_token);
 				String token = jsonobj.getString("access_token");
@@ -248,13 +249,12 @@ public class ArticleLibraryController {
 				String info = HttpClientUtil.doPost(url_id,"utf-8");
 				//{"code": 1,"msg":"操作成功 ","data": {"docId": "D123456705ABCD89"}}
 				//获取文章信息
-				articleNetEase(token,info,form.getId());
+				/*articleNetEase(token,info,form.getId());*/
 			}
 		}
 	}
 	return CallBack.success();
  }
-	
 	//企鹅号获取文章信息,返回审核状态
 	public String articleTencent(String access_token,String info,String id) throws ParseException{
 		String resource="0";