한글파일명 음악파일 업로드이슈 수정

dev_bert
jonghwan76 3 years ago
parent 420b04a71c
commit 0f1ef5dd79

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

@ -9,10 +9,17 @@
<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 afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week_20220327.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/runConfigurations.xml" beforeDir="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/login/view_join_member_04.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl" 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$/src/main/java/com/backoffice/api/ApiSMSController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.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/api/com.backoffice.api.bf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.sms.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.sms.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/member_env/view_set_account.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -43,6 +50,9 @@
<option name="FILTER_DEBUG" value="true" />
<option name="CUSTOM_FILTER" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProjectId" id="25N3nbghfzlUr7bQe0LDtBjHKie" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
@ -55,7 +65,7 @@
<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/webapp/WEB-INF/views/ftl/m/member_env" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory" />
<property name="project.structure.last.edited" value="프로젝트" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.0" />
@ -64,11 +74,12 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\memory" />
<recent name="C:\Users\MSI\IdeaProjects\bf\src\main\webapp\WEB-INF\views\ftl\m\member_env" />
</key>
</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">
<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" />
@ -232,7 +243,6 @@
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />

@ -147,6 +147,8 @@ public class ApiSMSController extends AbstractControllerManager{
if("P".equals(check_being)){
map_json.put("sms_msg", "이미 가입된 전화번호 입니다!");
} else if("W".equals(check_being)){
map_json.put("sms_msg", "해당계정은 탈퇴 처리 되었습니다. 30일 이후에 재가입 하실수 있습니다!");
}
}else{

@ -1,6 +1,7 @@
package com.backoffice.m.member_env;
import java.io.File;
import java.net.URLEncoder;
import java.util.*;
import java.util.Map.Entry;
@ -707,6 +708,7 @@ public class M_Member_envController extends AbstractControllerManager{
for (MultipartFile mf : fileList) {
idx = idx + 1;
String originFileName = mf.getOriginalFilename(); // 원본 파일 명
// String originFileName = URLEncoder.encode(mf.getOriginalFilename()).replaceAll("\\+", "%20");
String fileType = originFileName.substring(originFileName.lastIndexOf(".") + 1);
String saveFileName = nFileName + "_" + idx + "." + fileType; //저장된 음악 파일명
String filePath = path + "/" + rm_mem.get("member_id"); //저장파일 위치

@ -40,6 +40,7 @@
,x.social_type
,x.reg_dt
,x.mod_dt
,x.social_type
,x.withdraw_yn
,mc.email
,mc.phone_num

@ -4,9 +4,12 @@
<select id="select_member_is_being_member_id" resultClass="dataMap" parameterClass="dataMap">
SELECT
x.member_id
,CASE WHEN mc.email = #email# THEN 'E'
WHEN mc.phone_num = #phone_num# THEN 'P'
ELSE 'M' END check_being
,CASE
WHEN x.withdraw_yn = 'Y' THEN 'W'
WHEN mc.email = #email# THEN 'E'
WHEN mc.phone_num = #phone_num# THEN 'P'
ELSE 'M'
END check_being
FROM tbl_member x, tbl_member_confirm mc
WHERE 1 =1

@ -38,6 +38,7 @@
,x.reg_dt
,x.mod_dt
,x.withdraw_yn
,x.social_type
,mc.email
,mc.phone_num

@ -34,7 +34,7 @@
<a href="${URL_ROOT}/m/member_env/setting_nm.do?view_nm=view_set_account_name&return_url=view_set_account" class="list_item">
<span class="emphasis_tit">이름</span> 변경
</a>
<a href="${URL_ROOT}/m/member_env/setting_nm.do?view_nm=view_set_account_pw&return_url=view_set_account" class="list_item">
<a href="javascript:fncGoSetPwd();" class="list_item">
<span class="emphasis_tit">비밀번호</span> 변경
</a>
<a href="${URL_ROOT}/m/member_env/setting_nm.do?view_nm=view_set_account_phone&return_url=view_set_account" class="list_item">
@ -56,5 +56,18 @@
<#include "/m/member_env/include_return_url.ftl">
<script>
var socialType = "${Session.rm_member['social_type']!}";
function fncGoSetPwd() {
if(socialType == "") {
location.href = "${URL_ROOT}/m/member_env/setting_nm.do?view_nm=view_set_account_pw&return_url=view_set_account";
} else {
Swal.fire({text: socialType + ' 소셜 로그인 회원은 해당 소셜 사이트에서 비밀번호를 변경할수 있습니다.'});
}
}
</script>
</body>
<#include "/m/include/index_bottom.ftl">

@ -67,7 +67,7 @@
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
<#assign idx = idx + 0.5>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
@ -82,7 +82,7 @@
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
<#assign idx = idx + 0.5>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
@ -97,7 +97,7 @@
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
<#assign idx = idx + 0.5>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
@ -112,7 +112,7 @@
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
<#assign idx = idx + 0.5>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
@ -127,7 +127,7 @@
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
<#assign idx = idx + 0.5>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
@ -142,7 +142,7 @@
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
<#assign idx = idx + 0.5>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
@ -157,7 +157,7 @@
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
<#assign idx = idx + 0.5>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>

@ -0,0 +1,239 @@
<!DOCTYPE html>
<html lang="ko">
<#include "/m/include/index_top.ftl">
<link href="../css/custom.css?1" rel="stylesheet" type="text/css" >
<body>
<!-- wrap -->
<div class="wrap">
<!-- header_sub -->
<header class="header_wrapper">
<a href="javascript:back.return_url()" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">메모리</h1>
<a href="#" class="side_Rbtn hidden"></a>
</header>
<!-- //header_sub -->
<!-- 메모리 카테고리 -->
<ul class="memory_ca">
<li>
<a href="${URL_ROOT}/m/memory/memory_daily.do?return_url=index">
일간
</a>
</li>
<li class="current">
<a href="${URL_ROOT}/m/memory/memory_week.do?return_url=index">
주간
</a>
</li>
<li>
<a href="${URL_ROOT}/m/memory/memory_timeline.do?return_url=index">
타임라인
</a>
</li>
</ul>
<!-- //메모리 카테고리 -->
<!-- 컬러 박스 -->
<div class="color_box">
<button type="button" class="m_color01"></button>
<button type="button" class="m_color02"></button>
<button type="button" class="m_color03"></button>
<button type="button" class="m_color04"></button>
<button type="button" class="m_color05"></button>
<button type="button" class="m_color06"></button>
</div>
<!-- //컬러 박스 -->
<!-- 날짜 -->
<div class="memory_date">
<a href="javascript:fncMoveDay('minus')"><img src="../img/xxxx_sprites/arrow_01_left.png" alt=""></a>
${model['rm_mem']['today']!}(${model['rm_mem']['day']!})
<a href="javascript:fncMoveDay('plus')"><img src="../img/xxxx_sprites/arrow_01_right.png" alt=""></a>
</div>
<!-- //날짜 -->
<!-- 그래프 -->
<div class="week_chart">
<div class="gray_box_div">
<!-- 가로열 -->
<ul class="gray_box">
<li>
<#assign pre_date = model['dayList']['day1'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
<li>
<#assign pre_date = model['dayList']['day2'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
<li>
<#assign pre_date = model['dayList']['day3'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
<li>
<#assign pre_date = model['dayList']['day4'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
<li>
<#assign pre_date = model['dayList']['day5'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
<li>
<#assign pre_date = model['dayList']['day6'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
<li>
<#assign pre_date = model['dayList']['day7'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 1>
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
</ul>
<ul class="border_box">
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
</ul>
<div class="time_bar" style="top:-9px;">
<span></span>
<div class="time_bar_number">
<img src="../../img/time_bar02.png" alt="">
<p>00:00</p>
</div>
</div>
<div class="time_bar02" style="top:57%;">
<span></span>
<img src="../../img/time_bar.png" alt="">
</div>
</div>
<ul class="number_bottom">
<li>${model['dayList']['day1']!}</li>
<li>${model['dayList']['day2']!}</li>
<li>${model['dayList']['day3']!}</li>
<li>${model['dayList']['day4']!}</li>
<li>${model['dayList']['day5']!}</li>
<li>${model['dayList']['day6']!}</li>
<li>${model['dayList']['day7']!}</li>
</ul>
<ul class="number_right">
<li>01</li>
<li>03</li>
<li>06</li>
<li>09</li>
<li>12</li>
<li>15</li>
<li>18</li>
<li>21</li>
<li>24</li>
</ul>
</div>
<!--// 그래프 -->
<div class="fix_icon">
<button type="button"><img src="../../img/ico_image_grey_24.png" alt=""></button>
<button type="button"><img src="../../img/ico_share_grey_24.png" alt=""></button>
</div>
</div>
<!-- //wrap -->
<!-- 하단 네비 iyu_nav -->
<#include "/m/include/index_bottom_menu.ftl">
<!-- //iyu_nav -->
<script>
function fncMoveDay(dayFlag) {
location.href = "${URL_ROOT}/m/memory/memory_week.do?dayFlag=" + dayFlag + "&currDate=" + "${model['rm_mem']['today']!}";
<#--location.href = "${URL_ROOT}/m/memory/memory_week.do";-->
}
</script>
<#include "/m/member_env/include_return_url.ftl">
</body>
<#include "/m/include/index_bottom.ftl">
</html>
Loading…
Cancel
Save