|
@@ -154,27 +154,34 @@ public class OwnCfcaProjectController extends BaseController {
|
|
|
|
|
|
//发送短信验证码
|
|
|
JSONObject jsonObject = AxqCommonUtil.sendSms(userId,projectCode,new HttpConnector(jksPath,keyStorePassword, channel,platId));
|
|
|
- Boolean isHave = jsonObject.has("retCode");
|
|
|
+ Boolean isHave = jsonObject.has("head");
|
|
|
//成功
|
|
|
if(isHave){
|
|
|
- String retCode = jsonObject.getString("retCode");
|
|
|
- if("60000000".equals(retCode)){
|
|
|
- //手机号掩码
|
|
|
- String newIphone = iphone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2");
|
|
|
- Map<String,String > map = new HashMap<>();
|
|
|
- //结果
|
|
|
- map.put("result",retCode);
|
|
|
- //掩码后的手机号
|
|
|
- map.put("newIphone",newIphone);
|
|
|
- //项目编号
|
|
|
- map.put("projectCode",projectCode);
|
|
|
- return R.ok(map);
|
|
|
+ JSONObject json = jsonObject.getJSONObject("head");
|
|
|
+ Boolean isRetCode = jsonObject.has("head");
|
|
|
+ if(isRetCode){
|
|
|
+ String retCode = json.getString("retCode");
|
|
|
+ if("60000000".equals(retCode)){
|
|
|
+ //手机号掩码
|
|
|
+ String newIphone = iphone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2");
|
|
|
+ Map<String,String > map = new HashMap<>();
|
|
|
+ //结果
|
|
|
+ map.put("result",retCode);
|
|
|
+ //掩码后的手机号
|
|
|
+ map.put("newIphone",newIphone);
|
|
|
+ //项目编号
|
|
|
+ map.put("projectCode",projectCode);
|
|
|
+ return R.ok(map);
|
|
|
+ }else{
|
|
|
+ return R.fail(jsonObject.getString("retMessage"));
|
|
|
+ }
|
|
|
}else{
|
|
|
return R.fail(jsonObject.getString("retMessage"));
|
|
|
}
|
|
|
}else{
|
|
|
return R.fail(jsonObject.getString("errorMessage"));
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|