- 체크리스트 오류사항 수정

.idea/workspace.xml

@@ -9,17 +9,19 @@
     <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="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정">
       <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/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/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/include/confirm.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/admin/bf/bf_notice/A_Bf_noticeBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/admin/bf/bf_notice/A_Bf_noticeBO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/admin/bf/bf_notice/A_Bf_noticeBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/admin/bf/bf_notice/A_Bf_noticeBOImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBOImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_notice.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_notice.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_notice/com.backoffice.m.bf_notice.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_notice/com.backoffice.m.bf_notice.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.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/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01_confirm.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01_confirm.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -234,7 +236,9 @@
       <workItem from="1650593739212" duration="527000" />
       <workItem from="1650608503578" duration="718000" />
       <workItem from="1650613105021" duration="532000" />
-      <workItem from="1650638814398" duration="7547000" />
+      <workItem from="1650638814398" duration="7670000" />
+      <workItem from="1650687202332" duration="1688000" />
+      <workItem from="1650693305284" duration="6651000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -509,7 +513,14 @@
       <option name="project" value="LOCAL" />
       <updated>1650298188596</updated>
     </task>
-    <option name="localTasksCounter" value="40" />
+    <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>
+    <option name="localTasksCounter" value="41" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -529,7 +540,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="데이터 연동작업" />
     <MESSAGE value="퍼블리싱 기능 적용&#10;1. 설정하기&#10; - 인증코드 확인&#10; - 계정연동 하기&#10; - 기록 카테고리 수정&#10; - 자주쓰는 표현 수정&#10; &#10;2. 로그인화면" />
@@ -554,6 +564,7 @@
     <MESSAGE value="공유기능 퍼블리싱 및 기능 적용" />
     <MESSAGE value="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함." />
     <MESSAGE value="d-day 체크리스트 사항 수정" />
-    <option name="LAST_COMMIT_MESSAGE" value="d-day 체크리스트 사항 수정" />
+    <MESSAGE value="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정" />
+    <option name="LAST_COMMIT_MESSAGE" value="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정" />
   </component>
 </project>

src/main/java/com/backoffice/admin/bf/bf_notice/A_Bf_noticeBO.java

@@ -12,6 +12,8 @@ public interface A_Bf_noticeBO {
 	public abstract List<DataMap> select_bf_notice_img_by_gn_no(DataMap paramMap) throws Exception;
 	
     public abstract int select_bf_notice_list_count(DataMap paramMap) throws Exception;
+    public abstract int select_recent_notice_count(DataMap paramMap) throws Exception;
+
 	public abstract List<DataMap> select_bf_notice_list(DataMap paramMap) throws Exception;
 	public abstract DataMap select_bf_notice(DataMap paramMap) throws Exception;
 	

src/main/java/com/backoffice/admin/bf/bf_notice/A_Bf_noticeBOImpl.java

@@ -32,6 +32,19 @@ public class A_Bf_noticeBOImpl extends AbstractBOManager implements A_Bf_noticeB
 		return lm;
 	}
 
