正在显示
11 个修改的文件
包含
13 行增加
和
22 行删除
| @@ -24,7 +24,7 @@ module.exports = { | @@ -24,7 +24,7 @@ module.exports = { | ||
| 24 | }, | 24 | }, |
| 25 | dev: { | 25 | dev: { |
| 26 | env: require('./dev.env'), | 26 | env: require('./dev.env'), |
| 27 | - port: 4006, | 27 | + port: 12020, |
| 28 | autoOpenBrowser: true, | 28 | autoOpenBrowser: true, |
| 29 | assetsSubDirectory: 'static', | 29 | assetsSubDirectory: 'static', |
| 30 | assetsPublicPath: '/', | 30 | assetsPublicPath: '/', |
| @@ -85,7 +85,7 @@ | @@ -85,7 +85,7 @@ | ||
| 85 | }, | 85 | }, |
| 86 | "adler-32": { | 86 | "adler-32": { |
| 87 | "version": "1.2.0", | 87 | "version": "1.2.0", |
| 88 | - "resolved": "https://registry.npm.taobao.org/adler-32/download/adler-32-1.2.0.tgz", | 88 | + "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz", |
| 89 | "integrity": "sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=", | 89 | "integrity": "sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=", |
| 90 | "requires": { | 90 | "requires": { |
| 91 | "exit-on-epipe": "~1.0.1", | 91 | "exit-on-epipe": "~1.0.1", |
| @@ -2340,7 +2340,7 @@ | @@ -2340,7 +2340,7 @@ | ||
| 2340 | }, | 2340 | }, |
| 2341 | "codepage": { | 2341 | "codepage": { |
| 2342 | "version": "1.14.0", | 2342 | "version": "1.14.0", |
| 2343 | - "resolved": "https://registry.npm.taobao.org/codepage/download/codepage-1.14.0.tgz", | 2343 | + "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz", |
| 2344 | "integrity": "sha1-jL4lSBMjVZ19MHVxsP/5HnodL5k=", | 2344 | "integrity": "sha1-jL4lSBMjVZ19MHVxsP/5HnodL5k=", |
| 2345 | "requires": { | 2345 | "requires": { |
| 2346 | "commander": "~2.14.1", | 2346 | "commander": "~2.14.1", |
| @@ -6313,11 +6313,7 @@ | @@ -6313,11 +6313,7 @@ | ||
| 6313 | }, | 6313 | }, |
| 6314 | "normalize-wheel": { | 6314 | "normalize-wheel": { |
| 6315 | "version": "1.0.1", | 6315 | "version": "1.0.1", |
| 6316 | -<<<<<<< HEAD | ||
| 6317 | "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", | 6316 | "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", |
| 6318 | -======= | ||
| 6319 | - "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz", | ||
| 6320 | ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861 | ||
| 6321 | "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" | 6317 | "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" |
| 6322 | }, | 6318 | }, |
| 6323 | "npm": { | 6319 | "npm": { |
| @@ -10551,7 +10547,7 @@ | @@ -10551,7 +10547,7 @@ | ||
| 10551 | }, | 10547 | }, |
| 10552 | "raw-loader": { | 10548 | "raw-loader": { |
| 10553 | "version": "0.5.1", | 10549 | "version": "0.5.1", |
| 10554 | - "resolved": "https://registry.npm.taobao.org/raw-loader/download/raw-loader-0.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fraw-loader%2Fdownload%2Fraw-loader-0.5.1.tgz", | 10550 | + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz", |
| 10555 | "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=" | 10551 | "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=" |
| 10556 | }, | 10552 | }, |
| 10557 | "read-pkg": { | 10553 | "read-pkg": { |
| @@ -11146,13 +11142,8 @@ | @@ -11146,13 +11142,8 @@ | ||
| 11146 | }, | 11142 | }, |
| 11147 | "resize-observer-polyfill": { | 11143 | "resize-observer-polyfill": { |
| 11148 | "version": "1.5.1", | 11144 | "version": "1.5.1", |
| 11149 | -<<<<<<< HEAD | ||
| 11150 | - "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", | ||
| 11151 | - "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" | ||
| 11152 | -======= | ||
| 11153 | "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresize-observer-polyfill%2Fdownload%2Fresize-observer-polyfill-1.5.1.tgz", | 11145 | "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresize-observer-polyfill%2Fdownload%2Fresize-observer-polyfill-1.5.1.tgz", |
| 11154 | "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=" | 11146 | "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=" |
| 11155 | ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861 | ||
| 11156 | }, | 11147 | }, |
| 11157 | "resolve": { | 11148 | "resolve": { |
| 11158 | "version": "1.12.0", | 11149 | "version": "1.12.0", |
| 1 | import http from './http.js' | 1 | import http from './http.js' |
| 2 | -let baseUrl = 'nmms-server/nmms/country' | 2 | +let baseUrl = 'nmms-server-export/nmms/country' |
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | export const getCountry = params => { return http.get(`${baseUrl}/getCountryCode`, params); }; | 5 | export const getCountry = params => { return http.get(`${baseUrl}/getCountryCode`, params); }; |
| 1 | import http from './http.js' | 1 | import http from './http.js' |
| 2 | 2 | ||
| 3 | -let baseUrl = 'nmms-server/nmms/mt3201' | 3 | +let baseUrl = 'nmms-server-export/nmms/mt3201' |
| 4 | 4 | ||
| 5 | export const getMt3201ListForParam = params => { | 5 | export const getMt3201ListForParam = params => { |
| 6 | return http.get(`${baseUrl}/getMt3201ListForParam`, params); | 6 | return http.get(`${baseUrl}/getMt3201ListForParam`, params); |
| 1 | import http from './http.js' | 1 | import http from './http.js' |
| 2 | 2 | ||
| 3 | -let baseUrl = 'nmms-server/nmms/flight' | 3 | +let baseUrl = 'nmms-server-export/nmms/flight' |
| 4 | 4 | ||
| 5 | export const getFlightListForParam = params => { | 5 | export const getFlightListForParam = params => { |
| 6 | return http.get(`${baseUrl}/getFlight`, params); | 6 | return http.get(`${baseUrl}/getFlight`, params); |
| 1 | import http from './http.js' | 1 | import http from './http.js' |
| 2 | 2 | ||
| 3 | -let baseUrl = 'nmms-server/nmms/mt4201' | 3 | +let baseUrl = 'nmms-server-export/nmms/mt4201' |
| 4 | 4 | ||
| 5 | export const getMt4201ListForParam = params => { | 5 | export const getMt4201ListForParam = params => { |
| 6 | return http.get(`${baseUrl}/getMt4201ListForParam`, params); | 6 | return http.get(`${baseUrl}/getMt4201ListForParam`, params); |
| 1 | import http from './http.js' | 1 | import http from './http.js' |
| 2 | 2 | ||
| 3 | -let baseUrl = 'nmms-server/nmms/manifest' | 3 | +let baseUrl = 'nmms-server-export/nmms/manifest' |
| 4 | 4 | ||
| 5 | export const getManifests = params => { | 5 | export const getManifests = params => { |
| 6 | return http.get(`${baseUrl}/getManifests`, params); | 6 | return http.get(`${baseUrl}/getManifests`, params); |
| 1 | import http from './http.js' | 1 | import http from './http.js' |
| 2 | 2 | ||
| 3 | -let baseUrl = 'nmms-server/nmms/mt2201' | 3 | +let baseUrl = 'nmms-server-export/nmms/mt2201' |
| 4 | 4 | ||
| 5 | export const getMt2201ListForParam = params => { return http.get(`${baseUrl}/getMt2201ListForParam`, params)}; | 5 | export const getMt2201ListForParam = params => { return http.get(`${baseUrl}/getMt2201ListForParam`, params)}; |
| 6 | 6 |
| 1 | import http from './http.js' | 1 | import http from './http.js' |
| 2 | 2 | ||
| 3 | -let baseUrl = 'nmms-server/nmms/mt520x' | 3 | +let baseUrl = 'nmms-server-export/nmms/mt520x' |
| 4 | 4 | ||
| 5 | export const getMt520XListForParam = params => { | 5 | export const getMt520XListForParam = params => { |
| 6 | return http.get(`${baseUrl}/getMt520xListForParam`, params); | 6 | return http.get(`${baseUrl}/getMt520xListForParam`, params); |
| 1 | import http from './http.js' | 1 | import http from './http.js' |
| 2 | -let baseUrl = 'nmms-server/nmms/mt1201' | 2 | +let baseUrl = 'nmms-server-export/nmms/mt1201' |
| 3 | 3 | ||
| 4 | export const getMt1201ListForParam = params => { return http.get(`${baseUrl}/getMt1201ListForParam`, params); }; | 4 | export const getMt1201ListForParam = params => { return http.get(`${baseUrl}/getMt1201ListForParam`, params); }; |
| 5 | 5 |
| 1 | import http from './http.js' | 1 | import http from './http.js' |
| 2 | 2 | ||
| 3 | -let baseUrl = 'nmms-server/nmms/rep' | 3 | +let baseUrl = 'nmms-server-export/nmms/rep' |
| 4 | 4 | ||
| 5 | export const getResponseForParam = params => { | 5 | export const getResponseForParam = params => { |
| 6 | return http.get(`${baseUrl}/getResponseForParam`, params); | 6 | return http.get(`${baseUrl}/getResponseForParam`, params); |
-
请 注册 或 登录 后发表评论