Commit e020776b authored by 邓晓峰's avatar 邓晓峰

update qiankun

parent fc82af14
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
module.exports = { module.exports = {
dev: { dev: {
'/CityInterface': { '/CityInterface': {
// target: 'http://192.168.10.150:8050', target: 'http://192.168.10.150:8050',
target: 'https://panda-water.cn', // target: 'https://panda-water.cn',
// target: 'http://192.168.19.103:8112', // target: 'http://192.168.19.103:8112',
// target: 'http://192.168.12.8:8098', // target: 'http://192.168.12.8:8098',
changeOrigin: true, changeOrigin: true,
...@@ -16,8 +16,8 @@ module.exports = { ...@@ -16,8 +16,8 @@ module.exports = {
} }
}, },
'/cityinterface': { '/cityinterface': {
// target: 'http://192.168.10.151:8055', target: 'http://192.168.10.151:8055',
target: 'https://panda-water.cn', // target: 'https://panda-water.cn',
// target: 'http://192.168.12.8:8098', // target: 'http://192.168.12.8:8098',
changeOrigin: true, changeOrigin: true,
headers: { headers: {
......
module.exports = { module.exports = {
dev: { dev: {
'/CityInterface': { '/CityInterface': {
// target: 'http://192.168.10.150:8050', target: 'http://192.168.10.150:8050',
target: 'https://panda-water.cn', // target: 'https://panda-water.cn',
// target: 'http://192.168.19.103:8112', // target: 'http://192.168.19.103:8112',
// target: 'http://192.168.12.8:8098', // target: 'http://192.168.12.8:8098',
changeOrigin: true, changeOrigin: true,
...@@ -14,8 +14,8 @@ module.exports = { ...@@ -14,8 +14,8 @@ module.exports = {
}, },
}, },
'/cityinterface': { '/cityinterface': {
// target: 'http://192.168.10.151:8055', target: 'http://192.168.10.151:8055',
target: 'https://panda-water.cn', // target: 'https://panda-water.cn',
// target: 'http://192.168.12.8:8098', // target: 'http://192.168.12.8:8098',
changeOrigin: true, changeOrigin: true,
headers: { headers: {
......
...@@ -22491,9 +22491,9 @@ ...@@ -22491,9 +22491,9 @@
"dev": true "dev": true
}, },
"qiankun": { "qiankun": {
"version": "2.2.2", "version": "2.2.3-1",
"resolved": "https://g.civnet.cn:4873/qiankun/-/qiankun-2.2.2.tgz", "resolved": "https://g.civnet.cn:4873/qiankun/-/qiankun-2.2.3-1.tgz",
"integrity": "sha512-VMz7trkWbaQDnkUKgPDrS3Z83ZCwBHAvFXC/ivkpROR2tqNctPwfUc3K/PYWCy1eNhy9YiPhuPtf0UYBGLKd7g==", "integrity": "sha512-HeTp3nN28JcPbZn8A5LgwPg9GNbyiT6BSm37sl1fvBMiN3djt5J8KNCdIz5CihTlAHDE28UJdIdJmGkvVotNgA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/runtime": "^7.10.5", "@babel/runtime": "^7.10.5",
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
"postcss-safe-parser": "4.0.2", "postcss-safe-parser": "4.0.2",
"pre-commit": "1.2.2", "pre-commit": "1.2.2",
"prettier": "1.17.0", "prettier": "1.17.0",
"qiankun": "^2.2.2", "qiankun": "^2.2.3-1",
"qs": "^6.9.0", "qs": "^6.9.0",
"react": "^16.8.6", "react": "^16.8.6",
"react-app-polyfill": "0.2.2", "react-app-polyfill": "0.2.2",
......
...@@ -22,7 +22,6 @@ class HttpRequest { ...@@ -22,7 +22,6 @@ class HttpRequest {
// removeAllPending() // removeAllPending()
// } // }
// ------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------
debugger;
if (this.getSite()) { if (this.getSite()) {
config.headers['Civ-Site'] = this.getSite(); config.headers['Civ-Site'] = this.getSite();
} }
......
...@@ -83,7 +83,6 @@ const initGlobalConfig = () => { ...@@ -83,7 +83,6 @@ const initGlobalConfig = () => {
window.share && window.share &&
window.share.event && window.share.event &&
window.share.event.on('triggerMicro', () => { window.share.event.on('triggerMicro', () => {
console.log('triggerMicro');
initMicroApps(loader); initMicroApps(loader);
}); });
......
...@@ -537,8 +537,6 @@ function () { ...@@ -537,8 +537,6 @@ function () {
userPhone: userPhone, userPhone: userPhone,
'request.preventCache': Date.now() 'request.preventCache': Date.now()
}).then(function (response) { }).then(function (response) {
debugger;
if (response && response.token) { if (response && response.token) {
var token = response.token; var token = response.token;
......
...@@ -51,7 +51,6 @@ const Login = props => { ...@@ -51,7 +51,6 @@ const Login = props => {
loginAction.login(values.userName, values.password); loginAction.login(values.userName, values.password);
setSubmitting(true); setSubmitting(true);
debugger;
loginAction.events.on('loginSuccess', event => { loginAction.events.on('loginSuccess', event => {
setSubmitting(false); setSubmitting(false);
// window.share.event.on('updateGlobalConfig', props.global); // window.share.event.on('updateGlobalConfig', props.global);
......
...@@ -515,7 +515,6 @@ class Login { ...@@ -515,7 +515,6 @@ class Login {
'request.preventCache': Date.now(), 'request.preventCache': Date.now(),
}) })
.then(response => { .then(response => {
debugger;
if (response && response.token) { if (response && response.token) {
const token = response.token; const token = response.token;
Cookies.set('token', token); Cookies.set('token', token);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment