기록정보 홈화면 표시오류 수정-2

dev_bert
jonghwan76 3 years ago
parent 7f950614bd
commit be752ab7f1

@ -9,14 +9,9 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="유축수유표시 오류 수정"> <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/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" /> <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/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" 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" /> <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" />
<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/member_env/setting.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -260,14 +255,7 @@
<workItem from="1652058308312" duration="456000" /> <workItem from="1652058308312" duration="456000" />
<workItem from="1652060536329" duration="3124000" /> <workItem from="1652060536329" duration="3124000" />
<workItem from="1652100883750" duration="5459000" /> <workItem from="1652100883750" duration="5459000" />
<workItem from="1652321382844" duration="6959000" /> <workItem from="1652321382844" duration="7258000" />
</task>
<task id="LOCAL-00021" summary="D-Day 관리기능 적용">
<created>1649494087226</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1649494087226</updated>
</task> </task>
<task id="LOCAL-00022" summary="D-Day 관리기능 적용-2"> <task id="LOCAL-00022" summary="D-Day 관리기능 적용-2">
<created>1649519729954</created> <created>1649519729954</created>
@ -605,7 +593,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1652324219016</updated> <updated>1652324219016</updated>
</task> </task>
<option name="localTasksCounter" value="70" /> <task id="LOCAL-00070" summary="기록정보 홈화면 표시오류 수정">
<created>1652340136434</created>
<option name="number" value="00070" />
<option name="presentableId" value="LOCAL-00070" />
<option name="project" value="LOCAL" />
<updated>1652340136434</updated>
</task>
<option name="localTasksCounter" value="71" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -625,7 +620,6 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" /> <option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="아이디 비밀번호 찾기 오류 수정" />
<MESSAGE value="아이디 저장기능 적용" /> <MESSAGE value="아이디 저장기능 적용" />
<MESSAGE value="체크리스트 오류 수정" /> <MESSAGE value="체크리스트 오류 수정" />
<MESSAGE value="계정연동 취소하기 기능적용-1" /> <MESSAGE value="계정연동 취소하기 기능적용-1" />
@ -650,6 +644,7 @@
<MESSAGE value="1. 남은 작업 기록&#10;2. 소셜로그인 도메인 및 redirect 정보 프로퍼티 수정" /> <MESSAGE value="1. 남은 작업 기록&#10;2. 소셜로그인 도메인 및 redirect 정보 프로퍼티 수정" />
<MESSAGE value="1. 젖병 기록 수정" /> <MESSAGE value="1. 젖병 기록 수정" />
<MESSAGE value="유축수유표시 오류 수정" /> <MESSAGE value="유축수유표시 오류 수정" />
<option name="LAST_COMMIT_MESSAGE" value="유축수유표시 오류 수정" /> <MESSAGE value="기록정보 홈화면 표시오류 수정" />
<option name="LAST_COMMIT_MESSAGE" value="기록정보 홈화면 표시오류 수정" />
</component> </component>
</project> </project>

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

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

Loading…
Cancel
Save