Commit @3139c3e9cda8ef9fc6bb4a63e417d465a0c3fe2e

류윤주 04-09

Merge branch 'master' of http://210.180.118.83/jhpark/cms_frontend

@3139c3e9cda8ef9fc6bb4a63e417d465a0c3fe2e

d5b510f

3139c3e

client/views/layout/AdminHeader.vue

--- client/views/layout/AdminHeader.vue

+++ client/views/layout/AdminHeader.vue


         // 로그 아웃
         async fnlogOut() {
             await this.logout();
-            this.$router.push({
-                path: this.$filters.ctxPath("/login.page"),
-            });
+            // this.$router.push({
+            //     path: this.$filters.ctxPath("/login.page"),
+            // });
         },
         // 캐시 초기화
         async cacheClean() {

d5b510f

3139c3e

client/views/pages/AppStore.js

--- client/views/pages/AppStore.js

+++ client/views/pages/AppStore.js


   actions: {
     async logout({ commit }) {
       try {
+        const ctx = this.state.contextPath; // 캐시 초기화 전 contextPath 저장
         const res = await logOutProc();
         alert(res.data.message);
         if (res.status == 200) {

           document.cookie = "refresh=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
           document.cookie = "Authorization=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
           // 4. 로그인 페이지로 이동
-          window.location = state.contextPath + "/login.page";
+          window.location = ctx + "/login.page";
         }
       } catch(error) {
         const errorData = error.response.data;

d5b510f

3139c3e

client/views/pages/adm/system/LoginPolicy/LoginPolicy.vue

--- client/views/pages/adm/system/LoginPolicy/LoginPolicy.vue

+++ client/views/pages/adm/system/LoginPolicy/LoginPolicy.vue


               storeCtx = '';
             }
             store.commit("setContextPath", storeCtx); // 캐시 초기화 요청을 보내기 위한 Context Path 정보 저장
-            const cacheRes = await cacheReSet(); // 캐시 초기화
+            await this.$store.dispatch("logout");
+            /* const cacheRes = await cacheReSet(); // 캐시 초기화
             if (cacheRes.status !== 200) {
               alert(cacheRes.data.message);
             }
             store.commit("setStoreReset"); // 캐시 초기화 후 Store 초기화
             store.commit("setContextPath", storeCtx); // 라우터 Context Path 정보 저장
             window.location.href = `${storeCtx}/login.page`;
-            // window.location.href = `${storeCtx}/adm/main.page`;
+            // window.location.href = `${storeCtx}/adm/main.page`; */
           } else {
             alert(res.data.message);
           }

Add a comment

Open 0
Closed 0

List

...	...	@@ -50,9 +50,9 @@
50	50	// 로그 아웃
51	51	async fnlogOut() {
52	52	await this.logout();
53		- this.$router.push({
54		- path: this.$filters.ctxPath("/login.page"),
55		- });
	53	+ // this.$router.push({
	54	+ // path: this.$filters.ctxPath("/login.page"),
	55	+ // });
56	56	},
57	57	// 캐시 초기화
58	58	async cacheClean() {

...	...	@@ -68,6 +68,7 @@
68	68	actions: {
69	69	async logout({ commit }) {
70	70	try {
	71	+ const ctx = this.state.contextPath; // 캐시 초기화 전 contextPath 저장
71	72	const res = await logOutProc();
72	73	alert(res.data.message);
73	74	if (res.status == 200) {
...	...	@@ -81,7 +82,7 @@
81	82	document.cookie = "refresh=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
82	83	document.cookie = "Authorization=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
83	84	// 4. 로그인 페이지로 이동
84		- window.location = state.contextPath + "/login.page";
	85	+ window.location = ctx + "/login.page";
85	86	}
86	87	} catch(error) {
87	88	const errorData = error.response.data;

...	...	@@ -180,14 +180,15 @@
180	180	storeCtx = '';
181	181	}
182	182	store.commit("setContextPath", storeCtx); // 캐시 초기화 요청을 보내기 위한 Context Path 정보 저장
183		- const cacheRes = await cacheReSet(); // 캐시 초기화
	183	+ await this.$store.dispatch("logout");
	184	+ /* const cacheRes = await cacheReSet(); // 캐시 초기화
184	185	if (cacheRes.status !== 200) {
185	186	alert(cacheRes.data.message);
186	187	}
187	188	store.commit("setStoreReset"); // 캐시 초기화 후 Store 초기화
188	189	store.commit("setContextPath", storeCtx); // 라우터 Context Path 정보 저장
189	190	window.location.href = `${storeCtx}/login.page`;
190		- // window.location.href = `${storeCtx}/adm/main.page`;
	191	+ // window.location.href = `${storeCtx}/adm/main.page`; */
191	192	} else {
192	193	alert(res.data.message);
193	194	}

Delete comment