peiguo 5 роки тому
батько
коміт
dc8fe62122

+ 1 - 1
admin-ui/user/resetPWD.js

@@ -32,7 +32,7 @@ define(function (require) {
         {
           text: "提交", iconCls: "fa fa-save", onClick: function () {
             $.yvan.ajax({
-              url: '/sys/sys/account/resetPwd',
+              url: api('/account/resetPwd'),
               method: 'post',
               data: $form.formGet(),
               success: function (data) {

+ 1 - 1
whepi-ui/templates/user/login.ftl

@@ -102,7 +102,7 @@
 
             $("#login").attr("disabled", true);
             $.ajax({
-                url: '/user/login.json',
+                url: api('/user/login.json'),
                 type: "post",
                 data: {
                     ig_username: $('#login_name').val(),

+ 4 - 2
whepi-web/src/main/java/com/bofeng/controller/LoginController.java

@@ -143,7 +143,7 @@ public class LoginController {
         return r.setMsg("未知错误:" + e.getMessage());
     }
 
-    @PostMapping("/sys/account/resetPwd")
+    @PostMapping("/whepi/account/resetPwd")
     public ModelOps resetPwd(@Pd(name = "oldPwd") String oldPwd,
                              @Pd(name = "newPwd") String newPwd,
                              @Pd(name = "rePwd") String repwd){
@@ -160,7 +160,9 @@ public class LoginController {
         int a = userMapper.updatePassword(userId,  oldPwd, newPwd);
         if (a > 0) {
             User user = userMapper.selectById(userId);
-            return (ModelOps) ModelOps.newSuccess(a).setMsg("密码修改成功,请重新登录");
+            if (user != null) {
+                return ModelOps.newSuccess(a).setMsg("密码修改成功,请重新登录");
+            }
         }
         return ModelOps.newFail("密码修改失败,请输入正确的原始密码!");
     }

+ 1 - 1
whepi-web/src/main/java/com/bofeng/entity/User.java

@@ -10,7 +10,7 @@ import org.joda.time.DateTime;
 
 @Getter
 @Setter
-@TableName("tb_user")
+@TableName("sys_user")
 public class User {
     @TableId("user_id")
     private Long userId;

+ 4 - 4
whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -64,10 +64,10 @@ public class UserOpenController {
                              @RequestParam(value = "userType", required = false,defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-//            UserOpen userOpen = homeService.getUserOpen();
-//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");