Merge branch 'publish' into auth

hebing

public/index.html

@@ -16,7 +16,6 @@
 </noscript>
 <script>
 	window.__data = {
-		token : "<%= process.env.NODE_ENV === 'development' ? 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MjA4NSwibmFtZSI6IuWKs-eQquWzsCIsImFjY291bnQiOiJsYW9xaWZlbmciLCJlbWFpbCI6Imxhb3FpZmVuZ0BkdWliYS5jb20uY24iLCJtb2JpbGUiOiIxMzQ1Njc3NDE1MyIsImRpbmdVc2VySWQiOiI1MDY5MDYyOTIxMjkxMDAxIiwibW9kZWxBdXRob3JpemUiOmZhbHNlLCJsb2dpblRpbWVvdXQiOjgzMzUzLCJnbXRDcmVhdGUiOjE1MzQ0MTIwMTUwMDAsImdtdE1vZGlmaWVkIjoxNTczODgyMDk2MDAwLCJzeXN0ZW1JZFNldCI6WzAsMSwzNCwyMjcsMzYsMzcsMjMxLDIwMyw0NCwxOSwyMSwyNDYsMjMsMjQ5LDI1LDI3LDMwXSwiaWF0IjoxNTc4Mjc3OTg5fQ.mm6T34NuMBwTKaLBbVOI5AqGQNC9rwfiAdIv8c4C4_I' : '$TOKEN$' %>",
 		apiHost : "<%= process.env.NODE_ENV === 'development' ? '//beacon.duibadev.com.cn' : '$API_HOST$' %>"
 	}
 </script>

src/App.vue

@@ -11,6 +11,7 @@
 <script>
 	import i18n from "./i18n";
 	import {SSO_VERIFY_PAGE_URL} from "./config";
+	import {getCookie} from "./api/utils";
 
 	const errorTipsArr = [
 		'',
@@ -29,13 +30,15 @@
 			}
 		},
 		mounted() {
-			if (!window['zeroing_token']) {
+			let sso_ticket = getCookie('sso_ticket');
+			if (!sso_ticket) {
 				this.dealError(1);
 			}
 		},
 		computed: {
 			showErrorTips() {
-				return !window['zeroing_token'] || !this.$route.matched || this.$route.matched.length === 0;
+				let sso_ticket = getCookie('sso_ticket');
+				return !sso_ticket || !this.$route.matched || this.$route.matched.length === 0;
 			},
 			errorTipsStr() {
 				return this.errorTips + ' ' + this.$t('Jump after', {cd: this.cd});
@@ -61,6 +64,7 @@
 				}
 			},
 			startCD() {
+				clearInterval(this.timer);
 				this.timer = setInterval(() => {
 					if (this.cd <= 0) {
 						clearInterval(this.timer);

src/config.js

@@ -11,6 +11,7 @@ if (process.env.NODE_ENV === 'development') {
 	//API_HOST = '//localhost:3002';
 	//API_HOST = window.__data.apiHost;
 	//API_HOST = 'http://beacon.duiba.com.cn';
+	//API_HOST = 'http://beacon.duibadev.com.cn';
 } else {
 	API_HOST = window.__data.apiHost;
 }
@@ -19,7 +20,7 @@ if (API_HOST[API_HOST.length - 1] === '/') {
 	API_HOST = API_HOST.substr(0, API_HOST.length - 1);
 }
 
-export const SSO_VERIFY_PAGE_URL = '/sso/logout';
+export const SSO_VERIFY_PAGE_URL = '/sso/login';
 
 export const DOCK_POINT_OFFSET = 4;
 

src/views/Editor/Assets.vue

@@ -55,9 +55,6 @@
 			return {
 				showFields: ['url', 'uuid'],
 				currentItem: null,
-				uploadHeaders: {
-					authorization: 'Bearer ' + window['zeroing_token'],
-				},
 			}
 		},
 		computed: {

src/views/Editor/Views.vue

@@ -88,9 +88,6 @@
 					children: 'children',
 					label: 'name'
 				},
-				uploadHeaders: {
-					authorization: 'Bearer ' + window['zeroing_token'],
-				},
 				expandedKeys: [],
         nodeFilterPresets: this.$t('nodeFilterPresets'),
         iconMap: {

src/views/Editor/dialogs/PxSkinEditorDialog.vue

@@ -203,7 +203,7 @@
 					name,
 					env,
 					isProd: true,
-					qas: [921],
+					qas: [2085],
 				};
 				const {ret} = await playWaiting(saveSkin(params), this.$t('In processing'));
 				if (ret.success !== false) {