From 234d7a14f2c74edc5ee062586075cff05c0c13ea Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Sat, 26 Mar 2022 20:54:10 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EB=AA=A8=EC=A0=95=EB=B3=B4=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EB=8F=99=EA=B8=B0=ED=99=94=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/encodings.xml                           |  2 +-
 .idea/workspace.xml                           | 26 ++++++++++++++-----
 .../m/bf_family/M_Bf_familyController.java    |  7 +++++
 .../com.backoffice.m.member_env.xml           |  4 +--
 .../ftl/m/member_env/setting_sync_confirm.ftl | 13 +++++++++-
 개발참고.txt                              |  2 +-
 6 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 97626ba..c2bae49 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 37a975f..ec7165f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,9 +11,11 @@
   <component name="ChangeListManager">
     <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" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_family/M_Bf_familyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_family/M_Bf_familyController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" 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" />
+      <change beforePath="$PROJECT_DIR$/개발참고.txt" beforeDir="false" afterPath="$PROJECT_DIR$/개발참고.txt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -56,11 +58,13 @@
     <property name="project.structure.last.edited" value="프로젝트" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.0" />
-    <property name="settings.editor.selected.configurable" value="vcs.Git" />
+    <property name="settings.editor.selected.configurable" value="File.Encoding" />
+    <property name="settings.editor.splitter.proportion" value="0.3126273" />
   </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://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" />
       <deployment>
@@ -166,7 +170,9 @@
       <workItem from="1647827688472" duration="275000" />
       <workItem from="1647828259040" duration="971000" />
       <workItem from="1647845776551" duration="2830000" />
-      <workItem from="1648224612860" duration="2569000" />
+      <workItem from="1648224612860" duration="3752000" />
+      <workItem from="1648230232646" duration="27000" />
+      <workItem from="1648280563733" duration="10279000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -182,7 +188,14 @@
       <option name="project" value="LOCAL" />
       <updated>1646014385815</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="메인페이지 챗봇 관련 수정">
+      <created>1648229178397</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1648229178397</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -205,6 +218,7 @@
     <option name="CHECK_NEW_TODO" value="false" />
     <MESSAGE value="최초 커밋" />
     <MESSAGE value="설정파일커밋" />
-    <option name="LAST_COMMIT_MESSAGE" value="설정파일커밋" />
+    <MESSAGE value="메인페이지 챗봇 관련 수정" />
+    <option name="LAST_COMMIT_MESSAGE" value="메인페이지 챗봇 관련 수정" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/m/bf_family/M_Bf_familyController.java b/src/main/java/com/backoffice/m/bf_family/M_Bf_familyController.java
index 6f38cca..d268181 100644
--- a/src/main/java/com/backoffice/m/bf_family/M_Bf_familyController.java
+++ b/src/main/java/com/backoffice/m/bf_family/M_Bf_familyController.java
@@ -171,6 +171,10 @@ public class M_Bf_familyController extends AbstractControllerManager{
 		
 		DataMap paramMap = gmUtil.getDataMapFromRequest(request);
 
+		log.info("부모정보 입력 ----------------");
+		log.info("엄마:" + paramMap.get("birthday"));
+		log.info("아빠:" + paramMap.get("f_birthday"));
+
 		String redirect_url = "redirect:/m/bf_family/view_bf_family.do";
 		
 		try {
@@ -202,6 +206,9 @@ public class M_Bf_familyController extends AbstractControllerManager{
 					paramMap.put("bf_f_no", bf_f_no);
 				}else{
 					paramMap.put("bf_no", bf_f_no);
+					paramMap.put("birthday", paramMap.get("f_birthday"));
+					paramMap.put("weight", paramMap.get("f_weight"));
+					paramMap.put("height", paramMap.get("f_height"));
 					bf_familyBO.update_bf_f_family(paramMap);
 				}
 				ra.addFlashAttribute("script_msg", "저장 되었습니다");
diff --git a/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml b/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml
index 147bb77..4a32c86 100644
--- a/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml
+++ b/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml
@@ -92,7 +92,7 @@
 	</update>
 
 	<!-- 아이정보 해당 아이디로 동기화 처리 -->
-	<update id="insert_bf_sync_family_baby" parameterClass="dataMap">
+	<insert id="insert_bf_sync_family_baby" parameterClass="dataMap">
 		INSERT INTO tbl_bf_family_match
 		(
 			member_id,
@@ -106,7 +106,7 @@
 		FROM tbl_bf_family_baby a
 		INNER JOIN tbl_bf_family_match y on a.smc_no = y.smc_no
 		INNER JOIN tbl_sync_log b on y.member_id = b.member_id and b.sync_num = #sync_num# and DATE_ADD(b.reg_dt, INTERVAL 180 second) > now()
-	</update>
+	</insert>
 
 	<!-- 기록 카테고리 정렬 삭제 -->
 	<delete id="delete_tbl_member_category" parameterClass="dataMap">
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm.ftl
index 3f341cb..3bfd830 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm.ftl
@@ -33,6 +33,11 @@
 
 <script>
     function fncSync() {
+        if( $("#sync_num").val() == "") {
+            Swal.fire({text: '동기화 코드를 입력해주세요'});
+            return;
+        }
+
         $.ajax({
             url: '${URL_ROOT}/m/member_env/ajax_sync_baby.do?1=1',
             type: 'post',
@@ -45,7 +50,13 @@
                 console.log("동기화가 실패하였습니다." + status);
             },
             success :  function(result) {
-                alert("동기화가 완료 되었습니다.");
+                // console.log(result);
+                if(result == "0") {
+                    Swal.fire({ text: "동기화가 완료 되었습니다.", icon: 'success', showConfirmButton: false, timer: 2500 }); // success
+                } else {
+                    Swal.fire({text: '동기화가 실패 하였습니다. 인증코드 확인 부탁드립니다.'});
+                    return;
+                }
                 location.href= "${URL_ROOT}/m/member_env/setting_nm.do?view_nm=setting";
             }
         });
diff --git a/개발참고.txt b/개발참고.txt
index 25dfdb1..de0b277 100644
--- a/개발참고.txt
+++ b/개발참고.txt
@@ -1,7 +1,7 @@
 # 계정정보
  - 어드민 운영서버 : [http://devops.lookylooks.ai:14288/bf/admin/index.do](http://devops.lookylooks.ai:14288/bf/admin/index.do)
  - 프론트 운영서버 : [http://devops.lookylooks.ai:14288/bf/m/login/view_login.do](http://devops.lookylooks.ai:14288/bf/m/login/view_login.do)
- - 계정정보 : imcloud / imc1234
+ - 어드민 계정정보 : imcloud / imc1234
 
 # DB정보
  - http://devops.lookylooks.ai:14236