朱兆平 / spring cloud基础开发框架 · 提交

转到一个项目

作者 朱兆平
提交 e3c17aef3bc5949d82f8cc554fc5185c97356fb3 1 个父辈 6d0d4a77

update: 将RESFUL协议取消,以适应机场防火墙.

内嵌 并排对比
正在显示 3 个修改的文件 包含 12 行增加 和 11 行删除
@@ -46,7 +46,7 @@ public class PermssionController { @@ -46,7 +46,7 @@ public class PermssionController {
46 } 46 }
47 47
48 @LogAnnotation(moduleName = "权限管理",operate = "权限修改") 48 @LogAnnotation(moduleName = "权限管理",operate = "权限修改")
49 - @PutMapping("/edit") 49 + @PostMapping("/edit")
50 @ResponseBody 50 @ResponseBody
51 public ResultJson edit(@RequestBody @Valid PERMISSION permission){ 51 public ResultJson edit(@RequestBody @Valid PERMISSION permission){
52 52
@@ -62,7 +62,7 @@ public class PermssionController { @@ -62,7 +62,7 @@ public class PermssionController {
62 } 62 }
63 63
64 @LogAnnotation(moduleName = "权限管理",operate = "权限删除") 64 @LogAnnotation(moduleName = "权限管理",operate = "权限删除")
65 - @DeleteMapping("/del") 65 + @PostMapping("/del")
66 public ResultJson reomve(@RequestBody PERMISSION permission, HttpServletRequest request, HttpServletResponse response){ 66 public ResultJson reomve(@RequestBody PERMISSION permission, HttpServletRequest request, HttpServletResponse response){
67 67
68 int i =permissionService.deleteByPrimaryKey(permission.getPermissionId().toString()); 68 int i =permissionService.deleteByPrimaryKey(permission.getPermissionId().toString());
@@ -47,14 +47,14 @@ public class RoleController { @@ -47,14 +47,14 @@ public class RoleController {
47 * @return 47 * @return
48 */ 48 */
49 @LogAnnotation(moduleName = "岗位/角色管理",operate = "权限设置") 49 @LogAnnotation(moduleName = "岗位/角色管理",operate = "权限设置")
50 - @PutMapping("/permSet") 50 + @PostMapping("/permSet")
51 public ResultJson permissionSet(@RequestBody RolePermission rolePermission){ 51 public ResultJson permissionSet(@RequestBody RolePermission rolePermission){
52 int i = roleService.setRolePermissoin(rolePermission); 52 int i = roleService.setRolePermissoin(rolePermission);
53 return i==1 ? new ResultJson("200","设置权限成功") :new ResultJson("500","设置权限失败"); 53 return i==1 ? new ResultJson("200","设置权限成功") :new ResultJson("500","设置权限失败");
54 } 54 }
55 55
56 @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色修改") 56 @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色修改")
57 - @PutMapping("/edit") 57 + @PostMapping("/edit")
58 @ResponseBody 58 @ResponseBody
59 public ResultJson edit(@RequestBody @Valid ROLE role){ 59 public ResultJson edit(@RequestBody @Valid ROLE role){
60 60
@@ -70,7 +70,7 @@ public class RoleController { @@ -70,7 +70,7 @@ public class RoleController {
70 } 70 }
71 71
72 @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色删除") 72 @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色删除")
73 - @DeleteMapping("/del") 73 + @PostMapping("/del")
74 public ResultJson reomve(@RequestBody ROLE role, HttpServletRequest request, HttpServletResponse response){ 74 public ResultJson reomve(@RequestBody ROLE role, HttpServletRequest request, HttpServletResponse response){
75 75
76 int i =roleService.deleteByPrimaryKey(role.getRoleId()); 76 int i =roleService.deleteByPrimaryKey(role.getRoleId());
@@ -93,7 +93,7 @@ public class UserController { @@ -93,7 +93,7 @@ public class UserController {
93 } 93 }
94 94
95 @LogAnnotation(moduleName = "用户管理",operate = "用户编辑") 95 @LogAnnotation(moduleName = "用户管理",operate = "用户编辑")
96 - @PutMapping("/edit") 96 + @PostMapping("/edit")
97 public ResultJson updateUserById(@Validated(UpdateUser.class) @RequestBody KakoUser user){ 97 public ResultJson updateUserById(@Validated(UpdateUser.class) @RequestBody KakoUser user){
98 user.setPassword(null); 98 user.setPassword(null);
99 int i = userService.updateByPrimaryKeySelective(user); 99 int i = userService.updateByPrimaryKeySelective(user);
@@ -102,7 +102,7 @@ public class UserController { @@ -102,7 +102,7 @@ public class UserController {
102 } 102 }
103 103
104 @LogAnnotation(moduleName = "用户锁定",operate = "用户锁定") 104 @LogAnnotation(moduleName = "用户锁定",operate = "用户锁定")
105 - @PutMapping("/lock") 105 + @PostMapping("/lock")
106 public ResultJson lockUserById(@Validated(UpdateUser.class) @RequestBody KakoUser user){ 106 public ResultJson lockUserById(@Validated(UpdateUser.class) @RequestBody KakoUser user){
107 KakoUser kakoUser = new KakoUser(); 107 KakoUser kakoUser = new KakoUser();
108 kakoUser.setId(user.getId()); 108 kakoUser.setId(user.getId());
@@ -115,13 +115,14 @@ public class UserController { @@ -115,13 +115,14 @@ public class UserController {
115 if (StringUtils.isNotEmpty(userTokenStr)){ 115 if (StringUtils.isNotEmpty(userTokenStr)){
116 redisUtils.del(userTokenStr); 116 redisUtils.del(userTokenStr);
117 } 117 }
  118 + log.info("用户锁定成功:key:{}",userTokenStr);
118 } 119 }
119 return i==1 ? new ResultJson("200","success") :new ResultJson("500","lock user faild"); 120 return i==1 ? new ResultJson("200","success") :new ResultJson("500","lock user faild");
120 121
121 } 122 }
122 123
123 @LogAnnotation(moduleName = "用户管理",operate = "用户密码修改") 124 @LogAnnotation(moduleName = "用户管理",operate = "用户密码修改")
124 - @PutMapping("/password") 125 + @PostMapping("/password")
125 public ResultJson updateUserPassById(@RequestBody KakoUser user){ 126 public ResultJson updateUserPassById(@RequestBody KakoUser user){
126 KakoUser kakoUser = new KakoUser(); 127 KakoUser kakoUser = new KakoUser();
127 kakoUser.setId(user.getId()); 128 kakoUser.setId(user.getId());
@@ -144,14 +145,14 @@ public class UserController { @@ -144,14 +145,14 @@ public class UserController {
144 } 145 }
145 146
146 @LogAnnotation(moduleName = "用户管理",operate = "用户删除") 147 @LogAnnotation(moduleName = "用户管理",operate = "用户删除")
147 - @DeleteMapping("/del") 148 + @PostMapping("/del")
148 public ResultJson delUser(@RequestBody KakoUser user,HttpServletRequest request,HttpServletResponse response){ 149 public ResultJson delUser(@RequestBody KakoUser user,HttpServletRequest request,HttpServletResponse response){
149 //String username = getusername(); 150 //String username = getusername();
150 int i = userService.deleteByPrimaryKey(user); 151 int i = userService.deleteByPrimaryKey(user);
151 return i==1 ? new ResultJson("200","删除账户成功") :new ResultJson("500","delete faild"); 152 return i==1 ? new ResultJson("200","删除账户成功") :new ResultJson("500","delete faild");
152 } 153 }
153 154
154 - @PutMapping("/roleset") 155 + @PostMapping("/roleset")
155 public ResultJson roleSet(@RequestBody Map<String,Object> map,HttpServletRequest request,HttpServletResponse respons){ 156 public ResultJson roleSet(@RequestBody Map<String,Object> map,HttpServletRequest request,HttpServletResponse respons){
156 String id = map.get("userId").toString(); 157 String id = map.get("userId").toString();
157 List<Integer> roles = (List<Integer>) map.get("roleIds"); 158 List<Integer> roles = (List<Integer>) map.get("roleIds");
@@ -167,7 +168,7 @@ public class UserController { @@ -167,7 +168,7 @@ public class UserController {
167 */ 168 */
168 @ApiOperation(value = "更新用户权限缓存", notes = "重新生成用户的信息到redis") 169 @ApiOperation(value = "更新用户权限缓存", notes = "重新生成用户的信息到redis")
169 @RedisCacheDelTarget(cacheKey = "com.tianbo.warehouse.service.imp.PermissionServiceImp") 170 @RedisCacheDelTarget(cacheKey = "com.tianbo.warehouse.service.imp.PermissionServiceImp")
170 - @PutMapping("/resetToken") 171 + @PostMapping("/resetToken")
171 public ResultJson resetToken(HttpServletRequest request,HttpServletResponse respons) { 172 public ResultJson resetToken(HttpServletRequest request,HttpServletResponse respons) {
172 /** 173 /**
173 * 更新目标用户的权限缓存 174 * 更新目标用户的权限缓存