fix: micro config

b5299731 · 邓晓峰 · ceb174ac · ceb174ac · b5299731 · b5299731
Commit b5299731 authored May 08, 2021 by 邓晓峰
9 changed files
--- a/civbase.zip
+++ b/civbase.zip
--- a/config/micor.js
+++ b/config/micor.js
 export function genActiveRule(routerPrefix) {
+  debugger
  return location => location.pathname.startsWith(routerPrefix);
 }
 export default {
@@ -11,10 +12,16 @@ export default {
      props: {},
    },
    {
-      name: 'civmanage',
-      entry: `//${window.location.hostname}:8081/civbase/civmanage`,
+      name: 'civ_monitor',
+      entry: `//${window.location.hostname}:8081/civ_monitor`,
      container: '#micro-container',
-      activeRule: genActiveRule('/civbase/civmanage'),
+      activeRule: genActiveRule('/civbase/civ_monitor'),
+    },
+    {
+      name: 'civweb5',
+      entry: `//172.16.10.54:3008/civweb5`,
+      container: '#micro-container',
+      activeRule: genActiveRule('/civbase/civweb5'),
    },
  ],
  prod: [

--- 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://panda-water.com';
+const proxyURL = 'http://192.168.10.150:8777';
 module.exports = {
  assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './',
  dev: {

--- a/internals/webpack/webpack.base.babel.js
+++ b/internals/webpack/webpack.base.babel.js
@@ -237,19 +237,11 @@ module.exports = options => {
    .rule('svg')
    .test(/\.(svg)(\?.*)?$/)
    .use('file-loader')
-    .loader(require.resolve('file-loader'))
+    .loader(require.resolve('@umijs/deps/compiled/file-loader'))
    .options({
      name: 'static/[name].[hash:8].[ext]',
      esModule: false,
    })
-    .end()
-    .use('svg-url-loader')
-    .loader(require.resolve('svg-url-loader'))
-    .options({
-      limit: defineConfig.inlineLimit || 10000,
-      // name: '[name].[ext]',
-      noquotes: true,
-    })
    .end();

  chainConfig.module

--- a/package-lock.json
+++ b/package-lock.json
@@ -1726,6 +1726,12 @@
        }
      }
    },
+    "@bloomberg/record-tuple-polyfill": {
+      "version": "0.0.3",
+      "resolved": "https://g.civnet.cn:4873/@bloomberg%2frecord-tuple-polyfill/-/record-tuple-polyfill-0.0.3.tgz",
+      "integrity": "sha1-CwPRi4ijCJTKqxSr1mmxy79HuEM=",
+      "dev": true
+    },
    "@braintree/sanitize-url": {
      "version": "5.0.0",
      "resolved": "https://g.civnet.cn:4873/@braintree%2fsanitize-url/-/sanitize-url-5.0.0.tgz",
@@ -7738,6 +7744,145 @@
        }
      }
    },
