jbcheong/hubez-admin
1
0
Fork 0
mirror of http://git.mhez-qa.uplus.co.kr/hubez/hubez-admin.git synced 2025-12-06 20:53:52 +09:00
Code Issues Projects Releases Wiki Activity

수정건 수정

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/modules/attractMgt/router/index.js
View File

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

2
frontend/src/modules/calculate/router/index.js
View File

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

2
frontend/src/modules/channelMgt/router/index.js
View File

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

10
frontend/src/modules/custMgt/router/index.js
View File

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

12
frontend/src/modules/custMgt/views/MemberAdminDetail.vue
View File

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

18
frontend/src/modules/custMgt/views/MemberDetail.vue
View File

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

4
frontend/src/modules/mntrng/router/index.js
View File

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

8
frontend/src/modules/riskMgt/router/index.js
View File

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

2
frontend/src/modules/sendNumMgt/components/NumberRegPop.vue
View File

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

6
frontend/src/modules/sendNumMgt/router/index.js
View File

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

2
frontend/src/modules/servMgt/router/index.js
View File

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

8
frontend/src/modules/stats/router/index.js
View File

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

8
frontend/src/modules/sysMgt/router/index.js
View File

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

13
frontend/src/router.js
View File

@@ -62,10 +62,6 @@ const router = new Router({
...mntrngRoutes,
...riskmgtRoutes,
...monthRoutes,
]
},
{path: '*', redirect: '/view/error/404'}
@@ -74,12 +70,11 @@ const router = new Router({
router.beforeEach((to, from, next) => {
const isPublic = to.matched.some(record => record.meta.public);
const loggedIn = !!tokenSvc.getToken();
if (!isPublic && !loggedIn) {
const loggedIn = !!tokenSvc.getToken();
if (!isPublic && !loggedIn) {
return next('/login');
}else{
var nextUrl = to.fullPath;
}else{
var nextUrl = to.fullPath;
if(nextUrl == '/'){
console.log(store.getters);
const rootUrl = store.getters['login/getRootUrl'];

16
src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java
View File

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

7
src/main/java/kr/co/uplus/ez/api/custMgt/dto/MemberAdminDetailRes.java
View File

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

6
src/main/java/kr/co/uplus/ez/api/custMgt/dto/MemberDetailRes.java
View File

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

5
src/main/java/kr/co/uplus/ez/common/jwt/JwtService.java
View File

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

4
src/main/resources/application-dev.yml
View File

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

4
src/main/resources/application-local.yml
View File

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

4
src/main/resources/application-prd.yml
View File

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

2
src/main/resources/application-stg.yml
View File

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