수정건 수정

This commit is contained in:
USER
2022-07-27 10:31:41 +09:00
parent 3093a33015
commit d5bf4444a3
22 changed files with 89 additions and 58 deletions

View File

@@ -7,14 +7,14 @@ export default [
component: ChannelList, component: ChannelList,
name: 'channelList', name: 'channelList',
props: true, props: true,
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/attractMgt/channelDetail', path: '/attractMgt/channelDetail',
component: ChannelDetail, component: ChannelDetail,
name: 'channelDetail', name: 'channelDetail',
props: true, props: true,
meta: { public: true } meta: { public: false }
} }
] ]

View File

@@ -5,7 +5,7 @@ export default [
path: '/calculate/calcList', path: '/calculate/calcList',
component: CalcList, component: CalcList,
name: 'calcList', name: 'calcList',
meta: { public: true } meta: { public: false }
}, },
] ]

View File

@@ -5,7 +5,7 @@ export default [
path: '/channelMgt/tmpltList', path: '/channelMgt/tmpltList',
component: TmpltList, component: TmpltList,
name: 'tmpltList', name: 'tmpltList',
meta: { public: true } meta: { public: false }
}, },
] ]

View File

@@ -10,34 +10,34 @@ export default [
component: SubsList, component: SubsList,
name: 'subsList', name: 'subsList',
props: true, props: true,
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/custMgt/memberList', path: '/custMgt/memberList',
component: MemberList, component: MemberList,
name: 'memberList', name: 'memberList',
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/custMgt/subsDetail', path: '/custMgt/subsDetail',
component: SubsDetail, component: SubsDetail,
name: 'subsDetail', name: 'subsDetail',
props: true, props: true,
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/custMgt/memberDetail', path: '/custMgt/memberDetail',
component: MemberDetail, component: MemberDetail,
name: 'memberDetail', name: 'memberDetail',
props: true, props: true,
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/custMgt/memberAdminDetail', path: '/custMgt/memberAdminDetail',
component: MemberAdminDetail, component: MemberAdminDetail,
name: 'memberAdminDetail', name: 'memberAdminDetail',
props: true, props: true,
meta: { public: true } meta: { public: false }
}, },
] ]

View File

@@ -234,6 +234,7 @@ export default {
selected: [], selected: [],
svcUserId: '', svcUserId: '',
ezSvcUserAuthKey: '', ezSvcUserAuthKey: '',
homePageUrl: '',
isActive: true, isActive: true,
//applyTbStyle: 'cursor: default;', //applyTbStyle: 'cursor: default;',
}; };
@@ -329,6 +330,8 @@ export default {
this.userTotalCnt = result.data.list.length; this.userTotalCnt = result.data.list.length;
console.log('userTotalCnt:' + result.data.list.length); console.log('userTotalCnt:' + result.data.list.length);
this.totalItems = result.data.paging.totalCnt; this.totalItems = result.data.paging.totalCnt;
this.homePageUrl = result.data.homePageUrl;
this.ezSvcUserAuthKey = result.data.authKey;
} }
} catch (error) { } catch (error) {
console.log(error); console.log(error);
@@ -452,11 +455,8 @@ export default {
Object.assign(this.$data, this.$options.data()); Object.assign(this.$data, this.$options.data());
}, },
homeLogin() { homeLogin() {
console.log(process.env.VUE_APP_HOME_PAGE_URL); this.$refs.form.action = this.homePageUrl;
console.log(process.env.VUE_APP_AUTHKEY);
this.$refs.form.action = process.env.VUE_APP_HOME_PAGE_URL;
this.svcUserId = this.userId; this.svcUserId = this.userId;
this.ezSvcUserAuthKey = process.env.VUE_APP_AUTHKEY;
this.$refs.form.submit(); this.$refs.form.submit();
}, },
confirmCalbackFnc(props) { confirmCalbackFnc(props) {

View File

@@ -117,8 +117,9 @@ export default {
mdn : '', mdn : '',
email: '', email: '',
stat:'', stat:'',
svcUserId:'', svcUserId:'',
ezSvcUserAuthKey:'' ezSvcUserAuthKey:'',
homePageUrl: ''
} }
}, },
@@ -153,6 +154,7 @@ export default {
try { try {
const response = await custMgtApi.memberDetail(this.row); const response = await custMgtApi.memberDetail(this.row);
const result = response.data; const result = response.data;
console.log('>>>>>>>>>>>>');
console.log(result); console.log(result);
if (result != null && result.retCode == "0000") { if (result != null && result.retCode == "0000") {
// isView // isView
@@ -169,7 +171,8 @@ export default {
this.memo = result.data.memo; this.memo = result.data.memo;
this.mdn = result.data.mdn; this.mdn = result.data.mdn;
this.email = result.data.email; this.email = result.data.email;
this.homePageUrl = result.data.homePageUrl;
this.ezSvcUserAuthKey = result.data.authKey;
} }
} catch (error) { } catch (error) {
console.log(error); console.log(error);
@@ -278,11 +281,8 @@ export default {
this.$refs._email.focus(); this.$refs._email.focus();
}, },
homeLogin(){ homeLogin(){
console.log(process.env.VUE_APP_HOME_PAGE_URL) this.$refs.form.action = this.homePageUrl;
console.log(process.env.VUE_APP_AUTHKEY)
this.$refs.form.action = process.env.VUE_APP_HOME_PAGE_URL
this.svcUserId = this.userId this.svcUserId = this.userId
this.ezSvcUserAuthKey = process.env.VUE_APP_AUTHKEY
this.$refs.form.submit() this.$refs.form.submit()
}, },
}, },

View File

@@ -6,13 +6,13 @@ export default [
path: '/mntrng/sendList', path: '/mntrng/sendList',
component: SendList, component: SendList,
name: 'sendList', name: 'sendList',
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/mntrng/liveSendSttus', path: '/mntrng/liveSendSttus',
component: LiveSendSttus, component: LiveSendSttus,
name: 'liveSendSttus', name: 'liveSendSttus',
meta: { public: true } meta: { public: false }
}, },
] ]

