From f278d03caa49a96aa568404a8f22c3ddcffb255b Mon Sep 17 00:00:00 2001 From: zhujunjieit Date: Mon, 28 Jan 2019 03:07:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E7=94=A8=E6=88=B7=E6=B3=A8?= =?UTF-8?q?=E5=86=8C"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 304f94a340f36c16c9707d5c3a14f284a5b99cf8. --- .../cms/controller/CmsUserController.java | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java index 4423ca982..abead0cae 100644 --- a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java +++ b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java @@ -2,6 +2,7 @@ package com.ruoyi.cms.controller; import com.github.pagehelper.PageInfo; import com.ruoyi.common.base.AjaxResult; +import com.ruoyi.common.constant.UserConstants; import com.ruoyi.exam.domain.*; import cn.hutool.extra.servlet.ServletUtil; import com.ruoyi.exam.domain.ExamPractice; @@ -9,6 +10,7 @@ import com.ruoyi.exam.domain.ExamUserErrorQuestion; import com.ruoyi.exam.domain.ExamUserErrorQuestionVO; import com.ruoyi.exam.service.*; 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.ShiroUtils; import com.ruoyi.system.domain.SysUser; @@ -35,6 +37,7 @@ import org.springframework.web.servlet.ModelAndView; import sun.awt.image.IntegerComponentRaster; import javax.servlet.http.Cookie; +import java.util.Date; import java.util.List; /** @@ -49,8 +52,6 @@ public class CmsUserController { private String prefix = "web"; - @Autowired - private ISysUserService sysUserService; @Autowired private IExamUserErrorQuestionService examUserErrorQuestionService; @@ -64,6 +65,11 @@ public class CmsUserController { @Autowired private IVipUserOrdersService vipUserOrdersService; + @Autowired + private ISysUserService sysUserService; + + @Autowired + private SysPasswordService passwordService; @RequestMapping("/user/login.html") @@ -78,6 +84,25 @@ public class CmsUserController { return prefix + "/user/reg"; } + @RequestMapping("/user/regaccount") + @ResponseBody + public AjaxResult reg(SysUser user) { + List 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") From 1527c4c0a0b06a0f352fd672e21dcc3ef1cd6eaf Mon Sep 17 00:00:00 2001 From: zhujunjieit Date: Mon, 28 Jan 2019 03:14:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A4=B4=E5=83=8F=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=EF=BC=8C=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/web/user/set.html | 281 ++++++++++++------ 1 file changed, 193 insertions(+), 88 deletions(-) diff --git a/ruoyi-cms/src/main/resources/templates/web/user/set.html b/ruoyi-cms/src/main/resources/templates/web/user/set.html index 41bb56225..7a64d64ea 100644 --- a/ruoyi-cms/src/main/resources/templates/web/user/set.html +++ b/ruoyi-cms/src/main/resources/templates/web/user/set.html @@ -10,17 +10,17 @@
- +
- - + +
  • 我的资料
  • 头像
  • 密码
    • -
  • 帐号绑定
- +
- +
-
如果您在邮箱已激活的情况下，变更了邮箱，需重新验证邮箱。
+
如果您在邮箱已激活的情况下，变更了邮箱，需重新验证邮箱。
- +
- +
- - + +
- +
- +
- +
- +
- + +
+
+ +
+
+
+

建议尺寸168*168，支持jpg、png、gif，最大不能超过50KB

+ + +
- -
-
-
-

建议尺寸168*168，支持jpg、png、gif，最大不能超过50KB

- - - -
+
+ +
+
+ +
+
- -
- -
- -
- -
-
-
- -
- -
-
6到16个字符
-
-
- -
- -
-
-
- -
- +
+ +
+ +
+
6到16个字符
- -
-
    -
  • - - 已成功绑定，您可以使用QQ帐号直接登录Fly社区，当然，您也可以 - 解除绑定 - - -
    • -
  • - - - - 立即绑定 - ，即可使用微博帐号登录Fly社区 -
    • -
+
+ +
+ +
+
+
+
+
+
+ + + +
@@ -192,7 +173,131 @@ $(function(){ $("#set").addClass("layui-this") }) + + var userId="[[${user?.userId}]]"; + layui.use('upload', function() { + var $ = layui.jquery + , upload = layui.upload; + //普通图片上传 + var uploadInst = upload.render({ + elem: '#upload' + ,url: '/upload/oss' + ,data:{module:"train/course"}//文件存放路径 + ,before: function(obj){ + //预读本地文件示例，不支持ie8 + // obj.preview(function(index, file, result){ + // $('#avatar').attr('src', result); //图片链接（base64） + // }); + } + ,done: function(res){ + //如果上传失败 + if(res.code !=200){ + return layer.msg('上传失败'); + } + //上传成功 + if(res.code ==200){ + $('#avatar').attr('src', res.data); //图片链接（base64） + var data={userId:userId, + avatar:res.data + } + updateUserAvatar(data); + } + } + ,error: function(){ + //演示失败状态，并实现重传 + var demoText = $('#demoText'); + demoText.html('上传失败 重试'); + demoText.find('.demo-reload').on('click', function(){ + uploadInst.upload(); + }); + } + }); + }); + function updateUserAvatar(data) { + $.ajax({ + cache : true, + type : "POST", + url : ctx + "web/user/update", + data : data, + async : false, + error : function(request) { + $.modal.alertError("系统错误"); + }, + success : function(data) { + return layer.msg('修改成功'); + } + }); + } + function updateUserInfo() { + var data={ + userId:userId, + loginName:$("#loginName").val(), + phonenumber:$("#phonenumber").val(), + remark:$("#remark").val(), + userName:$("#userName").val() + } + updateUserAvatar(data); + } + var flag=false; + function checkPassword() { + var data={ + loginName:$("#loginName").val(), + password:$("#oldPassword").val() + } + $.ajax({ + cache : true, + type : "get", + url : ctx + "system/user/profile/checkPassword", + data : data, + dataType:"json", + async : false, + error : function(request) { + $.modal.alertError("系统错误"); + }, + success : function(res) { + if(!res){ + return layer.msg('旧密码与当前密码不一致'); + }else{ + flag=true; + } + } + }); + } + function checkTwoPassword() { + var password=$("#password").val(); + var confirm=$("#confirm").val(); + if(password!==confirm){ + layer.msg('两次密码不一致'); + return false; + } + } + function updateUserPassword() { + var password=$("#password").val(); + var confirm=$("#confirm").val(); + if(password!==confirm||!flag){ + layer.msg('两次密码不一致'); + return false; + } + var data={ + userId:userId, + loginName:$("#loginName").val(), + password:$("#password").val() + } + $.ajax({ + type : "POST", + url : ctx + "web/user/resetPwd", + data : data, + error : function(request) { + $.modal.alertError("系统错误"); + }, + success : function(data) { + return layer.msg('修改成功'); + } + }); + } + - \ No newline at end of file + +