diff --git a/src/main/java/com/ifish/API/GwellApi.java b/src/main/java/com/ifish/API/GwellApi.java index 690505b..c74fa3e 100644 --- a/src/main/java/com/ifish/API/GwellApi.java +++ b/src/main/java/com/ifish/API/GwellApi.java @@ -203,7 +203,7 @@ public class GwellApi { * @return */ public static String getEmail(String phoneNumber) { - String email = "ifish7" + phoneNumber + "@ifish7.com"; + String email = "ifish7toEng" + phoneNumber + "@ifish7.com"; return email; } diff --git a/src/main/java/com/ifish/controller/LiveRoom.java b/src/main/java/com/ifish/controller/LiveRoom.java index 2c9bb88..7165013 100644 --- a/src/main/java/com/ifish/controller/LiveRoom.java +++ b/src/main/java/com/ifish/controller/LiveRoom.java @@ -112,7 +112,7 @@ public class LiveRoom { * @param liveRoom * @return */ - @RequestMapping(value = "/liveRoom/v3/updateLiveRoom.do", method = RequestMethod.GET) + @RequestMapping(value = "/liveRoom/v3/updateLiveRoom.do", method = RequestMethod.POST) public Object updateLiveRoom(MultipartFile fileUpload, Tbl_Live_Room liveRoom) { try { return liveRoomHelperI.updateLiveRoom(fileUpload, liveRoom); diff --git a/src/main/java/com/ifish/helper/UserHelper.java b/src/main/java/com/ifish/helper/UserHelper.java index c83cdb0..233401f 100644 --- a/src/main/java/com/ifish/helper/UserHelper.java +++ b/src/main/java/com/ifish/helper/UserHelper.java @@ -119,6 +119,9 @@ public class UserHelper implements UserHelperI { //4.1未注册技威,则注册获取code1,code2 Map gwellMap = registUserGWell(user, false); user = (Tbl_User) gwellMap.get("user"); + if (StringUtils.isBlank(user.getP2pverifyCode1()) || StringUtils.isBlank(user.getP2pverifyCode2()) || StringUtils.isBlank(user.getGwellUserid())) { + return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); + } Integer updateInteger = tbl_User_Mapper.updateUser(user); //如果修改失败,返回错误信息 if (updateInteger <= 0) { @@ -329,7 +332,7 @@ public class UserHelper implements UserHelperI { userMap.put("P2PVerifyCode1", tmpUser.getP2pverifyCode1()); userMap.put("P2PVerifyCode2", tmpUser.getP2pverifyCode2()); userMap.put("gwellUserID", tmpUser.getGwellUserid()); - userMap.put("userType", tmpUser.getUserType()); + //userMap.put("userType", tmpUser.getUserType()); if (tmpUser.getUpdateTime() != null) { userMap.put("updateTime", IfishUtil.format(tmpUser.getUpdateTime())); }