Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/services/impl/WechatScanLoginServiceImpl.java

@@ -76,12 +76,12 @@ public class WechatScanLoginServiceImpl implements WechatScanLoginService {
 		url = url.replaceAll("APPID", PropertiesUtil.getValue(HttpParame.APPID));
 		try {
 			url = url.replaceAll("REDIRECT_URI", URLEncoder.encode(
-					PropertiesUtil.getValue(HttpParame.BIND_URI)+"&cardNo="+cardNo,"UTF-8"));
+					PropertiesUtil.getValue(HttpParame.BIND_URI)+"?cardNo="+cardNo,"UTF-8"));
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
 		//url = url.replaceAll("SCOPE", "snsapi_login");
-		url = url.replaceAll("SCOPE", "snsapi_base");
+		url = url.replaceAll("SCOPE", "snsapi_login");
 		url = url.replace("STATE", parseByte2HexStr);	//加密state进行验证 回调地址当天有效 防止恶意攻击
 		map.put("url", url);
 		return map;