+    "@umijs/deps": {
+      "version": "0.8.1",
+      "resolved": "https://g.civnet.cn:4873/@umijs%2fdeps/-/deps-0.8.1.tgz",
+      "integrity": "sha1-sg+bOyz2e6hTBuLB9scgxofFzpU=",
+      "dev": true,
+      "requires": {
+        "@bloomberg/record-tuple-polyfill": "0.0.3",
+        "chokidar": "3.5.1",
+        "clipboardy": "2.3.0",
+        "jest-worker": "24.9.0",
+        "prettier": "2.2.1"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "3.1.2",
+          "resolved": "https://g.civnet.cn:4873/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha1-wFV8CWrzLxBhmPT04qODU343hxY=",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "binary-extensions": {
+          "version": "2.2.0",
+          "resolved": "https://g.civnet.cn:4873/binary-extensions/-/binary-extensions-2.2.0.tgz",
+          "integrity": "sha1-dfUC7q+f/eQvyYgpZFvk6na9ni0=",
+          "dev": true
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://g.civnet.cn:4873/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chokidar": {
+          "version": "3.5.1",
+          "resolved": "https://g.civnet.cn:4873/chokidar/-/chokidar-3.5.1.tgz",
+          "integrity": "sha1-7pznu+vSt59J8wR5nVRo4x4U5oo=",
+          "dev": true,
+          "requires": {
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.3.1",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.5.0"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://g.civnet.cn:4873/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://g.civnet.cn:4873/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha1-ilJveLj99GI7cJ4Ll1xSwkwC/Ro=",
+          "dev": true,
+          "optional": true
+        },
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://g.civnet.cn:4873/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "is-binary-path": {
+          "version": "2.1.0",
+          "resolved": "https://g.civnet.cn:4873/is-binary-path/-/is-binary-path-2.1.0.tgz",
+          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+          "dev": true,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://g.civnet.cn:4873/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-worker": {
+          "version": "24.9.0",
+          "resolved": "https://g.civnet.cn:4873/jest-worker/-/jest-worker-24.9.0.tgz",
+          "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+          "dev": true,
+          "requires": {
+            "merge-stream": "^2.0.0",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "prettier": {
+          "version": "2.2.1",
+          "resolved": "https://g.civnet.cn:4873/prettier/-/prettier-2.2.1.tgz",
+          "integrity": "sha1-eVoaeN1S8HPaDNQrIfnJE4GSP/U=",
+          "dev": true
+        },
+        "readdirp": {
+          "version": "3.5.0",
+          "resolved": "https://g.civnet.cn:4873/readdirp/-/readdirp-3.5.0.tgz",
+          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+          "dev": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://g.civnet.cn:4873/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://g.civnet.cn:4873/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
    "@umijs/error-code-map": {
      "version": "1.0.1",
      "resolved": "https://g.civnet.cn:4873/@umijs%2ferror-code-map/-/error-code-map-1.0.1.tgz",
--- a/package.json
+++ b/package.json
@@ -162,6 +162,7 @@
    "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
    "@svgr/webpack": "4.3.3",
    "@umijs/bundler-utils": "3.3.7",
+    "@umijs/deps": "^0.8.1",
    "@umijs/fabric": "^2.2.0",
    "@umijs/runtime": "3.3.7",
    "@umijs/utils": "3.3.7",
@@ -247,7 +248,7 @@
    "postcss-safe-parser": "^4.0.2",
    "pre-commit": "1.2.2",
    "prettier": "1.17.0",
-    "raw-loader": "4.0.2",
+    "raw-loader": "^4.0.2",
    "react-app-polyfill": "0.2.2",
    "react-error-overlay": "6.0.8",
    "react-refresh": "^0.9.0",
@@ -268,7 +269,7 @@
    "stylelint-config-recommended": "2.2.0",
    "stylelint-config-styled-components": "0.1.1",
    "stylelint-processor-styled-components": "1.6.0",
-    "svg-url-loader": "2.3.2",
+    "svg-url-loader": "^2.3.2",
    "swagger-ui-react": "^3.42.0",
    "swagger2openapi": "^7.0.5",
    "terser-webpack-plugin": "1.2.3",

--- a/public/logo.svg
+++ b/public/logo.svg
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200" version="1.1" viewBox="0 0 200 200"><title>Group 28 Copy 5</title><desc>Created with Sketch.</desc><defs><linearGradient id="linearGradient-1" x1="62.102%" x2="108.197%" y1="0%" y2="37.864%"><stop offset="0%" stop-color="#4285EB"/><stop offset="100%" stop-color="#2EC7FF"/></linearGradient><linearGradient id="linearGradient-2" x1="69.644%" x2="54.043%" y1="0%" y2="108.457%"><stop offset="0%" stop-color="#29CDFF"/><stop offset="37.86%" stop-color="#148EFF"/><stop offset="100%" stop-color="#0A60FF"/></linearGradient><linearGradient id="linearGradient-3" x1="69.691%" x2="16.723%" y1="-12.974%" y2="117.391%"><stop offset="0%" stop-color="#FA816E"/><stop offset="41.473%" stop-color="#F74A5C"/><stop offset="100%" stop-color="#F51D2C"/></linearGradient><linearGradient id="linearGradient-4" x1="68.128%" x2="30.44%" y1="-35.691%" y2="114.943%"><stop offset="0%" stop-color="#FA8E7D"/><stop offset="51.264%" stop-color="#F74A5C"/><stop offset="100%" stop-color="#F51D2C"/></linearGradient></defs><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="logo" transform="translate(-20.000000, -20.000000)"><g id="Group-28-Copy-5" transform="translate(20.000000, 20.000000)"><g id="Group-27-Copy-3"><g id="Group-25" fill-rule="nonzero"><g id="2"><path id="Shape" fill="url(#linearGradient-1)" d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28.285908,101.993122 C27.1162831,100.824459 27.1162831,99.050775 28.285908,97.8821118 L98.0875359,28.1378823 C99.2571609,26.9692191 101.032305,26.9692191 102.20193,28.1378823 L129.985225,55.8983314 C134.193707,60.1033528 141.017005,60.1033528 145.225487,55.8983314 C149.433969,51.69331 149.433969,44.8756232 145.225487,40.6706018 L108.58055,4.05574592 C103.862049,-0.537986846 96.2692618,-0.500797906 91.5880863,4.17652823 Z"/><path id="Shape" fill="url(#linearGradient-2)" d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28.285908,101.993122 C27.1162831,100.824459 27.1162831,99.050775 28.285908,97.8821118 L98.0875359,28.1378823 C100.999864,25.6271836 105.751642,20.541824 112.729652,19.3524487 C117.915585,18.4685261 123.585219,20.4140239 129.738554,25.1889424 C125.624663,21.0784292 118.571995,14.0340304 108.58055,4.05574592 C103.862049,-0.537986846 96.2692618,-0.500797906 91.5880863,4.17652823 Z"/></g><path id="Shape" fill="url(#linearGradient-3)" d="M153.685633,135.854579 C157.894115,140.0596 164.717412,140.0596 168.925894,135.854579 L195.959977,108.842726 C200.659183,104.147384 200.659183,96.5636133 195.960527,91.8688194 L168.690777,64.7181159 C164.472332,60.5180858 157.646868,60.5241425 153.435895,64.7316526 C149.227413,68.936674 149.227413,75.7543607 153.435895,79.9593821 L171.854035,98.3623765 C173.02366,99.5310396 173.02366,101.304724 171.854035,102.473387 L153.685633,120.626849 C149.47715,124.83187 149.47715,131.649557 153.685633,135.854579 Z"/></g><ellipse id="Combined-Shape" cx="100.519" cy="100.437" fill="url(#linearGradient-4)" rx="23.6" ry="23.581"/></g></g></g></g></svg>
--- a/src/assets/二维_二供设备_二供指标.svg
+++ b/src/assets/二维_二供设备_二供指标.svg
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="56px" height="19.7px" viewBox="0 0 56 19.7" style="enable-background:new 0 0 56 19.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);stroke:url(#SVGID_2_);stroke-width:0.3032;stroke-miterlimit:10;}
+	.st1{fill:#209BFB;}
+</style>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="28.05" y1="0.9" x2="28.05" y2="19.8323" gradientTransform="matrix(1 0 0 -1 0 20)">
+	<stop  offset="6.967118e-03" style="stop-color:#064381"/>
+	<stop  offset="0.9733" style="stop-color:#2C4DB3;stop-opacity:0.3"/>
+</linearGradient>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="28.05" y1="20" x2="28.05" y2="0.7645" gradientTransform="matrix(1 0 0 -1 0 20)">
+	<stop  offset="0" style="stop-color:#235D93"/>
+	<stop  offset="0.9937" style="stop-color:#297FCE"/>
+</linearGradient>
+<path class="st0" d="M55.8,19.1H0.2V0.2h55.7v18.9H55.8z"/>
+<rect y="18.8" class="st1" width="56" height="0.9"/>
+</svg>
--- a/src/components/Authorized/CheckPermissions.js
+++ b/src/components/Authorized/CheckPermissions.js
@@ -7,7 +7,6 @@ const checkPermissions = (
  target,
  Exception,
 ) => {
-  debugger
  const client = (window.globalConfig && window.globalConfig.client) || 'city';
  const filterPath = [
    { name: '/', path: '/' },