release: 发布 uni-halo beta-v2.0 版本

common/http/index.js

@@ -11,6 +11,7 @@
  */
 
 import HaloConfig from '@/config/halo.config.js'
+import HaloTokenConfig from '@/config/token.config.js'
 import {
 	setInterceptors
 } from "./interceptors.js";
@@ -21,11 +22,10 @@ const http = new Request()
 http.setConfig((config) => {
 
 	// 如果是在外部浏览器调试或者编译为h5，请注释该行代码
-	config.baseURL = HaloConfig.apiUrl;
+	config.baseURL = HaloTokenConfig.BASE_API;
 
 	config.header = {
-		...config.header,
-		'api-authorization': HaloConfig.apiAuthorization,
+		...config.header, 
 		ContentType: 'application/json',
 		dataType: 'json'
 	}

common/http/interceptors.js

@@ -64,13 +64,15 @@ const showCategoryInputPasswordModal = (response, category) => {
 export const setInterceptors = (http) => {
 	http.interceptors.request.use(
 		(config) => {
+			console.log("config", config)
+
 			// 可使用async await 做异步操作
 			config.header = {
 				...config.header
 				// ... 可以直接加参数
 			};
-			if (getAdminAccessToken()) {
-				config.header['admin-authorization'] = getAdminAccessToken()
+			if (config.custom.systemToken) {
+				config.header['Authorization'] = `Bearer ${config.custom.systemToken}`
 			}
 			return config;
 		},
@@ -138,12 +140,14 @@ export const setInterceptors = (http) => {
 						})
 					})
 				}
+				return Promise.reject(response.data);
 			} else if (response.data.status == 403) {
 				// 如果报403是请求分类文章接口（您没有该分类的访问权限）的话说明是私密分类，需要输入密码请求
 				if (response.config.url.indexOf('/api/content/categories') >= 0) {
 					const category = getCategoryNameByUrl(response.config.url);
 					showCategoryInputPasswordModal(response, category);
 				}
+				return Promise.reject(response.data);
 			} else {
 				return Promise.reject(response.data);
 			}

common/markdown/markdown.config.js

@@ -3,8 +3,9 @@
  */
 
 import HaloConfig from '@/config/halo.config.js'
+import HaloTokenConfig from '@/config/token.config.js'
 export default {
-	domain: HaloConfig.apiUrl,
+	domain: HaloTokenConfig.BASE_API,
 	tagStyle: {
 		table: ` 
 			table-layout: fixed;

common/mixins/wxshare.mixin.js

@@ -1,5 +1,6 @@
 // 微信分享配置
 import haloConfig from '@/config/halo.config.js'
+import HaloTokenConfig from '@/config/token.config.js'
 import { jsonToUrlParams2 } from '@/utils/url.params.js'
 export const haloWxShareMixin = {
 	data() {
@@ -55,7 +56,7 @@ export const haloWxShareMixin = {
 			}
 			let _config = Object.assign({}, {
 				path: sharePath,
-				copyLink: haloConfig.apiUrl,
+				copyLink: HaloTokenConfig.BASE_API,
 				query: {}
 			}, config)