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

b5e152bb · 曾婧 · f043fb42 · 7c9371f3 · b5e152bb · b5e152bb
Commit b5e152bb authored Apr 21, 2022 by 曾婧
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 8 deletions

proxy.js config/proxy.js +13 -4

package.json package.json +3 -3

index.ejs src/index.ejs +1 -1

No files found.
--- a/config/proxy.js
+++ b/config/proxy.js
 /* eslint-disable */
 // 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 = 'http://192.168.12.47:8082';
-const proxyURL = 'http://localhost:8086';
+const proxyURL = 'http://192.168.12.3:8082';
+// const proxyURL = 'https://panda-water.cn';

 module.exports = {
  assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './',
@@ -112,7 +112,6 @@ module.exports = {
        '/Publish': '/Publish',
      },
    },
-
    '/PandaCore': {
      target: proxyURL,
      changeOrigin: true,
@@ -216,6 +215,16 @@ module.exports = {
        '/cityjson': '/cityjson',
      },
    },
+    '/PandaCore': {
+      target: proxyURL,
+      changeOrigin: true,
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+      },
+      pathRewrite: {
+        '/PandaCore': '/PandaCore',
+      }
+    },
    '/Publish': {
      target: 'https://panda-water.cn',
      changeOrigin: true,
@@ -227,4 +236,4 @@ module.exports = {
      },
    },
  },
-};
+}
--- a/package.json
+++ b/package.json
@@ -106,9 +106,9 @@
        "@wisdom-cesium/cesium": "^1.0.75",
        "@wisdom-components/basictable": "^1.5.16",
        "@wisdom-components/empty": "^1.4.1",
-        "@wisdom-map/Amap": "^1.0.49-11",
-        "@wisdom-map/Map": "^1.0.12-23",
-        "@wisdom-map/arcgismap": "^1.0.79-23",
+        "@wisdom-map/Amap": "^1.0.49-14",
+        "@wisdom-map/Map": "^1.0.12-27",
+        "@wisdom-map/arcgismap": "^1.0.79-27",
        "@wisdom-map/util": "^1.0.27-0",
        "@wisdom-utils/components": "0.1.58",
        "@wisdom-utils/runtime": "0.0.15",

--- a/src/index.ejs
+++ b/src/index.ejs
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh-CN">
  <head>
    <!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> -->
    <!-- The first thing in any HTML file should be the charset -->