DB 컬럼명에 맞게 VO 수정
This commit is contained in:
JSYOO
parent
763a2db4b2
commit
14504c70cd
@ -94,7 +94,7 @@ public class OAuthLogin {
|
||||
// 네이버 (2021.08.19 KKN)
|
||||
//------------------------------------
|
||||
if (this.oauthVO.isNaver()) {
|
||||
user.setServiceName(OAuthConfig.NAVER_SERVICE_NAME);
|
||||
user.setSnsType(OAuthConfig.NAVER_SERVICE_NAME);
|
||||
JsonNode resNode = rootNode.get("response");
|
||||
|
||||
// 사용자 내부 고유 ID (예: kh3lhfSg2v7TnJLmdhH7a0HyL-1zExIS4cF1mD4Hi4Y)
|
||||
@ -102,15 +102,15 @@ public class OAuthLogin {
|
||||
|
||||
// 사용자로그인ID (메일형식) : 네이버 계정 제공하지 않으므로 연락처 이메일을 기본 메일 계정으로 설정
|
||||
if (resNode.has("email")) {
|
||||
user.setLoginUserId(StringUtil.getString(resNode.get("email").asText(), ""));
|
||||
user.setSnsUserId(StringUtil.getString(resNode.get("email").asText(), ""));
|
||||
|
||||
// 메일주소
|
||||
user.setEmail(StringUtil.getString(resNode.get("email").asText(), ""));
|
||||
user.setSnsEmail(StringUtil.getString(resNode.get("email").asText(), ""));
|
||||
}
|
||||
|
||||
// 사용자명 (예: 홍길동)
|
||||
if (resNode.has("name")) {
|
||||
user.setName(StringUtil.getString(resNode.get("name").asText(), ""));
|
||||
user.setSnsName(StringUtil.getString(resNode.get("name").asText(), ""));
|
||||
}
|
||||
|
||||
// 생년월일
|
||||
@ -125,7 +125,7 @@ public class OAuthLogin {
|
||||
birthday = birthday.replaceAll("-", "");
|
||||
if(birthday.length() != 4) birthday = "0000";
|
||||
if(birthyear.length() != 4) birthyear = "0000";
|
||||
user.setBirthday(birthyear + birthday);
|
||||
user.setSnsBirthday(birthyear + birthday);
|
||||
|
||||
// 성별
|
||||
if (resNode.has("gender")) {
|
||||
@ -139,12 +139,12 @@ public class OAuthLogin {
|
||||
// 구글
|
||||
//------------------------------------
|
||||
else if (this.oauthVO.isGoogle()) {
|
||||
user.setServiceName(OAuthConfig.GOOGLE_SERVICE_NAME);
|
||||
user.setSnsType(OAuthConfig.GOOGLE_SERVICE_NAME);
|
||||
if (rootNode.has("sub"))
|
||||
user.setSnsId(StringUtil.getString(rootNode.get("sub").asText(), ""));
|
||||
|
||||
if (rootNode.has("email"))
|
||||
user.setLoginUserId(StringUtil.getString(rootNode.get("email").asText(), ""));
|
||||
user.setSnsUserId(StringUtil.getString(rootNode.get("email").asText(), ""));
|
||||
|
||||
|
||||
}
|
||||
@ -152,23 +152,23 @@ public class OAuthLogin {
|
||||
// 카카오
|
||||
//------------------------------------
|
||||
else if (this.oauthVO.isKakao()) {
|
||||
user.setServiceName(OAuthConfig.KAKAO_SERVICE_NAME);
|
||||
user.setSnsType(OAuthConfig.KAKAO_SERVICE_NAME);
|
||||
JsonNode resNode = rootNode.get("kakao_account");
|
||||
|
||||
user.setSnsId((rootNode.get("id").asText() == null) ? "" : rootNode.get("id").asText());
|
||||
|
||||
if (resNode.has("email")) {
|
||||
user.setLoginUserId(StringUtil.getString(resNode.get("email").asText(), ""));
|
||||
user.setEmail(StringUtil.getString(resNode.get("email").asText(), ""));
|
||||
user.setSnsUserId(StringUtil.getString(resNode.get("email").asText(), ""));
|
||||
user.setSnsEmail(StringUtil.getString(resNode.get("email").asText(), ""));
|
||||
}
|
||||
if (resNode.has("gender"))
|
||||
user.setGender(StringUtil.getString(resNode.get("gender").asText(), ""));
|
||||
user.setSnsGender(StringUtil.getString(resNode.get("gender").asText(), ""));
|
||||
|
||||
if (resNode.has("birthday") || resNode.has("birthyear"))
|
||||
user.setLoginUserId((resNode.get("email").asText() == null) ? "" : resNode.get("email").asText());
|
||||
user.setSnsUserId((resNode.get("email").asText() == null) ? "" : resNode.get("email").asText());
|
||||
|
||||
if (resNode.has("phone_number"))
|
||||
user.setMobileNo(StringUtil.getString(resNode.get("phone_number").asText(), ""));
|
||||
user.setSnsMobileNo(StringUtil.getString(resNode.get("phone_number").asText(), ""));
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -8,16 +8,16 @@ public class OAuthUniversalUser {
|
||||
|
||||
private String snsId;
|
||||
|
||||
private String email;
|
||||
private String loginUserId;
|
||||
private String name;
|
||||
private String nickName;
|
||||
private String snsEmail;
|
||||
private String snsUserId;
|
||||
private String snsName;
|
||||
private String snsNickName;
|
||||
|
||||
private String birthday;
|
||||
private String gender;
|
||||
private String snsBirthday;
|
||||
private String snsGender;
|
||||
|
||||
private String serviceName;
|
||||
private String mobileNo;
|
||||
private String snsType;
|
||||
private String snsMobileNo;
|
||||
|
||||
private String loginIp;
|
||||
private Date lastLogin;
|
||||
@ -36,44 +36,44 @@ public class OAuthUniversalUser {
|
||||
this.snsId = snsId;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
public String getSnsEmail() {
|
||||
return snsEmail;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
public void setSnsEmail(String email) {
|
||||
this.snsEmail = email;
|
||||
}
|
||||
|
||||
public String getLoginUserId() {
|
||||
return loginUserId;
|
||||
public String getSnsUserId() {
|
||||
return snsUserId;
|
||||
}
|
||||
|
||||
public void setLoginUserId(String loginUserId) {
|
||||
this.loginUserId = loginUserId;
|
||||
public void setSnsUserId(String snsUserId) {
|
||||
this.snsUserId = snsUserId;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
public String getSnsName() {
|
||||
return snsName;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
public void setSnsName(String snsName) {
|
||||
this.snsName = snsName;
|
||||
}
|
||||
|
||||
public String getNickName() {
|
||||
return nickName;
|
||||
public String getSnsNickName() {
|
||||
return snsNickName;
|
||||
}
|
||||
|
||||
public void setNickName(String nickName) {
|
||||
this.nickName = nickName;
|
||||
public void setSnsNickName(String snsNickName) {
|
||||
this.snsNickName = snsNickName;
|
||||
}
|
||||
|
||||
public String getServiceName() {
|
||||
return serviceName;
|
||||
public String getSnsType() {
|
||||
return snsType;
|
||||
}
|
||||
|
||||
public void setServiceName(String serviceName) {
|
||||
this.serviceName = serviceName;
|
||||
public void setSnsType(String snsType) {
|
||||
this.snsType = snsType;
|
||||
}
|
||||
|
||||
public String getLoginip() {
|
||||
@ -92,12 +92,12 @@ public class OAuthUniversalUser {
|
||||
this.lastLogin = lastLogin;
|
||||
}
|
||||
|
||||
public String getBirthday() {
|
||||
return birthday;
|
||||
public String getSnsBirthday() {
|
||||
return snsBirthday;
|
||||
}
|
||||
|
||||
public void setBirthday(String birthday) {
|
||||
this.birthday = birthday;
|
||||
public void setSnsBirthday(String snsBirthday) {
|
||||
this.snsBirthday = snsBirthday;
|
||||
}
|
||||
|
||||
public String getLoginIp() {
|
||||
@ -116,12 +116,12 @@ public class OAuthUniversalUser {
|
||||
this.lastLogin = lastLogin;
|
||||
}
|
||||
|
||||
public String getGender() {
|
||||
return gender;
|
||||
public String getSnsGender() {
|
||||
return snsGender;
|
||||
}
|
||||
|
||||
public void setGender(String gender) {
|
||||
this.gender = gender;
|
||||
public void setSnsGender(String snsGender) {
|
||||
this.snsGender = snsGender;
|
||||
}
|
||||
|
||||
public boolean isValidLogin() {
|
||||
@ -132,12 +132,12 @@ public class OAuthUniversalUser {
|
||||
this.isValidLogin = isValidLogin;
|
||||
}
|
||||
|
||||
public String getMobileNo() {
|
||||
return mobileNo;
|
||||
public String getSnsMobileNo() {
|
||||
return snsMobileNo;
|
||||
}
|
||||
|
||||
public void setMobileNo(String mobileNo) {
|
||||
this.mobileNo = mobileNo;
|
||||
public void setSnsMobileNo(String snsMobileNo) {
|
||||
this.snsMobileNo = snsMobileNo;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user