Authored by wangtao

集成平台

@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 # password: 123456 82 # password: 123456
83 spring: 83 spring:
84 application: 84 application:
85 - name: aj-report 85 + name: mj-aj-report
86 cloud: 86 cloud:
87 bootstrap: 87 bootstrap:
88 enabled: true 88 enabled: true
@@ -90,9 +90,9 @@ spring: @@ -90,9 +90,9 @@ spring:
90 config: 90 config:
91 server-addr: http://192.168.0.40:8848 91 server-addr: http://192.168.0.40:8848
92 file-extension: yaml 92 file-extension: yaml
93 - namespace: monitor-dev-mj 93 + namespace: monitor-dev-ww
94 discovery: 94 discovery:
95 - namespace: monitor-dev-mj 95 + namespace: monitor-dev-ww
96 server-addr: http://192.168.0.40:8848 96 server-addr: http://192.168.0.40:8848
97 main: 97 main:
98 allow-bean-definition-overriding: true 98 allow-bean-definition-overriding: true
@@ -4,6 +4,6 @@ const prodEnv = require('./prod.env') @@ -4,6 +4,6 @@ const prodEnv = require('./prod.env')
4 4
5 module.exports = merge(prodEnv, { 5 module.exports = merge(prodEnv, {
6 NODE_ENV: '"development"', 6 NODE_ENV: '"development"',
7 - BASE_API: '"http://192.168.0.75:8089"',  
8 - MONITOR_GATEWAY: '"http://192.168.0.75:8080"' 7 + BASE_API: '"/aj-web"',
  8 + MONITOR_GATEWAY: '"/mj"'
9 }) 9 })
@@ -57,7 +57,7 @@ module.exports = { @@ -57,7 +57,7 @@ module.exports = {
57 * then assetsPublicPath should be set to "/bar/". 57 * then assetsPublicPath should be set to "/bar/".
58 * In most cases please use '/' !!! 58 * In most cases please use '/' !!!
59 */ 59 */
60 - assetsPublicPath: '/', 60 + assetsPublicPath: '/aj-web/',
61 61
62 /** 62 /**
63 * Source Maps 63 * Source Maps
1 'use strict' 1 'use strict'
2 module.exports = { 2 module.exports = {
3 NODE_ENV: '"production"', 3 NODE_ENV: '"production"',
4 - BASE_API: '""',  
5 - MONITOR_GATEWAY: '""' 4 + BASE_API: '"/aj-web"',
  5 + MONITOR_GATEWAY: '"/mj"'
6 } 6 }
1 import axios from 'axios' 1 import axios from 'axios'
2 -import { Message, MessageBox } from 'element-ui'  
3 -import store from '../store'  
4 -import { getToken } from '@/utils/auth' 2 +import {Message, MessageBox} from 'element-ui'
  3 +import {getToken} from '@/utils/auth'
  4 +
  5 +
  6 +const getParams = () => {
  7 + let map = {};
  8 + let query = window.location.search.substring(1);
  9 + if (query == '') {
  10 + query = document.location.href
  11 + let args = query.split('?');
  12 + let arr = [];
  13 + if (args && args.length > 1) {
  14 + arr = args[1].split('&')
  15 + }
  16 + for (let i = 0; i < arr.length; i++) {
  17 + let pair = arr[i].split("=");
  18 + map[pair[0]] = pair[1];
  19 + }
  20 + return map;
  21 + }
  22 + let vars = query.split("&");
  23 + for (let i = 0; i < vars.length; i++) {
  24 + let pair = vars[i].split("=");
  25 + map[pair[0]] = pair[1];
  26 + }
  27 + return map;
  28 +}
  29 +
5 // 创建axios实例 30 // 创建axios实例
6 const service = axios.create({ 31 const service = axios.create({
7 - baseURL: process.env.NODE_ENV == 'development' ? process.env.BASE_API : '/',// api 的 base_url 32 + baseURL: process.env.BASE_API,// api 的 base_url
8 timeout: 120000 // 请求超时时间 33 timeout: 120000 // 请求超时时间
9 }) 34 })
10 35
@@ -12,6 +37,34 @@ const service = axios.create({ @@ -12,6 +37,34 @@ const service = axios.create({
12 service.interceptors.request.use( 37 service.interceptors.request.use(
13 config => { 38 config => {
14 config.headers['Authorization'] = (getToken() == null || getToken() == undefined) ? '' : getToken() 39 config.headers['Authorization'] = (getToken() == null || getToken() == undefined) ? '' : getToken()
  40 +
  41 + // 平台token
  42 + let mjToken = getParams()['AuthVal'];
  43 + if (mjToken) {
  44 + let hash = btoa(window.location.hash);
  45 + let url = config.url;
  46 + let userId = getParams()['userId'];
  47 + let userName = getParams()['nickName'];
  48 +
  49 + switch (config.method) {
  50 + case 'post':
  51 + config.headers.AuthorizationMj = "BearerMj " + mjToken + ""
  52 + config.headers.MjUserId = userId;
  53 + config.headers.MjUserName = userName;
  54 + config.headers.MjHash = hash;
  55 + break;
  56 + default:
  57 + var access_token = `accessToken=${mjToken}&MjUserId=${userId}&MjUserName=${userName}&MjHash=${hash}`;
  58 + if (url.indexOf('?') === -1) {
  59 + url += '?' + access_token;
  60 + } else {
  61 + url += '&' + access_token;
  62 + }
  63 + config.url = url;
  64 + }
  65 + }
  66 +
  67 +
15 return config 68 return config
16 }, 69 },
17 error => { 70 error => {
@@ -42,8 +95,7 @@ service.interceptors.response.use( @@ -42,8 +95,7 @@ service.interceptors.response.use(
42 localStorage.clear() 95 localStorage.clear()
43 window.location.href = "/"; 96 window.location.href = "/";
44 }) 97 })
45 - }  
46 - else if (res.code !== '200') { 98 + } else if (res.code !== '200') {
47 Message({ 99 Message({
48 message: res.message, 100 message: res.message,
49 type: 'error', 101 type: 'error',
@@ -56,9 +108,9 @@ service.interceptors.response.use( @@ -56,9 +108,9 @@ service.interceptors.response.use(
56 }, 108 },
57 error => { 109 error => {
58 //start lsq 超时用console输出信息 2022-03-14 110 //start lsq 超时用console输出信息 2022-03-14
59 - if(error.code == 'ECONNABORTED' && error.message.indexOf('timeout')!=-1){  
60 - console.log(error.message)  
61 - }else{ 111 + if (error.code == 'ECONNABORTED' && error.message.indexOf('timeout') != -1) {
  112 + console.log(error.message)
  113 + } else {
62 Message({ 114 Message({
63 message: error.message, 115 message: error.message,
64 type: 'error', 116 type: 'error',