diff --git a/frontend/src/modules/custMgt/views/MemberAdminDetail.vue b/frontend/src/modules/custMgt/views/MemberAdminDetail.vue index 319afab..5dc1f36 100644 --- a/frontend/src/modules/custMgt/views/MemberAdminDetail.vue +++ b/frontend/src/modules/custMgt/views/MemberAdminDetail.vue @@ -7,7 +7,7 @@
-
+
@@ -235,7 +235,7 @@ export default { svcUserId: '', ezSvcUserAuthKey: '', homePageUrl: '', - isActive: true, + isActive: true //applyTbStyle: 'cursor: default;', }; }, @@ -256,10 +256,12 @@ export default { created() { if(this.$route.params.serviceId != null){ this.$store.commit('dataStore/updateUserId', this.$route.params.serviceId); - this.memberDetail(this.$route.params.serviceId); + this.userId = this.$route.params.serviceId; + this.memberDetail(this.$route.params.serviceId); }else{ - var userId = this.$store.getters["dataStore/getUserId"]; - this.memberDetail(userId); + var userId2 = this.$store.getters["dataStore/getUserId"]; + this.userId = userId2; + this.memberDetail(this.userId); } }, destroyed() { @@ -302,7 +304,7 @@ export default { valConfirm(props) { this.$refs.commmonModal.confirmModalOpen(props); }, - async memberDetail(serviceId) { + async memberDetail(serviceId) { this.row.userId = serviceId; try { const response = await custMgtApi.memberAdminDetail(this.row); @@ -331,7 +333,7 @@ export default { console.log('userTotalCnt:' + result.data.list.length); this.totalItems = result.data.paging.totalCnt; this.homePageUrl = result.data.homePageUrl; - this.ezSvcUserAuthKey = result.data.authKey; + this.ezSvcUserAuthKey = result.data.authKey; } } catch (error) { console.log(error); @@ -454,9 +456,9 @@ export default { formReset() { Object.assign(this.$data, this.$options.data()); }, - homeLogin() { + homeLogin() { this.$refs.form.action = this.homePageUrl; - this.svcUserId = this.userId; + this.svcUserId = this.userId; this.$refs.form.submit(); }, confirmCalbackFnc(props) { diff --git a/frontend/src/modules/login/views/LoginMain.vue b/frontend/src/modules/login/views/LoginMain.vue index 92af810..9989de7 100644 --- a/frontend/src/modules/login/views/LoginMain.vue +++ b/frontend/src/modules/login/views/LoginMain.vue @@ -135,13 +135,13 @@ export default { this.$router.push({ name: 'updatePassword',params: {userId : this.userId}}); }else if(rsp.retCode == '4003') { // ID 조회 없음. this.row.title = '로그인 실패'; - this.row.msg1 = '등록되지 않은 아이디입니다.'; - this.row.msg2 = '아이디를 다시 확인하세요'; + this.row.msg1 = '아이디, 비밀번호를 확인해 주세요.'; this.$refs.commonModal.alertModalOpen(this.row); } else if(rsp.retCode == '4004') { // ID/PWD 불일치 - this.row.title = '비밀번호 오류'; - this.row.msg1 = '비밀번호를 확인해주세요.'; - + //this.row.title = '비밀번호 오류'; + //this.row.msg1 = '비밀번호를 확인해주세요.'; + this.row.title = '로그인 실패'; + this.row.msg1 = '아이디, 비밀번호를 확인해 주세요.'; this.$refs.commonModal.alertModalOpen(this.row); } else if(rsp.retCode == '4005') { // ID/PWD 불일치 횟수초과로 계정 잠김 4005 this.row.title = '로그인 실패'; diff --git a/frontend/src/modules/mntrng/views/SendList.vue b/frontend/src/modules/mntrng/views/SendList.vue index db4f1a0..0fade19 100644 --- a/frontend/src/modules/mntrng/views/SendList.vue +++ b/frontend/src/modules/mntrng/views/SendList.vue @@ -9,8 +9,7 @@
- -
+ - -
+
@@ -50,7 +48,7 @@
+ @keypress="onlyText" @input="onlyText" @keyup.enter="search" ref="_searchText3" maxlength="100">
@@ -173,17 +171,17 @@ export default { columns: [ {name: 'no', header: 'NO', align: 'center', width: '5%'}, - {name: '', header: '발송일자', align: 'left', width: '11%'}, - {name: '', header: '고객사명', align: 'left', width: '9%'}, - {name: '', header: '발송아이디(사용자ID)', align: 'center', width: '9%'}, - {name: '', header: '수신번호', align: 'center', width: '11%'}, - {name: '', header: '발신번호', align: 'center', width: '11%'}, - {name: '', header: '요청채널', align: 'center', width: '5%'}, - {name: '', header: '최종채널', align: 'center', width: '5%'}, - {name: '', header: '이통사', align: 'center', width: '5%'}, - {name: '', header: '결과(코드)', align: 'center', width: '9%'}, - {name: '', header: '요청일시', align: 'center', width: '10%'}, - {name: '', header: '완료일시', align: 'center', width: '10%'}, + {name: 'sentDate', header: '발송일자', align: 'center', width: '11%'}, + {name: 'custNm', header: '고객사명', align: 'center', width: '9%'}, + {name: 'userId', header: '발송아이디(사용자ID)', align: 'center', width: '9%'}, + {name: 'phone', header: '수신번호', align: 'center', width: '11%'}, + {name: 'callbackNumber', header: '발신번호', align: 'center', width: '11%'}, + {name: 'reqProduct', header: '요청채널', align: 'center', width: '5%'}, + {name: 'doneCh', header: '최종채널', align: 'center', width: '5%'}, + {name: 'doneTelco', header: '이통사', align: 'center', width: '5%'}, + {name: 'doneCode', header: '결과(코드)', align: 'center', width: '9%'}, + {name: 'reqDate', header: '요청일시', align: 'center', width: '10%'}, + {name: 'doneDate', header: '완료일시', align: 'center', width: '10%'}, ], noDataStr: '검색 결과가 없습니다.', @@ -252,8 +250,8 @@ export default { methods: { search: function (isKeep) { if (this.initMode) { - this.grid.params.phone = 99999999999; - this.grid.params.callbackNumber = 99999999999; + this.grid.params.phone = ''; + this.grid.params.callbackNumber = ''; } else { if (this.doValidate()) { this.grid.params.sentDate = moment(this.startDate).format('YYYYMMDD'); diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java index 9d3bf78..fc28c28 100644 --- a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java @@ -95,7 +95,7 @@ public class CustMgtService { @Value("${msghubez.homepage-url:https://mhez.uplus.co.kr}") private String mailTempleteHomeUrl; - @Value("${msghubez.uri.homepageLogin: /auth/bo}") + @Value("${msghubez.uri.homepageLogin:/auth/bo}") private String loginUri; @Value("${msghubez.authKey: bohubez!@#$%}") diff --git a/src/main/java/kr/co/uplus/ez/api/login/LoginService.java b/src/main/java/kr/co/uplus/ez/api/login/LoginService.java index 4f514c1..dd5a3a7 100644 --- a/src/main/java/kr/co/uplus/ez/api/login/LoginService.java +++ b/src/main/java/kr/co/uplus/ez/api/login/LoginService.java @@ -296,7 +296,12 @@ public class LoginService { } String newPw = EncryptionUtil.getCustomSHA512(updatePasswordReqDto.getUserId(), updatePasswordReqDto.getNewPw()); - + String oldPw = user.getPwd(); + + if(oldPw.equals(newPw)) { + return new UpdatePasswordResDto(ApiResponseCode.CE_FAILED_TO_PW_CHANGE); + } + // 2. 비밀번호 변경 - update EZ_ADM_USER (비밀번호, 비밀번호변경일시) AuthUser authUser = new AuthUser(); authUser.setOprtrId(updatePasswordReqDto.getUserId()); diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 2e9efd1..e76e57b 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -42,7 +42,7 @@ mail: templeteCode: E0005 msghubez: - hmoepage-url: https://mhez-dev.uplus.co.kr + homepage-url: https://mhez-dev.uplus.co.kr api-url: https://api-int.mhez-dev.uplus.co.kr applicationId: EZ_ADMIN uri: diff --git a/src/main/resources/mapper/mysql/mntrng/mntrng-mapper.xml b/src/main/resources/mapper/mysql/mntrng/mntrng-mapper.xml index 6ef98a5..6d046a8 100644 --- a/src/main/resources/mapper/mysql/mntrng/mntrng-mapper.xml +++ b/src/main/resources/mapper/mysql/mntrng/mntrng-mapper.xml @@ -4,157 +4,163 @@ - + + GROUP BY FB_CH_STR + ) T + \ No newline at end of file