fix: 修复https安全降级

abbe5683 · 邓晓峰 · b1524af6 · abbe5683 · abbe5683 · abbe5683
Commit abbe5683 authored 3 years ago by 邓晓峰
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

proxy.js config/proxy.js +1 -1

index.js src/containers/App/index.js +5 -0

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

micro.js src/micro.js +2 -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.10.150:8014';
 module.exports = {
  assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './',
  dev: {

--- a/src/containers/App/index.js
+++ b/src/containers/App/index.js
@@ -22,6 +22,8 @@ const defaultSetting = config.layout;


 function App(props) {
+  //
+  const metaSecurity = /https/.test(window.location.protocol) ? <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"></meta>: null;
  return (
    <>
      <Helmet
@@ -35,6 +37,9 @@ function App(props) {
          href={`https://panda-water.cn/web4/${props.global &&
            props.global.shortcutIcon}`}
        />
+        {
+          metaSecurity
+        }
        <meta
          name="description"
          content={`${props.global && props.global.title}`}

--- a/src/index.ejs
+++ b/src/index.ejs
 <!DOCTYPE html>
 <html lang="en">
  <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 -->
    <meta charset="utf-8" />
    <!-- Make the page mobile compatible -->

--- a/src/micro.js
+++ b/src/micro.js
@@ -186,7 +186,8 @@ export const defaultApp = () => {
        if(config && config.home) {
            setDefaultMountApp(`/civbase/${config.home.path.replace(/^\//, '')}`);
        } else {
-            const homepage = _.isNull(config.homepage) ? '': '/' + config.homepage;
+            debugger
+            const homepage = _.isNull(config.homepage) ? '/index': '/' + config.homepage;
            setDefaultMountApp(`/${pkg.name.toLocaleLowerCase()}/${basePath}${homepage}`);
            createStoreage.set('init_web4', true)
        }