Skip to content

C
CivWeb
Commit b5e152bb authored by 曾婧's avatar 曾婧
Browse files
Options

Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/CivWeb

parents f043fb42 7c9371f3
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 8 deletions
config/proxy.js
View file @ b5e152bb
/* eslint-disable */ /* eslint-disable */
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin; // const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
// const proxyURL = 'https://work.panda-water.cn'; // const proxyURL = 'https://work.panda-water.cn';
// const proxyURL = 'http://192.168.12.47:8082'; const proxyURL = 'http://192.168.12.3:8082';
const proxyURL = 'http://localhost:8086'; // const proxyURL = 'https://panda-water.cn';
module.exports = { module.exports = {
assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './', assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './',
...@@ -112,7 +112,6 @@ module.exports = { ...@@ -112,7 +112,6 @@ module.exports = {
'/Publish': '/Publish', '/Publish': '/Publish',
}, },
}, },
'/PandaCore': { '/PandaCore': {
target: proxyURL, target: proxyURL,
changeOrigin: true, changeOrigin: true,
...@@ -216,6 +215,16 @@ module.exports = { ...@@ -216,6 +215,16 @@ module.exports = {
'/cityjson': '/cityjson', '/cityjson': '/cityjson',
}, },
}, },
'/PandaCore': {
target: proxyURL,
changeOrigin: true,
headers: {
'Access-Control-Allow-Origin': '*',
},
pathRewrite: {
'/PandaCore': '/PandaCore',
}
},
'/Publish': { '/Publish': {
target: 'https://panda-water.cn', target: 'https://panda-water.cn',
changeOrigin: true, changeOrigin: true,
...@@ -227,4 +236,4 @@ module.exports = { ...@@ -227,4 +236,4 @@ module.exports = {
}, },
}, },
}, },
}; }
package.json
View file @ b5e152bb
...@@ -106,9 +106,9 @@ ...@@ -106,9 +106,9 @@
"@wisdom-cesium/cesium": "^1.0.75", "@wisdom-cesium/cesium": "^1.0.75",
"@wisdom-components/basictable": "^1.5.16", "@wisdom-components/basictable": "^1.5.16",
"@wisdom-components/empty": "^1.4.1", "@wisdom-components/empty": "^1.4.1",
"@wisdom-map/Amap": "^1.0.49-11", "@wisdom-map/Amap": "^1.0.49-14",
"@wisdom-map/Map": "^1.0.12-23", "@wisdom-map/Map": "^1.0.12-27",
"@wisdom-map/arcgismap": "^1.0.79-23", "@wisdom-map/arcgismap": "^1.0.79-27",
"@wisdom-map/util": "^1.0.27-0", "@wisdom-map/util": "^1.0.27-0",
"@wisdom-utils/components": "0.1.58", "@wisdom-utils/components": "0.1.58",
"@wisdom-utils/runtime": "0.0.15", "@wisdom-utils/runtime": "0.0.15",
......
src/index.ejs
View file @ b5e152bb
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh-CN">
<head> <head>
<!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> --> <!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> -->
<!-- The first thing in any HTML file should be the charset --> <!-- The first thing in any HTML file should be the charset -->
......
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