diff --git a/WebSite/.env.development b/WebSite/.env.development index deb2d351e8d30ce92a9422da92d4a0ba426f6d18..67993408561a9586b792a3ee57ee4ae29197f338 100644 --- a/WebSite/.env.development +++ b/WebSite/.env.development @@ -1,2 +1,2 @@ -VUE_APP_BASE_URI = '/' +VUE_APP_BASE_URI = '/adjustprojectweb' VUE_APP_BASE_API = '/api' \ No newline at end of file diff --git a/WebSite/.env.production b/WebSite/.env.production index 0c872bbd8be96f2a5051c11fc1a3adb863c3297b..ee8344ffc81724ab68be5faaa8424f35f799cb9b 100644 --- a/WebSite/.env.production +++ b/WebSite/.env.production @@ -1,2 +1,3 @@ -VUE_APP_BASE_URI = '/noctua-admin-micro/' -VUE_APP_BASE_API = '/api' \ No newline at end of file +NODE_ENV = production +VUE_APP_BASE_URI = '/adjustprojectweb' +VUE_APP_BASE_API = '/adjustproject' \ No newline at end of file diff --git a/WebSite/src/api/quotaAdjust.js b/WebSite/src/api/quotaAdjust.js index 251726d4ca2674ffbed16436c79652b71c293453..930f8d2171d14afaf8c90175a9ccfd362e768ef0 100644 --- a/WebSite/src/api/quotaAdjust.js +++ b/WebSite/src/api/quotaAdjust.js @@ -2,7 +2,7 @@ import request from '@/core/base/request'; class QuotaAdjust { static loginOut() { - return request.post(`/projectInfo/pc/v1/logout`); + return request.post(`/basedata/pc/v1/logout`); } static queryPrimaryFundPageList(data) { return request.post('/adjustPlan/pc/v1/queryPrimaryFundPageList', data); diff --git a/WebSite/src/api/user.js b/WebSite/src/api/user.js index 09d1e029b579045382f337f5b96a89a983d3f012..381ccdb4b26c23be9c7bcbbfd1fbb6cdbc9bb5a0 100644 --- a/WebSite/src/api/user.js +++ b/WebSite/src/api/user.js @@ -10,11 +10,11 @@ import request from '@/core/base/request'; class User { static setCurrent(data) { - return request.post('/projectInfo/pc/v1/getUserInfo', data); + return request.post('/basedata/pc/v1/getUserInfo', data); } static getCurrent() { - return request.post('/projectInfo/pc/v1/listMenuByCurUser'); + return request.post('/basedata/pc/v1/listMenuByCurUser'); } } diff --git a/WebSite/src/core/base/Realm.js b/WebSite/src/core/base/Realm.js index cbb742e4cfb69f51c241a10c04af484fc6eb294a..dd200bbf71afc656af744d324ecf7b5383d2531d 100644 --- a/WebSite/src/core/base/Realm.js +++ b/WebSite/src/core/base/Realm.js @@ -50,12 +50,10 @@ class Realm { * @return {Promise} */ static async doGetAuthorizationInfo(authorizationToken) { - alert(11); if (authorizationToken) { - alert(1); // do somethings here await User.setCurrent({ id: authorizationToken }); - alert(2); + const res = await User.getCurrent(); return new AuthorizationInfo(res.data[0], 'token'); diff --git a/WebSite/src/router/guards.js b/WebSite/src/router/guards.js index 784c33a0223fbdb610306f64a5200af6a9e68c2d..74691a83abc7fa00843d77d07f5e9787321353f7 100644 --- a/WebSite/src/router/guards.js +++ b/WebSite/src/router/guards.js @@ -87,8 +87,10 @@ const before = async (to, from, next) => { // next(); // console.warn('鏈璇�', to, store.state); NProgress.done(); + if (!whiteListLv1.includes(to.path)) { // console.warn('鏈璇乮f'); + const redirect = await store.dispatch('subject/logout', { routerPush: false }); diff --git a/WebSite/src/store/modules/subject.js b/WebSite/src/store/modules/subject.js index b7190ac6eea9546e8c5abb3311220c2711917847..134350a1eb6e8d40a518b8456cae12cbe0013b13 100644 --- a/WebSite/src/store/modules/subject.js +++ b/WebSite/src/store/modules/subject.js @@ -239,14 +239,14 @@ const actions = { } = payload; // action before logout typeof beforeLogout !== 'function' && (beforeLogout = Realm.beforeLogout); - const { login: requestAddress } = - !state.ssoAddress && (await beforeLogout()); + const { login: requestAddress } = await beforeLogout(); console.log('璇锋眰杩斿洖鐨勫湴鍧€', requestAddress); const realmSsoAddress = process.env.NODE_ENV === 'development' ? 'http://localhost:9529/#/login' : requestAddress; // ssoAddress priority: option > relam > setting + debugger; realmSsoAddress && commit('SET_SSO_ADDRESS', realmSsoAddress); ssoAddress && commit('SET_SSO_ADDRESS', ssoAddress); // remove storage listener diff --git a/WebSite/src/views/auth-redirect/index.vue b/WebSite/src/views/auth-redirect/index.vue index 0eac61b2c1d68a477288fe6fad04a99d455145d8..95908e9bd98c64c0b856c2b332f6fffdfd8af4b1 100644 --- a/WebSite/src/views/auth-redirect/index.vue +++ b/WebSite/src/views/auth-redirect/index.vue @@ -28,12 +28,13 @@ export default { const goSso = () => { console.log('NODE_ENV', process.env.NODE_ENV); const redirect_uri = `${window.location.origin}/${ - process.env.NODE_ENV === 'development' ? '' : 'projectplanweb/' + process.env.NODE_ENV === 'development' ? '' : 'adjustprojectweb/' }login`; // window.location.href = `${data.ssoAddress}?redirect=${encodeURIComponent( // redirect_uri // )}&recognizeId=projectplan`; - console.log(redirect_uri); + console.log('redirect_uri', redirect_uri); + console.log('data.ssoAddress', data.ssoAddress); window.location.href = `${data.ssoAddress}?redirect=${encodeURIComponent( redirect_uri )}&recognizeId=28ce5a12-ba5c-431b-995b-6df7a7081944`;