fix: Merge branch 'zhijiang'

config/proxy.ts

@@ -26,12 +26,12 @@ export default {
     //   },
     // },
     '/sgadmin/duoduo-service': {
-      //target: 'https://duoduoenv.sagacloud.cn/',
-      target: 'http://10.100.28.79',
+      target: 'https://duoduoenv.sagacloud.cn/',
+      //   target: 'http://10.100.28.79',
       changeOrigin: true,
       pathRewrite: {
         //'^/sgadmin': '/sgadmin',
-        '^/sgadmin/duoduo-service': '/sgadmin/duoduo-service',
+        '^/sgadmin/duoduo-service': '/duoduo-service',
       },
     },
   },

src/app.tsx

@@ -28,7 +28,9 @@ export async function getInitialState(): Promise<{
 
   var dealRes = deal_locationsearch();
   var persagyToken = dealRes[0];
-  let userName = persagyToken && decrypt(persagyToken);
+  let deCode = decodeURIComponent(persagyToken);
+
+  let userName = persagyToken && decrypt(deCode);
 
   //如果有值 存起来
   if (access_token) {

src/config/screate.js

@@ -1,18 +1,21 @@
-const cryptojs = require('crypto-js'); //引用AES源码js
+const CryptoJS = require('crypto-js'); //引用AES源码js
 
 // 解密
-export function decrypt(word, keystr = '1234123412341234', ivstr = '1234123412341234') {
-  //keystr = keystr ? keystr : ;
-  //ivstr = ivstr ? ivstr : ;
-  var key = cryptojs.enc.Utf8.parse(keystr);
-  let iv = cryptojs.enc.Utf8.parse(ivstr);
-  var decrypt = cryptojs.AES.decrypt(word, key, {
-    iv,
-    mode: cryptojs.mode.CBC,
-    padding: cryptojs.pad.Pkcs7,
-  });
-  return decrypt.toString(cryptojs.enc.Utf8);
+export function decrypt(word, keystr, ivstr) {
+    console.log(word,'111');
+    keystr = keystr ? keystr : "1234123412341234";
+    ivstr = ivstr ? ivstr : "1234123412341234";
+    var key = CryptoJS.enc.Utf8.parse(keystr);
+    let iv = CryptoJS.enc.Utf8.parse(ivstr);
+    var decrypt = CryptoJS.AES.decrypt(word, key, {
+        iv,
+        mode: CryptoJS.mode.CBC,
+        padding: CryptoJS.pad.Pkcs7
+    });
+    return decrypt.toString(CryptoJS.enc.Utf8);
 }
+
+
 export function deal_locationsearch() {
   var search = location.search.substring(1).split('&'); //初步处理数据-->去掉?分开多个键值对
 
@@ -27,6 +30,6 @@ export function deal_locationsearch() {
       keyvalue.push(val);
     }
   }
-
+ console.log(keyvalue,'keyvalue1');
   return keyvalue; //最终返回值为对象
 }

src/layouts/index.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { useModel, useLocation, useIntl } from 'umi';
 import styles from './index.less';
 import { MenuFoldOutlined, SmileOutlined } from '@ant-design/icons';
@@ -104,8 +104,30 @@ export default (props) => {
     //debugger;
     console.log('location', location);
   }, [location]);
+
+  let setTimer = useRef();
+
+  const logOut = () => {
+    clearTimeout(setTimer.current);
+    setTimer.current = null;
+    setTimer.current = setTimeout(() => {
+      console.log('----没有点击，退出');
+      window.parent.postMessage('loginOut', '*');
+    }, 1000 * 60 * 30);
+  };
+  logOut();
+  useEffect(() => {
+    clearTimeout(setTimer.current);
+    setTimer.current = null;
+  }, []);
   return (
-    <div className={styles.layout}>
+    <div
+      className={styles.layout}
+      onClick={(event) => {
+        console.log('----已点击等待超时，退出');
+        logOut();
+      }}
+    >
       <div className={styles.header}>
         <div className={styles.title}>之江项目</div>
         <div className={styles.right}>