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

fix excel v1

Browse Source
dev_bert
Shallwe 3 years ago
parent cc63bc29fd
commit 3d5580dc40
8 changed files with 287 additions and 655 deletions
Show Stats Download Patch File Download Diff File

3
.idea/encodings.xml
Unescape View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
</project>

89
.idea/jarRepositories.xml
Unescape View File

@ -1,55 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="maven2" />
<option name="name" value="maven2" />
<option name="url" value="http://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="mvnrepository" />
<option name="name" value="mvnrepository" />
<option name="url" value="https://mvnrepository.com" />
</remote-repository>
<remote-repository>
<option name="id" value="egovframe" />
<option name="name" value="egovframe" />
<option name="url" value="http://maven.egovframe.go.kr/maven/" />
</remote-repository>
<remote-repository>
<option name="id" value="egovframe" />
<option name="name" value="egovframe" />
<option name="url" value="https://maven.egovframe.go.kr/maven/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven2" />
<option name="name" value="maven2" />
<option name="url" value="https://repo1.maven.org/maven2/" />
</remote-repository>
<remote-repository>
<option name="id" value="egovframe" />
<option name="name" value="egovframe" />
<option name="url" value="http://maven.egovframe.kr:8080/maven/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven2" />
<option name="name" value="maven2" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
</component>
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="maven2" />
<option name="name" value="maven2" />
<option name="url" value="http://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="mvnrepository" />
<option name="name" value="mvnrepository" />
<option name="url" value="https://mvnrepository.com" />
</remote-repository>
<remote-repository>
<option name="id" value="egovframe" />
<option name="name" value="egovframe" />
<option name="url" value="https://maven.egovframe.go.kr/maven/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="egovframe" />
<option name="name" value="egovframe" />
<option name="url" value="http://maven.egovframe.kr:8080/maven/" />
</remote-repository>
</component>
</project>

5
.idea/misc.xml
Unescape View File

@ -11,8 +11,5 @@
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
<component name="ProjectType">
<option name="id" value="jpab" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" />
</project>

591
.idea/workspace.xml
Unescape View File

@ -9,11 +9,8 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이슬라이드 기능 좌우 이동되도록 적용-2">
<change afterPath="$PROJECT_DIR$/src/main/resources/bf_real.properties" afterDir="false" />
<list default="true" id="d38a1a39-11ab-49f3-ba5c-d4ebbf69bdaf" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -27,15 +24,6 @@
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="ROOT_SYNC" value="DONT_SYNC" />
</component>
<component name="GitSEFilterConfiguration">
<file-type-list>
<filtered-out-file-type name="LOCAL_BRANCH" />
<filtered-out-file-type name="REMOTE_BRANCH" />
<filtered-out-file-type name="TAG" />
<filtered-out-file-type name="COMMIT_BY_MESSAGE" />
</file-type-list>
</component>
<component name="LogFilters">
<option name="FILTER_ERRORS" value="false" />
@ -47,43 +35,57 @@
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProjectId" id="25N3nbghfzlUr7bQe0LDtBjHKie" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="useMavenConfig" value="true" />
</MavenGeneralSettings>
</option>
<option name="importingSettings">
<MavenImportingSettings>
<option name="workspaceImportEnabled" value="true" />
</MavenImportingSettings>
</option>
</component>
<component name="ProjectId" id="2JUJvq4bKAD6X1env3wHQqS45ed" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources" />
<property name="project.structure.last.edited" value="라이브러리" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.42643678" />
<property name="settings.editor.selected.configurable" value="MavenSettings" />
<property name="settings.editor.splitter.proportion" value="0.3126273" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\project\bf\src\main\resources" />
<recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\index" />
<recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\login" />
<recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\include" />
<recent name="C:\project\bf\src\main\java\com\backoffice\m\tutorial" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.backoffice.m.tutorial" />
</key>
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"last_opened_file_path": "E:/jason-project-bt/bf-dev_jason/bf-dev_jason",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"project.structure.last.edited": "Artifacts",
"project.structure.proportion": "0.0",
"project.structure.side.proportion": "0.2",
"spring.configuration.checksum": "c9f9d7dd806cf4122041837a80f47c64",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<component name="RunManager">
<configuration name="Tomcat 8.5.73" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.73" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
<option name="OPEN_IN_BROWSER_URL" value="http://devops.lookylooks.ai:14288/bf/" />
<option name="COMMON_VM_ARGUMENTS" value="-Dfile.encoding=UTF-8" />
<option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
<option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
<configuration default="true" type="JetRunConfigurationType">
<module name="bf-git" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
<module name="bf-git" />
<option name="filePath" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Tomcat 8.5.73" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.73" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="corretto-1.8" nameIsGenerated="true">
<option name="UPDATING_POLICY" value="redeploy-artifacts" />
<deployment>
<artifact name="bf:war exploded">
<settings>
@ -92,7 +94,7 @@
</artifact>
</deployment>
<server-settings>
<option name="BASE_DIRECTORY_NAME" value="74459d57-0c62-4108-b724-12902c75dca6" />
<option name="BASE_DIRECTORY_NAME" value="e68db40c-5c25-42c8-b2e2-dc834ac86141" />
<option name="HTTP_PORT" value="14288" />
</server-settings>
<predefined_log_file enabled="true" id="Tomcat" />
@ -101,7 +103,7 @@
<predefined_log_file id="Tomcat Host Manager" />
<predefined_log_file id="Tomcat Localhost Access" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="52282" />
<option name="DEBUG_PORT" value="56684" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
@ -171,497 +173,46 @@
</method>
</configuration>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="애플리케이션 수준" UseSingleDictionary="true" transferred="true" />
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="디폴트 작업">
<changelist id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="" />
<created>1645353886990</created>
<task active="true" id="Default" summary="Default task">
<changelist id="d38a1a39-11ab-49f3-ba5c-d4ebbf69bdaf" name="Changes" comment="" />
<created>1672126962178</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1645353886990</updated>
<workItem from="1645353892176" duration="1379000" />
<workItem from="1645416234103" duration="623000" />
<workItem from="1646014218212" duration="2868000" />
<workItem from="1646029185464" duration="3288000" />
<workItem from="1647826687598" duration="665000" />
<workItem from="1647827688472" duration="275000" />
<workItem from="1647828259040" duration="971000" />
<workItem from="1647845776551" duration="2830000" />
<workItem from="1648224612860" duration="3752000" />
<workItem from="1648230232646" duration="27000" />
<workItem from="1648280563733" duration="10279000" />
<workItem from="1648351480256" duration="22180000" />
<workItem from="1648430275073" duration="49000" />
<workItem from="1648430348136" duration="702000" />
<workItem from="1648431787209" duration="14235000" />
<workItem from="1648451792083" duration="3736000" />
<workItem from="1648554891169" duration="4461000" />
<workItem from="1648720402622" duration="2770000" />
<workItem from="1648786659469" duration="28242000" />
<workItem from="1648875329000" duration="23079000" />
<workItem from="1648963023291" duration="19862000" />
<workItem from="1649040256227" duration="5551000" />
<workItem from="1649066917331" duration="10378000" />
<workItem from="1649160006499" duration="6876000" />
<workItem from="1649290781944" duration="34201000" />
<workItem from="1649570725292" duration="12891000" />
<workItem from="1649642776611" duration="10336000" />
<workItem from="1649670553832" duration="574000" />
<workItem from="1649678553834" duration="14999000" />
<workItem from="1649694391290" duration="109000" />
<workItem from="1649766300130" duration="9906000" />
<workItem from="1649776968602" duration="4118000" />
<workItem from="1649844246447" duration="2069000" />
<workItem from="1649847492440" duration="12812000" />
<workItem from="1649866838129" duration="5432000" />
<workItem from="1649906187756" duration="250000" />
<workItem from="1649909664739" duration="214000" />
<workItem from="1649917548966" duration="1302000" />
<workItem from="1649921550394" duration="230000" />
<workItem from="1649928321125" duration="16823000" />
<workItem from="1650020162949" duration="8484000" />
<workItem from="1650082025322" duration="596000" />
<workItem from="1650099253570" duration="21674000" />
<workItem from="1650210956375" duration="846000" />
<workItem from="1650243545918" duration="874000" />
<workItem from="1650278800214" duration="17684000" />
<workItem from="1650385175659" duration="2438000" />
<workItem from="1650430500051" duration="96000" />
<workItem from="1650431968073" duration="1154000" />
<workItem from="1650593739212" duration="527000" />
<workItem from="1650608503578" duration="718000" />
<workItem from="1650613105021" duration="532000" />
<workItem from="1650638814398" duration="7670000" />
<workItem from="1650687202332" duration="1688000" />
<workItem from="1650693305284" duration="10783000" />
<workItem from="1650722240024" duration="593000" />
<workItem from="1650776418092" duration="22940000" />
<workItem from="1650851675151" duration="3750000" />
<workItem from="1650880342548" duration="16000" />
<workItem from="1650881164110" duration="14717000" />
<workItem from="1651074703299" duration="129000" />
<workItem from="1651149304746" duration="15131000" />
<workItem from="1651193694137" duration="12076000" />
<workItem from="1651229947933" duration="3142000" />
<workItem from="1651296949782" duration="12479000" />
<workItem from="1651382880827" duration="4947000" />
<workItem from="1651421131462" duration="153000" />
<workItem from="1651457534351" duration="24275000" />
<workItem from="1651552871470" duration="866000" />
<workItem from="1651626281483" duration="151000" />
<workItem from="1651631474537" duration="12924000" />
<workItem from="1651659992753" duration="18000" />
<workItem from="1651735183816" duration="1465000" />
<workItem from="1651850876348" duration="8000" />
<workItem from="1651995870891" duration="2261000" />
<workItem from="1652058308312" duration="456000" />
<workItem from="1652060536329" duration="3124000" />
<workItem from="1652100883750" duration="5459000" />
<workItem from="1652321382844" duration="8153000" />
<workItem from="1652418151986" duration="203000" />
<workItem from="1652431636439" duration="2013000" />
<workItem from="1652521262263" duration="2280000" />
<workItem from="1652603888709" duration="5834000" />
</task>
<task id="LOCAL-00025" summary="아이디/비밀번호 찾기 적용">
<created>1649689766053</created>
<option name="number" value="00025" />
<option name="presentableId" value="LOCAL-00025" />
<option name="project" value="LOCAL" />
<updated>1649689766053</updated>
</task>
<task id="LOCAL-00026" summary="계정관리 퍼블리싱 적용-1">
<created>1649694291712</created>
<option name="number" value="00026" />
<option name="presentableId" value="LOCAL-00026" />
<option name="project" value="LOCAL" />
<updated>1649694291712</updated>
</task>
<task id="LOCAL-00027" summary="회원가입 퍼블리싱 페이지 적용">
<created>1649774128269</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1649774128269</updated>
</task>
<task id="LOCAL-00028" summary="회원가입 퍼블리싱 페이지 적용-2">
<created>1649780972822</created>
<option name="number" value="00028" />
<option name="presentableId" value="LOCAL-00028" />
<option name="project" value="LOCAL" />
<updated>1649780972822</updated>
</task>
<task id="LOCAL-00029" summary="아이정보등록 퍼블리싱">
<created>1649860415035</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1649860415035</updated>
</task>
<task id="LOCAL-00030" summary="D-Day 설정관련 홈화면 오류 수정">
<created>1649918801887</created>
<option name="number" value="00030" />
<option name="presentableId" value="LOCAL-00030" />
<option name="project" value="LOCAL" />
<updated>1649918801887</updated>
</task>
<task id="LOCAL-00031" summary="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.">
<created>1649954244235</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1649954244235</updated>
</task>
<task id="LOCAL-00032" summary="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2">
<created>1649954272997</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1649954272997</updated>
</task>
<task id="LOCAL-00033" summary="아기정보입력 생년월일 형식 수정&#10;추천이유식 &gt; 카트팝업 검색 기능 및 조회 적용">
<created>1650025938024</created>
<option name="number" value="00033" />
<option name="presentableId" value="LOCAL-00033" />
<option name="project" value="LOCAL" />
<updated>1650025938024</updated>
</task>
<task id="LOCAL-00034" summary="메모리 공유기능 적용 - 카카오, URL복사">
<created>1650035532550</created>
<option name="number" value="00034" />
<option name="presentableId" value="LOCAL-00034" />
<option name="project" value="LOCAL" />
<updated>1650035532550</updated>
</task>
<task id="LOCAL-00035" summary="회원가입 밸리데이션 및 유효성체크 보완">
<created>1650110425602</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1650110425602</updated>
</task>
<task id="LOCAL-00036" summary="회원가입 밸리데이션 및 유효성체크 보완 - 2">
<created>1650124395162</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1650124395162</updated>
</task>
<task id="LOCAL-00037" summary="공유기능 퍼블리싱 및 기능 적용">
<created>1650286771669</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1650286771669</updated>
</task>
<task id="LOCAL-00038" summary="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함.">
<created>1650292837211</created>
<option name="number" value="00038" />
<option name="presentableId" value="LOCAL-00038" />
<option name="project" value="LOCAL" />
<updated>1650292837211</updated>
</task>
<task id="LOCAL-00039" summary="d-day 체크리스트 사항 수정">
<created>1650298188595</created>
<option name="number" value="00039" />
<option name="presentableId" value="LOCAL-00039" />
<option name="project" value="LOCAL" />
<updated>1650298188596</updated>
</task>
<task id="LOCAL-00040" summary="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정">
<created>1650646900010</created>
<option name="number" value="00040" />
<option name="presentableId" value="LOCAL-00040" />
<option name="project" value="LOCAL" />
<updated>1650646900010</updated>
</task>
<task id="LOCAL-00041" summary="- 체크리스트 오류사항 수정">
<created>1650706673085</created>
<option name="number" value="00041" />
<option name="presentableId" value="LOCAL-00041" />
<option name="project" value="LOCAL" />
<updated>1650706673085</updated>
</task>
<task id="LOCAL-00042" summary="- 기본음악파일 삭제불가처리">
<created>1650709918086</created>
<option name="number" value="00042" />
<option name="presentableId" value="LOCAL-00042" />
<option name="project" value="LOCAL" />
<updated>1650709918086</updated>
</task>
<task id="LOCAL-00043" summary="소셜회원가입 오류수정">
<created>1650796823828</created>
<option name="number" value="00043" />
<option name="presentableId" value="LOCAL-00043" />
<option name="project" value="LOCAL" />
<updated>1650796823828</updated>
</task>
<task id="LOCAL-00044" summary="아이디 비밀번호 찾기 오류 수정">
<created>1650801028670</created>
<option name="number" value="00044" />
<option name="presentableId" value="LOCAL-00044" />
<option name="project" value="LOCAL" />
<updated>1650801028670</updated>
<updated>1672126962178</updated>
<workItem from="1672126965227" duration="256000" />
<workItem from="1672128318583" duration="1495000" />
<workItem from="1672371372770" duration="5985000" />
<workItem from="1672925731411" duration="386000" />
<workItem from="1672972791115" duration="12394000" />
</task>
<task id="LOCAL-00045" summary="아이디 저장기능 적용">
<created>1650806994907</created>
<option name="number" value="00045" />
<option name="presentableId" value="LOCAL-00045" />
<option name="project" value="LOCAL" />
<updated>1650806994907</updated>
</task>
<task id="LOCAL-00046" summary="체크리스트 오류 수정">
<created>1651074067731</created>
<option name="number" value="00046" />
<option name="presentableId" value="LOCAL-00046" />
<option name="project" value="LOCAL" />
<updated>1651074067731</updated>
</task>
<task id="LOCAL-00047" summary="계정연동 취소하기 기능적용-1">
<created>1651161846084</created>
<option name="number" value="00047" />
<option name="presentableId" value="LOCAL-00047" />
<option name="project" value="LOCAL" />
<updated>1651161846084</updated>
</task>
<task id="LOCAL-00048" summary="계정연동 취소하기 기능적용-2">
<created>1651167758932</created>
<option name="number" value="00048" />
<option name="presentableId" value="LOCAL-00048" />
<option name="project" value="LOCAL" />
<updated>1651167758932</updated>
</task>
<task id="LOCAL-00049" summary="아이정보수정 &gt; 질병기록 오류 수정">
<created>1651202097639</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1651202097639</updated>
</task>
<task id="LOCAL-00050" summary="추천이유식 레시피 식재료 번호 수정">
<created>1651208904947</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1651208904948</updated>
</task>
<task id="LOCAL-00051" summary="디폴트 선택한 아이 유지안되는 버그 수정">
<created>1651210460823</created>
<option name="number" value="00051" />
<option name="presentableId" value="LOCAL-00051" />
<option name="project" value="LOCAL" />
<updated>1651210460823</updated>
</task>
<task id="LOCAL-00052" summary="디폴트 선택한 아이 유지안되는 버그 수정-2">
<created>1651232993829</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1651232993829</updated>
</task>
<task id="LOCAL-00053" summary="튜토리얼 기능 적용">
<created>1651309230468</created>
<option name="number" value="00053" />
<option name="presentableId" value="LOCAL-00053" />
<option name="project" value="LOCAL" />
<updated>1651309230468</updated>
</task>
<task id="LOCAL-00054" summary="튜토리얼 기능 적용-2">
<created>1651309672731</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1651309672731</updated>
</task>
<task id="LOCAL-00055" summary="메모리 &gt; 주간 오류 수정">
<created>1651415855453</created>
<option name="number" value="00055" />
<option name="presentableId" value="LOCAL-00055" />
<option name="project" value="LOCAL" />
<updated>1651415855454</updated>
</task>
<task id="LOCAL-00056" summary="- 아이3명 보기오류 수정&#10;- 아기정보 변경시 생년월이 형식 체크 추가&#10;- 앱 네이버로그인시 코드 수정">
<created>1651483285806</created>
<option name="number" value="00056" />
<option name="presentableId" value="LOCAL-00056" />
<option name="project" value="LOCAL" />
<updated>1651483285807</updated>
</task>
<task id="LOCAL-00057" summary="앱 네이버소셜로그인 수정">
<created>1651549880517</created>
<option name="number" value="00057" />
<option name="presentableId" value="LOCAL-00057" />
<option name="project" value="LOCAL" />
<updated>1651549880517</updated>
</task>
<task id="LOCAL-00058" summary="카카오 소셜로그인 수정">
<created>1651642988293</created>
<option name="number" value="00058" />
<option name="presentableId" value="LOCAL-00058" />
<option name="project" value="LOCAL" />
<updated>1651642988293</updated>
</task>
<task id="LOCAL-00059" summary="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록.">
<created>1651675831475</created>
<option name="number" value="00059" />
<option name="presentableId" value="LOCAL-00059" />
<option name="project" value="LOCAL" />
<updated>1651675831475</updated>
</task>
<task id="LOCAL-00060" summary="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기 - 오류수정&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록. - 오류수정">
<created>1651736465197</created>
<option name="number" value="00060" />
<option name="presentableId" value="LOCAL-00060" />
<option name="project" value="LOCAL" />
<updated>1651736465197</updated>
</task>
<task id="LOCAL-00061" summary="메모리 &gt; 주간 중복 동일 카테고리 간격제거">
<created>1651997859461</created>
<option name="number" value="00061" />
<option name="presentableId" value="LOCAL-00061" />
<option name="project" value="LOCAL" />
<updated>1651997859462</updated>
</task>
<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>
<task id="LOCAL-00063" summary="연동계정 취소하기시 확인 창">
<created>1652062225892</created>
<option name="number" value="00063" />
<option name="presentableId" value="LOCAL-00063" />
<option name="project" value="LOCAL" />
<updated>1652062225892</updated>
</task>
<task id="LOCAL-00064" summary="연동완료후 이동 URL 수정">
<created>1652066405558</created>
<option name="number" value="00064" />
<option name="presentableId" value="LOCAL-00064" />
<option name="project" value="LOCAL" />
<updated>1652066405558</updated>
</task>
<task id="LOCAL-00065" summary="연동완료후 이동 URL 수정-2">
<created>1652066536512</created>
<option name="number" value="00065" />
<option name="presentableId" value="LOCAL-00065" />
<option name="project" value="LOCAL" />
<updated>1652066536512</updated>
</task>
<task id="LOCAL-00066" summary="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정">
<created>1652106063064</created>
<option name="number" value="00066" />
<option name="presentableId" value="LOCAL-00066" />
<option name="project" value="LOCAL" />
<updated>1652106063064</updated>
</task>
<task id="LOCAL-00067" summary="1. 남은 작업 기록&#10;2. 소셜로그인 도메인 및 redirect 정보 프로퍼티 수정">
<created>1652106845798</created>
<option name="number" value="00067" />
<option name="presentableId" value="LOCAL-00067" />
<option name="project" value="LOCAL" />
<updated>1652106845798</updated>
</task>
<task id="LOCAL-00068" summary="1. 젖병 기록 수정">
<created>1652323538975</created>
<option name="number" value="00068" />
<option name="presentableId" value="LOCAL-00068" />
<option name="project" value="LOCAL" />
<updated>1652323538976</updated>
</task>
<task id="LOCAL-00069" summary="유축수유표시 오류 수정">
<created>1652324219016</created>
<option name="number" value="00069" />
<option name="presentableId" value="LOCAL-00069" />
<option name="project" value="LOCAL" />
<updated>1652324219016</updated>
</task>
<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>
<task id="LOCAL-00071" summary="기록정보 홈화면 표시오류 수정-2">
<created>1652340163521</created>
<option name="number" value="00071" />
<option name="presentableId" value="LOCAL-00071" />
<option name="project" value="LOCAL" />
<updated>1652340163521</updated>
</task>
<task id="LOCAL-00072" summary="아이슬라이드 기능 좌우 이동되도록 적용">
<created>1652463194062</created>
<option name="number" value="00072" />
<option name="presentableId" value="LOCAL-00072" />
<option name="project" value="LOCAL" />
<updated>1652463194062</updated>
</task>
<task id="LOCAL-00073" summary="아이슬라이드 기능 좌우 이동되도록 적용-2">
<created>1652463738227</created>
<option name="number" value="00073" />
<option name="presentableId" value="LOCAL-00073" />
<option name="project" value="LOCAL" />
<updated>1652463738227</updated>
</task>
<option name="localTasksCounter" value="74" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="Vcs.Log.History.Properties">
<option name="COLUMN_ID_ORDER">
<list>
<option value="Default.Root" />
<option value="Default.Author" />
<option value="Default.Date" />
<option value="Default.Subject" />
<option value="Space.CommitStatus" />
</list>
</option>
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
<State>
<option name="FILTERS">
<map>
<entry key="text">
<value>
<list>
<option value="wait .... let's me try" />
</list>
</value>
</entry>
</map>
</option>
</State>
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="계정연동 취소하기 기능적용-2" />
<MESSAGE value="아이정보수정 &gt; 질병기록 오류 수정" />
<MESSAGE value="추천이유식 레시피 식재료 번호 수정" />
<MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정" />
<MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정-2" />
<MESSAGE value="튜토리얼 기능 적용" />
<MESSAGE value="튜토리얼 기능 적용-2" />
<MESSAGE value="메모리 &gt; 주간 오류 수정" />
<MESSAGE value="- 아이3명 보기오류 수정&#10;- 아기정보 변경시 생년월이 형식 체크 추가&#10;- 앱 네이버로그인시 코드 수정" />
<MESSAGE value="앱 네이버소셜로그인 수정" />
<MESSAGE value="카카오 소셜로그인 수정" />
<MESSAGE value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록." />
<MESSAGE value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기 - 오류수정&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록. - 오류수정" />
<MESSAGE value="메모리 &gt; 주간 중복 동일 카테고리 간격제거" />
<MESSAGE value="연동계정 취소하기시 확인 창" />
<MESSAGE value="연동완료후 이동 URL 수정" />
<MESSAGE value="연동완료후 이동 URL 수정-2" />
<MESSAGE value="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정" />
<MESSAGE value="1. 남은 작업 기록&#10;2. 소셜로그인 도메인 및 redirect 정보 프로퍼티 수정" />
<MESSAGE value="1. 젖병 기록 수정" />
<MESSAGE value="유축수유표시 오류 수정" />
<MESSAGE value="기록정보 홈화면 표시오류 수정" />
<MESSAGE value="기록정보 홈화면 표시오류 수정-2" />
<MESSAGE value="아이슬라이드 기능 좌우 이동되도록 적용" />
<MESSAGE value="아이슬라이드 기능 좌우 이동되도록 적용-2" />
<option name="LAST_COMMIT_MESSAGE" value="아이슬라이드 기능 좌우 이동되도록 적용-2" />
</component>
</project>