View File

@@ -8,27 +8,27 @@ export default [
path: '/riskMgt/sendNum/intrcpList', path: '/riskMgt/sendNum/intrcpList',
component: IntrcpList, component: IntrcpList,
name: 'intrcpList', name: 'intrcpList',
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/riskMgt/sendNum/zezNum', path: '/riskMgt/sendNum/zezNum',
component: ZezNum, component: ZezNum,
name: 'zezNum', name: 'zezNum',
props: true, props: true,
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/riskMgt/sendNum/msg', path: '/riskMgt/sendNum/msg',
component: Msg, component: Msg,
name: 'msg', name: 'msg',
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/riskMgt/sendNum/all', path: '/riskMgt/sendNum/all',
component: All, component: All,
name: 'all', name: 'all',
props: true, props: true,
meta: { public: true } meta: { public: false }
}, },
] ]

View File

@@ -236,7 +236,7 @@ export default {
// 소문자로 변환 // 소문자로 변환
fileExt = fileExt.toLowerCase() fileExt = fileExt.toLowerCase()
// 이미지 확장자 체크, jpg, png, pdf, tiff // 이미지 확장자 체크, jpg, png, pdf, tiff
if (["jpeg", "png", "pdf", "tiff"].includes(fileExt)) { if (["jpg", "png", "pdf", "tiff"].includes(fileExt)) {
return true; return true;
} else { } else {
this.row.title = '발신번호 파일 업로드'; this.row.title = '발신번호 파일 업로드';

View File

@@ -7,19 +7,19 @@ export default [
path: '/sendNumMgt/profileList', path: '/sendNumMgt/profileList',
component: ProfileList, component: ProfileList,
name: 'profileList', name: 'profileList',
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/sendNumMgt/numberList', path: '/sendNumMgt/numberList',
component: NumberList, component: NumberList,
name: 'numberList', name: 'numberList',
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/sendNumMgt/apprList', path: '/sendNumMgt/apprList',
component: ApprList, component: ApprList,
name: 'apprList', name: 'apprList',
meta: { public: true } meta: { public: false }
}, },
] ]

View File

@@ -5,7 +5,7 @@ export default [
path: '/servMgt/rejectRecvList', path: '/servMgt/rejectRecvList',
component: rejectRecvList, component: rejectRecvList,
name: 'rejectRecvList', name: 'rejectRecvList',
meta: { public: true } meta: { public: false }
}, },
] ]

View File

