修改部分框架代码

ruoyi-admin/src/main/resources/application.yml

@@ -107,11 +107,10 @@ mybatis-plus:
   configLocation: classpath:mybatis/mybatis-config.xml
 
 # PageHelper分页插件
-pagehelper: 
+pagehelper:
   helperDialect: postgresql
-  reasonable: true
   supportMethodsArguments: true
-  params: count=countSql 
+  params: count=countSql
 
 # Swagger配置
 swagger:

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -5,6 +5,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -26,17 +28,21 @@ public class BaseEntity implements Serializable
     private String searchValue;
 
     /** 创建者 */
+    @TableField(fill = FieldFill.INSERT,updateStrategy = FieldStrategy.NEVER)
     private String createBy;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.INSERT,updateStrategy = FieldStrategy.NEVER)
     private Date createTime;
 
     /** 更新者 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
 
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     /** 备注 */

ruoyi-common/src/main/java/com/ruoyi/common/handler/AutoFillHandler.java

@@ -0,0 +1,33 @@
+package com.ruoyi.common.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AutoFillHandler implements MetaObjectHandler {
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        String userId = Convert.toStr(SecurityUtils.getUserId());
+        if (metaObject.hasSetter("createBy")) {
+            metaObject.setValue("createBy", userId);
+        }
+        if (metaObject.hasSetter("createTime")) {
+            metaObject.setValue("createTime", DateUtils.getNowDate());
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        String userId = Convert.toStr(SecurityUtils.getUserId());
+        if (metaObject.hasSetter("updateBy")) {
+            metaObject.setValue("updateBy", userId);
+        }
+        if (metaObject.hasSetter("updateTime")) {
+            metaObject.setValue("updateTime", DateUtils.getNowDate());
+        }
+    }
+}

ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -36,8 +36,11 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/${moduleName}/${businessName}")
 public class ${ClassName}Controller extends BaseController
 {
-    @Autowired
     private I${ClassName}Service ${className}Service;
+    @Autowired
+    public void set${ClassName}Service(I${ClassName}Service ${className}Service) {
+        this.${className}Service = ${className}Service;
+    }
 
     /**
      * 查询${functionName}列表