浏览代码

初始化线上

1607636152@qq.com 1 年之前
父节点
当前提交
40d883760b

+ 1 - 1
.env.development

@@ -1,3 +1,3 @@
 NODE_ENV=development
-VUE_APP_PREVIEW=true
+VUE_APP_PREVIEW=false
 VUE_APP_API_BASE_URL=/api

+ 1 - 1
.env.preview

@@ -1,3 +1,3 @@
 NODE_ENV=production
-VUE_APP_PREVIEW=true
+VUE_APP_PREVIEW=false
 VUE_APP_API_BASE_URL=/api

+ 1 - 1
src/api/login.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 const userApi = {
   Login: '/login',
-  Logout: '/auth/logout',
+  Logout: '/logout',
   ForgePassword: '/auth/forge-password',
   Register: '/auth/register',
   twoStepCode: '/auth/2step-code',

+ 1 - 1
src/config/defaultSettings.js

@@ -26,5 +26,5 @@ export default {
   title: 'Ant Design Pro',
   pwa: false,
   iconfontUrl: '',
-  production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true'
+  production: process.env.NODE_ENV === 'production' || process.env.VUE_APP_PREVIEW !== 'true'
 }

+ 2 - 2
src/layouts/BasicLayout.vue

@@ -13,7 +13,7 @@
       广告代码 真实项目中请移除
       production remove this Ads
     -->
-    <ads v-if="isProPreviewSite && !collapsed"/>
+    <!-- <ads v-if="isProPreviewSite && !collapsed"/> -->
     <!-- Ads end -->
 
     <!-- 1.0.0+ 版本 pro-layout 提供 API,
@@ -136,7 +136,7 @@ export default {
 
     // first update color
     // TIPS: THEME COLOR HANDLER!! PLEASE CHECK THAT!!
-    if (process.env.NODE_ENV !== 'production' || process.env.VUE_APP_PREVIEW === 'true') {
+    if (process.env.NODE_ENV !== 'production' && process.env.VUE_APP_PREVIEW === 'true') {
       updateTheme(this.settings.primaryColor)
     }
   },

+ 1 - 1
src/router/index.js

@@ -13,7 +13,7 @@ Vue.use(Router)
 
 const createRouter = () =>
   new Router({
-    mode: 'hash',
+    mode: 'historyis',
     routes: constantRouterMap
   })
 

+ 2 - 2
src/store/index.js

@@ -6,11 +6,11 @@ import user from './modules/user'
 
 // default router permission control
 // 默认路由模式为静态路由 (router.config.js)
-import permission from './modules/static-router'
+// import permission from './modules/static-router'
 
 // dynamic router permission control (Experimental)
 // 动态路由模式(api请求后端生成)
-// import permission from './modules/async-router'
+import permission from './modules/async-router'
 
 import getters from './getters'
 

+ 3 - 1
src/store/modules/user.js

@@ -1,7 +1,7 @@
 import storage from 'store'
 import expirePlugin from 'store/plugins/expire'
 import { login, getInfo, logout } from '@/api/login'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { ACCESS_TOKEN,Authorization } from '@/store/mutation-types'
 import { welcome } from '@/utils/util'
 
 storage.addPlugin(expirePlugin)
@@ -42,6 +42,7 @@ const user = {
           const result = response.data
           console.log(response)
           storage.set(ACCESS_TOKEN, result.token, new Date().getTime() + 7 * 24 * 60 * 60 * 1000)
+          storage.set(Authorization, result.token)
           commit('SET_TOKEN', result.token)
           resolve()
         }).catch(error => {
@@ -91,6 +92,7 @@ const user = {
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
           storage.remove(ACCESS_TOKEN)
+          storage.remove(Authorization)
           resolve()
         }).catch((err) => {
           console.log('logout fail:', err)

+ 1 - 0
src/store/mutation-types.js

@@ -1,4 +1,5 @@
 export const ACCESS_TOKEN = 'Access-Token'
+export const Authorization = 'Authorization'
 
 export const SIDEBAR_TYPE = 'sidebar_type'
 export const TOGGLE_MOBILE_TYPE = 'is_mobile'

+ 2 - 1
src/utils/request.js

@@ -3,7 +3,7 @@ import store from '@/store'
 import storage from 'store'
 import notification from 'ant-design-vue/es/notification'
 import { VueAxios } from './axios'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { ACCESS_TOKEN,Authorization } from '@/store/mutation-types'
 
 // 创建 axios 实例
 const request = axios.create({
@@ -48,6 +48,7 @@ request.interceptors.request.use(config => {
   // 让每个请求携带自定义 token 请根据实际情况自行修改
   if (token) {
     config.headers[ACCESS_TOKEN] = token
+    config.headers[Authorization] = 'Bearer '+ token
   }
   return config
 }, errorHandler)