java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

동기화오류 수정

Browse Source
dev_bert
jonghwan76 3 years ago
parent 4e4b5a7413
commit 8573bf22f8
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File

25
.idea/workspace.xml
Unescape View File

@ -11,15 +11,8 @@
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family/view_bf_family.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family/view_bf_family.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/개발참고.txt" beforeDir="false" afterPath="$PROJECT_DIR$/개발참고.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm.ftl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -186,7 +179,7 @@
<workItem from="1648224612860" duration="3752000" />
<workItem from="1648230232646" duration="27000" />
<workItem from="1648280563733" duration="10279000" />
<workItem from="1648351480256" duration="19022000" />
<workItem from="1648351480256" duration="22180000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -216,7 +209,14 @@
<option name="project" value="LOCAL" />
<updated>1648364237160</updated>
</task>
<option name="localTasksCounter" value="5" />
<task id="LOCAL-00005" summary="SNS 탈퇴 로그인 불가 처리 메시지">
<created>1648370835819</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1648370835819</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -241,6 +241,7 @@
<MESSAGE value="설정파일커밋" />
<MESSAGE value="메인페이지 챗봇 관련 수정" />
<MESSAGE value="아이 사진 업로드 오류" />
<option name="LAST_COMMIT_MESSAGE" value="아이 사진 업로드 오류" />
<MESSAGE value="SNS 탈퇴 로그인 불가 처리 메시지" />
<option name="LAST_COMMIT_MESSAGE" value="SNS 탈퇴 로그인 불가 처리 메시지" />
</component>
</project>

6
src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl
Unescape View File

@ -64,8 +64,10 @@
console.log("동기화가 실패하였습니다." + status);
},
success : function(result) {
if(result == "0") {
Swal.fire({ text: "동기화가 완료 되었습니다.", icon: 'success', showConfirmButton: false, timer: 2500 }); // success
console.log(result);
if(result.RESULT == "0") {
alert("동기화가 완료 되었습니다.");
} else {
Swal.fire({text: '동기화가 실패 하였습니다. 인증코드 확인 부탁드립니다.'});
return;

4
src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm.ftl
Unescape View File

@ -51,8 +51,8 @@
},
success : function(result) {
// console.log(result);
if(result == "0") {
Swal.fire({ text: "동기화가 완료 되었습니다.", icon: 'success', showConfirmButton: false, timer: 2500 }); // success
if(result.RESULT == "0") {
alert("동기화가 완료 되었습니다.");
} else {
Swal.fire({text: '동기화가 실패 하였습니다. 인증코드 확인 부탁드립니다.'});
return;

Write Preview
Loading…
Cancel
Save