root
/
ifish_english
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

技威注册邮箱修改，避免和国内项目混合，用户和直播间接口进行整合修改

This commit is contained in:
谢洪龙 2017-07-12 17:29:00 +08:00
parent edd2c3b3cc
commit a824dd7101
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ifish/API/GwellApi.java
View File

@ -203,7 +203,7 @@ public class GwellApi {
* @return * @return
*/ */
public static String getEmail(String phoneNumber) { public static String getEmail(String phoneNumber) {
String email = "ifish7" + phoneNumber + "@ifish7.com"; String email = "ifish7toEng" + phoneNumber + "@ifish7.com";
return email; return email;
} }

2
src/main/java/com/ifish/controller/LiveRoom.java
View File

@ -112,7 +112,7 @@ public class LiveRoom {
* @param liveRoom * @param liveRoom
* @return * @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) { public Object updateLiveRoom(MultipartFile fileUpload, Tbl_Live_Room liveRoom) {
try { try {
return liveRoomHelperI.updateLiveRoom(fileUpload, liveRoom); return liveRoomHelperI.updateLiveRoom(fileUpload, liveRoom);

5
src/main/java/com/ifish/helper/UserHelper.java
View File

@ -119,6 +119,9 @@ public class UserHelper implements UserHelperI {
//4.1未注册技威，则注册获取code1，code2 //4.1未注册技威，则注册获取code1，code2
Map gwellMap = registUserGWell(user, false); Map gwellMap = registUserGWell(user, false);
user = (Tbl_User) gwellMap.get("user"); 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); Integer updateInteger = tbl_User_Mapper.updateUser(user);
//如果修改失败，返回错误信息 //如果修改失败，返回错误信息
if (updateInteger <= 0) { if (updateInteger <= 0) {
@ -329,7 +332,7 @@ public class UserHelper implements UserHelperI {
userMap.put("P2PVerifyCode1", tmpUser.getP2pverifyCode1()); userMap.put("P2PVerifyCode1", tmpUser.getP2pverifyCode1());
userMap.put("P2PVerifyCode2", tmpUser.getP2pverifyCode2()); userMap.put("P2PVerifyCode2", tmpUser.getP2pverifyCode2());
userMap.put("gwellUserID", tmpUser.getGwellUserid()); userMap.put("gwellUserID", tmpUser.getGwellUserid());
userMap.put("userType", tmpUser.getUserType()); //userMap.put("userType", tmpUser.getUserType());
if (tmpUser.getUpdateTime() != null) { if (tmpUser.getUpdateTime() != null) {
userMap.put("updateTime", IfishUtil.format(tmpUser.getUpdateTime())); userMap.put("updateTime", IfishUtil.format(tmpUser.getUpdateTime()));
} }