用户信息修改,头像上传,密码修改
This commit is contained in:
parent
15413b401b
commit
c34d44dfdb
|
|
@ -2,7 +2,6 @@ package com.ruoyi.cms.controller;
|
||||||
|
|
||||||
import com.github.pagehelper.PageInfo;
|
import com.github.pagehelper.PageInfo;
|
||||||
import com.ruoyi.common.base.AjaxResult;
|
import com.ruoyi.common.base.AjaxResult;
|
||||||
import com.ruoyi.common.constant.UserConstants;
|
|
||||||
import com.ruoyi.exam.domain.*;
|
import com.ruoyi.exam.domain.*;
|
||||||
import cn.hutool.extra.servlet.ServletUtil;
|
import cn.hutool.extra.servlet.ServletUtil;
|
||||||
import com.ruoyi.exam.domain.ExamPractice;
|
import com.ruoyi.exam.domain.ExamPractice;
|
||||||
|
|
@ -10,7 +9,6 @@ import com.ruoyi.exam.domain.ExamUserErrorQuestion;
|
||||||
import com.ruoyi.exam.domain.ExamUserErrorQuestionVO;
|
import com.ruoyi.exam.domain.ExamUserErrorQuestionVO;
|
||||||
import com.ruoyi.exam.service.*;
|
import com.ruoyi.exam.service.*;
|
||||||
import com.ruoyi.framework.jwt.JwtUtil;
|
import com.ruoyi.framework.jwt.JwtUtil;
|
||||||
import com.ruoyi.framework.shiro.service.SysPasswordService;
|
|
||||||
import com.ruoyi.framework.web.util.ServletUtils;
|
import com.ruoyi.framework.web.util.ServletUtils;
|
||||||
import com.ruoyi.framework.web.util.ShiroUtils;
|
import com.ruoyi.framework.web.util.ShiroUtils;
|
||||||
import com.ruoyi.system.domain.SysUser;
|
import com.ruoyi.system.domain.SysUser;
|
||||||
|
|
@ -37,7 +35,6 @@ import org.springframework.web.servlet.ModelAndView;
|
||||||
import sun.awt.image.IntegerComponentRaster;
|
import sun.awt.image.IntegerComponentRaster;
|
||||||
|
|
||||||
import javax.servlet.http.Cookie;
|
import javax.servlet.http.Cookie;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -52,6 +49,8 @@ public class CmsUserController {
|
||||||
|
|
||||||
private String prefix = "web";
|
private String prefix = "web";
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ISysUserService sysUserService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private IExamUserErrorQuestionService examUserErrorQuestionService;
|
private IExamUserErrorQuestionService examUserErrorQuestionService;
|
||||||
|
|
@ -65,11 +64,6 @@ public class CmsUserController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private IVipUserOrdersService vipUserOrdersService;
|
private IVipUserOrdersService vipUserOrdersService;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysUserService sysUserService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private SysPasswordService passwordService;
|
|
||||||
|
|
||||||
|
|
||||||
@RequestMapping("/user/login.html")
|
@RequestMapping("/user/login.html")
|
||||||
|
|
@ -84,25 +78,6 @@ public class CmsUserController {
|
||||||
return prefix + "/user/reg";
|
return prefix + "/user/reg";
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("/user/regaccount")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult reg(SysUser user) {
|
|
||||||
List<SysUser> sysUsers = sysUserService.selectUserList(user);
|
|
||||||
AjaxResult success = AjaxResult.success("注册成功");
|
|
||||||
if(sysUsers.size()>0){
|
|
||||||
success = AjaxResult.error("账户名已存在");
|
|
||||||
return success;
|
|
||||||
}
|
|
||||||
user.setStatus("0");
|
|
||||||
user.setDelFlag("0");
|
|
||||||
user.setCreateTime(new Date());
|
|
||||||
user.setSalt( ShiroUtils.randomSalt() );
|
|
||||||
user.setUserType( UserConstants.USER_VIP );
|
|
||||||
user.setPassword( passwordService.encryptPassword( user.getLoginName(), user.getPassword(), user.getSalt() ) );
|
|
||||||
sysUserService.insertUser(user);
|
|
||||||
return success;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@RequestMapping("/user/index.html")
|
@RequestMapping("/user/index.html")
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,11 @@
|
||||||
<link rel="stylesheet" th:href="@{/web/res/layui/css/layui.css}">
|
<link rel="stylesheet" th:href="@{/web/res/layui/css/layui.css}">
|
||||||
<link rel="stylesheet" th:href="@{/web/res/css/global.css}">
|
<link rel="stylesheet" th:href="@{/web/res/css/global.css}">
|
||||||
<script th:src="@{/js/jquery.min.js}"></script>
|
<script th:src="@{/js/jquery.min.js}"></script>
|
||||||
|
|
||||||
|
<!-- jquery-validate 表单验证插件 -->
|
||||||
|
<script th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
|
||||||
|
<script th:src="@{/ajax/libs/validate/messages_zh.min.js}"></script>
|
||||||
|
<script th:src="@{/ajax/libs/validate/jquery.validate.extend.js}"></script>
|
||||||
<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
|
<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
|
||||||
<script th:src="@{/web/res/layui/layui.js}"></script>
|
<script th:src="@{/web/res/layui/layui.js}"></script>
|
||||||
<script th:src="@{/ruoyi/js/common.js}"></script>
|
<script th:src="@{/ruoyi/js/common.js}"></script>
|
||||||
|
|
|
||||||
|
|
@ -87,6 +87,7 @@
|
||||||
<div class="layui-input-inline">
|
<div class="layui-input-inline">
|
||||||
<input type="text" id="L_email" name="email" required lay-verify="email" autocomplete="off" value="" class="layui-input">
|
<input type="text" id="L_email" name="email" required lay-verify="email" autocomplete="off" value="" class="layui-input">
|
||||||
</div>
|
</div>
|
||||||
|
<div class="layui-form-mid layui-word-aux">如果您在邮箱已激活的情况下,变更了邮箱,需<a href="activate.html" style="font-size: 12px; color: #4f99cf;">重新验证邮箱</a>。</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<label for="L_username" class="layui-form-label">昵称</label>
|
<label for="L_username" class="layui-form-label">昵称</label>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue