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

메인페이지 챗봇 관련 수정

Browse Source
dev_bert
jonghwan76 3 years ago
parent ebbc4757ed
commit 7daa8b4af6
4 changed files with 87 additions and 70 deletions
Show Stats Download Patch File Download Diff File

8
.idea/encodings.xml
Unescape View File

@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<<<<<<< HEAD
<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" />
=======
<component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
<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" />
>>>>>>> 2b825f68f968665fd5ed658b68d5a9f36fb2d599
</component>
</project>

6
.idea/jarRepositories.xml
Unescape View File

@ -7,8 +7,6 @@
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<<<<<<< HEAD
=======
<option name="id" value="maven2" />
<option name="name" value="maven2" />
<option name="url" value="http://repo1.maven.org/maven2" />
@ -24,7 +22,6 @@
<option name="url" value="http://maven.egovframe.go.kr/maven/" />
</remote-repository>
<remote-repository>
>>>>>>> 2b825f68f968665fd5ed658b68d5a9f36fb2d599
<option name="id" value="egovframe" />
<option name="name" value="egovframe" />
<option name="url" value="https://maven.egovframe.go.kr/maven/" />
@ -39,8 +36,6 @@
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<<<<<<< HEAD
=======
<remote-repository>
<option name="id" value="maven2" />
<option name="name" value="maven2" />
@ -56,6 +51,5 @@
<option name="name" value="maven2" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
>>>>>>> 2b825f68f968665fd5ed658b68d5a9f36fb2d599
</component>
</project>

37
.idea/workspace.xml
Unescape View File

@ -9,7 +9,12 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<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/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
<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/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -24,6 +29,14 @@
<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" />
<option name="FILTER_WARNINGS" value="false" />
@ -47,7 +60,7 @@
</component>
<component name="RunManager">
<configuration name="Tomcat 9.0.43" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.43" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
<option name="OPEN_IN_BROWSER_URL" value="http://dev.bf.co.kr:8080/bf/" />
<option name="OPEN_IN_BROWSER_URL" value="http://devops.lookylooks.ai:14288/bf/" />
<option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
<option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
<deployment>
@ -59,6 +72,7 @@
</deployment>
<server-settings>
<option name="BASE_DIRECTORY_NAME" value="74459d57-0c62-4108-b724-12902c75dca6" />
<option name="HTTP_PORT" value="14288" />
</server-settings>
<predefined_log_file enabled="true" id="Tomcat" />
<predefined_log_file enabled="true" id="Tomcat Catalina" />
@ -146,6 +160,13 @@
<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="2569000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -154,7 +175,14 @@
<option name="project" value="LOCAL" />
<updated>1645354476031</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="설정파일커밋">
<created>1646014385815</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1646014385815</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -176,6 +204,7 @@
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="최초 커밋" />
<option name="LAST_COMMIT_MESSAGE" value="최초 커밋" />
<MESSAGE value="설정파일커밋" />
<option name="LAST_COMMIT_MESSAGE" value="설정파일커밋" />
</component>
</project>

2
src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
Unescape View File

@ -261,11 +261,13 @@
<!-- //main -->
<!-- float chatbot -->
<#if model[ 'rm_child']? has_content>
<a href="http://devops.lookylooks.ai:42110/browser_common_index.html?site_id=7973031d-157e-4140-914e-8f39059098d2&cb_id=31ef0fe4-3c2d-4d5a-b73b-76f7213b1737&ch_id=null&in=test_in_id&phone_num=${model['rm_mem']['phone_num']!}&name=${model['rm_child']['name']}&month=${(model['rm_child']['past_month'])}">
<div class="float_chatbot">
<img src="https://ccbot.hanaw.com/img/hana_icon.JPG">
</div>
</a>
</#if>
</div>
<!-- //wrap -->

Write Preview
Loading…
Cancel
Save