Merge branch 'cocacola' into dev

@@ -36,6 +36,7 @@ public class ClientSecretHelper {
 		if (MapUtils.isEmpty(map)) {
 		if (MapUtils.isEmpty(map)) {
 			return null;
 			return null;
 		}
 		}
+		map.put("v", "7");
 		map.put("client_secret", securityInterceptor.getSign(map));
 		map.put("client_secret", securityInterceptor.getSign(map));
 		List<String> list = new ArrayList<String>();
 		List<String> list = new ArrayList<String>();
 		for (Entry<String, String> entry : map.entrySet()) {
 		for (Entry<String, String> entry : map.entrySet()) {

@@ -104,6 +104,7 @@ public class CocacolaServiceImpl implements ICocacolaService {
 		ApiResponse response = validRegCode(code, area, mobile);
 		ApiResponse response = validRegCode(code, area, mobile);
 		if (Constant.CODE_SUCCESS != response.getCode()) {
 		if (Constant.CODE_SUCCESS != response.getCode()) {
 			log.warn("validCodeAndSendCode error validCode is error with code={}, area={}, mobile={}", code, area, mobile);
 			log.warn("validCodeAndSendCode error validCode is error with code={}, area={}, mobile={}", code, area, mobile);
+			response.setMessage("验证码错误");
 			return response;
 			return response;
 		}
 		}