--no commit message

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

@@ -201,29 +201,37 @@ public class UserController {
 		String userName =null;
 		String userId =null;
 		String access_token =null;
+		String token =null;
 		//获取access_token值
 		if(form.getOriginal_author().equals(1)){//企鹅号
 			String url_token = "https://auth.om.qq.com/omoauth2/accesstoken?grant_type=authorization_code&client_id=cdceb3dc663949260ae913d2160f94b9&client_secret=b9ec3434e3ad6dbf53a61b0c5c3bd0b54cbba638&code="+form.getCode()+"";
 			access_token = HttpClientUtil.doPost(url_token, "utf-8",null);
 			JSONObject jsonobj_token = JSON.parseObject(access_token);
 			String code = jsonobj_token.getString("code");
+			//{"code":"0","data":{"access_token":"QGGP9MEANRIYIKBJQSF4TG","expires_in":7200,"openid":"35f12d8ea049b7c3274770d7b6309df9","refresh_token":"1J5KRBNSVNUQON5WNATSUQ"}}
+			token = jsonobj_token.getJSONObject("data").getString("access_token");
+			String openid = jsonobj_token.getJSONObject("data").getString("openid");
 			if(!code.equals("0")){
 				throw new BaseException(-7,"获取access_token失败!");
 			}
 			//获取账号名称
-			userName = jsonobj_token.getJSONObject("data").getString("openid");
+			String user="https://api.om.qq.com/media/basicinfoauth?access_token="+token+"&openid="+openid+"";
+			String nick = HttpClientUtil.doGet(user, "utf-8");
+			jsonobj_token = JSON.parseObject(nick);
+			//{"code":"0","msg": "success","data": {"header": "http://inews.gtimg.com/newsapp_ls/0/183849551_100100/0","nick": "测试"}}
+			userName = jsonobj_token.getJSONObject("data").getString("nick");
 		}
 		if(form.getOriginal_author().equals(7)){
-			String token = "https://mp.163.com/oauth2/access_token?client_id=3vo8XswFtc&client_secret=PZx98usfLsjFQITV&grant_type=authorization_code&code="+form.getCode()+"";
-			access_token = HttpClientUtil.doPost(token, "utf-8",null);
+			String url_token = "https://mp.163.com/oauth2/access_token?client_id=3vo8XswFtc&client_secret=PZx98usfLsjFQITV&grant_type=authorization_code&code="+form.getCode()+"";
+			access_token = HttpClientUtil.doPost(url_token, "utf-8",null);
 			JSONObject jsonobj_token = JSON.parseObject(access_token);
 			//{"access_token": "8521834b4553b7f5675c7c515ede6c6b","refresh_token": "273491a05edc6440cc2f449ed5183ea7","expires_in": "2017-12-27 16:05:34","user_id": "boniutest3@163.com"}
 			token = jsonobj_token.getString("access_token");
 			//获取账号名称
-			String user="https://mp.163.com/oauth2/mediaInfo/get.do?client_id=3vo8XswFtc&access_token=69f4b51debccaebea9ad09ec8e592f1a";
+			String user="https://mp.163.com/oauth2/mediaInfo/get.do?client_id=3vo8XswFtc&access_token="+token+"";
 			//{"tname":"中国市场出版社","icon":"http://dingyue.ws.126.net/zLDW28g1KvKuYAqTJ12cOvZpmriGuH96zqDVrrIM1HLPT1472629279651.jpg","desc":"国家发改委主管中央级出版社"}
-			userName = HttpClientUtil.doGet(user, "utf-8");
-			jsonobj_token = JSON.parseObject(userName);
+			String tname = HttpClientUtil.doGet(user, "utf-8");
+			jsonobj_token = JSON.parseObject(tname);
 			userName = jsonobj_token.getString("tname");
 			userId = jsonobj_token.getString("user_id");
 		}