@@ -8,25 +8,25 @@ export default [
path: '/stats/monthList', path: '/stats/monthList',
component: MonthList, component: MonthList,
name: 'monthList', name: 'monthList',
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/stats/bsnmMonthList', path: '/stats/bsnmMonthList',
component: BsnmMonthList, component: BsnmMonthList,
name: 'bsnmMonthList', name: 'bsnmMonthList',
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/stats/dayList', path: '/stats/dayList',
component: DayList, component: DayList,
name: 'dayList', name: 'dayList',
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/stats/bsnmDayList', path: '/stats/bsnmDayList',
component: BsnmDayList, component: BsnmDayList,
name: 'bsnmDayList', name: 'bsnmDayList',
meta: { public: true } meta: { public: false }
}, },
] ]

View File

@@ -8,26 +8,26 @@ export default [
path: '/sysMgt/authList', path: '/sysMgt/authList',
component: AustList, component: AustList,
name: 'authList', name: 'authList',
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/sysMgt/adminList', path: '/sysMgt/adminList',
component: AdminList, component: AdminList,
name: 'adminList', name: 'adminList',
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/sysMgt/authAdd', path: '/sysMgt/authAdd',
component: AuthAdd, component: AuthAdd,
name: 'authAdd', name: 'authAdd',
meta: { public: true } meta: { public: false }
}, },
{ {
path: '/sysMgt/authModify', path: '/sysMgt/authModify',
component: AuthModify, component: AuthModify,
name: 'authModify', name: 'authModify',
props: true, props: true,
meta: { public: true } meta: { public: false }
} }
] ]

View File

