xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复状态问题、用户中心页面查询及修改

Browse Source
This commit is contained in:
陈淳
2022-09-14 19:53:53 +08:00
parent 011d9d639b
commit ea2be7609c
17 changed files with 90 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
View File

@@ -41,13 +41,6 @@
</summary>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.UpdatePassword(Yi.Framework.DTOModel.UpdatePasswordDto)">
<summary>
更新登录的用户密码
</summary>
<param name="updatePasswordDto"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.UpdateUserByHttp(Yi.Framework.Model.Models.UserEntity)">
<summary>
更新已登录用户的用户信息
@@ -55,6 +48,13 @@
<param name="user"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.UpdatePassword(Yi.Framework.DTOModel.UpdatePasswordDto)">
<summary>
自己更新密码
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="T:Yi.Framework.ApiMicroservice.Controllers.BaseCrudController`1">
<summary>
Json To Sql 类比模式，通用模型

41
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
View File

@@ -111,34 +111,12 @@ namespace Yi.Framework.ApiMicroservice.Controllers
{
var userId = HttpContext.GetCurrentUserEntityInfo(out _).Id;
var data = await _iUserService.GetUserAllInfo(userId);
//将后端菜单转换成前端路由，组件级别需要过滤
List<VueRouterModel> routers = MenuEntity.RouterBuild(data.Menus.ToList());
return Result.Success().SetData(routers);
}
/// <summary>
/// 更新登录的用户密码
/// </summary>
/// <param name="updatePasswordDto"></param>
/// <returns></returns>
[HttpPut]
public async Task<Result> UpdatePassword(UpdatePasswordDto updatePasswordDto)
{
var userId = HttpContext.GetCurrentUserEntityInfo(out _).Id;
var userEntiy = await _iUserService._repository.GetByIdAsync(userId);
//判断输入的老密码是否和原密码相同
if (userEntiy.JudgePassword(updatePasswordDto.OldPassword))
{
userEntiy.Password = updatePasswordDto.NewPassword;
userEntiy.BuildPassword();
return Result.Success().SetStatus(await _iUserService._repository.UpdateAsync(userEntiy));
}
return Result.SuccessError("原密码错误！");
}
/// <summary>
/// 更新已登录用户的用户信息
/// </summary>
@@ -155,5 +133,22 @@ namespace Yi.Framework.ApiMicroservice.Controllers
user.Id = HttpContext.GetCurrentUserEntityInfo(out _).Id;
return Result.Success().SetStatus(await _iUserService._repository.UpdateIgnoreNullAsync(user));
}
/// <summary>
/// 自己更新密码
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPut]
public async Task<Result> UpdatePassword(UpdatePasswordDto dto)
{
long userId = HttpContext.GetCurrentUserEntityInfo(out _).Id;
if (await _iUserService.UpdatePassword(dto, userId))
{
return Result.Success();
}
return Result.Error("更新失败！");
}
}
}

BIN
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
View File

Binary file not shown.

19
Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs
View File

@@ -68,8 +68,6 @@ namespace Yi.Framework.Interface
/// <returns></returns>
Task<UserRoleMenuDto> GetUserAllInfo(long userId);
/// <summary>
/// 动态条件分页查询
/// </summary>
@@ -100,6 +98,23 @@ namespace Yi.Framework.Interface
/// <param name="password"></param>
/// <returns></returns>
Task<bool> RestPassword(long userId,string password );
/// <summary>
/// 给用户设置岗位
/// </summary>
/// <param name="userIds"></param>
/// <param name="postIds"></param>
/// <returns></returns>
Task<bool> GiveUserSetPost(List<long> userIds, List<long> postIds);
/// <summary>
/// 更新密码
/// </summary>
/// <param name="dto"></param>
/// <param name="userId"></param>
/// <returns></returns>
Task<bool> UpdatePassword(UpdatePasswordDto dto, long userId);
}
}

1
Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs
View File

@@ -41,6 +41,7 @@ namespace Yi.Framework.Model.Models
/// <returns></returns>
public bool JudgePassword(string password)
{
var p = MD5Helper.SHA2Encode(password, this.Salt);
if (this.Password == MD5Helper.SHA2Encode(password, this.Salt))
{
return true;

22
Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
View File

@@ -202,7 +202,7 @@ namespace Yi.Framework.Service
{
//如果deptId不为空，部门id以下及自己都可以
List<long> deptIds = (await _repository._Db.Queryable<DeptEntity>().ToChildListAsync(it => it.ParentId, deptId)).Select(d => d.Id).ToList();
query = query.Where(u => u.DeptId!=null&& deptIds.Contains((long)u.DeptId));
query = query.Where(u => u.DeptId != null && deptIds.Contains((long)u.DeptId));
}
data = await query.OrderBy(u => u.OrderNum, OrderByType.Desc)
@@ -248,5 +248,25 @@ namespace Yi.Framework.Service
}
public async Task<bool> UpdatePassword(UpdatePasswordDto dto, long userId)
{
var user = await _repository.GetByIdAsync(userId);
if (dto.OldPassword.Equals(dto.NewPassword))
{
return false;
}
if (!user.JudgePassword(dto.OldPassword))
{
return false;
}
var newUser = new UserEntity();
newUser.Password = dto.NewPassword;
newUser.Id = userId;
newUser.BuildPassword();
return await _repository.UpdateIgnoreNullAsync(newUser);
}
}
}

