增加标准库

fb12c19f · 潘亚楠 · bf5c4b0b · fb12c19f · fb12c19f · fb12c19f
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -45,6 +45,8 @@ module.exports = {
    'element-ui': 'ELEMENT',
    // 用户操作埋点包
    'buriedPoint':'BuriedPoint',
+    // 标准库
+    'common': 'QjMethod'
  },
  module: {
    rules: [

--- a/index.html
+++ b/index.html
@@ -39,6 +39,8 @@
    <!-- production -->
    <script src="https://webplugin.allhome.com.cn/libs@1.0.0/BuriedPoint.js"></script>
    <!-- 用户操作埋点结束 -->
+    <!-- 标准库 -->
+    <script src="https://qjsl.allhome.com.cn/index.js"></script>
  </head>
  <body>
    <div id="app"></div>

--- a/package.json
+++ b/package.json
 {
-  "name": "hello_world",
+  "name": "QJ_vue_project",
  "version": "1.0.0",
-  "description": "A Vue.js project",
-  "author": "panyanan <panda_peter@126.com>",
+  "description": "A QJ vue project",
+  "author": "qj <qj@allhome.com.cn>",
  "private": true,
  "scripts": {
    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",

--- a/src/api/user.js
+++ b/src/api/user.js
 import request from '@/assets/js/axios.js';
 const apiList = [
-    // 正常响应 
-    // {
-    //     url: '/dev/rightServer',
-    //     method: 'post',
-    //     defaultData: {
-    //         a: 1
-    //     },
-    //     name: "rightServerPost"
-    // },
-    // 异常响应
    {
        url: '/user',
        method: 'get',
        name: 'getUserById'
    },
-    // 查询用户交互日志
-    // {
-    //     url: '/dev/logLine',
-    //     method: 'get',
-    //     name: 'getLogline',
-    // }
 ]
 const namespace = 'userApi';
 request.add(namespace, apiList);

--- a/src/assets/js/axios.js
+++ b/src/assets/js/axios.js
 import { Request } from 'buriedPoint';
+import token from './controlToken'
 const baseURL = {
 	'development': ' http://mock.allhome.com.cn/mock/5df2ec78d72c6e32062ac4b6/cli',
 	'lan': ' http://mock.allhome.com.cn/mock/5df2ec78d72c6e32062ac4b6/cli',
@@ -13,7 +14,7 @@ const request = new Request({
 request.interceptors({
 	// 请求拦截
 	request: config => {
-		config.headers.token = window.token;
+		config.headers.token = token;
 		return config
 	},
 	// 响应拦截

--- a/src/assets/js/controlToken.js
+++ b/src/assets/js/controlToken.js
+import { ControlToken } from 'common';
+const controlToken = new ControlToken();
+if (!controlToken.getToken()) {
+    const token = {
+        'development':
+        'I16S21xSj+i0vHo0fD/1I+35R4WWbFs6sCtqS9ZhkTWDyu3zSWL91Qsv9y6WOy/LN4rLzTGHu6EsN5ygle3v4FWh1wxJEO63gVhql6b+52XO5FC8JB94oI7RiafOg44nwVSM6c+5teiCNqbtYPhOl1Cg5ruesyl1KebWXINJHuAJI4h4RbMNZ23vBihcf0f6DwDYMJCpI9pLyzYMWiENFV7QuNO5uv5c2RyuumzAUdn0qQnCmlp0lIhjeg/yXmGKlc0VElOsw+xsqEty7quhpqFVKgqrJll2fExY/6WQqgLBdbLNeyNgbgjnIrrq80OGtm97qEswMxaiWWbKfWDY/w==',
+        'lan':
+        'I16S21xSj+i0vHo0fD/1I+35R4WWbFs6sCtqS9ZhkTWDyu3zSWL91Qsv9y6WOy/LN4rLzTGHu6EsN5ygle3v4FWh1wxJEO63gVhql6b+52XO5FC8JB94oI7RiafOg44nwVSM6c+5teiCNqbtYPhOl1Cg5ruesyl1KebWXINJHuAJI4h4RbMNZ23vBihcf0f6DwDYMJCpI9pLyzYMWiENFV7QuNO5uv5c2RyuumzAUdn0qQnCmlp0lIhjeg/yXmGKlc0VElOsw+xsqEty7quhpqFVKgqrJll2fExY/6WQqgLBdbLNeyNgbgjnIrrq80OGtm97qEswMxaiWWbKfWDY/w==',
+        'dtest': 
+        'I16S21xSj+i0vHo0fD/1I+35R4WWbFs6sCtqS9ZhkTWDyu3zSWL91Qsv9y6WOy/LN4rLzTGHu6EsN5ygle3v4FWh1wxJEO63gVhql6b+52XO5FC8JB94oI7RiafOg44nwVSM6c+5teiCNqbtYPhOl1Cg5ruesyl1KebWXINJHuAJI4h4RbMNZ23vBihcf0f6DwDYMJCpI9pLyzYMWiENFV7QuNO5uv5c2RyuumzAUdn0qQnCmlp0lIhjeg/yXmGKlc0VElOsw+xsqEty7quhpqFVKgqrJll2fExY/6WQqgLBdbLNeyNgbgjnIrrq80OGtm97qEswMxaiWWbKfWDY/w==',
+        'pred':
+        'I16S21xSj+i0vHo0fD/1I+35R4WWbFs6sCtqS9ZhkTWDyu3zSWL91Qsv9y6WOy/LN4rLzTGHu6EsN5ygle3v4FWh1wxJEO63gVhql6b+52XO5FC8JB94oI7RiafOg44nwVSM6c+5teiCNqbtYPhOl1Cg5ruesyl1KebWXINJHuAJI4h4RbMNZ23vBihcf0f6DwDYMJCpI9pLyzYMWiENFV7QuNO5uv5c2RyuumzAUdn0qQnCmlp0lIhjeg/yXmGKlc0VElOsw+xsqEty7quhpqFVKgqrJll2fExY/6WQqgLBdbLNeyNgbgjnIrrq80OGtm97qEswMxaiWWbKfWDY/w==',
+    }[process.env.NODE_ENV]
+    controlToken.setToken("globalToken", token);
+}
+export default controlToken.getToken();
--- a/src/assets/js/iframeProxy.js
+++ b/src/assets/js/iframeProxy.js
+import { ProxyIframe } from "common";
+const globalPath = new Map([
+    ['development', {
+        domain: "qj.com",
+        portal: "http://wrp.qj.com"
+    }],
+    ['lan', {
+        domain: "qj.com",
+        portal: "http://wrp.qj.com"
+    }],
+    ['pred', {
+        domain: "allhome.com.cn",
+        portal: "https://dmis.allhome.com.cn"
+    }],
+    ['production', {
+        domain: "allhome.com.cn",
+        portal: "https://mis.allhome.com.cn"
+    }]
+]);
+const env = process.env.NODE_ENV;
+const proxyIframe = new ProxyIframe({env,type:"child"});
+try {
+    proxyIframe.solve(globalPath);
+} catch (error) {
+    
+}
+proxyIframe.run("token",
+                () => parent.window.globalToken,
+                val => parent.window.globalToken = val);
--- a/src/main.js
+++ b/src/main.js
@@ -13,14 +13,18 @@ import '../src/assets/icon/iconfont.css'
 import buriedPoint from 'buriedPoint';
 // 引入样式
 import './style/index.scss';
-import App from './App'
+// 引入iframe代理
+import './assets/js/iframeProxy';
+// 引入token设置
+import './assets/js/controlToken';
+// 引入icon
 import './assets/icon/iconfont'
+// 根组件
+import App from './App'
+
 Vue.use(buriedPoint);
 Vue.use(ElementUI);
 Vue.config.productionTip = false;
-// token 放这里避免埋点包初始化无法获取token
-window.token || (window.token = 'I16S21xSj+i0vHo0fD/1I+35R4WWbFs6sCtqS9ZhkTWDyu3zSWL91Qsv9y6WOy/LN4rLzTGHu6EsN5ygle3v4FWh1wxJEO63gVhql6b+52XO5FC8JB94oI7RiafOg44nwVSM6c+5teiCNqbtYPhOl1Cg5ruesyl1KebWXINJHuAJI4h4RbMNZ23vBihcf0f6DwDYMJCpI9pLyzYMWiENFV7QuNO5uv5c2RyuumzAUdn0qQnCmlp0lIhjeg/yXmGKlc0VElOsw+xsqEty7quhpqFVKgqrJll2fExY/6WQqgLBdbLNeyNgbgjnIrrq80OGtm97qEswMxaiWWbKfWDY/w==');
-/* eslint-disable no-new */
 new Vue({
 	el: '#app',
 	router,