add 操作日志主键ID

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorCategoryController.java

@@ -59,7 +59,7 @@ public class MajorCategoryController extends BaseController {
     /**
      * 导出【专业分类】列表
      */
-    @ApiOperation("导出【专业分类】列表")
+  /*  @ApiOperation("导出【专业分类】列表")
     @PreAuthorize("@ss.hasPermi('course:category:export')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
@@ -67,7 +67,7 @@ public class MajorCategoryController extends BaseController {
         List<MajorCategoryVo> list = iMajorCategoryService.queryList(bo);
         ExcelUtil<MajorCategoryVo> util = new ExcelUtil<MajorCategoryVo>(MajorCategoryVo.class);
         return util.exportExcel(list, "【专业分类】");
-    }
+    }*/
 
     /**
      * 获取【专业分类】详细信息
@@ -97,7 +97,7 @@ public class MajorCategoryController extends BaseController {
     @ApiOperation("修改【专业分类】")
     @PreAuthorize("@ss.hasPermi('course:category:edit')")
     @Log(title = "【专业分类】", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@Validated @RequestBody MajorCategoryEditBo bo) {
         return toAjax(iMajorCategoryService.updateByEditBo(bo) ? 1 : 0);
     }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysMenuController.java

@@ -126,7 +126,7 @@ public class SysMenuController extends BaseController
             ,"parentName","remark","updateBy","updateTime"})
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysMenu menu)
     {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
@@ -152,7 +152,7 @@ public class SysMenuController extends BaseController
     @ApiOperation("删除菜单")
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{menuId}")
+    @PostMapping("/{menuId}")
     public AjaxResult remove(@PathVariable("menuId") Long menuId)
     {
         if (menuService.hasChildByMenuId(menuId))

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysRoleController.java

@@ -108,7 +108,7 @@ public class SysRoleController extends BaseController
     @ApiOperation("修改保存角色")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -143,7 +143,7 @@ public class SysRoleController extends BaseController
     @ApiOperation("修改保存数据权限")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/dataScope")
+    @PostMapping("/dataScope")
     public AjaxResult dataScope(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -156,7 +156,7 @@ public class SysRoleController extends BaseController
     @ApiOperation("状态修改")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
+    @PostMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -167,9 +167,10 @@ public class SysRoleController extends BaseController
     /**
      * 删除角色
      */
+    @ApiOperation("删除角色")
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{roleIds}")
+    @PostMapping("/{roleIds}")
     public AjaxResult remove(@PathVariable Long[] roleIds)
     {
         return toAjax(roleService.deleteRoleByIds(roleIds));

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysUserController.java

@@ -154,7 +154,7 @@ public class SysUserController extends BaseController
     @ApiOperation("更新用户")
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);

zhongzheng-admin/src/main/java/com/zhongzheng/core/config/SwaggerConfig.java

@@ -141,7 +141,6 @@ public class SwaggerConfig
         // header query cookie
         parameterBuilder.name("X-Auth-Token").description("token").modelRef(new ModelRef("string")).parameterType("header").defaultValue("test").required(false);
         pars.add(parameterBuilder.build());
-
         return pars;
     }
 

zhongzheng-framework/src/main/java/com/zhongzheng/framework/aspectj/LogAspect.java

@@ -2,11 +2,14 @@ package com.zhongzheng.framework.aspectj;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.enums.BusinessStatus;
 import com.zhongzheng.common.enums.HttpMethod;
+import com.zhongzheng.common.filter.XssHttpServletRequestWrapper;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.common.utils.http.HttpHelper;
 import com.zhongzheng.common.utils.ip.IpUtils;
 import com.zhongzheng.common.utils.spring.SpringUtils;
 import com.zhongzheng.framework.manager.AsyncManager;
@@ -164,6 +167,7 @@ public class LogAspect
         {
             String params = argsArrayToString(joinPoint.getArgs());
             operLog.setOperParam(StrUtil.sub(params, 0, 2000));
+            operLog.addPrimaryKeyId(params);
         }
         else
         {
@@ -172,6 +176,14 @@ public class LogAspect
         }
     }
 
+    private void setPrimaryKeyId(SysOperLog operLog,String params){
+        if(operLog.getOperUrl().equals("/system/notice")){
+            JSONObject  jsonObject = JSONObject.parseObject(params);
+            operLog.setPrimaryKeyId((Integer) jsonObject.get("noticeId"));
+        }
+    }
+
+
     /**
      * 是否存在注解，如果存在就获取
      */

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TokenService.java

@@ -97,18 +97,18 @@ public class TokenService
         {
             // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
             authentication = authenticationManager
-                    .authenticate(new UsernamePasswordAuthenticationToken("test", "123456"));
+                    .authenticate(new UsernamePasswordAuthenticationToken("admin", "admin123"));
         }
         catch (Exception e)
         {
             if (e instanceof BadCredentialsException)
             {
-                AsyncManager.me().execute(AsyncFactory.recordLogininfor("test", Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor("admin", Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
                 throw new UserPasswordNotMatchException();
             }
             else
             {
-                AsyncManager.me().execute(AsyncFactory.recordLogininfor("test", Constants.LOGIN_FAIL, e.getMessage()));
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor("admin", Constants.LOGIN_FAIL, e.getMessage()));
                 throw new CustomException(e.getMessage());
             }
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysOperLog.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.system.domain;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -138,4 +139,25 @@ public class SysOperLog implements Serializable {
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 
+
+    /**
+     * 返回参数
+     */
+    @Excel(name = "主键ID")
+    private Integer primaryKeyId;
+
+    @Excel(name = "操作文案")
+    private String operContent;
+
+    //PUT POST方法会触发
+    public void addPrimaryKeyId(String params){
+        if(getOperUrl().equals("/system/notice")){
+            JSONObject jsonObject = JSONObject.parseObject(params);
+            if (jsonObject.containsKey("noticeId")){
+                setPrimaryKeyId((Integer) jsonObject.get("noticeId"));
+                setOperContent("操作文案");
+            }
+
+        }
+    }
 }