Bläddra i källkod

update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题

疯狂的狮子Li 3 år sedan
förälder
incheckning
3706d2e1db
51 ändrade filer med 56 tillägg och 122 borttagningar
  1. 3 1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
  2. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
  3. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
  4. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
  5. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
  6. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
  7. 0 4
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java
  8. 2 4
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java
  9. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
  10. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
  11. 0 1
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
  12. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
  13. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
  14. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
  15. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
  16. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
  17. 0 2
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
  18. 0 1
      ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
  19. 12 4
      ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
  20. 6 8
      ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java
  21. 0 2
      ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java
  22. 6 2
      ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
  23. 0 2
      ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
  24. 0 2
      ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
  25. 11 10
      ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
  26. 0 2
      ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
  27. 0 1
      ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
  28. 0 2
      ruoyi-generator/src/main/resources/vm/java/domain.java.vm
  29. 2 4
      ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java
  30. 1 2
      ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java
  31. 1 1
      ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java
  32. 1 3
      ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java
  33. 1 3
      ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java
  34. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
  35. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
  36. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
  37. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
  38. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
  39. 0 1
      ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java
  40. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
  41. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
  42. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
  43. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
  44. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
  45. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
  46. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
  47. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
  48. 0 2
      ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
  49. 2 1
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
  50. 2 1
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
  51. 6 6
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java

+ 3 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java

