연동계정 취소하기시 확인 창

dev_bert
jonghwan76 3 years ago
parent 7ebe1b37a6
commit d3b6e0b432

@ -9,9 +9,9 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="메모리 &gt; 주간 중복 동일 카테고리 간격제거">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" afterDir="false" />
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="연동계정 취소하기시 확인 창">
<change beforePath="$PROJECT_DIR$/src/main/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -253,14 +253,7 @@
<workItem from="1651850876348" duration="8000" />
<workItem from="1651995870891" duration="2261000" />
<workItem from="1652058308312" duration="456000" />
<workItem from="1652060536329" duration="880000" />
</task>
<task id="LOCAL-00013" summary="닉네임 변경기능 적용">
<created>1648975038077</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1648975038077</updated>
<workItem from="1652060536329" duration="1005000" />
</task>
<task id="LOCAL-00014" summary="계정 동기화 기능 수정">
<created>1648986499410</created>
@ -598,7 +591,14 @@
<option name="project" value="LOCAL" />
<updated>1651997859462</updated>
</task>
<option name="localTasksCounter" value="62" />
<task id="LOCAL-00062" summary="연동계정 취소하기시 확인 창">
<created>1652062154219</created>
<option name="number" value="00062" />
<option name="presentableId" value="LOCAL-00062" />
<option name="project" value="LOCAL" />
<updated>1652062154219</updated>
</task>
<option name="localTasksCounter" value="63" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -618,7 +618,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="공유기능 퍼블리싱 및 기능 적용" />
<MESSAGE value="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함." />
<MESSAGE value="d-day 체크리스트 사항 수정" />
<MESSAGE value="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정" />
@ -643,6 +642,7 @@
<MESSAGE value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록." />
<MESSAGE value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기 - 오류수정&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록. - 오류수정" />
<MESSAGE value="메모리 &gt; 주간 중복 동일 카테고리 간격제거" />
<option name="LAST_COMMIT_MESSAGE" value="메모리 &gt; 주간 중복 동일 카테고리 간격제거" />
<MESSAGE value="연동계정 취소하기시 확인 창" />
<option name="LAST_COMMIT_MESSAGE" value="연동계정 취소하기시 확인 창" />
</component>
</project>

@ -1,8 +1,8 @@
########## 개발 Environment ##########
URL_BASE=http://121.166.66.72:14280
URL_BASE=http://devops.lookylooks.ai:14280
SERVER_TP_KOR=개발
SERVER_TP=DEV
system.domain=http://121.166.66.72:14280
system.domain=http://devops.lookylooks.ai:14280
system.weburl=http://devops.lookylooks.ai:14288
SERVER_NAME=bf
PLATFORM_VERSION = 1.0
@ -51,7 +51,7 @@ sms.api_id=gaonn0509
sms.api_key=040ec316ad13c59031b5c4c30cdec923
sms.api_sendnum=02-363-5123
file.music_path=c:/bf/music/
file.music_path=/home/imcloud/Music
smtp.mail_id=eusikdang@gmail.com
smtp.mail_pw=gaonn&0509

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context path="/">
<Resources>
<PostResources base="c:\bf\music" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/upload"/>
<!-- <PostResources base="/home/imcloud/Music" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/upload"/>-->
<!-- <PostResources base="c:\bf\music" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/upload"/>-->
<PostResources base="/home/imcloud/Music" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/upload"/>
</Resources>
</Context>

Loading…
Cancel
Save