@@ -62,10 +62,6 @@ const router = new Router({
...mntrngRoutes, ...mntrngRoutes,
...riskmgtRoutes, ...riskmgtRoutes,
...monthRoutes, ...monthRoutes,
] ]
}, },
{path: '*', redirect: '/view/error/404'} {path: '*', redirect: '/view/error/404'}
@@ -75,7 +71,6 @@ const router = new Router({
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
const isPublic = to.matched.some(record => record.meta.public); const isPublic = to.matched.some(record => record.meta.public);
const loggedIn = !!tokenSvc.getToken(); const loggedIn = !!tokenSvc.getToken();
if (!isPublic && !loggedIn) { if (!isPublic && !loggedIn) {
return next('/login'); return next('/login');
}else{ }else{

View File

@@ -95,6 +95,12 @@ public class CustMgtService {
@Value("${msghubez.homepage-url:https://mhez.uplus.co.kr}") @Value("${msghubez.homepage-url:https://mhez.uplus.co.kr}")
private String mailTempleteHomeUrl; private String mailTempleteHomeUrl;
@Value("${msghubez.uri.homepageLogin: /auth/bo}")
private String loginUri;
@Value("${msghubez.authKey: bohubez!@#$%}")
private String authKey;
@Value("${msghubez.applicationId:EZ_ADMIN}") @Value("${msghubez.applicationId:EZ_ADMIN}")
private String apiApplicationId; private String apiApplicationId;
@@ -325,11 +331,14 @@ public class CustMgtService {
* @param memberDetailReqDto * @param memberDetailReqDto
* @return MemberDetailResDto * @return MemberDetailResDto
*/ */
public MemberDetailResDto memberDetail(MemberDetailReqDto memberDetailReqDto) { @SuppressWarnings("unused")
public MemberDetailResDto memberDetail(MemberDetailReqDto memberDetailReqDto) {
CustMgtMapper custMgtMapper = sqlSessionSlave.getMapper(CustMgtMapper.class); CustMgtMapper custMgtMapper = sqlSessionSlave.getMapper(CustMgtMapper.class);
MemberDetailRes memberDetailRes = custMgtMapper.selectMemberDetail(memberDetailReqDto); MemberDetailRes memberDetailRes = custMgtMapper.selectMemberDetail(memberDetailReqDto);
memberDetailRes.setHomePageUrl(mailTempleteHomeUrl+loginUri);
memberDetailRes.setAuthKey(authKey);
// 조회 결과 없음. // 조회 결과 없음.
if (memberDetailRes == null) { if (memberDetailRes == null) {
@@ -356,6 +365,9 @@ public class CustMgtService {
return new MemberAdminDetailResDto(ApiResponseCode.CM_NOT_FOUND); return new MemberAdminDetailResDto(ApiResponseCode.CM_NOT_FOUND);
} }
memberAdminDetailRes.setHomePageUrl(mailTempleteHomeUrl+loginUri);
memberAdminDetailRes.setAuthKey(authKey);
String nowPage = String.valueOf(memberAdminDetailReqDto.getPage()); String nowPage = String.valueOf(memberAdminDetailReqDto.getPage());
int totalCnt = custMgtMapper.selectMemberDetailListTotalCnt(memberAdminDetailReqDto); int totalCnt = custMgtMapper.selectMemberDetailListTotalCnt(memberAdminDetailReqDto);

View File

@@ -41,4 +41,11 @@ public class MemberAdminDetailRes implements Serializable {
private Paging paging; private Paging paging;
private List<MemberDetail> list; private List<MemberDetail> list;
/** 홈페이지 로그인 url */
@ApiModelProperty(hidden = true)
private String homePageUrl;
/** 홈페이지 로그인 key */
@ApiModelProperty(hidden = true)
private String authKey;
} }

View File

@@ -30,4 +30,10 @@ public class MemberDetailRes implements Serializable {
@ApiModelProperty(example = "이메일", name = "이메일", dataType = "String") @ApiModelProperty(example = "이메일", name = "이메일", dataType = "String")
private String email; private String email;
/** 홈페이지 로그인 url */
@ApiModelProperty(hidden = true)
private String homePageUrl;
/** 홈페이지 로그인 key */
@ApiModelProperty(hidden = true)
private String authKey;
} }

View File

@@ -80,12 +80,15 @@ public class JwtService {
// header.paload 부분만 일반 쿠키에 저장 - JS로 읽기 가능 // header.paload 부분만 일반 쿠키에 저장 - JS로 읽기 가능
Cookie part1 = new Cookie(jwtProps.getPart1(), payload); Cookie part1 = new Cookie(jwtProps.getPart1(), payload);
//part1.setHttpOnly(true);
part1.setSecure(true);
part1.setPath("/"); part1.setPath("/");
response.addCookie(part1); response.addCookie(part1);
// signature 부분만 httpOnly 쿠키에 저장 - JS로 읽기 불가능 // signature 부분만 httpOnly 쿠키에 저장 - JS로 읽기 불가능
Cookie part2 = new Cookie(jwtProps.getPart2(), signature); Cookie part2 = new Cookie(jwtProps.getPart2(), signature);
part2.setHttpOnly(true); part2.setHttpOnly(true);
part2.setSecure(true);
part2.setPath("/"); part2.setPath("/");
response.addCookie(part2); response.addCookie(part2);
} }

View File

@@ -47,6 +47,8 @@ msghubez:
applicationId: EZ_ADMIN applicationId: EZ_ADMIN
uri: uri:
sendTemplateMail: /api/v1/fo/sendTemplateMail sendTemplateMail: /api/v1/fo/sendTemplateMail
homepageLogin: /auth/bo
authKey: "bohubez!@#$%"
testId: testId:
prodCd: LPZ0045389 prodCd: LPZ0045389

View File

@@ -47,6 +47,8 @@ msghubez:
applicationId: EZ_ADMIN applicationId: EZ_ADMIN
uri: uri:
sendTemplateMail: /api/v1/fo/sendTemplateMail sendTemplateMail: /api/v1/fo/sendTemplateMail
homepageLogin: /auth/bo
authKey: "bohubez!@#$%"
testId: testId:
prodCd: LPZ0045389 prodCd: LPZ0045389

View File

@@ -48,6 +48,8 @@ msghubez:
applicationId: EZ_ADMIN applicationId: EZ_ADMIN
uri: uri:
sendTemplateMail: /api/v1/fo/sendTemplateMail sendTemplateMail: /api/v1/fo/sendTemplateMail
homepageLogin: /auth/bo
authKey: "bohubez!@#$%"
testId: testId:
prodCd: LPZ0045389 prodCd: LPZ0045389

View File

@@ -47,6 +47,8 @@ msghubez:
applicationId: EZ_ADMIN applicationId: EZ_ADMIN
uri: uri:
sendTemplateMail: /api/v1/fo/sendTemplateMail sendTemplateMail: /api/v1/fo/sendTemplateMail
homepageLogin: /auth/bo
authKey: "bohubez!@#$%"
testId: testId:
prodCd: LPZ0045389 prodCd: LPZ0045389