From 55050d2ed17dc5635871af4bec1fa88c4b8b3887 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 27 二月 2024 13:12:01 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java | 1 +
zy-asrs-flow/src/pages/User/Login/index.jsx | 35 +++++++++++++++++++++++++++++------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java | 10 ++++++++++
zy-asrs-flow/src/global.less | 4 ++++
4 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/global.less b/zy-asrs-flow/src/global.less
index 555c608..9618d1f 100644
--- a/zy-asrs-flow/src/global.less
+++ b/zy-asrs-flow/src/global.less
@@ -92,4 +92,8 @@
width: 200px;
height: 100%;
margin: 30px 0;
+}
+
+.centered-select .ant-select-selection-item {
+ text-align: center;
}
\ No newline at end of file
diff --git a/zy-asrs-flow/src/pages/User/Login/index.jsx b/zy-asrs-flow/src/pages/User/Login/index.jsx
index 6a2f762..bca7dea 100644
--- a/zy-asrs-flow/src/pages/User/Login/index.jsx
+++ b/zy-asrs-flow/src/pages/User/Login/index.jsx
@@ -9,6 +9,7 @@
ProFormCaptcha,
ProFormCheckbox,
ProFormText,
+ ProFormSelect
} from '@ant-design/pro-components';
import { Button, Divider, Alert, Tabs, message, theme, Form } from 'antd';
import { useState, useEffect } from 'react';
@@ -17,6 +18,7 @@
import { request } from '@umijs/max';
import { setToken } from '@/utils/token-util'
import { PROJECT_NAME } from '@/config/setting'
+import Http from '@/utils/http';
import logo from './logo.png'
@@ -77,6 +79,12 @@
}
};
+ const fetchHostList = async () => {
+ const res = await Http.doGet('api/auth/host', {})
+ console.log(res.data);
+ }
+ fetchHostList();
+
const handleSubmit = async (values) => {
try {
const r = await request('/api/login', {
@@ -133,10 +141,6 @@
backgroundColor: 'rgba(0, 0, 0,0.65)',
backdropFilter: 'blur(4px)',
}}
- initialValues={{
- // username: 'root',
- // password: '123456',
- }}
onFinish={async (values) => {
await handleSubmit(values);
}}
@@ -151,6 +155,25 @@
</Tabs>
{loginType === 'account' && (
<>
+ <ProFormSelect
+ className="centered-select"
+ name="hostId"
+ placeholder="鏈烘瀯锛�"
+ rules={[
+ {
+ required: true,
+ message: '璇烽�夋嫨鏈烘瀯!',
+ },
+ ]}
+ debounceTime={300}
+ request={async ({ keyWords }) => {
+ const resp = await Http.doGet('api/auth/host', {});
+ return resp.data.map(item => ({
+ label: item.name,
+ value: item.id
+ }));
+ }}
+ />
<ProFormText
name="username"
fieldProps={{
@@ -164,7 +187,7 @@
/>
),
}}
- placeholder={'鐢ㄦ埛鍚�: root'}
+ placeholder={'鐢ㄦ埛鍚�: '}
rules={[
{
required: true,
@@ -185,7 +208,7 @@
/>
),
}}
- placeholder={'瀵嗙爜: 123456'}
+ placeholder={'瀵嗙爜: '}
rules={[
{
required: true,
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
index bebf245..e25ef31 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
@@ -32,6 +32,7 @@
public class SecurityConfig extends WebSecurityConfigurerAdapter {
public static final String[] FILTER_PATH = new String[]{
+ "/api/auth/host",
"/test/**",
"/api/login",
"/druid/**",
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java
index 9af0dcb..43c215f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java
@@ -8,9 +8,11 @@
import com.zy.asrs.wcs.system.controller.param.LoginParam;
import com.zy.asrs.wcs.system.controller.param.UpdatePasswordParam;
import com.zy.asrs.wcs.system.controller.result.LoginResult;
+import com.zy.asrs.wcs.system.entity.Host;
import com.zy.asrs.wcs.system.entity.Menu;
import com.zy.asrs.wcs.system.entity.User;
import com.zy.asrs.wcs.system.entity.UserLogin;
+import com.zy.asrs.wcs.system.service.HostService;
import com.zy.asrs.wcs.system.service.RoleMenuService;
import com.zy.asrs.wcs.system.service.UserLoginService;
import com.zy.asrs.wcs.system.service.UserService;
@@ -40,6 +42,8 @@
private UserLoginService userLoginService;
@Resource
private RoleMenuService roleMenuService;
+ @Resource
+ private HostService hostService;
@PostMapping("/login")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
@@ -72,6 +76,12 @@
return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
}
+ @GetMapping("/auth/host")
+ public R authHost() {
+ List<Host> list = hostService.list();
+ return R.ok().add(list);
+ }
+
@PreAuthorize("hasAuthority('sys:auth:user')")
@OperationLog
@PutMapping("/auth/user")
--
Gitblit v1.9.1