ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-13 14:57:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增：新增修改基础信息 API（优化 Jackson 针对通用枚举接口 IEnum 的序列化和反序列化）

Browse Source
This commit is contained in:
Charles7c
2023-01-09 22:41:09 +08:00
parent 5252c54c48
commit 76fb698a37
21 changed files with 442 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
continew-admin-ui/src/api/interceptor.ts
View File

@@ -38,7 +38,11 @@ axios.interceptors.request.use(
// add response interceptors
axios.interceptors.response.use(
(response: AxiosResponse<HttpResponse>) => {
return response.data;
const res = response.data;
if (!res.success) {
Message.error(res.msg);
}
return res;
},
(error) => {
const res = error.response.data;

8
continew-admin-ui/src/api/system/user-center.ts
View File

@@ -13,6 +13,10 @@ export function uploadAvatar(data: FormData) {
return axios.post<AvatarRes>('/system/user/center/avatar', data);
}
export function saveUserInfo() {
return axios.get('/api/user/save-info');
export interface UpdateBasicInfoReq {
nickname: string;
gender: number;
}
export function updateBasicInfo(req: UpdateBasicInfoReq) {
return axios.patch('/system/user/center/basic/info', req);
}

7
continew-admin-ui/src/views/login/components/login-form.vue
View File

@@ -19,6 +19,8 @@
<a-input
v-model="loginForm.username"
:placeholder="$t('login.form.username.placeholder')"
size="large"
max-length="50"
>
<template #prefix>
<icon-user />
@@ -34,7 +36,9 @@
<a-input-password
v-model="loginForm.password"
:placeholder="$t('login.form.password.placeholder')"
size="large"
allow-clear
max-length="50"
>
<template #prefix>
<icon-lock />
@@ -51,6 +55,7 @@
<a-input
v-model="loginForm.captcha"
:placeholder="$t('login.form.captcha.placeholder')"
size="large"
style="width: 63%"
allow-clear
>
@@ -70,7 +75,7 @@
{{ $t('login.form.rememberMe') }}
</a-checkbox>
</div>
<a-button type="primary" html-type="submit" long :loading="loading">
<a-button type="primary" size="large" html-type="submit" long :loading="loading">
{{ $t('login.form.login') }}
</a-button>
</a-space>

23
continew-admin-ui/src/views/login/locale/en-US.ts
View File

@@ -1,18 +1,19 @@
export default {
'login.form.title': 'Login to ContiNew Admin',
'login.form.subTitle': 'Continue to build the latest popular technology stack in the background management framework',
'login.form.username.errMsg': 'Username cannot be empty',
'login.form.password.errMsg': 'Password cannot be empty',
'login.form.captcha.errMsg': 'Captcha cannot be empty',
'login.form.login.errMsg': 'Login error, refresh and try again',
'login.form.login.success': 'welcome to use',
'login.form.username.placeholder': 'Username',
'login.form.password.placeholder': 'Password',
'login.form.captcha.placeholder': 'Captcha',
'login.form.rememberMe': 'Remember Me',
'login.form.username.placeholder': 'Please enter username',
'login.form.username.errMsg': 'Please enter username',
'login.form.password.placeholder': 'Please enter password',
'login.form.password.errMsg': 'Please enter password',
'login.form.captcha.placeholder': 'Please enter captcha',
'login.form.captcha.errMsg': 'Please enter captcha',
'login.form.rememberMe': 'Remember me',
'login.form.login': 'Login',
'login.form.register': 'Register account',
'login.form.forgetPassword': 'Forgot password',
'login.form.login': 'login',
'login.form.register': 'register account',
'login.form.login.success': 'Welcome to use',
'login.form.login.errMsg': 'Login error, refresh and try again',
'login.banner.slogan1': 'Out-of-the-box high-quality template',
'login.banner.subSlogan1':
'Rich page templates, covering most typical business scenarios',

19
continew-admin-ui/src/views/login/locale/zh-CN.ts
View File

@@ -1,18 +1,19 @@
export default {
'login.form.title': '登录 ContiNew Admin',
'login.form.subTitle': '持续以最新流行技术栈构建的中后台管理框架',
'login.form.username.errMsg': '用户名不能为空',
'login.form.password.errMsg': '密码不能为空',
'login.form.captcha.errMsg': '验证码不能为空',
'login.form.login.errMsg': '登录出错，请刷新重试',
'login.form.login.success': '欢迎使用',
'login.form.username.placeholder': '用户名',
'login.form.password.placeholder': '密码',
'login.form.captcha.placeholder': '验证码',
'login.form.username.placeholder': '请输入用户名',
'login.form.username.errMsg': '请输入用户名',
'login.form.password.placeholder': '请输入密码',
'login.form.password.errMsg': '请输入密码',
'login.form.captcha.placeholder': '请输入验证码',
'login.form.captcha.errMsg': '请输入验证码',
'login.form.rememberMe': '记住我',
'login.form.forgetPassword': '忘记密码',
'login.form.login': '登录',
'login.form.register': '注册账号',
'login.form.forgetPassword': '忘记密码',
'login.form.login.success': '欢迎使用',
'login.form.login.errMsg': '登录出错，请刷新重试',
'login.banner.slogan1': '中后台管理框架',
'login.banner.subSlogan1': 'Continue New Admin，持续以最新流行技术栈构建',
'login.banner.slogan2': '内置了常见问题的解决方案',

28
continew-admin-ui/src/views/system/user/center/components/basic-information.vue
View File

@@ -19,6 +19,7 @@
<a-input
v-model="formData.username"
:placeholder="$t('userCenter.basicInfo.placeholder.username')"
max-length="50"
/>
</a-form-item>
<a-form-item
@@ -34,6 +35,7 @@
<a-input
v-model="formData.nickname"
:placeholder="$t('userCenter.basicInfo.placeholder.nickname')"
max-length="32"
/>
</a-form-item>
<a-form-item
@@ -48,7 +50,7 @@
</a-form-item>
<a-form-item>
<a-space>
<a-button type="primary" @click="validate">
<a-button type="primary" :loading="loading" @click="save">
{{ $t('userCenter.save') }}
</a-button>
<a-button type="secondary" @click="reset">
@@ -62,9 +64,13 @@
<script lang="ts" setup>
import { ref } from 'vue';
import { useLoginStore } from '@/store';
import { updateBasicInfo } from '@/api/system/user-center';
import useLoading from '@/hooks/loading';
import { FormInstance } from '@arco-design/web-vue/es/form';
import { BasicInfoModel } from '@/api/system/user-center';
import { Message } from "@arco-design/web-vue";
const { loading, setLoading } = useLoading();
const loginStore = useLoginStore();
const formRef = ref<FormInstance>();
const formData = ref<BasicInfoModel>({
@@ -74,11 +80,21 @@
});
// 保存
const validate = async () => {
const res = await formRef.value?.validate();
if (!res) {
// do some thing
// you also can use html-type to submit
const save = async () => {
const errors = await formRef.value?.validate();
if (loading.value) return;
if (!errors) {
setLoading(true);
try {
const res = await updateBasicInfo({
nickname: formData.value.nickname,
gender: formData.value.gender,
});
await loginStore.getInfo();
if (res.success) Message.success(res.msg);
} finally {
setLoading(false);
}
}
};

57
continew-admin-ui/src/views/system/user/center/components/user-panel.vue
View File

@@ -19,7 +19,6 @@
</template>
</a-upload>
<a-descriptions
:data="renderData"
:column="2"
align="right"
layout="inline-horizontal"
@@ -34,21 +33,21 @@
textAlign: 'left',
}"
>
<template #label="{ label }">{{ $t(label) }} :</template>
<template #value="{ value, data }">
<div v-if="data.label === 'userCenter.label.gender'">
<div v-if="loginStore.gender === 1">
男
<icon-man style="color: #19BBF1" />
</div>
<div v-else-if="loginStore.gender === 2">
女
<icon-woman style="color: #FA7FA9" />
</div>
<div v-else>未知</div>
<a-descriptions-item :label="$t('userCenter.label.nickname')">{{ loginStore.nickname }}</a-descriptions-item>
<a-descriptions-item :label="$t('userCenter.label.gender')">
<div v-if="loginStore.gender === 1">
男
<icon-man style="color: #19BBF1" />
</div>
<span v-else>{{ value }}</span>
</template>
<div v-else-if="loginStore.gender === 2">
女
<icon-woman style="color: #FA7FA9" />
</div>
<div v-else>未知</div>
</a-descriptions-item>
<a-descriptions-item :label="$t('userCenter.label.phone')">{{ loginStore.phone }}</a-descriptions-item>
<a-descriptions-item :label="$t('userCenter.label.email')">{{ loginStore.email }}</a-descriptions-item>
<a-descriptions-item :label="$t('userCenter.label.registrationDate')">{{ loginStore.registrationDate }}</a-descriptions-item>
</a-descriptions>
</a-space>
</a-card>
@@ -62,7 +61,6 @@
} from '@arco-design/web-vue/es/upload/interfaces';
import { useLoginStore } from '@/store';
import { uploadAvatar } from '@/api/system/user-center';
import type { DescData } from '@arco-design/web-vue/es/descriptions/interface';
import getAvatar from "@/utils/avatar";
import { Message } from "@arco-design/web-vue";
@@ -72,28 +70,6 @@
name: 'avatar.png',
url: getAvatar(loginStore),
};
const renderData = [
{
label: 'userCenter.label.nickname',
value: loginStore.nickname,
},
{
label: 'userCenter.label.gender',
value: loginStore.gender,
},
{
label: 'userCenter.label.phone',
value: loginStore.phone,
},
{
label: 'userCenter.label.email',
value: loginStore.email,
},
{
label: 'userCenter.label.registrationDate',
value: loginStore.registrationDate,
},
] as DescData[];
const avatarList = ref<FileItem[]>([avatar]);
// 切换头像
@@ -118,10 +94,7 @@
try {
const res = await uploadAvatar(formData);
onSuccess(res);
Message.success({
content: res.msg || '网络错误',
duration: 3 * 1000,
});
if (res.success) Message.success(res.msg);
// 更换头像
loginStore.avatar = res.data.avatar;
} catch (error) {

10
continew-admin-ui/src/views/system/user/center/locale/en-US.ts
View File

@@ -1,10 +1,10 @@
export default {
'menu.user.center': 'User Center',
'userCenter.label.nickname': 'Nick Name',
'userCenter.label.gender': 'Gender',
'userCenter.label.phone': 'Phone',
'userCenter.label.email': 'Email',
'userCenter.label.registrationDate': 'Registration Date',
'userCenter.label.nickname': 'Nick Name :',
'userCenter.label.gender': 'Gender :',
'userCenter.label.phone': 'Phone :',
'userCenter.label.email': 'Email :',
'userCenter.label.registrationDate': 'Registration Date :',
'userCenter.tab.basicInformation': 'Basic Information',
'userCenter.basicInfo.form.label.username': 'Username',

14
continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts
View File

@@ -1,17 +1,17 @@
export default {
'menu.user.center': '个人中心',
'userCenter.label.nickname': '昵称',
'userCenter.label.gender': '性别',
'userCenter.label.phone': '手机号码',
'userCenter.label.email': '邮箱',
'userCenter.label.registrationDate': '注册日期',
'userCenter.label.nickname': '昵称 :',
'userCenter.label.gender': '性别 :',
'userCenter.label.phone': '手机号码 :',
'userCenter.label.email': '邮箱 :',
'userCenter.label.registrationDate': '注册日期 :',
'userCenter.tab.basicInformation': '基础信息',
'userCenter.basicInfo.form.label.username': '用户名',
'userCenter.basicInfo.placeholder.username': '请输入您的用户名',
'userCenter.basicInfo.placeholder.username': '请输入用户名',
'userCenter.form.error.username.required': '请输入用户名',
'userCenter.basicInfo.form.label.nickname': '昵称',
'userCenter.basicInfo.placeholder.nickname': '请输入您的昵称',
'userCenter.basicInfo.placeholder.nickname': '请输入昵称',
'userCenter.form.error.nickname.required': '请输入昵称',
'userCenter.basicInfo.form.label.gender': '性别',
'userCenter.save': '保存',