@@ -132,7 +132,9 @@ public class SysOssController extends BaseController {
     @PutMapping("/changePreviewListResource")
     public AjaxResult<Void> changePreviewListResource(@RequestBody String body) {
         Map<String, Boolean> map = JsonUtils.parseMap(body);
-        SysConfig config = iSysConfigService.getOne(new SysConfig().setConfigKey(OssConstant.PEREVIEW_LIST_RESOURCE_KEY));
+        SysConfig sysConfig = new SysConfig();
+        sysConfig.setConfigKey(OssConstant.PEREVIEW_LIST_RESOURCE_KEY);
+        SysConfig config = iSysConfigService.getOne(sysConfig);
         config.setConfigValue(map.get("previewListResource").toString());
         return toAjax(iSysConfigService.updateConfig(config));
     }

+ 0 - 2
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java

@@ -2,7 +2,6 @@ package com.ruoyi.common.config;
 
 import lombok.Data;
 import lombok.Getter;
-import lombok.experimental.Accessors;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -13,7 +12,6 @@ import org.springframework.stereotype.Component;
  */
 
 @Data
-@Accessors(chain = true)
 @Component
 @ConfigurationProperties(prefix = "ruoyi")
 public class RuoYiConfig {

+ 0 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 /**
  * 操作消息提醒
@@ -16,7 +15,6 @@ import lombok.experimental.Accessors;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(chain = true)
 @ApiModel("请求响应对象")
 public class AjaxResult<T> {
 

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -18,7 +17,6 @@ import java.util.Map;
  */
 
 @Data
-@Accessors(chain = true)
 public class BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java

@@ -7,7 +7,6 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.sql.SqlUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 
@@ -18,7 +17,6 @@ import java.io.Serializable;
  */
 
 @Data
-@Accessors(chain = true)
 public class PageQuery implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,7 +16,6 @@ import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 public class TreeEntity extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

+ 0 - 4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java

@@ -1,8 +1,6 @@
 package com.ruoyi.common.core.domain.dto;
 
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -14,8 +12,6 @@ import java.util.Date;
  */
 
 @Data
-@NoArgsConstructor
-@Accessors(chain = true)
 public class OperLogDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 2 - 4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java

@@ -1,8 +1,7 @@
 package com.ruoyi.common.core.domain.dto;
 
+import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 
@@ -13,8 +12,7 @@ import java.io.Serializable;
  */
 
 @Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@Builder
 public class UserOnlineDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
@@ -23,7 +22,6 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_dept")
 @ApiModel("部门业务对象")
 public class SysDept extends TreeEntity {

+ 0 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java

@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -25,7 +24,6 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_dict_data")
 @ExcelIgnoreUnannotated
 @ApiModel("字典数据业务对象")

+ 0 - 1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java

@@ -24,7 +24,6 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_dict_type")
 @ExcelIgnoreUnannotated
 @ApiModel("字典类型业务对象")

+ 0 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -22,7 +21,6 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_menu")
 @ApiModel("菜单权限业务对象")
 public class SysMenu extends TreeEntity {

+ 0 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -27,7 +26,6 @@ import javax.validation.constraints.Size;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_role")
 @ExcelIgnoreUnannotated
 public class SysRole extends BaseEntity {

+ 0 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
@@ -29,7 +28,6 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_user")
 @ApiModel("用户信息业务对象")
 public class SysUser extends BaseEntity {

+ 0 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java

@@ -4,7 +4,6 @@ import com.ruoyi.common.constant.UserConstants;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
@@ -16,7 +15,6 @@ import javax.validation.constraints.NotBlank;
  */
 
 @Data
-@Accessors(chain = true)
 @ApiModel("用户登录对象")
 public class LoginBody {
 

+ 0 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -3,7 +3,6 @@ package com.ruoyi.common.core.domain.model;
 import com.ruoyi.common.helper.LoginHelper;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Set;
@@ -16,7 +15,6 @@ import java.util.Set;
 
 @Data
 @NoArgsConstructor
-@Accessors(chain = true)
 public class LoginUser implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 /**
  * 用户注册对象
@@ -13,7 +12,6 @@ import lombok.experimental.Accessors;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @ApiModel("用户注册对象")
 public class RegisterBody extends LoginBody {
 

+ 0 - 1
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java

@@ -19,7 +19,6 @@ import java.util.List;
 
 @Data
 @NoArgsConstructor
-@Accessors(chain = true)
 @ApiModel("分页响应对象")
 public class TableDataInfo<T> implements Serializable {
     private static final long serialVersionUID = 1L;

+ 12 - 4
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java

@@ -44,7 +44,11 @@ public class TestBatchController extends BaseController {
     public AjaxResult<Void> add() {
         List<TestDemo> list = new ArrayList<>();
         for (int i = 0; i < 1000; i++) {
-            list.add(new TestDemo().setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增"));
+            TestDemo testDemo = new TestDemo();
+            testDemo.setOrderNum(-1L);
+            testDemo.setTestKey("批量新增");
+            testDemo.setValue("测试新增");
+            list.add(testDemo);
         }
         return toAjax(testDemoMapper.insertBatch(list) ? 1 : 0);
     }
@@ -60,12 +64,16 @@ public class TestBatchController extends BaseController {
     public AjaxResult<Void> addOrUpdate() {
         List<TestDemo> list = new ArrayList<>();
         for (int i = 0; i < 1000; i++) {
-            list.add(new TestDemo().setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增"));
-        }
+            TestDemo testDemo = new TestDemo();
+            testDemo.setOrderNum(-1L);
+            testDemo.setTestKey("批量新增");
+            testDemo.setValue("测试新增");
+            list.add(testDemo);        }
         testDemoMapper.insertBatch(list);
         for (int i = 0; i < list.size(); i++) {
             TestDemo testDemo = list.get(i);
-            testDemo.setTestKey("批量新增或修改").setValue("批量新增或修改");
+            testDemo.setTestKey("批量新增或修改");
+            testDemo.setValue("批量新增或修改");
             if (i % 2 == 0) {
                 testDemo.setId(null);
             }

+ 6 - 8
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java

@@ -7,7 +7,6 @@ import com.ruoyi.common.enums.SensitiveStrategy;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
-import lombok.experimental.Accessors;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -33,17 +32,16 @@ public class TestSensitiveController extends BaseController {
     @ApiOperation("查询测试单表列表")
     @GetMapping("/test")
     public AjaxResult<TestSensitive> test() {
-        TestSensitive testSensitive = new TestSensitive()
-            .setIdCard("210397198608215431")
-            .setPhone("17640125371")
-            .setAddress("北京市朝阳区某某四合院1203室")
-            .setEmail("17640125371@163.com")
-            .setBankCard("6226456952351452853");
+        TestSensitive testSensitive = new TestSensitive();
+        testSensitive.setIdCard("210397198608215431");
+        testSensitive.setPhone("17640125371");
+        testSensitive.setAddress("北京市朝阳区某某四合院1203室");
+        testSensitive.setEmail("17640125371@163.com");
+        testSensitive.setBankCard("6226456952351452853");
         return AjaxResult.success(testSensitive);
     }
 
     @Data
-    @Accessors(chain = true)
     static class TestSensitive {
 
         /**

+ 0 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java

@@ -2,7 +2,6 @@ package com.ruoyi.demo.controller.queue;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 /**
  * 实体类 注意不允许使用内部类 否则会找不到类
@@ -11,7 +10,6 @@ import lombok.experimental.Accessors;
  * @version 3.6.0
  */
 @Data
-@Accessors(chain = true)
 @NoArgsConstructor
 public class PriorityDemo {
     private String name;

+ 6 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java

@@ -46,7 +46,9 @@ public class PriorityQueueController {
         }
         for (int i = 0; i < 10; i++) {
             int randomNum = RandomUtil.randomInt(10);
-            PriorityDemo data = new PriorityDemo().setName("data-" + i).setOrderNum(randomNum);
+            PriorityDemo data = new PriorityDemo();
+            data.setName("data-" + i);
+            data.setOrderNum(randomNum);
             if (QueueUtils.addPriorityQueueObject(queueName, data)) {
                 log.info("通道: {} , 发送数据: {}", queueName, data);
             } else {
@@ -61,7 +63,9 @@ public class PriorityQueueController {
     public AjaxResult<Void> remove(@ApiParam("队列名") String queueName,
                                    @ApiParam("对象名") String name,
                                    @ApiParam("排序号") Integer orderNum) {
-        PriorityDemo data = new PriorityDemo().setName(name).setOrderNum(orderNum);
+        PriorityDemo data = new PriorityDemo();
+        data.setName(name);
+        data.setOrderNum(orderNum);
         if (QueueUtils.removePriorityQueueObject(queueName, data)) {
             log.info("通道: {} , 删除数据: {}", queueName, data);
         } else {

+ 0 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 /**
  * 测试单表对象 test_demo
@@ -14,7 +13,6 @@ import lombok.experimental.Accessors;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("test_demo")
 public class TestDemo extends BaseEntity {
 

+ 0 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.Version;
 import com.ruoyi.common.core.domain.TreeEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 /**
  * 测试树表对象 test_tree
@@ -17,7 +16,6 @@ import lombok.experimental.Accessors;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("test_tree")
 public class TestTree extends TreeEntity {
 

+ 11 - 10
ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java

@@ -46,18 +46,19 @@ public class UserActionListener implements SaTokenListener {
             String ip = ServletUtils.getClientIP();
             SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginHelper.getUserId());
             String tokenValue = StpUtil.getTokenValue();
-            UserOnlineDTO userOnlineDTO = new UserOnlineDTO()
-                .setIpaddr(ip)
-                .setLoginLocation(AddressUtils.getRealAddressByIP(ip))
-                .setBrowser(userAgent.getBrowser().getName())
-                .setOs(userAgent.getOs().getName())
-                .setLoginTime(System.currentTimeMillis())
-                .setTokenId(tokenValue)
-                .setUserName(user.getUserName());
+            UserOnlineDTO dto = UserOnlineDTO.builder()
+                .ipaddr(ip)
+                .loginLocation(AddressUtils.getRealAddressByIP(ip))
+                .browser(userAgent.getBrowser().getName())
+                .os(userAgent.getOs().getName())
+                .loginTime(System.currentTimeMillis())
+                .tokenId(tokenValue)
+                .userName(user.getUserName())
+                .build();
             if (ObjectUtil.isNotNull(user.getDept())) {
-                userOnlineDTO.setDeptName(user.getDept().getDeptName());
+                dto.setDeptName(user.getDept().getDeptName());
             }
-            RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, userOnlineDTO, tokenConfig.getTimeout(), TimeUnit.SECONDS);
+            RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, dto, tokenConfig.getTimeout(), TimeUnit.SECONDS);
             log.info("user doLogin, useId:{}, token:{}", loginId, tokenValue);
         } else if (userType == UserType.APP_USER) {
             // app端 自行根据业务编写

+ 0 - 2
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

@@ -8,7 +8,6 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.utils.StringUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 import org.apache.commons.lang3.ArrayUtils;
 
 import javax.validation.Valid;
@@ -23,7 +22,6 @@ import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("gen_table")
 public class GenTable extends BaseEntity {
 

+ 0 - 1
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java

@@ -20,7 +20,6 @@ import javax.validation.constraints.NotBlank;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("gen_table_column")
 public class GenTableColumn extends BaseEntity {
 

+ 0 - 2
ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -3,7 +3,6 @@ package ${packageName}.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
@@ -29,7 +28,6 @@ import com.ruoyi.common.core.domain.TreeEntity;
     #set($Entity="TreeEntity")
 #end
 @Data
-@Accessors(chain = true)
 @TableName("${tableName}")
 public class ${ClassName} extends ${Entity} {
 

+ 2 - 4
ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java

@@ -1,8 +1,7 @@
 package com.ruoyi.oss.entity;
 
+import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 /**
  * 上传返回体
@@ -10,8 +9,7 @@ import lombok.experimental.Accessors;
  * @author Lion Li
  */
 @Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@Builder
 public class UploadResult {
 
     /**

+ 1 - 2
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java

@@ -77,8 +77,7 @@ public class AliyunOssStrategy extends AbstractOssStrategy {
         } catch (Exception e) {
             throw new OssException("上传文件失败,请检查阿里云配置信息:[" + e.getMessage() + "]");
         }
-        return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
-    }
+        return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build();    }
 
     @Override
     public void delete(String path) {

+ 1 - 1
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java

@@ -80,7 +80,7 @@ public class MinioOssStrategy extends AbstractOssStrategy {
         } catch (Exception e) {
             throw new OssException("上传文件失败,请核对Minio配置信息:[" + e.getMessage() + "]");
         }
-        return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
+        return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build();
     }
 
     @Override

+ 1 - 3
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java

@@ -11,10 +11,8 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.oss.entity.UploadResult;
 import com.ruoyi.oss.enumd.OssEnumd;
 import com.ruoyi.oss.exception.OssException;
-import com.ruoyi.oss.factory.OssFactory;
 import com.ruoyi.oss.properties.OssProperties;
 import com.ruoyi.oss.service.abstractd.AbstractOssStrategy;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Component;
 
 import java.io.ByteArrayInputStream;
@@ -87,7 +85,7 @@ public class QcloudOssStrategy extends AbstractOssStrategy {
         } catch (Exception e) {
             throw new OssException("上传文件失败,请检查腾讯云配置信息:[" + e.getMessage() + "]");
         }
-        return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
+        return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build();
     }
 
     @Override

+ 1 - 3
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java

@@ -10,10 +10,8 @@ import com.qiniu.util.Auth;
 import com.ruoyi.oss.entity.UploadResult;
 import com.ruoyi.oss.enumd.OssEnumd;
 import com.ruoyi.oss.exception.OssException;
-import com.ruoyi.oss.factory.OssFactory;
 import com.ruoyi.oss.properties.OssProperties;
 import com.ruoyi.oss.service.abstractd.AbstractOssStrategy;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Component;
 
 import java.io.InputStream;
@@ -78,7 +76,7 @@ public class QiniuOssStrategy extends AbstractOssStrategy {
         } catch (Exception e) {
             throw new OssException("上传文件失败,请核对七牛配置信息:[" + e.getMessage() + "]");
         }
-        return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
+        return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build();
     }
 
     @Override

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java

@@ -11,7 +11,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -24,7 +23,6 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_config")
 @ExcelIgnoreUnannotated
 @ApiModel("参数配置业务对象")

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java

@@ -10,7 +10,6 @@ import com.ruoyi.common.convert.ExcelDictConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -24,7 +23,6 @@ import java.util.Map;
  */
 
 @Data
-@Accessors(chain = true)
 @TableName("sys_logininfor")
 @ExcelIgnoreUnannotated
 @ApiModel("系统访问记录业务对象")

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java

@@ -7,7 +7,6 @@ import com.ruoyi.common.xss.Xss;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -20,7 +19,6 @@ import javax.validation.constraints.Size;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_notice")
 public class SysNotice extends BaseEntity {
 

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java

@@ -10,7 +10,6 @@ import com.ruoyi.common.convert.ExcelDictConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -24,7 +23,6 @@ import java.util.Map;
  */
 
 @Data
-@Accessors(chain = true)
 @TableName("sys_oper_log")
 @ExcelIgnoreUnannotated
 @ApiModel("操作日志记录业务对象")

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 /**
  * OSS对象存储对象
@@ -15,7 +14,6 @@ import lombok.experimental.Accessors;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_oss")
 public class SysOss extends BaseEntity {
 

+ 0 - 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java

@@ -14,7 +14,6 @@ import lombok.experimental.Accessors;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_oss_config")
 public class SysOssConfig extends BaseEntity {
 

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java

@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -25,7 +24,6 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_post")
 @ExcelIgnoreUnannotated
 @ApiModel("岗位信息业务对象")

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 /**
  * 角色和部门关联 sys_role_dept
@@ -15,7 +14,6 @@ import lombok.experimental.Accessors;
  */
 
 @Data
-@Accessors(chain = true)
 @TableName("sys_role_dept")
 @ApiModel("角色和部门关联")
 public class SysRoleDept {

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 /**
  * 角色和菜单关联 sys_role_menu
@@ -15,7 +14,6 @@ import lombok.experimental.Accessors;
  */
 
 @Data
-@Accessors(chain = true)
 @TableName("sys_role_menu")
 @ApiModel("角色和菜单关联")
 public class SysRoleMenu {

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java

@@ -3,7 +3,6 @@ package com.ruoyi.system.domain;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 /**
  * 当前在线会话
@@ -12,7 +11,6 @@ import lombok.experimental.Accessors;
  */
 
 @Data
-@Accessors(chain = true)
 @ApiModel("当前在线会话业务对象")
 public class SysUserOnline {
 

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 /**
  * 用户和岗位关联 sys_user_post
@@ -15,7 +14,6 @@ import lombok.experimental.Accessors;
  */
 
 @Data
-@Accessors(chain = true)
 @TableName("sys_user_post")
 @ApiModel("用户和岗位关联")
 public class SysUserPost {

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 /**
  * 用户和角色关联 sys_user_role
@@ -15,7 +14,6 @@ import lombok.experimental.Accessors;
  */
 
 @Data
-@Accessors(chain = true)
 @TableName("sys_user_role")
 @ApiModel("用户和角色关联")
 public class SysUserRole {

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java

@@ -4,7 +4,6 @@ import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 /**
  * 路由显示信息
@@ -13,7 +12,6 @@ import lombok.experimental.Accessors;
  */
 
 @Data
-@Accessors(chain = true)
 @ApiModel("路由显示信息")
 public class MetaVo {
 

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 import java.util.List;
 
@@ -14,7 +13,6 @@ import java.util.List;
  * @author Lion Li
  */
 @Data
-@Accessors(chain = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 @ApiModel("路由配置信息")
 public class RouterVo {

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java

@@ -5,7 +5,6 @@ import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -18,7 +17,6 @@ import java.util.Date;
 
 @Data
 @NoArgsConstructor
-@Accessors(chain = true)
 public class SysUserExportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 2 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java

@@ -100,7 +100,8 @@ public class SysLogininforServiceImpl implements ISysLogininforService, Logininf
             .between(params.get("beginTime") != null && params.get("endTime") != null,
                 SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime"));
         if (StringUtils.isBlank(pageQuery.getOrderByColumn())) {
-            pageQuery.setOrderByColumn("info_id").setIsAsc("desc");
+            pageQuery.setOrderByColumn("info_id");
+            pageQuery.setIsAsc("desc");
         }
         Page<SysLogininfor> page = baseMapper.selectPage(pageQuery.build(), lqw);
         return TableDataInfo.build(page);

+ 2 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java

@@ -65,7 +65,8 @@ public class SysOperLogServiceImpl implements ISysOperLogService, OperLogService
             .between(params.get("beginTime") != null && params.get("endTime") != null,
                 SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime"));
         if (StringUtils.isBlank(pageQuery.getOrderByColumn())) {
-            pageQuery.setOrderByColumn("oper_id").setIsAsc("desc");
+            pageQuery.setOrderByColumn("oper_id");
+            pageQuery.setIsAsc("desc");
         }
         Page<SysOperLog> page = baseMapper.selectPage(pageQuery.build(), lqw);
         return TableDataInfo.build(page);

+ 6 - 6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java

@@ -73,12 +73,12 @@ public class SysOssServiceImpl implements ISysOssService {
             throw new ServiceException(e.getMessage());
         }
         // 保存文件信息
-        SysOss oss = new SysOss()
-            .setUrl(uploadResult.getUrl())
-            .setFileSuffix(suffix)
-            .setFileName(uploadResult.getFilename())
-            .setOriginalName(originalfileName)
-            .setService(storage.getServiceType().getValue());
+        SysOss oss = new SysOss();
+        oss.setUrl(uploadResult.getUrl());
+        oss.setFileSuffix(suffix);
+        oss.setFileName(uploadResult.getFilename());
+        oss.setOriginalName(originalfileName);
+        oss.setService(storage.getServiceType().getValue());
         baseMapper.insert(oss);
         return oss;
     }