Bladeren bron

Merge pull request #1605 from visuddhinanda/agile

token验证失败按照未登录算
visuddhinanda 2 jaren geleden
bovenliggende
commit
9f2981a6ff

+ 16 - 0
dashboard/src/components/general/BeiAn.tsx

@@ -0,0 +1,16 @@
+const BeiAnWidget = () => {
+  const hostName = document.location.hostname;
+  const ending = hostName.split(".");
+  const ending2 = ending[ending.length - 1];
+  return (
+    <>
+      {ending2 === "cc" ? (
+        <a href="https://beian.miit.gov.cn/" target="_blank" rel="noreferrer">
+          您的备案号
+        </a>
+      ) : undefined}
+    </>
+  );
+};
+
+export default BeiAnWidget;

+ 4 - 1
dashboard/src/components/library/FooterBar.tsx

@@ -1,5 +1,6 @@
 import { Link } from "react-router-dom";
 import { Layout, Row, Col, Typography } from "antd";
+import BeiAn from "../general/BeiAn";
 
 const { Footer } = Layout;
 const { Paragraph } = Typography;
@@ -26,7 +27,9 @@ const FooterBarWidget = () => {
         </Col>
       </Row>
       <Row>
-        <Col>Powered by PCDS</Col>
+        <Col>
+          <BeiAn />
+        </Col>
       </Row>
     </Footer>
   );

+ 7 - 1
dashboard/src/components/studio/Footer.tsx

@@ -1,5 +1,11 @@
+import BeiAn from "../general/BeiAn";
+
 const FooterWidget = () => {
-  return <div>Studio Footer</div>;
+  return (
+    <div>
+      <BeiAn />
+    </div>
+  );
 };
 
 export default FooterWidget;

+ 14 - 14
dashboard/src/load.ts

@@ -70,21 +70,21 @@ const init = () => {
   );
   const token = getToken();
   if (token) {
-    get<ITokenRefreshResponse | IErrorResponse>("/v2/auth/current").then(
-      (response) => {
-        console.log(response);
-        if ("data" in response) {
-          const it: IUser = {
-            id: response.data.id,
-            nickName: response.data.nickName,
-            realName: response.data.realName,
-            avatar: response.data.avatar,
-            roles: response.data.roles,
-          };
-          store.dispatch(signIn([it, response.data.token]));
-        }
+    get<ITokenRefreshResponse>("/v2/auth/current").then((response) => {
+      console.log(response);
+      if (response.ok) {
+        const it: IUser = {
+          id: response.data.id,
+          nickName: response.data.nickName,
+          realName: response.data.realName,
+          avatar: response.data.avatar,
+          roles: response.data.roles,
+        };
+        store.dispatch(signIn([it, response.data.token]));
+      } else {
+        localStorage.removeItem("token");
       }
-    );
+    });
   } else {
     console.log("no token");
   }

+ 0 - 5
dashboard/src/pages/library/download/Download.tsx

@@ -9,11 +9,6 @@ import { get } from "../../../request";
 
 const { Paragraph } = Typography;
 
-function serverLink(url: string): string {
-  return process.env.REACT_APP_API_HOST
-    ? process.env.REACT_APP_API_HOST + url
-    : window.location.origin + url;
-}
 interface IOfflineIndex {
   filename: string;
   url: string;