Merge branch 'dev' of trick9191/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/WeixinBaseController.java

@@ -72,19 +72,16 @@ public class WeixinBaseController extends BaseController {
	}
	/**
	 * 通过code获取判断openid
	 *
	 * @param code
	 * 通过openid获取Unionid
	 * @return
	 */
	public String getUnionIDByCode(String code) {
	public String getUnionidByOpenid(String openid) {
		try {
			String token_url = "https://api.weixin.qq.com/sns/oauth2/access_token";
			String params = "appid=" + appId + "&secret=" +appSecret+ "&code=" + code + "&grant_type=authorization_code";
			String token_url = "https://api.weixin.qq.com/cgi-bin/user/info";
			String params = "access_token=" + getAccessToken() + "&openid=" +openid+ "&lang=zh_CN";
			String result = HttpUtil.sendGet(token_url, params);
			System.out.println("getOpenidByCode:"+result);
			System.out.println("getUnionidByOpenid:"+result);
			JSONObject json = new JSONObject(result);
			System.out.println("result:"+json.toString());
			if (json.has("unionid")) {
				return json.get("unionid").toString();
			} else {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/WechatController.java

@@ -685,14 +685,14 @@ public class WechatController extends WeixinBaseController {
    /**
     * 获取微信unionid
     *
     * @param code
     * @param openid
     * @return
     */
    @RequestMapping(value = "getUnionidByCode", method = {RequestMethod.POST, RequestMethod.GET})
    @RequestMapping(value = "getUnionidByOpenid", method = {RequestMethod.POST, RequestMethod.GET})
    @ResponseBody
    public String getUnionidByCode(String code) {
    public String getUnionidByOpenid(String openid) {
        try {
            String unionid = super.getOpenidByCode(code);
            String unionid = super.getUnionidByOpenid(openid);
            if (!StringUtils.isEmpty(unionid)) {
                return write(200, "获取unionid成功！", "unionid", unionid);
            } else {