+	public int select_recent_notice_count(DataMap paramMap) throws Exception{
+		int result = 0;
+
+		try {
+			generalDAO.setNamespace(SQLMAP_NAMESPACE);
+			result = generalDAO.select_item_to_number("select_recent_notice_count", paramMap);
+		} catch (SQLException e) {
+			throw e;
+		}
+
+		return result;
+	}
+
     public int select_bf_notice_list_count(DataMap paramMap) throws Exception{
         int result = 0;
         

src/main/java/com/backoffice/m/index/M_IndexController.java

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import com.backoffice.admin.bf.bf_notice.A_Bf_noticeBO;
 import com.backoffice.admin.bf.bf_score.A_Bf_scoreBO;
 import com.backoffice.logic.FoodScoreCalculation;
 import com.backoffice.logic.NutrientScoreCalculation;
@@ -56,6 +57,7 @@ public class M_IndexController extends AbstractControllerManager{
 	@Autowired M_Bf_growth_bodyBO bf_growth_bodyBO;
 	@Autowired M_Bf_daily_nutritionBO bf_daily_nutritionBO;
 	@Autowired A_Bf_scoreBO scoreBO;
+	@Autowired A_Bf_noticeBO bf_noticeBO;
 
 	// paging info
 	int ROW_COUNT = 20;
@@ -164,6 +166,9 @@ public class M_IndexController extends AbstractControllerManager{
 				// 아이
 				DataMap rm_child = init_child(model, request, paramMap);
 
+				int recent_notice_cnt = bf_noticeBO.select_recent_notice_count(paramMap);
+				paramMap.put("recent_notice_cnt", recent_notice_cnt);
+
 				if(rm_child != null) {
 					// 선택아이 성장 정보 조회
 					DataMap rm_last_h = init_child_info(model, request, paramMap, "Y", "N");				

src/main/java/com/backoffice/m/login/M_LoginBO.java

@@ -16,6 +16,8 @@ public interface M_LoginBO {
 	public abstract DataMap select_member_with_id(DataMap paramMap) throws Exception;
 	public abstract DataMap select_member(DataMap paramMap) throws Exception;
 
+	public abstract int select_member_check_pw(DataMap paramMap) throws Exception;
+
 	int update_member_with_pwd(DataMap paramMap) throws Exception;
 	int update_member(DataMap paramMap) throws Exception;
 	int update_member_pw(DataMap paramMap) throws Exception;

src/main/java/com/backoffice/m/login/M_LoginBOImpl.java

@@ -85,6 +85,20 @@ public class M_LoginBOImpl extends AbstractBOManager implements M_LoginBO {
 		return rm;
 	}
 
+	public int select_member_check_pw(DataMap paramMap) throws Exception{
+		int result = 0;
+
+		try {
+			generalDAO.setNamespace(SQLMAP_NAMESPACE);
+			result = generalDAO.select_item_to_number("select_member_check_pw", paramMap);
+		} catch (SQLException e) {
+			throw e;
+		}
+
+		return result;
+	}
+
+
 	@Override
 	public int update_member_with_pwd(DataMap paramMap) throws Exception{
 		int result = 0;

src/main/java/com/backoffice/m/member_env/M_Member_envController.java

@@ -439,10 +439,16 @@ public class M_Member_envController extends AbstractControllerManager{
 				result.put("RESULT", ConstantResultCode.RESULT_NEED_PARAMS);
 			}else {
 				HttpSession session = request.getSession(false);
-
 				String password = RenaStringUtil.getData(paramMap, "password_1");			//변경될 패스워드
 				paramMap.put("password", RenaEncription.getInstance().getSHA256(password));
 
+				//이전 암호와 동일한지 비교
+				int cnt = loginBO.select_member_check_pw(paramMap);
+				if(cnt > 0) {
+					result.put("RESULT", ConstantResultCode.RESULT_CUSTOM_MSG);
+					result.put("MSG", "신규 비밀번호가 이전 비밀번호와 동일합니다.");
+				} else {
+
 					if(loginBO.update_member_pw(paramMap) <= 0) {
 						result.put("RESULT", ConstantResultCode.RESULT_EXCEPTION);
 					} else {
@@ -452,6 +458,7 @@ public class M_Member_envController extends AbstractControllerManager{
 						result.put("RESULT", ConstantResultCode.RESULT_SUCCESS);
 					}
 				}
+			}
 		} catch (Exception ex1) {
 			ex1.printStackTrace();
 			result.put("RESULT", ConstantResultCode.RESULT_EXCEPTION);

src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_notice.xml

@@ -33,6 +33,13 @@
 		
     </select>
 
+	<select id="select_recent_notice_count" resultClass="Integer" parameterClass="dataMap">
+		SELECT
+			count(*)
+		FROM tbl_bf_notice x
+		WHERE DATE_ADD(x.reg_dt, INTERVAL 7 day) <![CDATA[>]]> now();
+	</select>
+
     <select id="select_bf_notice_list" resultClass="dataMap" parameterClass="dataMap">
 		SELECT x.*
 		

src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml

@@ -11,6 +11,20 @@
 		  AND x.email = #email#
     </select>
 
+	<select id="select_member_check_pw" resultClass="Integer" parameterClass="dataMap">
+		SELECT
+			count(*)
+		FROM tbl_member x
+		WHERE member_id =
+		(
+			select
+				member_id
+			from tbl_member_confirm b
+			where email = #email#
+		)
+		AND x.password = #password#
+	</select>
+
 	<select id="select_member_confirm_for_check_social" resultClass="dataMap" parameterClass="dataMap">
 		SELECT
 			x.member_id,

src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl

@@ -30,7 +30,7 @@
 							<#else>
 								<p onclick="fncImgDivClick()" class="proimg"><img style="width: 65; height: 64px; object-fit:cover; border-radius:60px;" id="preview-img" src="../img/main/nutrition_cont_img_camera.png" alt="프로필 사진" /></p>
 							</#if>
-							<p class="info"><span class="name">사진을 등록해주세요</span></p>
+							<p class="info"><span class="name">사진변경을 원할 시 이미지를 클릭해서 등록해주세요</span></p>
 						</div>
 					</div>
 					<h2 class="p_sub_title">아기 이름<span style="color:#FF9C01">*</span></h2>

src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl

@@ -40,8 +40,11 @@
 			<h1 class="brand_logo hidden">이유식당</h1>
 		</div>
 		<div class="right_btn_box">
-<#--			<a href="${URL_ROOT}/m/bf_notice/list_bf_notice.do" class="side_Rbtn noti_new_btn hidden">알림센터</a>-->
+			<#if model['recent_notice_cnt'] gt 0 >
+				<a href="${URL_ROOT}/m/bf_notice/list_bf_notice.do" class="side_Rbtn noti_new_btn hidden">알림센터${model['recent_notice_cnt']}</a>
+			<#else>
 				<a href="${URL_ROOT}/m/bf_notice/list_bf_notice.do" class="side_Rbtn hidden">알림센터</a>
+			</#if>
 		</div>
 	</header>
 

src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl

@@ -15,7 +15,7 @@
 		<div id="search_id" class="search_id">
 			<div class="search_phone">
 				<h3>비밀번호 재설정</h3>
-				<div class="input_search_phone">
+				<div style="padding-bottom: 15px" class="input_search_phone">
 					<input type="password" maxlength="15" id="password_1" name="password_1" value="" class="input_box" placeholder="영문/숫자/특수문자2조합 9~15자 이내로 작성해주세요." />
 				</div>
 				<div class="input_search_phone">