--no commit message

app/third/src/main/java/com/zrqx/third/wechatlogin/WeChatLoginWapController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zrqx.core.client.vo.third.wechartlogin.WeChartThirdReturn;
 import com.zrqx.core.commons.model.third.WeChartTicket;
@@ -132,13 +133,10 @@ public class WeChatLoginWapController {
 	
 	@ApiOperation(value = "获取用户是否关注公众号", notes = "获取用户是否关注公众号")
 	@GetMapping("/getUserInfo")
-	public CallBack<WeChartUserInfo> getUserInfo(){
-		String appid="&appid="+WeChatLoginWapConfig.APPID;
-		String secret="&secret="+WeChatLoginWapConfig.SECRET;
-		String grant_type="grant_type=client_credential";
+	public CallBack<WeChartUserInfo> getUserInfo(String openId,HttpServletRequest request) throws Exception{
 		//调用微信接口获得openid和access_token
-		String param=grant_type+appid+secret;
-		String result=HttpsUtils.sendGet("https://api.weixin.qq.com/cgi-bin/token?", param);
+		String param="grant_type=client_credential&appid="+WeChatLoginWapConfig.APPID+"&secret="+WeChatLoginWapConfig.SECRET;
+		String result=HttpsUtils.sendGet("https://api.weixin.qq.com/cgi-bin/token", param);
 		JSONObject object = (JSONObject)JSON.parse(result);
 		//判断接口是否调用成功
 		if(object.containsKey("errcode")){
@@ -146,20 +144,9 @@ public class WeChatLoginWapController {
 		}
 		//凭证
 		String access_token=object.get("access_token").toString();
-		
-		//获取用户标识
-		String param2="access_token="+access_token;
-		String result2=HttpsUtils.sendGet("https://api.weixin.qq.com/cgi-bin/user/info/updateremark?", param2);
-		JSONObject object2 = (JSONObject)JSON.parse(result2);
-		//判断接口是否调用成功
-		if(object2.containsKey("errcode")){
-			throw new BaseException(ResponseCodeEnum.EXCEPTION.getCode(),object.get("errcode").toString()); 
-		}
-		//唯一标识用户的 openId
-		String openId=object.get("openid").toString();
 		//获取用户基本信息
 		String param1="access_token="+access_token+"&openid="+openId+"&lang=zh_CN";
-		String result1=HttpsUtils.sendGet("https://api.weixin.qq.com/cgi-bin/user/info?", param1);
+		String result1=HttpsUtils.sendGet("https://api.weixin.qq.com/cgi-bin/user/info", param1);
 		JSONObject object1=(JSONObject)JSON.parse(result1);
 		//判断接口是否调用成功
 		if(object1.containsKey("errcode")){