132
src/main/resources/bf.properties
Unescape View File

@ -1,67 +1,67 @@
########## 개발 Environment ##########
#URL_BASE=http://15.164.37.166:80
URL_BASE=http://121.166.66.72:14280
SERVER_TP_KOR=개발
SERVER_TP=DEV
#system.domain=http://15.164.37.166:80
system.domain=http://121.166.66.72:14280
#system.weburl=http://15.164.37.166:14288
system.weburl=http://121.166.66.72:14288
SERVER_NAME=bf
PLATFORM_VERSION = 1.0
PLATFORM_NAME = 백오피스
COMPANY_NAME = 가온앤
COMPANY_MAIL = renamaestro@gmail.com
system.servername=bf
REAL_BACKOFFICE=bf
AGENT_LOGO_IMG=
AGENT_HOMEPAGE_LINK=http://
AGENT_HOMEPAGE_NAME=가온앤
########## Database Main ##########
maxActCon=10
maxRequests=10
maxSessions=10
maxTransactions=10
logAbondoned=false
removeAbondoned=false
abondonedTimeout=60000
initialSize=10
maxTotal=10
maxIdle=10
minIdle=10
maxWaitMillis=3600000
maxWaitTime=3600000
poolPreparedStatements=true
validationQuery=select 1
maximumActiveConnections=10
maximumIdleConnections=10
logAbandoned=true
removeAbandoned=true
removeAbandonedTimeout=30000
defaultTransactionIsolation=2
social.url.naverApiUrl=https://openapi.naver.com/v1/nid/me
social.url.kakaoApiUrl=https://kapi.kakao.com/v2/user/me
social.key.naverAppKey=LLHMLQcsbBC8LhAuNeh5
social.key.kakaoAppKey=c0c39f65c1435fe0670ff76fe2296b06
social.callback.naver=/m/login/nhnLogin_callback
social.callback.kakao=/m/login/kakaoLogin_callback.do
sms.api_id=gaonn0509
sms.api_key=040ec316ad13c59031b5c4c30cdec923
sms.api_sendnum=02-363-5123
file.music_path=c:/bf/music/
smtp.mail_id=eusikdang@gmail.com
smtp.mail_pw=vumbtgvkdpqzrdnn
mysql_driver=net.sf.log4jdbc.DriverSpy
#mysql_url=jdbc:log4jdbc:mysql://15.164.37.166:3306/babyfeed
mysql_url=jdbc:log4jdbc:mysql://121.166.66.72:14236/babyfeed
#mysql_username=root
mysql_username=imcloud
?########## ?? Environment ##########
#URL_BASE=http://15.164.37.166:80
URL_BASE=http://121.166.66.72:14280
SERVER_TP_KOR=??
SERVER_TP=DEV
#system.domain=http://15.164.37.166:80
system.domain=http://121.166.66.72:14280
#system.weburl=http://15.164.37.166:14288
system.weburl=http://121.166.66.72:14288
SERVER_NAME=bf
PLATFORM_VERSION = 1.0
PLATFORM_NAME = ????
COMPANY_NAME = ???
COMPANY_MAIL = renamaestro@gmail.com
system.servername=bf
REAL_BACKOFFICE=bf
AGENT_LOGO_IMG=
AGENT_HOMEPAGE_LINK=http://
AGENT_HOMEPAGE_NAME=???
########## Database Main ##########
maxActCon=10
maxRequests=10
maxSessions=10
maxTransactions=10
logAbondoned=false
removeAbondoned=false
abondonedTimeout=60000
initialSize=10
maxTotal=10
maxIdle=10
minIdle=10
maxWaitMillis=3600000
maxWaitTime=3600000
poolPreparedStatements=true
validationQuery=select 1
maximumActiveConnections=10
maximumIdleConnections=10
logAbandoned=true
removeAbandoned=true
removeAbandonedTimeout=30000
defaultTransactionIsolation=2
social.url.naverApiUrl=https://openapi.naver.com/v1/nid/me
social.url.kakaoApiUrl=https://kapi.kakao.com/v2/user/me
social.key.naverAppKey=LLHMLQcsbBC8LhAuNeh5
social.key.kakaoAppKey=c0c39f65c1435fe0670ff76fe2296b06
social.callback.naver=/m/login/nhnLogin_callback
social.callback.kakao=/m/login/kakaoLogin_callback.do
sms.api_id=gaonn0509
sms.api_key=040ec316ad13c59031b5c4c30cdec923
sms.api_sendnum=02-363-5123
file.music_path=c:/bf/music/
smtp.mail_id=eusikdang@gmail.com
smtp.mail_pw=vumbtgvkdpqzrdnn
mysql_driver=net.sf.log4jdbc.DriverSpy
#mysql_url=jdbc:log4jdbc:mysql://15.164.37.166:3306/babyfeed
mysql_url=jdbc:log4jdbc:mysql://121.166.66.72:14236/babyfeed
#mysql_username=root
mysql_username=imcloud
mysql_password=imc1234

