Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -16,6 +16,7 @@
			import com.java110.utils.constant.*;
			import com.java110.utils.exception.SMOException;
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.Base64Convert;
			import com.java110.utils.util.BeanConvertUtil;
			import com.java110.utils.util.StringUtil;
			import com.java110.vo.ResultVo;
			@@ -223,6 +224,9 @@
			}
			JSONObject userinfo_paramObj = JSONObject.parseObject(userinfo_paramOut.getBody());

			//处理昵称有特殊符号导致入库失败问题
			userinfo_paramObj.put("nickname", Base64Convert.byteToBase64(userinfo_paramObj.getString("nickname").getBytes()));

			int loginFlag = paramIn.getInteger("loginFlag");

			//说明是登录页面，下发code 就可以，不需要下发key 之类
			@@ -413,7 +417,8 @@
			JSONObject userOwnerInfo = new JSONObject();
			OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
			ownerAppUserDto.setOpenId(openId);
			ownerAppUserDto.setNickName(StringUtil.encodeEmoji(nickname));
			// ownerAppUserDto.setNickName(StringUtil.encodeEmoji(nickname));
			ownerAppUserDto.setNickName(nickname);
			ownerAppUserDto.setHeadImgUrl(headimgurl);
			ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
			if (curOwnerApp != null) {
			@@ -556,5 +561,5 @@
			public void setRestTemplate(RestTemplate restTemplate) {
			this.restTemplate = restTemplate;
			}


			}