6
Yi.Vue3.X.RuoYi/src/api/system/user.js
View File

@@ -75,7 +75,7 @@ export function changeUserStatus(userId, isDel) {
// 查询用户个人信息
export function getUserProfile() {
return request({
url: '/system/user/profile',
url: '/account/getUserAllInfo',
method: 'get'
})
}
@@ -96,9 +96,9 @@ export function updateUserPwd(oldPassword, newPassword) {
newPassword
}
return request({
url: '/system/user/profile/updatePwd',
url: '/account/UpdatePassword',
method: 'put',
params: data
data: data
})
}

2
Yi.Vue3.X.RuoYi/src/views/login.vue
View File

@@ -76,7 +76,7 @@ const { proxy } = getCurrentInstance();
const loginForm = ref({
username: "cc",
password: "123",
password: "123456",
rememberMe: false,
code: "",
uuid: ""

6
Yi.Vue3.X.RuoYi/src/views/system/dept/index.vue
View File

@@ -135,11 +135,7 @@
<el-col :span="12">
<el-form-item label="部门状态">
<el-radio-group v-model="form.isDeleted">
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio>
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>

10
Yi.Vue3.X.RuoYi/src/views/system/dict/data.vue
View File

@@ -161,13 +161,9 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio>
<el-form-item label="状态" prop="isDeleted">
<el-radio-group v-model="form.isDeleted">
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">

6
Yi.Vue3.X.RuoYi/src/views/system/dict/index.vue
View File

@@ -160,11 +160,7 @@
</el-form-item>
<el-form-item label="状态" prop="isDeleted">
<el-radio-group v-model="form.isDeleted">
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio>
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">

6
Yi.Vue3.X.RuoYi/src/views/system/menu/index.vue
View File

@@ -274,11 +274,7 @@
</span>
</template>
<el-radio-group v-model="form.isDeleted">
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio>
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>

6
Yi.Vue3.X.RuoYi/src/views/system/post/index.vue
View File

@@ -131,11 +131,7 @@
</el-form-item>
<el-form-item label="岗位状态" prop="isDeleted">
<el-radio-group v-model="form.isDeleted">
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio>
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">

3
Yi.Vue3.X.RuoYi/src/views/system/role/index.vue
View File

@@ -109,8 +109,7 @@
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="form.role.isDeleted">
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}
</el-radio>
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="菜单权限">

5
Yi.Vue3.X.RuoYi/src/views/system/user/index.vue
View File

@@ -165,11 +165,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="状态">
{{form.user.isDeleted}}
<el-radio-group v-model="form.user.isDeleted">
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{dict.value+ dict.label
}}</el-radio>
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>

12
Yi.Vue3.X.RuoYi/src/views/system/user/profile/index.vue
View File

@@ -19,7 +19,7 @@
</li>
<li class="list-group-item">
<svg-icon icon-class="phone" />手机号码
<div class="pull-right">{{ state.user.phonenumber }}</div>
<div class="pull-right">{{ state.user.phone }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="email" />用户邮箱
@@ -27,11 +27,11 @@
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
<div class="pull-right" v-if="state.user.dept">{{ state.user.dept.deptName }} / {{ state.postGroup }}</div>
<div class="pull-right" v-if="state.dept">{{ state.dept.deptName }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />所属角色
<div class="pull-right">{{ state.roleGroup }}</div>
<div class="pull-right"><span v-for="role in state.roles" :key="role.id">{{ role.roleName }} /</span></div>
</li>
<li class="list-group-item">
<svg-icon icon-class="date" />创建日期
@@ -71,13 +71,17 @@ import { getUserProfile } from "@/api/system/user";
const activeTab = ref("userinfo");
const state = reactive({
user: {},
dept: {},
roles: [],
roleGroup: {},
postGroup: {}
});
function getUser() {
getUserProfile().then(response => {
state.user = response.data;
state.user = response.data.user;
state.dept=response.data.dept;
state.roles=response.data.roles;
state.roleGroup = response.roleGroup;
state.postGroup = response.postGroup;
});

10
Yi.Vue3.X.RuoYi/src/views/system/user/profile/userInfo.vue
View File

@@ -1,10 +1,10 @@
<template>
<el-form ref="userRef" :model="user" :rules="rules" label-width="80px">
<el-form-item label="用户昵称" prop="nickName">
<el-input v-model="user.nickName" maxlength="30" />
<el-input v-model="user.nick" maxlength="30" />
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="user.phonenumber" maxlength="11" />
<el-form-item label="手机号码" prop="phone">
<el-input v-model="user.phone" maxlength="11" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="user.email" maxlength="50" />
@@ -34,9 +34,9 @@ const props = defineProps({
const { proxy } = getCurrentInstance();
const rules = ref({
nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
nick: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
phone: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
});
/** 提交按钮 */