You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by ra...@apache.org on 2021/03/21 13:27:13 UTC
[dubbo-admin] branch dev-change-ui2antd updated: Merge branch
'develop' of https://github.com/apache/dubbo-admin into upstream-develop
(#711)
This is an automated email from the ASF dual-hosted git repository.
ranke pushed a commit to branch dev-change-ui2antd
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
The following commit(s) were added to refs/heads/dev-change-ui2antd by this push:
new c14cdcd Merge branch 'develop' of https://github.com/apache/dubbo-admin into upstream-develop (#711)
c14cdcd is described below
commit c14cdcdbe63f24573ce4210eab8dc54b93ba1e3e
Author: tzr164 <tz...@163.com>
AuthorDate: Sun Mar 21 21:25:03 2021 +0800
Merge branch 'develop' of https://github.com/apache/dubbo-admin into upstream-develop (#711)
# Conflicts:
# dubbo-admin-server/src/main/java/org/apache/dubbo/admin/interceptor/AuthInterceptor.java
# dubbo-admin-ui/src/components/http-common.js
---
dubbo-admin-ui-antd/config/config.ts | 1 +
dubbo-admin-ui-antd/config/routes.ts | 19 ++++++++++---
dubbo-admin-ui-antd/src/app.tsx | 19 ++++---------
.../src/components/Footer/index.tsx | 2 +-
.../{components/Footer => pages/Service}/index.tsx | 11 +++++---
dubbo-admin-ui-antd/src/pages/User/login/index.tsx | 7 +++--
.../Footer/index.tsx => storage/auth.ts} | 32 +++++++++++++++++++---
.../index.tsx => dubbo-admin-ui/src/util/auth.js | 29 +++++++++++++++++---
8 files changed, 87 insertions(+), 33 deletions(-)
diff --git a/dubbo-admin-ui-antd/config/config.ts b/dubbo-admin-ui-antd/config/config.ts
index 443a566..e3dd01d 100644
--- a/dubbo-admin-ui-antd/config/config.ts
+++ b/dubbo-admin-ui-antd/config/config.ts
@@ -71,4 +71,5 @@ export default defineConfig({
schemaPath: join(__dirname, 'oneapi.json'),
mock: false,
},
+ devtool:REACT_APP_ENV == 'dev' ? 'source-map' : undefined
});
diff --git a/dubbo-admin-ui-antd/config/routes.ts b/dubbo-admin-ui-antd/config/routes.ts
index b0965c2..a2b0b90 100644
--- a/dubbo-admin-ui-antd/config/routes.ts
+++ b/dubbo-admin-ui-antd/config/routes.ts
@@ -16,6 +16,21 @@
*/
export default [
{
+ path: '/',
+ routes: [
+ {
+ path: '/service',
+ routes:[
+ {
+ name: 'service',
+ path: '/service',
+ component: './Service'
+ }
+ ]
+ }
+ ],
+ },
+ {
path: '/user',
layout: false,
routes: [
@@ -59,10 +74,6 @@ export default [
component: './TableList',
},
{
- path: '/',
- redirect: '/welcome',
- },
- {
component: './404',
},
];
diff --git a/dubbo-admin-ui-antd/src/app.tsx b/dubbo-admin-ui-antd/src/app.tsx
index 26c361d..f2ef2d6 100644
--- a/dubbo-admin-ui-antd/src/app.tsx
+++ b/dubbo-admin-ui-antd/src/app.tsx
@@ -25,6 +25,7 @@ import Footer from '@/components/Footer';
import type { ResponseError } from 'umi-request';
import { currentUser as queryCurrentUser } from './services/ant-design-pro/api';
import { BookOutlined, LinkOutlined } from '@ant-design/icons';
+import { getToken } from '@/storage/auth'
const isDev = process.env.NODE_ENV === 'development';
@@ -40,26 +41,16 @@ export async function getInitialState(): Promise<{
currentUser?: API.CurrentUser;
fetchUserInfo?: () => Promise<API.CurrentUser | undefined>;
}> {
- const fetchUserInfo = async () => {
- try {
- const currentUser = await queryCurrentUser();
- return currentUser;
- } catch (error) {
- history.push('/user/login');
- }
- return undefined;
- };
// If it is a login page, do not execute
if (history.location.pathname !== '/user/login') {
- const currentUser = await fetchUserInfo();
+ if (!getToken()) {
+ history.push('/user/login');
+ }
return {
- fetchUserInfo,
- currentUser,
settings: {},
};
}
return {
- fetchUserInfo,
settings: {},
};
}
@@ -73,7 +64,7 @@ export const layout: RunTimeLayoutConfig = ({ initialState }) => {
onPageChange: () => {
const { location } = history;
// If not, redirect to login
- if (!initialState?.currentUser && location.pathname !== '/user/login') {
+ if (!getToken() && location.pathname !== '/user/login') {
history.push('/user/login');
}
},
diff --git a/dubbo-admin-ui-antd/src/components/Footer/index.tsx b/dubbo-admin-ui-antd/src/components/Footer/index.tsx
index 35b9407..d10c584 100644
--- a/dubbo-admin-ui-antd/src/components/Footer/index.tsx
+++ b/dubbo-admin-ui-antd/src/components/Footer/index.tsx
@@ -17,5 +17,5 @@
import { DefaultFooter } from '@ant-design/pro-layout';
export default () => (
- <DefaultFooter copyright="2018-2021 The Apache Software Foundation." links={[]} />
+ <DefaultFooter copyright="Copyright ©2018-2021 The Apache Software Foundation." links={[]} />
);
diff --git a/dubbo-admin-ui-antd/src/components/Footer/index.tsx b/dubbo-admin-ui-antd/src/pages/Service/index.tsx
similarity index 82%
copy from dubbo-admin-ui-antd/src/components/Footer/index.tsx
copy to dubbo-admin-ui-antd/src/pages/Service/index.tsx
index 35b9407..e82edb0 100644
--- a/dubbo-admin-ui-antd/src/components/Footer/index.tsx
+++ b/dubbo-admin-ui-antd/src/pages/Service/index.tsx
@@ -14,8 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { DefaultFooter } from '@ant-design/pro-layout';
-export default () => (
- <DefaultFooter copyright="2018-2021 The Apache Software Foundation." links={[]} />
-);
+import React, { useState } from 'react';
+
+const Service:React.FC = () => {
+ return (<div>service</div>);
+}
+
+export default Service;
diff --git a/dubbo-admin-ui-antd/src/pages/User/login/index.tsx b/dubbo-admin-ui-antd/src/pages/User/login/index.tsx
index ff83164..9c5547d 100644
--- a/dubbo-admin-ui-antd/src/pages/User/login/index.tsx
+++ b/dubbo-admin-ui-antd/src/pages/User/login/index.tsx
@@ -21,6 +21,7 @@ import ProForm, { ProFormCheckbox, ProFormText } from '@ant-design/pro-form';
import { useIntl, Link, history, FormattedMessage, SelectLang } from 'umi';
import Footer from '@/components/Footer';
import { login } from '@/services/ant-design-pro/login';
+import {setToken,setUsername} from '@/storage/auth'
import styles from './index.less';
@@ -66,8 +67,10 @@ const Login: React.FC = () => {
defaultMessage: 'Login successful!',
}),
);
- localStorage.setItem('token', msg);
- localStorage.setItem('username', values.username);
+
+ setToken(msg);
+ setUsername(values.username);
+
goto();
return;
}
diff --git a/dubbo-admin-ui-antd/src/components/Footer/index.tsx b/dubbo-admin-ui-antd/src/storage/auth.ts
similarity index 55%
copy from dubbo-admin-ui-antd/src/components/Footer/index.tsx
copy to dubbo-admin-ui-antd/src/storage/auth.ts
index 35b9407..6392ea1 100644
--- a/dubbo-admin-ui-antd/src/components/Footer/index.tsx
+++ b/dubbo-admin-ui-antd/src/storage/auth.ts
@@ -14,8 +14,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { DefaultFooter } from '@ant-design/pro-layout';
+/* eslint no-useless-escape:0 import/prefer-default-export:0 */
-export default () => (
- <DefaultFooter copyright="2018-2021 The Apache Software Foundation." links={[]} />
-);
+ /**
+ * token key
+ */
+ const tokenKey = 'token';
+
+ /**
+ * username token
+ */
+ const usernameKey = 'usernameKey';
+
+ export const setToken = (token:string)=>{
+ localStorage.setItem(tokenKey,token);
+ }
+
+ export const getToken = (): string => {
+ var result = localStorage.getItem(tokenKey);
+ return result?result:'';
+ }
+
+ export const setUsername = (username:string) => {
+ localStorage.setItem(usernameKey,username);
+ }
+
+ export const getUsername = ():string =>{
+ var result = localStorage.getItem(usernameKey);
+ return result?result:'';
+ }
diff --git a/dubbo-admin-ui-antd/src/components/Footer/index.tsx b/dubbo-admin-ui/src/util/auth.js
similarity index 64%
copy from dubbo-admin-ui-antd/src/components/Footer/index.tsx
copy to dubbo-admin-ui/src/util/auth.js
index 35b9407..76e92b7 100644
--- a/dubbo-admin-ui-antd/src/components/Footer/index.tsx
+++ b/dubbo-admin-ui/src/util/auth.js
@@ -14,8 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { DefaultFooter } from '@ant-design/pro-layout';
-export default () => (
- <DefaultFooter copyright="2018-2021 The Apache Software Foundation." links={[]} />
-);
+ /**
+ * token key
+ */
+ const tokenKey = 'token';
+
+ /**
+ * username token
+ */
+ const usernameKey = 'usernameKey';
+
+ export function setToken(token){
+ localStorage.setItem(tokenKey,token);
+ }
+
+ export function getToken(){
+ return localStorage.getItem(tokenKey)
+ }
+
+ export function setUsername(username){
+ localStorage.setItem(usernameKey,username);
+ }
+
+ export function getUsername(){
+ return localStorage.getItem(usernameKey)
+ }