4
src/main/webapp/META-INF/context.xml
Unescape View File

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

47
src/main/webapp/WEB-INF/views/ftl/m/include/index_tutorial.ftl
Unescape View File

@ -9,6 +9,7 @@
</div>
<div class="cont_sub_title">
<div class="title">내 아이의 모든 순간을 기록해보세요</div>
<div class="step" style="color:#fff;font-size:20px;margin-top:10px;">(1/5)</div>
</div>
<div class="cont_btn">
@ -29,9 +30,11 @@
<div class="cont_sub_title">
<div class="title">아이를 위한 영양만점 이유식 정보를</div>
<div class="title">확인해보세요</div>
<div class="step" style="color:#fff;font-size:20px;margin-top:10px;">(2/5)</div>
</div>
<div class="cont_btn">
<div class="cont_btn cont_btn1">
<div style="cursor:pointer" onclick="fnBack(1)" class="btn">뒤로</div>
<div style="cursor:pointer" onclick="fncNext(1,3)" class="btn">다음</div>
</div>
</div>
@ -47,9 +50,11 @@
</div>
<div class="cont_sub_title">
<div class="title">내 아이의 영양 상태를 확인해보세요 </div>
<div class="step" style="color:#fff;font-size:20px;margin-top:10px;">(3/5)</div>
</div>
<div class="cont_btn">
<div class="cont_btn cont_btn1">
<div style="cursor:pointer" onclick="fnBack(2)" class="btn">뒤로</div>
<div style="cursor:pointer" onclick="fncNext(1,4)" class="btn">다음</div>
</div>
</div>
@ -65,9 +70,11 @@
</div>
<div class="cont_sub_title">
<div class="title">내 아이의 영양 상태를 확인해보세요 </div>
<div class="step" style="color:#fff;font-size:20px;margin-top:10px;">(4/5)</div>
</div>
<div class="cont_btn">
<div class="cont_btn cont_btn1">
<div style="cursor:pointer" onclick="fnBack(3)" class="btn">뒤로</div>
<div style="cursor:pointer" onclick="fncNext(1,5)" class="btn">다음</div>
</div>
</div>
@ -113,6 +120,24 @@
</div>
<div class="arrow_flex" style="bottom: 50px;">
<div class="header_sprites_notice"></div>
<div class="header_sprites_menu"></div>
<div class="footer_sprites_menu_new">
<div class="icon icon1"></div>
<div class="title_new">이유식</div>
</div>
<div class="footer_sprites_menu_new footer_sprites_menu_new2">
<div class="icon icon2"></div>
<div class="title_new">아기건강</div>
</div>
<div class="footer_sprites_menu_new footer_sprites_menu_new4">
<div class="icon icon4"></div>
<div class="title_new">메모리</div>
</div>
<div class="footer_sprites_menu_new footer_sprites_menu_new5">
<div class="icon icon5"></div>
<div class="title_new">커뮤니티</div>
</div>
<div class="box">
<div class="arrow_box85">이유식 레시피/<br>영양정보</div>
<img class="ico_arrow_down" src="../img/tutorial/ico_arrow_up.svg">
@ -134,14 +159,23 @@
</div>
</div>
<div class="cont_btn cont_btn_start" style="position: absolute; bottom: 220px;">
<div style="cursor:pointer" onclick="fncNext(1,999)" class="btn">시작하기</div>
<div class="cont_btn cont_btn_start " style="position: absolute; bottom: 220px;">
<div class="step" style="color:#fff;font-size:20px;margin-top:10px;text-align: center">(5/5)</div>
<div class="cont_btn1">
<div style="cursor:pointer" onclick="fnBack(4)" class="btn">뒤로</div>
<div style="cursor:pointer" onclick="fncNext(1,999)" class="btn">시작하기</div>
</div>
</div>
</div>
<script>
function fnBack(toturial_idx) {
$(".tutorial").hide();
$("#tutorial_" + toturial_idx).show();
}
//다음 튜터리얼 이동
function fncNext(p_menu_id, toturial_idx) {
function fncNext(p_menu_id, toturial_idx, back_idx) {
if(toturial_idx == 999) {
$(".tutorial").hide();
@ -161,6 +195,7 @@
// console.log(result);
// var RESULT = result.RESULT;
// var RESULT_MSG = result.RESULT_MSG;
location.href='${URL_ROOT}/m/bf_family_baby/view_bf_family_baby.do?return_url=list_bf_family_baby'
is_loading = false;
}
});

71
src/main/webapp/m/css/style.css
Unescape View File

@ -7102,6 +7102,8 @@ p.selectbox {
padding: 15px 10px 17px 20px;
min-height: 55px;
border-bottom: 1px solid #ccc;
display: flex;
align-items: center;
}
.nutrition_kinds_search .search_result li:last-child {
@ -7116,14 +7118,15 @@ p.selectbox {
font-size: 14px;
word-spacing: -2px;
padding-left: 20px;
display: flex;
align-items: center;
}
.nutrition_kinds_search .search_result li img {
position: absolute;
top: 15%;
left: 10px;
width: 25px;
height: 35px;
height: 25px;
margin-right: 5px;
}
@ -15177,7 +15180,63 @@ main.sona_cont_measurement {
align-items: center;
margin-top: 7.5%;
}
.tutorial .header_sprites_notice{
background: url(../img/header_sprites.png) no-repeat -2.25rem -0.375rem/ auto 3.875rem;
width: 1.1875rem;
height: 1.4375rem;
color: #fff;
position: fixed;
top:10px;
left: auto;
right: 20px;
}
.tutorial .header_sprites_menu{
color: #fff;
position: fixed;
top: 15px;
left: 22px;
background: url(../img/header_sprites.png) no-repeat -0.37125rem -2.4375rem/ auto 3.875rem;
width: 1.3125rem;
height: 1.1875rem;
}
.footer_sprites_menu_new{
position: fixed;
color: #fff;
bottom: 11px;
font-size: 12px;
width: 20%;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
left:0;
}
.footer_sprites_menu_new2{
left:20%;
}
.footer_sprites_menu_new4{
left:60%;
}
.footer_sprites_menu_new5{
left:80%;
}
.footer_sprites_menu_new .icon{
width: 30px;
height: 40px;
filter: brightness(200%);
}
.footer_sprites_menu_new .icon1{
background: url(../img/main/iyu_nav_ico01.png) no-repeat center/auto 23px;
}
.footer_sprites_menu_new .icon2{
background: url(../img/main/iyu_nav_ico02.png) no-repeat center/auto 23px;
}
.footer_sprites_menu_new .icon4{
background: url(../img/main/iyu_nav_ico04.png) no-repeat center/auto 23px;
}
.footer_sprites_menu_new .icon5{
background: url(../img/main/iyu_nav_ico05.png) no-repeat center/auto 23px;
}
.tutorial .title {
color: #fff;
font-size: 1.1rem;
@ -15228,7 +15287,13 @@ main.sona_cont_measurement {
border-radius: 10px;
margin-top: 1rem;
}
.cont_btn1{
display: flex;
}
.cont_btn div{
margin:0 10px;
}
.tutorial .arrow {
position: absolute;
display: flex;

Write Preview
Loading…
Cancel
Save