优化代码，修复隐藏BUG

joying-admin/src/main/java/com/fzm/admin/controller/BannerController.java

@@ -11,11 +11,12 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.List;
 
@@ -27,13 +28,10 @@ import java.util.List;
 @RestController
 @RequestMapping("/banner")
 @Api(tags = "banner页管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class BannerController {
-
-    @Resource
-    private BannerService bannerService;
-
-    @Resource
-    private ObsUtil obsUtil;
+    private final BannerService bannerService;
+    private final ObsUtil obsUtil;
 
     @PostMapping("/create")
     @ApiOperation("新建banner")

joying-admin/src/main/java/com/fzm/admin/controller/CategoryController.java

@@ -6,11 +6,12 @@ import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.CategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -21,10 +22,9 @@ import java.util.List;
 @RestController
 @RequestMapping(value = "/category")
 @Api(tags = "类目管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CategoryController {
-
-    @Resource
-    private CategoryService categoryService;
+    private final CategoryService categoryService;
 
     @GetMapping("/list")
     @ApiOperation(value = "查询所有类目信息")

joying-admin/src/main/java/com/fzm/admin/controller/ChargeController.java

@@ -7,10 +7,10 @@ import com.fzm.common.service.ChargeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
 /**
  * @author tangtuo
  * @date 2022/1/25 10:13
@@ -19,10 +19,10 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping(value = "/charge")
 @Api(tags = "收费管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class ChargeController {
 
-    @Resource
-    private ChargeService chargeService;
+    private final ChargeService chargeService;
 
     @PostMapping("/update")
     @ApiOperation("编辑")

joying-admin/src/main/java/com/fzm/admin/controller/CopyrightApplyController.java

@@ -9,9 +9,10 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 
@@ -23,11 +24,9 @@ import java.util.concurrent.ExecutionException;
 @RestController
 @RequestMapping(value = "/copyright/apply")
 @Api(tags = "版权审核")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CopyrightApplyController {
-
-    @Resource
-    private CopyrightApplyService copyrightApplyService;
-
+    private final CopyrightApplyService copyrightApplyService;
 
     @GetMapping(value = "/pages")
     @ApiOperation(value = "分页查询")

joying-admin/src/main/java/com/fzm/admin/controller/EntrustShelfController.java

@@ -8,13 +8,13 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 /**
  * @author tangtuo
  * @date 2022/1/11 17:19
@@ -23,12 +23,9 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/entrust/shelf")
 @Api(tags = "委托上架")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class EntrustShelfController {
-
-
-    @Resource
-    private EntrustShelfService entrustShelfService;
-
+    private final EntrustShelfService entrustShelfService;
 
     @GetMapping("/page")
     @ApiOperation(value = "分页查询")

joying-admin/src/main/java/com/fzm/admin/controller/NftController.java

@@ -12,10 +12,11 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -27,13 +28,10 @@ import java.util.List;
 @RestController
 @RequestMapping("/nft")
 @Api(tags = "剧本nft管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class NftController {
-
-    @Resource
-    private NftService nftService;
-
-    @Resource
-    private NftTransferRecordService nftTransferRecordService;
+    private final NftService nftService;
+    private final NftTransferRecordService nftTransferRecordService;
 
     @GetMapping("/list")
     @ApiOperation(value = "查询nft列表")

joying-admin/src/main/java/com/fzm/admin/controller/PaymentController.java

@@ -8,13 +8,13 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 /**
  * @author tangtuo
  * @date 2022/2/8 16:11
@@ -23,10 +23,9 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/payment")
 @Api(tags = "支付流水管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class PaymentController {
-
-    @Resource
-    private PaymentService paymentService;
+    private final PaymentService paymentService;
 
     @GetMapping("/pages")
     @ApiOperation(value = "分页查询")

joying-admin/src/main/java/com/fzm/admin/controller/RefundController.java

@@ -8,12 +8,13 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 
 /**
@@ -24,10 +25,9 @@ import java.io.IOException;
 @RestController
 @RequestMapping("/refund")
 @Api(tags = "退款管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class RefundController {
-
-    @Resource
-    private RefundService refundService;
+    private final RefundService refundService;
 
     @GetMapping("/pages")
     @ApiOperation(value = "退款分页列表")

joying-admin/src/main/java/com/fzm/admin/controller/UserController.java

@@ -11,12 +11,13 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -27,10 +28,9 @@ import java.util.List;
 @RestController
 @RequestMapping("/admin")
 @Api(tags = "用户管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class UserController {
-
-    @Resource
-    private UserService userService;
+    private final UserService userService;
 
     @GetMapping("statistic")
     @ApiOperation(value = "用户概览", notes = "获取已注册用户、已实名用户等统计信息")

joying-admin/src/main/java/com/fzm/admin/listener/EvidenceHashLister.java

@@ -6,13 +6,14 @@ import com.fzm.common.entity.CopyrightApply;
 import com.fzm.common.entity.dto.EvidenceHashMessage;
 import com.fzm.common.service.CopyrightApplyService;
 import com.rabbitmq.client.Channel;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 
 /**
@@ -21,13 +22,10 @@ import java.io.IOException;
  */
 @Slf4j
 @Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class EvidenceHashLister {
-
-    @Resource
-    private CopyrightApplyService copyrightApplyService;
-
-    @Resource
-    private ParaChainClient paraChainClient;
+    private final CopyrightApplyService copyrightApplyService;
+    private final ParaChainClient paraChainClient;
 
     /**
      * 更新存证hash

joying-common/src/main/java/com/fzm/common/config/RabbitMQConfig.java

@@ -17,10 +17,6 @@ public class RabbitMQConfig {
 
     public static final String DEAD_LETTER_DIRECT = "dl.direct";
 
-    public static final String COPYRIGHT_QUEUE = "copyright.queue";
-
-    public static final String DEAD_LETTER_QUEUE = "dl.queue";
-
 
     public static final String EVIDENCE_HASH_QUEUE = "evidence.hash.queue";
 

joying-common/src/main/java/com/fzm/common/config/RedisCacheConfig.java

 package com.fzm.common.config;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.cache.CacheProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -12,10 +13,9 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 @Configuration
 @EnableConfigurationProperties(value = CacheProperties.class)
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class RedisCacheConfig {
-
-    @Autowired
-    private CacheProperties cacheProperties;
+    private final CacheProperties cacheProperties;
 
     @Bean
     public RedisCacheConfiguration redisCacheConfiguration() {

joying-common/src/main/java/com/fzm/common/config/RedissonConfig.java

 package com.fzm.common.config;
 
+import lombok.RequiredArgsConstructor;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.Resource;
-
 /**
  * @author tangtuo
  * @date 2021/7/19 10:25
@@ -17,10 +17,9 @@ import javax.annotation.Resource;
  * </p>
  */
 @Configuration
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class RedissonConfig {
-
-    @Resource
-    RedisProperties redisProperties;
+    private final RedisProperties redisProperties;
 
     @Bean
     public RedissonClient redisson() {
@@ -28,7 +27,6 @@ public class RedissonConfig {
         config.useSingleServer().
                 setAddress(String.format("redis://%s:%s", redisProperties.getHost(), redisProperties.getPort())).
                 setPassword(redisProperties.getPassword());
-        RedissonClient redisson = Redisson.create(config);
-        return redisson;
+        return Redisson.create(config);
     }
 }

joying-common/src/main/java/com/fzm/common/config/WxPayConfig.java

@@ -12,12 +12,13 @@ import com.wechat.pay.contrib.apache.httpclient.cert.CertificatesManager;
 import com.wechat.pay.contrib.apache.httpclient.exception.HttpCodeException;
 import com.wechat.pay.contrib.apache.httpclient.exception.NotFoundException;
 import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
+import lombok.RequiredArgsConstructor;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
@@ -28,11 +29,9 @@ import java.security.PrivateKey;
  * @date 2022/1/12 16:30
  */
 @Configuration
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class WxPayConfig {
-
-    @Resource
-    private WxPayProperties wxPayProperties;
-
+    private final WxPayProperties wxPayProperties;
 
     @Bean
     public PrivateKey wxPrivateKey() {

joying-common/src/main/java/com/fzm/common/entity/Admin.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fzm.common.constant.TokenConstant;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.Date;
  * @author tangtuo
  * @date 2021/7/5 15:02
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Accessors(chain = true)
 @TableName("tb_admin")

joying-common/src/main/java/com/fzm/common/entity/Category.java

@@ -3,12 +3,14 @@ package com.fzm.common.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
  * @author tangtuo
  * @date 2021/7/1 14:32
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("tb_category")
 @Accessors(chain = true)

joying-common/src/main/java/com/fzm/common/entity/Nft.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
@@ -15,6 +16,7 @@ import java.util.Date;
  * @author tangtuo
  * @date 2021/6/30 15:42
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel("nft信息")
 @Accessors(chain = true)

joying-common/src/main/java/com/fzm/common/entity/User.java

@@ -6,6 +6,7 @@ import com.fzm.common.constant.TokenConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
@@ -15,6 +16,7 @@ import java.util.Date;
  * @author tangtuo
  * @date 2021/6/23 11:54
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Accessors(chain = true)
 @ApiModel("用户信息")

joying-common/src/main/java/com/fzm/common/entity/dto/CopyrightRequest.java

-/**
- * Copyright 2021 bejson.com
- */
 package com.fzm.common.entity.dto;
 
 import cn.hutool.core.date.DateUtil;
@@ -102,7 +99,6 @@ public class CopyrightRequest {
 
         @ApiModelProperty(value = "著作权人列表")
         private List<Owner> owner_list = new ArrayList<>();
-        ;
 
         @ApiModelProperty(value = "发表地点")
         private String publish_address;

joying-common/src/main/java/com/fzm/common/enums/AuthStatus.java

@@ -15,7 +15,7 @@ public enum AuthStatus {
     SUCCESS(1, "认证成功"),
     FAIL(2, "认证失败"),
     ;
-    private Integer status;
+    private final Integer status;
 
-    private String desc;
+    private final String desc;
 }

joying-common/src/main/java/com/fzm/common/enums/AuthType.java

@@ -11,9 +11,9 @@ public enum AuthType {
 
     PERSON(0, "个人认证"),
     ENTERPRISE(1, "企业认证");
-    private Integer type;
+    private final Integer type;
 
-    private String desc;
+    private final String desc;
 
     AuthType(Integer type, String desc) {
         this.type = type;

joying-common/src/main/java/com/fzm/common/enums/AuthorityAcquire.java

@@ -18,8 +18,8 @@ public enum AuthorityAcquire {
     OTHER(4, "其他"),
     ;
 
-    private int code;
-    private String val;
+    private final int code;
+    private final String val;
 
     public static int getByType(String type) {
         for (AuthorityAcquire value : AuthorityAcquire.values()) {

joying-common/src/main/java/com/fzm/common/enums/AuthorityType.java

@@ -19,8 +19,8 @@ public enum AuthorityType {
     ENTRUST(5, "委托作品"),
     ;
 
-    private int code;
-    private String val;
+    private final int code;
+    private final String val;
 
     public static int getByType(String type) {
         for (AuthorityType value : AuthorityType.values()) {

joying-common/src/main/java/com/fzm/common/enums/CertificatesType.java

@@ -28,11 +28,11 @@ public enum CertificatesType {
     ;
 
     @ApiModelProperty(value = "证件类型编码(湖北版权局)")
-    private int code;
-    private String value;
+    private final int code;
+    private final String value;
     //0-身份证 1-营业执照  2-企业法人营业执照  3-组织机构代码证书  4-事业单位法人证书  5-社团法人证书  6-统一社会信用代码  7其他有效证件
     @ApiModelProperty(value = "数据库对应的每种证件类型的type")
-    private int type;
+    private final int type;
 
     public static CertificatesType getByType(int type) {
         for (CertificatesType value : CertificatesType.values()) {

joying-common/src/main/java/com/fzm/common/enums/CopyrightApplyState.java

@@ -23,9 +23,9 @@ public enum CopyrightApplyState {
     FINAL_JUDGMENT(7, "待终审", ""),
     ;
 
-    private int code;
-    private String value;
-    private String msg;
+    private final int code;
+    private final String value;
+    private final String msg;
 
     public static CopyrightApplyState getByState(int state) {
         for (CopyrightApplyState stateEnum : CopyrightApplyState.values()) {

joying-common/src/main/java/com/fzm/common/enums/IdCardVerificationResponse.java

@@ -17,6 +17,6 @@ public enum IdCardVerificationResponse {
     FAILED4("-4", "证件库服务异常"),
     FAILED5("-5", "证件库中无此身份证记录"),
     ;
-    private String code;
-    private String desc;
+    private final String code;
+    private final String desc;
 }

joying-common/src/main/java/com/fzm/common/enums/OpusProperty.java

@@ -23,8 +23,8 @@ public enum OpusProperty {
     ARRANGEMENT(6, "整理"),
     OTHER(7, "其他"),
     ;
-    private int code;
-    private String value;
+    private final int code;
+    private final String value;
 
     public static List<String> queryAll() {
         return Arrays.stream(OpusProperty.values()).map(OpusProperty::getValue).collect(Collectors.toList());

joying-common/src/main/java/com/fzm/common/enums/OrderStatus.java

@@ -30,6 +30,6 @@ public enum OrderStatus {
     CANCEL(5),
     ;
 
-    private Integer status;
+    private final Integer status;
 
 }

joying-common/src/main/java/com/fzm/common/enums/OwnerType.java

@@ -15,8 +15,8 @@ public enum OwnerType {
     LEGAL(1, "法人"),
 
     ;
-    private int type;
-    private String desc;
+    private final int type;
+    private final String desc;
 
     public static String getByType(int type) {
         return type == PERSON.getType() ? PERSON.getDesc() : LEGAL.getDesc();

joying-common/src/main/java/com/fzm/common/enums/PayScene.java

@@ -15,8 +15,8 @@ public enum PayScene {
     COPYRIGHT(2, "版权申请");
 
 
-    private Integer code;
-    private String type;
+    private final Integer code;
+    private final String type;
 
     public static String getTypeByCode(Integer code) {
         for (PayScene value : PayScene.values()) {

joying-common/src/main/java/com/fzm/common/enums/PayType.java

@@ -20,6 +20,6 @@ public enum PayType {
     /**
      * 类型
      */
-    private Integer code;
+    private final Integer code;
     private final String type;
 }

joying-common/src/main/java/com/fzm/common/enums/PublishStatus.java

@@ -21,8 +21,8 @@ public enum PublishStatus {
     SUSSED(2, "发行成功"),
     FAILED(3, "发行失败");
 
-    private Integer code;
-    private String type;
+    private final Integer code;
+    private final String type;
 
 
 }

joying-common/src/main/java/com/fzm/common/enums/RefundLaunchChannel.java

@@ -20,6 +20,6 @@ public enum RefundLaunchChannel {
     ADMIN(2);
 
 
-    private Integer code;
+    private final Integer code;
 
 }

joying-common/src/main/java/com/fzm/common/enums/RefundStatus.java

@@ -16,6 +16,6 @@ public enum RefundStatus {
     FAINED(3),
     ;
 
-    private Integer status;
+    private final Integer status;
 
 }

joying-common/src/main/java/com/fzm/common/enums/SignatureType.java

@@ -15,8 +15,8 @@ public enum SignatureType {
     ALIAS(2, "别名"),
     ANONYMOUS(3, "匿名"),
     ;
-    private int code;
-    private String value;
+    private final int code;
+    private final String value;
 
     public static int getCode(String value) {
         for (SignatureType signatureType : SignatureType.values()) {

joying-common/src/main/java/com/fzm/common/enums/WxPayStatus.java

@@ -25,8 +25,8 @@ public enum WxPayStatus {
 
     PAYERROR("PAYERROR", "支付失败（仅付款码支付会返回）");
 
-    private String status;
-    private String desc;
+    private final String status;
+    private final String desc;
 
 
 }

joying-common/src/main/java/com/fzm/common/interceptor/AuthenticationInterceptor.java

@@ -12,12 +12,13 @@ import com.fzm.common.service.AdminService;
 import com.fzm.common.service.UserService;
 import com.fzm.common.utils.JwtUtil;
 import com.fzm.common.utils.RedisUtil;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Method;
@@ -27,16 +28,11 @@ import java.util.Date;
  * @author tangtuo
  * @date 2021/7/13 14:30
  */
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class AuthenticationInterceptor implements HandlerInterceptor {
-
-    @Resource
-    private RedisUtil redisUtil;
-
-    @Resource
-    private UserService userService;
-
-    @Resource
-    private AdminService adminService;
+    private final RedisUtil redisUtil;
+    private final UserService userService;
+    private final AdminService adminService;
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {

joying-common/src/main/java/com/fzm/common/model/BufferedImageLuminanceSource.java

-package com.fzm.common.model;
-
-import com.google.zxing.LuminanceSource;
-
-import java.awt.*;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-
-public class BufferedImageLuminanceSource extends LuminanceSource {
-
-    private final BufferedImage image;
-    private final int left;
-    private final int top;
-
-    public BufferedImageLuminanceSource(BufferedImage image) {
-        this(image, 0, 0, image.getWidth(), image.getHeight());
-    }
-
-    public BufferedImageLuminanceSource(BufferedImage image, int left, int top, int width, int height) {
-        super(width, height);
-
-        int sourceWidth = image.getWidth();
-        int sourceHeight = image.getHeight();
-        if (left + width > sourceWidth || top + height > sourceHeight) {
-            throw new IllegalArgumentException("Crop rectangle does not fit within image data.");
-        }
-
-        for (int y = top; y < top + height; y++) {
-            for (int x = left; x < left + width; x++) {
-                if ((image.getRGB(x, y) & 0xFF000000) == 0) {
-                    image.setRGB(x, y, 0xFFFFFFFF); // = white
-                }
-            }
-        }
-
-        this.image = new BufferedImage(sourceWidth, sourceHeight, BufferedImage.TYPE_BYTE_GRAY);
-        this.image.getGraphics().drawImage(image, 0, 0, null);
-        this.left = left;
-        this.top = top;
-    }
-
-    public byte[] getRow(int y, byte[] row) {
-        if (y < 0 || y >= getHeight()) {
-            throw new IllegalArgumentException("Requested row is outside the image: " + y);
-        }
-        int width = getWidth();
-        if (row == null || row.length < width) {
-            row = new byte[width];
-        }
-        image.getRaster().getDataElements(left, top + y, width, 1, row);
-        return row;
-    }
-
-    public byte[] getMatrix() {
-        int width = getWidth();
-        int height = getHeight();
-        int area = width * height;
-        byte[] matrix = new byte[area];
-        image.getRaster().getDataElements(left, top, width, height, matrix);
-        return matrix;
-    }
-
-    @Override
-    public boolean isCropSupported() {
-        return true;
-    }
-
-    @Override
-    public LuminanceSource crop(int left, int top, int width, int height) {
-        return new BufferedImageLuminanceSource(image, this.left + left, this.top + top, width, height);
-    }
-
-    @Override
-    public boolean isRotateSupported() {
-        return true;
-    }
-
-    @Override
-    public LuminanceSource rotateCounterClockwise() {
-        int sourceWidth = image.getWidth();
-        int sourceHeight = image.getHeight();
-        AffineTransform transform = new AffineTransform(0.0, -1.0, 1.0, 0.0, 0.0, sourceWidth);
-        BufferedImage rotatedImage = new BufferedImage(sourceHeight, sourceWidth, BufferedImage.TYPE_BYTE_GRAY);
-        Graphics2D g = rotatedImage.createGraphics();
-        g.drawImage(image, transform, null);
-        g.dispose();
-        int width = getWidth();
-        return new BufferedImageLuminanceSource(rotatedImage, top, sourceWidth - (left + width), getHeight(), width);
-    }
-
-}
\ No newline at end of file

joying-common/src/main/java/com/fzm/common/mq/NotifyConsumer.java

@@ -23,7 +23,6 @@ public class NotifyConsumer {
     private final NotifyMapper notifyMapper;
     private final NotifyStateMapper notifyStateMapper;
 
-
     @RabbitListener(queues = {NotifyConfig.NOTIFY_QUEUE})
     public void notifyMessageUser(String content) {
         if (StringUtils.isBlank(content)) {

joying-common/src/main/java/com/fzm/common/service/CopyrightApplyOwnerRelationService.java

@@ -16,9 +16,8 @@ public interface CopyrightApplyOwnerRelationService extends IService<CopyrightAp
      * 根据版权id删除记录
      *
      * @param copyrightId
-     * @return
      */
-    Integer delByCopyrightId(Integer copyrightId);
+    void delByCopyrightId(Integer copyrightId);
 
     /**
      * 根据版权id查询

joying-common/src/main/java/com/fzm/common/service/CopyrightApplyService.java

@@ -149,9 +149,8 @@ public interface CopyrightApplyService extends IService<CopyrightApply> {
      *
      * @param copyrightId
      * @param state
-     * @return
      */
-    boolean updateRegisterState(Integer copyrightId, int state);
+    void updateRegisterState(Integer copyrightId, int state);
 
     void replaceNftHash(String oldNftHash, String newNftHash);
 }

joying-common/src/main/java/com/fzm/common/service/CopyrightAuthorService.java

@@ -15,9 +15,8 @@ public interface CopyrightAuthorService extends IService<CopyrightAuthor> {
      * 根据版权id删除
      *
      * @param id
-     * @return
      */
-    Integer delByCopyrightId(Integer id);
+    void delByCopyrightId(Integer id);
 
     /**
      * 根据版权id查询作者列表

joying-common/src/main/java/com/fzm/common/service/CopyrightAuthorityRelationService.java

@@ -14,6 +14,6 @@ public interface CopyrightAuthorityRelationService extends IService<CopyrightAut
      *
      * @param copyrightId
      */
-    Integer delByCopyrightId(Integer copyrightId);
+    void delByCopyrightId(Integer copyrightId);
 
 }

joying-common/src/main/java/com/fzm/common/service/CopyrightFileService.java

@@ -24,7 +24,6 @@ public interface CopyrightFileService extends IService<CopyrightFile> {
      * 根据版权id删除
      *
      * @param id
-     * @return
      */
-    Integer delByCopyrightId(Integer id, boolean delFile);
+    void delByCopyrightId(Integer id, boolean delFile);
 }

joying-common/src/main/java/com/fzm/common/service/NftService.java

@@ -126,7 +126,7 @@ public interface NftService extends IService<Nft> {
      * @param id
      * @return
      */
-    Integer publish(Integer id);
+    void publish(Integer id);
 
     /**
      * nft转让

joying-common/src/main/java/com/fzm/common/service/OrderService.java

@@ -45,7 +45,7 @@ public interface OrderService extends IService<Order> {
      * @param orderId
      * @param payType
      */
-    Boolean updatePayType(Long orderId, Integer payType);
+    void updatePayType(Long orderId, Integer payType);
 
     /**
      * 取消订单

joying-common/src/main/java/com/fzm/common/service/WxPayService.java

@@ -5,7 +5,6 @@ import com.fzm.common.entity.dto.JsapiPayDto;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.security.GeneralSecurityException;
 import java.util.Map;
 
 /**
@@ -32,7 +31,7 @@ public interface WxPayService {
      *
      * @param jsonObject
      */
-    void processOrder(JSONObject jsonObject) throws GeneralSecurityException, InterruptedException;
+    void processOrder(JSONObject jsonObject) throws InterruptedException;
 
     String queryOrder(Long orderId) throws IOException, InterruptedException;
 

joying-common/src/main/java/com/fzm/common/service/impl/AuthorityServiceImpl.java

@@ -5,9 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fzm.common.entity.Authority;
 import com.fzm.common.mapper.AuthorityMapper;
 import com.fzm.common.service.AuthorityService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -15,12 +16,9 @@ import java.util.List;
  * @date 2021/12/9 11:42
  */
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class AuthorityServiceImpl extends ServiceImpl<AuthorityMapper, Authority> implements AuthorityService {
-
-
-    @Resource
-    private AuthorityMapper authorityMapper;
-
+    private final AuthorityMapper authorityMapper;
 
     @Override
     public List<Authority> getByType(int type) {

joying-common/src/main/java/com/fzm/common/service/impl/CollectionServiceImpl.java

@@ -5,9 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fzm.common.entity.TbCollection;
 import com.fzm.common.mapper.CollectionMapper;
 import com.fzm.common.service.CollectionService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -15,10 +16,10 @@ import java.util.List;
  * @date 2021/7/1 14:36
  */
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, TbCollection> implements CollectionService {
 
-    @Resource
-    private CollectionMapper collectionMapper;
+    private final CollectionMapper collectionMapper;
 
     @Override
     public void deleteByUserIdAndNftId(int userId, Integer nftId) {

joying-common/src/main/java/com/fzm/common/service/impl/CommemorateNftServiceImpl.java

@@ -18,19 +18,19 @@ import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
 import com.fzm.common.mapper.CommemorateNftMapper;
 import com.fzm.common.service.CommemorateNftService;
-import com.fzm.common.service.NftChainInfoService;
 import com.fzm.common.service.NftService;
 import com.fzm.common.service.UserService;
 import com.fzm.common.utils.RedisUtil;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RSemaphore;
 import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.time.Instant;
 import java.util.Date;
 import java.util.HashMap;
@@ -43,31 +43,18 @@ import java.util.concurrent.TimeUnit;
  */
 @Slf4j
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CommemorateNftServiceImpl extends ServiceImpl<CommemorateNftMapper, CommemorateNft> implements CommemorateNftService {
 
-    @Resource
-    NftChainInfoService nftChainInfoService;
-
-    @Resource
-    private NftService nftService;
-
-    @Resource
-    private ParaChainClient paraChainClient;
-
+    private final NftService nftService;
+    private final ParaChainClient paraChainClient;
+    private final UserService userService;
+    private final RedissonClient redisson;
+    private final RedisUtil redisUtil;
 
     @Value("${chain.para.cAddr}")
     private String contractAddr;
 
-    @Resource
-    private UserService userService;
-
-    @Resource
-    private RedissonClient redisson;
-
-    @Resource
-    private RedisUtil redisUtil;
-
-
     @Override
     public Integer publish(CommemorateNft commemorateNft) {
         User user = userService.getUserByToken();

joying-common/src/main/java/com/fzm/common/service/impl/CopyrightApplyOwnerRelationServiceImpl.java

@@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fzm.common.entity.CopyrightApplyOwnerRelation;
 import com.fzm.common.mapper.CopyrightApplyOwnerRelationMapper;
 import com.fzm.common.service.CopyrightApplyOwnerRelationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -16,16 +17,15 @@ import java.util.List;
  * @date 2021/12/13 11:25
  */
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CopyrightApplyOwnerRelationServiceImpl extends ServiceImpl<CopyrightApplyOwnerRelationMapper, CopyrightApplyOwnerRelation> implements CopyrightApplyOwnerRelationService {
-
-    @Resource
-    private CopyrightApplyOwnerRelationMapper copyrightApplyOwnerRelationMapper;
+    private final CopyrightApplyOwnerRelationMapper copyrightApplyOwnerRelationMapper;
 
     @Override
-    public Integer delByCopyrightId(Integer copyrightId) {
+    public void delByCopyrightId(Integer copyrightId) {
         UpdateWrapper<CopyrightApplyOwnerRelation> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("copyright_id", copyrightId);
-        return copyrightApplyOwnerRelationMapper.delete(updateWrapper);
+        copyrightApplyOwnerRelationMapper.delete(updateWrapper);
     }
 
     @Override

joying-common/src/main/java/com/fzm/common/service/impl/CopyrightApplyServiceImpl.java

@@ -28,16 +28,17 @@ import com.fzm.common.utils.CopyrightSignUtil;
 import com.fzm.common.utils.ObsUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.Redisson;
 import org.redisson.api.RLock;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -54,64 +55,27 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Service
 @Transactional(rollbackFor = RuntimeException.class)
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper, CopyrightApply> implements CopyrightApplyService {
-
-    @Resource
-    private CopyrightApplyMapper copyrightApplyMapper;
-
-    @Resource
-    private CopyrightFileService copyrightFileService;
-
-    @Resource
-    private CopyrightApplyOwnerRelationService copyrightApplyOwnerRelationService;
-
-    @Resource
-    private CopyrightAuthorService copyrightAuthorService;
-
-    @Resource
-    private CopyrightAuthorityRelationService copyrightAuthorityRelationService;
-
-    @Resource
-    private AuthorityService authorityService;
-
-    @Resource
-    private CopyrightOwnerService copyrightOwnerService;
-
-    @Resource
-    private UserService userService;
-
-    @Resource
-    private AuthPersonService authPersonService;
-
-    @Resource
-    private NftService nftService;
-
-    @Resource
-    private ObsUtil obsUtil;
-
-    @Resource
-    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
-
-    @Resource
-    private OpusCategoryService opusCategoryService;
-
-    @Resource
-    private CopyrightProperties copyrightProperties;
-
-    @Resource
-    private Redisson redisson;
-
-    @Resource
-    private DraftService draftService;
-
-    @Resource
-    private OrderService orderService;
-
-    @Resource
-    private WxPayService wxPayService;
-
-    @Resource
-    private NotifyPublisher notifyPublisher;
+    private final CopyrightApplyMapper copyrightApplyMapper;
+    private final CopyrightFileService copyrightFileService;
+    private final CopyrightApplyOwnerRelationService copyrightApplyOwnerRelationService;
+    private final CopyrightAuthorService copyrightAuthorService;
+    private final CopyrightAuthorityRelationService copyrightAuthorityRelationService;
+    private final AuthorityService authorityService;
+    private final CopyrightOwnerService copyrightOwnerService;
+    private final UserService userService;
+    private final AuthPersonService authPersonService;
+    private final NftService nftService;
+    private final ObsUtil obsUtil;
+    private final ThreadPoolTaskExecutor threadPoolTaskExecutor;
+    private final OpusCategoryService opusCategoryService;
+    private final CopyrightProperties copyrightProperties;
+    private final Redisson redisson;
+    private final DraftService draftService;
+    private final OrderService orderService;
+    private final WxPayService wxPayService;
+    private final NotifyPublisher notifyPublisher;
 
 
     @Override
@@ -490,11 +454,11 @@ public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper,
     }
 
     @Override
-    public boolean updateRegisterState(Integer copyrightId, int state) {
+    public void updateRegisterState(Integer copyrightId, int state) {
         CopyrightApply copyrightApply = new CopyrightApply();
         copyrightApply.setId(copyrightId);
         copyrightApply.setRegisterState(state);
-        return updateById(copyrightApply);
+        updateById(copyrightApply);
     }
 
     @Override

joying-common/src/main/java/com/fzm/common/service/impl/CopyrightAuthorServiceImpl.java

@@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fzm.common.entity.CopyrightAuthor;
 import com.fzm.common.mapper.CopyrightAuthorMapper;
 import com.fzm.common.service.CopyrightAuthorService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -16,16 +17,16 @@ import java.util.List;
  * @date 2021/12/9 11:41
  */
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CopyrightAuthorServiceImpl extends ServiceImpl<CopyrightAuthorMapper, CopyrightAuthor> implements CopyrightAuthorService {
 
-    @Resource
-    private CopyrightAuthorMapper copyrightAuthorMapper;
+    private final CopyrightAuthorMapper copyrightAuthorMapper;
 
     @Override
-    public Integer delByCopyrightId(Integer copyrightId) {
+    public void delByCopyrightId(Integer copyrightId) {
         UpdateWrapper<CopyrightAuthor> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("copyright_id", copyrightId);
-        return copyrightAuthorMapper.delete(updateWrapper);
+        copyrightAuthorMapper.delete(updateWrapper);
     }
 
     @Override

joying-common/src/main/java/com/fzm/common/service/impl/CopyrightAuthorityRelationServiceImpl.java

@@ -5,25 +5,25 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fzm.common.entity.CopyrightAuthorityRelation;
 import com.fzm.common.mapper.CopyrightAuthorityRelationMapper;
 import com.fzm.common.service.CopyrightAuthorityRelationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-
 /**
  * @author tangtuo
  * @date 2021/12/9 11:44
  */
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CopyrightAuthorityRelationServiceImpl extends ServiceImpl<CopyrightAuthorityRelationMapper, CopyrightAuthorityRelation> implements CopyrightAuthorityRelationService {
 
-    @Resource
-    private CopyrightAuthorityRelationMapper copyrightAuthorityRelationMapper;
+    private final CopyrightAuthorityRelationMapper copyrightAuthorityRelationMapper;
 
     @Override
-    public Integer delByCopyrightId(Integer copyrightId) {
+    public void delByCopyrightId(Integer copyrightId) {
         UpdateWrapper<CopyrightAuthorityRelation> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("copyright_id", copyrightId);
-        return copyrightAuthorityRelationMapper.delete(updateWrapper);
+        copyrightAuthorityRelationMapper.delete(updateWrapper);
     }
 
 }

joying-common/src/main/java/com/fzm/common/service/impl/CopyrightFileServiceImpl.java

@@ -7,9 +7,10 @@ import com.fzm.common.entity.CopyrightFile;
 import com.fzm.common.mapper.CopyrightFileMapper;
 import com.fzm.common.service.CopyrightFileService;
 import com.fzm.common.utils.ObsUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -17,13 +18,12 @@ import java.util.List;
  * @date 2021/12/9 11:43
  */
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CopyrightFileServiceImpl extends ServiceImpl<CopyrightFileMapper, CopyrightFile> implements CopyrightFileService {
 
-    @Resource
-    private CopyrightFileMapper copyrightFileMapper;
+    private final CopyrightFileMapper copyrightFileMapper;
 
-    @Resource
-    private ObsUtil obsUtil;
+    private final ObsUtil obsUtil;
 
 
     @Override
@@ -34,7 +34,7 @@ public class CopyrightFileServiceImpl extends ServiceImpl<CopyrightFileMapper, C
     }
 
     @Override
-    public Integer delByCopyrightId(Integer copyrightId, boolean delFile) {
+    public void delByCopyrightId(Integer copyrightId, boolean delFile) {
         if (delFile) {
             List<CopyrightFile> list = getByCopyrightId(copyrightId);
             for (CopyrightFile file : list) {
@@ -44,6 +44,6 @@ public class CopyrightFileServiceImpl extends ServiceImpl<CopyrightFileMapper, C
 
         UpdateWrapper<CopyrightFile> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("copyright_id", copyrightId);
-        return copyrightFileMapper.delete(updateWrapper);
+        copyrightFileMapper.delete(updateWrapper);
     }
 }

joying-common/src/main/java/com/fzm/common/service/impl/CopyrightOwnerServiceImpl.java

@@ -5,9 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fzm.common.entity.CopyrightOwner;
 import com.fzm.common.mapper.CopyrightOwnerMapper;
 import com.fzm.common.service.CopyrightOwnerService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -15,10 +16,10 @@ import java.util.List;
  * @date 2021/12/9 11:40
  */
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CopyrightOwnerServiceImpl extends ServiceImpl<CopyrightOwnerMapper, CopyrightOwner> implements CopyrightOwnerService {
 
-    @Resource
-    private CopyrightOwnerMapper ownerMapper;
+    private final CopyrightOwnerMapper ownerMapper;
 
     @Override
     public List<CopyrightOwner> getByUserId(Integer userId) {

joying-common/src/main/java/com/fzm/common/service/impl/DraftServiceImpl.java

@@ -11,12 +11,13 @@ import com.fzm.common.entity.dto.DraftDTO;
 import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
 import com.fzm.common.mapper.DraftMapper;
-import com.fzm.common.service.*;
+import com.fzm.common.service.DraftService;
 import com.fzm.common.utils.ObsUtil;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
@@ -26,25 +27,10 @@ import java.util.List;
  * @date 2021/12/10 10:18
  */
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class DraftServiceImpl extends ServiceImpl<DraftMapper, Draft> implements DraftService {
-
-    @Resource
-    private DraftMapper draftMapper;
-
-    @Resource
-    private ObsUtil obsUtil;
-
-    @Resource
-    private CopyrightApplyService copyrightApplyService;
-
-    @Resource
-    private CopyrightFileService copyrightFileService;
-
-    @Resource
-    private CopyrightAuthorityRelationService copyrightAuthorityRelationService;
-
-    @Resource
-    private CopyrightAuthorService copyrightAuthorService;
+    private final DraftMapper draftMapper;
+    private final ObsUtil obsUtil;
 
     @Override
     public List<Draft> getByUserId(Integer userId) {

joying-common/src/main/java/com/fzm/common/service/impl/EntrustShelfServiceImpl.java

@@ -7,35 +7,29 @@ import com.fzm.common.constant.SystemConstant;
 import com.fzm.common.entity.EntrustShelf;
 import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
+import com.fzm.common.interceptor.LoginUserInfo;
 import com.fzm.common.mapper.EntrustShelfMapper;
 import com.fzm.common.service.EntrustShelfService;
 import com.fzm.common.service.NftService;
-import com.fzm.common.utils.JwtUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * @author tangtuo
  * @date 2021/7/5 15:09
  */
 @Service
-@Transactional(rollbackFor = RuntimeException.class)
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class EntrustShelfServiceImpl extends ServiceImpl<EntrustShelfMapper, EntrustShelf> implements EntrustShelfService {
-
-    @Resource
-    private HttpServletRequest request;
-
-    @Resource
-    private NftService nftService;
-
+    private final NftService nftService;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean submit(EntrustShelf entrustShelf) {
         // 查询当前nft是否已提交过申请
         QueryWrapper<EntrustShelf> queryWrapper = new QueryWrapper<>();
@@ -46,13 +40,13 @@ public class EntrustShelfServiceImpl extends ServiceImpl<EntrustShelfMapper, Ent
         }
         // 修改当前nft的是否已申请的状态为是
         nftService.updateEntrust(entrustShelf.getNftHash(), SystemConstant.BOOLEAN_DATA_TRUE);
-        String authorization = request.getHeader("Authorization");
-        Integer userId = JwtUtil.getUserIdFromToken(authorization);
+        Integer userId = LoginUserInfo.getLoginUser().getUserId();
         entrustShelf.setUserId(userId);
         return this.save(entrustShelf);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean cancel(Integer id) {
         EntrustShelf entrustShelf = this.getById(id);
         if (entrustShelf == null) {

joying-common/src/main/java/com/fzm/common/service/impl/NftTransferRecordServiceImpl.java

@@ -11,10 +11,11 @@ import com.fzm.common.entity.vo.NftTransferRecordVo;
 import com.fzm.common.mapper.NftTransferRecordMapper;
 import com.fzm.common.service.NftTransferRecordService;
 import com.fzm.common.service.UserService;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -22,13 +23,10 @@ import java.util.List;
  * @date 2021/6/28 11:29
  */
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class NftTransferRecordServiceImpl extends ServiceImpl<NftTransferRecordMapper, NftTransferRecord> implements NftTransferRecordService {
-
-    @Resource
-    private NftTransferRecordMapper nftTransferRecordMapper;
-
-    @Resource
-    private UserService userService;
+    private final NftTransferRecordMapper nftTransferRecordMapper;
+    private final UserService userService;
 
     @Override
     public List<NftTransferRecordVo> getTransferRecordList(String nftHash, String fromAddress, String toAddress, String startDate, String endDate) {

joying-common/src/main/java/com/fzm/common/service/impl/OrderServiceImpl.java

@@ -12,16 +12,16 @@ import com.fzm.common.enums.PayScene;
 import com.fzm.common.enums.PayType;
 import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
+import com.fzm.common.interceptor.LoginUserInfo;
 import com.fzm.common.mapper.OrderMapper;
 import com.fzm.common.service.*;
-import com.fzm.common.utils.JwtUtil;
 import com.fzm.common.utils.SnowflakeUtil;
+import lombok.RequiredArgsConstructor;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
@@ -34,31 +34,15 @@ import java.util.List;
  */
 @Service
 @Transactional(rollbackFor = RuntimeException.class)
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
-
-    @Resource
-    private NftService nftService;
-
-    @Resource
-    private CopyrightApplyService copyrightApplyService;
-
-    @Resource
-    private SnowflakeUtil snowflakeUtil;
-
-    @Resource
-    private HttpServletRequest request;
-
-    @Resource
-    private RabbitTemplate rabbitTemplate;
-
-    @Resource
-    private OrderMapper orderMapper;
-
-    @Resource
-    private WxPayService wxPayService;
-
-    @Resource
-    private ChargeService chargeService;
+    private final NftService nftService;
+    private final CopyrightApplyService copyrightApplyService;
+    private final SnowflakeUtil snowflakeUtil;
+    private final RabbitTemplate rabbitTemplate;
+    private final OrderMapper orderMapper;
+    private final WxPayService wxPayService;
+    private final ChargeService chargeService;
 
     @Override
     public Order getByPaySceneAndProductId(Integer payScene, Integer productId, Integer orderStatus) {
@@ -107,7 +91,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         order.setOrderName(orderName);
         order.setFee(orderDto.getFee());
         order.setProductId(productId);
-        order.setUserId(JwtUtil.getUserIdFromToken(request.getHeader("Authorization")));
+        order.setUserId(LoginUserInfo.getLoginUser().getUserId());
         order.setCreateDate(new Date());
         order.setUpdateDate(new Date());
         Integer orderStatus;
@@ -124,11 +108,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     @Override
-    public Boolean updatePayType(Long orderId, Integer payType) {
+    public void updatePayType(Long orderId, Integer payType) {
         Order o = new Order();
         o.setId(orderId);
         o.setPayType(payType);
-        return updateById(o);
+        updateById(o);
     }
 
     @Override
@@ -150,7 +134,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     @Override
     public List<OrderVo> listOrder(Integer payScene, Integer orderStatus) {
-        Integer userId = JwtUtil.getUserIdFromToken(request.getHeader("Authorization"));
+        Integer userId = LoginUserInfo.getLoginUser().getUserId();
         return orderMapper.getByPayScene(payScene, userId, orderStatus);
     }
 

joying-common/src/main/java/com/fzm/common/service/impl/PaymentServiceImpl.java

@@ -10,11 +10,12 @@ import com.fzm.common.mapper.PaymentMapper;
 import com.fzm.common.service.PaymentService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -23,10 +24,9 @@ import java.util.List;
  */
 @Service
 @Transactional(rollbackFor = RuntimeException.class)
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, Payment> implements PaymentService {
-
-    @Resource
-    private PaymentMapper paymentMapper;
+    private final PaymentMapper paymentMapper;
 
 
     @Override

joying-common/src/main/java/com/fzm/common/service/impl/RefundServiceImpl.java

@@ -12,11 +12,12 @@ import com.fzm.common.service.RefundService;
 import com.fzm.common.service.WxPayService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.List;
 
@@ -26,13 +27,11 @@ import java.util.List;
  */
 @Service
 @Transactional(rollbackFor = RuntimeException.class)
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class RefundServiceImpl extends ServiceImpl<RefundMapper, Refund> implements RefundService {
 
-    @Resource
-    private WxPayService wxPayService;
-
-    @Resource
-    private RefundMapper refundMapper;
+    private final WxPayService wxPayService;
+    private final RefundMapper refundMapper;
 
     @Override
     public Refund getByOrderId(Long orderId) {

joying-common/src/main/java/com/fzm/common/service/impl/SmsServiceImpl.java

@@ -6,10 +6,11 @@ import com.fzm.common.service.OrderService;
 import com.fzm.common.service.SmsService;
 import com.fzm.common.service.UserService;
 import com.fzm.common.utils.SmsUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 
 /**
@@ -17,16 +18,11 @@ import java.math.BigDecimal;
  * @date 2022/2/8 14:12
  */
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class SmsServiceImpl implements SmsService {
-
-    @Resource
-    private UserService userService;
-
-    @Resource
-    private SmsUtil smsUtil;
-
-    @Resource
-    private OrderService orderService;
+    private final UserService userService;
+    private final SmsUtil smsUtil;
+    private final OrderService orderService;
 
     @Override
     @Async("threadPoolTaskExecutor")

joying-common/src/main/java/com/fzm/common/service/impl/UserServiceImpl.java

@@ -20,6 +20,7 @@ import com.fzm.common.enums.AuthType;
 import com.fzm.common.enums.IdCardVerificationResponse;
 import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
+import com.fzm.common.interceptor.LoginUserInfo;
 import com.fzm.common.mapper.UserMapper;
 import com.fzm.common.mq.NotifyPublisher;
 import com.fzm.common.params.LoginParam;
@@ -27,7 +28,10 @@ import com.fzm.common.properties.DebugProperties;
 import com.fzm.common.properties.SmsProperties;
 import com.fzm.common.service.AuthPersonService;
 import com.fzm.common.service.UserService;
-import com.fzm.common.utils.*;
+import com.fzm.common.utils.ObsUtil;
+import com.fzm.common.utils.RedisUtil;
+import com.fzm.common.utils.SmsUtil;
+import com.fzm.common.utils.TencentApi;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import com.tencentcloudapi.common.profile.ClientProfile;
@@ -35,15 +39,16 @@ import com.tencentcloudapi.common.profile.HttpProfile;
 import com.tencentcloudapi.faceid.v20180301.FaceidClient;
 import com.tencentcloudapi.faceid.v20180301.models.IdCardOCRVerificationRequest;
 import com.tencentcloudapi.faceid.v20180301.models.IdCardOCRVerificationResponse;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.Base64;
@@ -56,40 +61,19 @@ import java.util.List;
 @Slf4j
 @Service
 @Transactional(rollbackFor = RuntimeException.class)
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
-
-    @Resource
-    private UserMapper userMapper;
-
-    @Resource
-    private PasswordEncoder passwordEncoder;
-
-    @Resource
-    private SmsProperties smsProperties;
-
-    @Resource
-    private SmsUtil smsUtil;
-
-    @Resource
-    private RedisUtil redisUtil;
-
-    @Resource
-    private AuthPersonService authPersonService;
-
-    @Resource
-    private ParaChainClient paraClient;
-
-    @Resource
-    private HttpServletRequest request;
-
-    @Resource
-    private ObsUtil obsUtil;
-
-    @Resource
-    private DebugProperties debugProperties;
-
-    @Resource
-    private NotifyPublisher notifyPublisher;
+    private final UserMapper userMapper;
+    private final PasswordEncoder passwordEncoder;
+    private final SmsProperties smsProperties;
+    private final SmsUtil smsUtil;
+    private final RedisUtil redisUtil;
+    private final AuthPersonService authPersonService;
+    private final ParaChainClient paraClient;
+    private final HttpServletRequest request;
+    private final ObsUtil obsUtil;
+    private final DebugProperties debugProperties;
+    private final NotifyPublisher notifyPublisher;
 
 
     @Override
@@ -164,7 +148,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if (StringUtils.isBlank(token)) {
             throw GlobalException.newException(ResultCode.UNAUTHORIZED, "您还没有登录,请先登录");
         }
-        Integer userId = JwtUtil.getUserIdFromToken(token);
+        Integer userId = LoginUserInfo.getLoginUser().getUserId();
         return getById(userId);
     }
 
@@ -329,7 +313,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             // 输出json格式的字符串回包
             System.out.println(IdCardOCRVerificationResponse.toJsonString(resp));
         } catch (TencentCloudSDKException e) {
-            System.out.println(e.toString());
+            System.out.println(e);
         }
     }
 }

joying-common/src/main/java/com/fzm/common/service/impl/WxPayServiceImpl.java

@@ -17,6 +17,7 @@ import com.fzm.common.properties.WxPayProperties;
 import com.fzm.common.service.*;
 import com.fzm.common.utils.SnowflakeUtil;
 import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -28,11 +29,11 @@ import org.apache.http.util.EntityUtils;
 import org.redisson.Redisson;
 import org.redisson.api.RLock;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Base64Utils;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -53,38 +54,19 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Service
 @Transactional(rollbackFor = RuntimeException.class)
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class WxPayServiceImpl implements WxPayService {
 
-
-    @Resource
-    private CloseableHttpClient httpClient;
-
-    @Resource
-    private WxPayProperties wxPayProperties;
-
-    @Resource
-    private PrivateKey wxPrivateKey;
-
-    @Resource
-    private OrderService orderService;
-
-    @Resource
-    private Redisson redisson;
-
-    @Resource
-    private PaymentService paymentService;
-
-    @Resource
-    private RabbitTemplate rabbitTemplate;
-
-    @Resource
-    private SnowflakeUtil snowflakeUtil;
-
-    @Resource
-    private RefundService refundService;
-
-    @Resource
-    private SmsService smsService;
+    private final CloseableHttpClient httpClient;
+    private final WxPayProperties wxPayProperties;
+    private final PrivateKey wxPrivateKey;
+    private final OrderService orderService;
+    private final Redisson redisson;
+    private final PaymentService paymentService;
+    private final RabbitTemplate rabbitTemplate;
+    private final SnowflakeUtil snowflakeUtil;
+    private final RefundService refundService;
+    private final SmsService smsService;
 
     public Map<String, Object> payJsapi(JsapiPayDto jsapiPayDto) throws Exception {
         RLock lock = redisson.getLock("pay-" + jsapiPayDto.getOrderId());

joying-common/src/main/java/com/fzm/common/utils/CopyrightSignUtil.java

 package com.fzm.common.utils;
 
 import cn.hutool.crypto.SecureUtil;
-import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;
 import java.util.TreeMap;
@@ -10,10 +9,8 @@ import java.util.TreeMap;
  * @author tangtuo
  * @date 2021/12/23 11:40
  */
-@Slf4j
 public class CopyrightSignUtil {
 
-
     public static String generateSign(TreeMap<String, String> param) {
         StringBuilder sb = new StringBuilder();
         for (Map.Entry<String, String> entry : param.entrySet()) {
@@ -23,7 +20,6 @@ public class CopyrightSignUtil {
             sb.append(key).append("=").append(value).append("&");
         }
         String signStr = sb.deleteCharAt(sb.length() - 1).toString();
-        log.info("signStr: {}", signStr);
         return SecureUtil.md5(signStr);
     }
 }

joying-common/src/main/java/com/fzm/common/utils/JsonUtil.java

@@ -2,7 +2,6 @@ package com.fzm.common.utils;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
 import java.lang.reflect.Type;
@@ -10,8 +9,8 @@ import java.lang.reflect.Type;
 
 public class JsonUtil {
 
-    private static Gson gson;
-    private static JsonParser jsonParser;
+    private static final Gson gson;
+    private static final JsonParser jsonParser;
 
     private JsonUtil() {
     }
@@ -48,12 +47,5 @@ public class JsonUtil {
     public static String toJson(Object object) {
         return gson.toJson(object);
     }
-
-    /**
-     * String转为jsonObject
-     */
-    public static JsonObject toJsonObject(String string) {
-        return jsonParser.parse(string).getAsJsonObject();
-    }
 }
 

joying-common/src/main/java/com/fzm/common/utils/JwtUtil.java

@@ -21,7 +21,6 @@ import java.util.Map;
  */
 public class JwtUtil {
 
-    private static final String CLAIM_KEY_USERNAME = "sub";
     private static final String CLAIM_KEY_CREATED = "created";
     private static final String CLAIM_KEY_USERID = "userId";
     private static final String CLAIM_KEY_APP_ID = "appId";
@@ -45,10 +44,9 @@ public class JwtUtil {
      * 从token中获取JWT中的负载
      */
     private static Claims getClaimsFromToken(String token) {
-        Claims claims = null;
         token = token.replace(TOKEN_PREFIX, "");
         try {
-            claims = Jwts.parser()
+            return Jwts.parser()
                     .setSigningKey(SECRET)
                     .parseClaimsJws(token)
                     .getBody();
@@ -57,7 +55,6 @@ public class JwtUtil {
         } catch (Exception e) {
             throw GlobalException.newException(ResultCode.UNAUTHORIZED, e.getMessage());
         }
-        return claims;
     }
 
     /**
@@ -110,12 +107,12 @@ public class JwtUtil {
         }
     }
 
-    /**
-     * 验证token是否还有效
-     *
-     * @param token       客户端传入的token
-     * @param userDetails 从数据库中查询出来的用户信息
-     */
+//    /**
+//     * 验证token是否还有效
+//     *
+//     * @param token       客户端传入的token
+//     * @param userDetails 从数据库中查询出来的用户信息
+//     */
 /*    public static boolean validateToken(String token, UserDetails userDetails) {
         String username = getUserNameFromToken(token);
         return username.equals(userDetails.getUsername()) && !isTokenExpired(token);

joying-common/src/main/java/com/fzm/common/utils/ObsUtil.java

@@ -8,11 +8,13 @@ import com.obs.services.ObsClient;
 import com.obs.services.model.DeleteObjectResult;
 import com.obs.services.model.ObsObject;
 import com.obs.services.model.PutObjectResult;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -28,16 +30,11 @@ import java.net.URLEncoder;
  */
 @Slf4j
 @Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class ObsUtil {
-
-    @Resource
-    private ObsClient obsClient;
-
-    @Resource
-    private ObsProperties obsProperties;
-
-    @Resource
-    private HttpServletResponse response;
+    private final ObsClient obsClient;
+    private final ObsProperties obsProperties;
+    private final HttpServletResponse response;
 
     /**
      * 上传对象
@@ -46,7 +43,11 @@ public class ObsUtil {
      * @return
      */
     public String putObject(MultipartFile file) throws IOException {
-        String objectName = IdUtil.simpleUUID().concat("/").concat(file.getOriginalFilename().replaceAll(" ", ""));
+        String originalFilename = file.getOriginalFilename();
+        if (StringUtils.isBlank(originalFilename)) {
+            throw GlobalException.newException(ResultCode.VALIDATE_FAILED, "文件名不能为空");
+        }
+        String objectName = IdUtil.simpleUUID().concat("/").concat(originalFilename.replaceAll(" ", ""));
         obsClient.putObject(obsProperties.getBucket(), objectName, file.getInputStream());
         return String.format("https://%s.%s/%s", obsProperties.getBucket(), obsProperties.getEndPoint(), objectName);
     }

joying-common/src/main/java/com/fzm/common/utils/RedisUtil.java

 package com.fzm.common.utils;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.DataType;
 import org.springframework.data.redis.core.Cursor;
@@ -13,13 +14,12 @@ import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 
 @Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class RedisUtil {
+    private final StringRedisTemplate redisTemplate;
 
-    @Autowired
-    private StringRedisTemplate redisTemplate;
 
-
-    /** -------------------key相关操作--------------------- */
+    /* -------------------key相关操作--------------------- */
 
     /**
      * 删除key
@@ -174,7 +174,7 @@ public class RedisUtil {
         return redisTemplate.type(key);
     }
 
-    /** -------------------string相关操作--------------------- */
+    /* -------------------string相关操作--------------------- */
 
     /**
      * 设置指定 key 的值
@@ -241,17 +241,6 @@ public class RedisUtil {
     }
 
     /**
-     * 设置ASCII码, 字符串'a'的ASCII码是97, 转为二进制是'01100001', 此方法是将二进制第offset位值变为value
-     *
-     * @param key   位置
-     * @param value 值,true为1, false为0
-     * @return
-     */
-    public boolean setBit(String key, long offset, boolean value) {
-        return redisTemplate.opsForValue().setBit(key, offset, value);
-    }
-
-    /**
      * 将值 value 关联到 key ，并将 key 的过期时间设为 timeout
      *
      * @param key
@@ -265,17 +254,6 @@ public class RedisUtil {
     }
 
     /**
-     * 只有在 key 不存在时设置 key 的值
-     *
-     * @param key
-     * @param value
-     * @return 之前已经存在返回false, 不存在返回true
-     */
-    public boolean setIfAbsent(String key, String value) {
-        return redisTemplate.opsForValue().setIfAbsent(key, value);
-    }
-
-    /**
      * 用 value 参数覆写给定 key 所储存的字符串值，从偏移量 offset 开始
      *
      * @param key
@@ -305,15 +283,6 @@ public class RedisUtil {
         redisTemplate.opsForValue().multiSet(maps);
     }
 
-    /**
-     * 同时设置一个或多个 key-value 对，当且仅当所有给定 key 都不存在
-     *
-     * @param maps
-     * @return 之前已经存在返回false, 不存在返回true
-     */
-    public boolean multiSetIfAbsent(Map<String, String> maps) {
-        return redisTemplate.opsForValue().multiSetIfAbsent(maps);
-    }
 
     /**
      * 增加(自增长), 负数则为自减
@@ -344,7 +313,7 @@ public class RedisUtil {
         return redisTemplate.opsForValue().append(key, value);
     }
 
-    /** -------------------hash相关操作------------------------- */
+    /* -------------------hash相关操作------------------------- */
 
     /**
      * 获取存储在哈希表中指定字段的值
@@ -485,7 +454,7 @@ public class RedisUtil {
         return redisTemplate.opsForHash().scan(key, options);
     }
 
-    /** ------------------------list相关操作---------------------------- */
+    /* ------------------------list相关操作---------------------------- */
 
     /**
      * 通过索引获取列表中的元素
@@ -728,7 +697,7 @@ public class RedisUtil {
         return redisTemplate.opsForList().size(key);
     }
 
-    /** --------------------set相关操作-------------------------- */
+    /* --------------------set相关操作-------------------------- */
 
     /**
      * set添加元素
@@ -991,7 +960,7 @@ public class RedisUtil {
         return redisTemplate.opsForSet().scan(key, options);
     }
 
-    /**------------------zSet相关操作--------------------------------*/
+    /*------------------zSet相关操作--------------------------------*/
 
     /**
      * 添加元素,有序集合是按照元素的score值由小到大排列

joying-common/src/main/java/com/fzm/common/utils/SmsUtil.java

@@ -11,31 +11,29 @@ import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
 import com.fzm.common.properties.DebugProperties;
 import com.fzm.common.properties.SmsProperties;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * @author tangtuo
  * @date 2021/6/28 16:02
  */
 @Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class SmsUtil {
-
-    @Resource
-    private SmsProperties smsProperties;
-
-    @Resource
-    private DebugProperties debugProperties;
-
+    private final SmsProperties smsProperties;
+    private final DebugProperties debugProperties;
 
     public static String getStringToSignOfStr(Map<String, Object> map) {
         TreeMap<String, String> treeMap = new TreeMap<>();
-        Iterator<String> iterator = map.keySet().iterator();
-        while (iterator.hasNext()) {
-            String key = iterator.next();
+        for (String key : map.keySet()) {
             treeMap.put(key, map.get(key).toString());
         }
         StringBuilder sb = new StringBuilder();
@@ -99,11 +97,10 @@ public class SmsUtil {
      *
      * @param mobile
      * @param fee
-     * @return
      */
-    public Boolean sendRefundSms(String mobile, String fee) {
+    public void sendRefundSms(String mobile, String fee) {
         if (debugProperties.getSms()) {
-            return true;
+            return;
         }
 
         String timestamp = getTimestamp();
@@ -119,13 +116,12 @@ public class SmsUtil {
                 header("FZM-Ca-AppKey", smsProperties.getAppKey()).
                 header("FZM-Ca-Signature", sign).form(params).execute();
         if (response == null || StringUtils.isBlank(response.body())) {
-            return false;
+            return;
         }
         JSONObject jsonObject = JSONUtil.parseObj(response.body());
         if (jsonObject.get("code", Integer.class) != HttpStatus.HTTP_OK) {
             throw GlobalException.newException(ResultCode.CODE_ERROR, jsonObject.getStr("message"));
         }
-        return true;
     }
 
     /**

joying-common/src/main/java/com/fzm/common/utils/SnowflakeUtil.java

@@ -4,23 +4,20 @@ import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.net.NetUtil;
 import cn.hutool.core.util.IdUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 
 @Component
-@Slf4j
 public class SnowflakeUtil {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private long workerId = 0;//为终端ID
-    private long datacenterId = 1;//数据中心ID
-    private Snowflake snowflake = IdUtil.createSnowflake(workerId, datacenterId);
+    private final long datacenterId = 1;//数据中心ID
+    private final Snowflake snowflake = IdUtil.createSnowflake(workerId, datacenterId);
 
     @PostConstruct
     public void init() {
         workerId = NetUtil.ipv4ToLong(NetUtil.getLocalhostStr());
-        log.info("当前机器的workId:{}", workerId);
     }
 
     public long snowflakeId() {

joying-common/src/main/java/com/fzm/common/utils/TencentApi.java

@@ -33,8 +33,7 @@ public class TencentApi {
         req.setImageBase64(imageBase64);
         // 返回的resp是一个IdCardOCRVerificationResponse的实例，与请求对象对应
         try {
-            IdCardOCRVerificationResponse resp = client.IdCardOCRVerification(req);
-            return resp;
+            return client.IdCardOCRVerification(req);
         } catch (TencentCloudSDKException e) {
             throw GlobalException.newException(ResultCode.ID_CARD_VERIFICATION_ERROR, "实名认证失败，失败原因: " + e.getMessage());
         }

joying-portal/src/main/java/com/fzm/portal/aop/LogAop.java

 package com.fzm.portal.aop;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;
@@ -8,6 +9,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -15,7 +17,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
@@ -32,12 +33,12 @@ import java.util.Map;
 @Order(1)
 @Component
 @Aspect
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class LogAop {
 
-    @Resource
-    private HttpServletRequest request;
+    private final HttpServletRequest request;
 
-    private static ThreadLocal<Long> threadLocal = new ThreadLocal<>();
+    private static final ThreadLocal<Long> threadLocal = new ThreadLocal<>();
 
     @Pointcut(value = "execution(public * com.fzm.portal.controller..*.*(..))")
     public void pointCut() {

joying-portal/src/main/java/com/fzm/portal/controller/AuthorityController.java

@@ -6,12 +6,13 @@ import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.AuthorityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -21,10 +22,10 @@ import java.util.List;
 @RestController
 @RequestMapping("/authority")
 @Api(tags = "权力")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class AuthorityController {
 
-    @Resource
-    private AuthorityService authorityService;
+    private final AuthorityService authorityService;
 
 
     @GetMapping("/list")

joying-portal/src/main/java/com/fzm/portal/controller/BannerController.java

@@ -5,11 +5,12 @@ import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.BannerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -19,10 +20,10 @@ import java.util.List;
 @RestController
 @RequestMapping("/banner")
 @Api(tags = "banner页管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class BannerController {
 
-    @Resource
-    private BannerService bannerService;
+    private final BannerService bannerService;
 
     @GetMapping("/list")
     @ApiOperation(value = "查询banner页列表")

joying-portal/src/main/java/com/fzm/portal/controller/CategoryController.java

@@ -5,11 +5,12 @@ import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.CategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -19,10 +20,10 @@ import java.util.List;
 @RestController
 @RequestMapping(value = "/category")
 @Api(tags = "类目管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CategoryController {
 
-    @Resource
-    private CategoryService categoryService;
+    private final CategoryService categoryService;
 
     @GetMapping("/list")
     @ApiOperation(value = "查询所有类目信息")

joying-portal/src/main/java/com/fzm/portal/controller/ChargeController.java

@@ -7,13 +7,13 @@ import com.fzm.common.service.ChargeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 /**
  * @author tangtuo
  * @date 2022/1/25 10:13
@@ -22,10 +22,10 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping(value = "/charge")
 @Api(tags = "收费管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class ChargeController {
 
-    @Resource
-    private ChargeService chargeService;
+    private final ChargeService chargeService;
 
 
     @GetMapping("/fee/{type}")

joying-portal/src/main/java/com/fzm/portal/controller/CollectionController.java

@@ -7,9 +7,10 @@ import com.fzm.common.service.NftService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -19,10 +20,10 @@ import java.util.List;
 @RestController
 @RequestMapping(value = "/collection")
 @Api(tags = "收藏")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CollectionController {
 
-    @Resource
-    private NftService nftService;
+    private final NftService nftService;
 
 
     @Authentication

joying-portal/src/main/java/com/fzm/portal/controller/CommemorateNftController.java

@@ -18,13 +18,14 @@ import com.fzm.common.utils.RedisUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RSemaphore;
 import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.List;
 
@@ -35,25 +36,14 @@ import java.util.List;
 @RestController
 @RequestMapping(value = "/commemorate/nft")
 @Api(tags = "纪念版nft")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CommemorateNftController {
-
-    @Resource
-    private CommemorateNftService commemorateNftService;
-
-    @Resource
-    private ObsUtil obsUtil;
-
-    @Resource
-    private UserService userService;
-
-    @Resource
-    private CategoryService categoryService;
-
-    @Resource
-    private RedissonClient redisson;
-
-    @Resource
-    private RedisUtil redisUtil;
+    private final CommemorateNftService commemorateNftService;
+    private final ObsUtil obsUtil;
+    private final UserService userService;
+    private final CategoryService categoryService;
+    private final RedissonClient redisson;
+    private final RedisUtil redisUtil;
 
     @Authentication
     @PostMapping("/publish")
@@ -67,7 +57,11 @@ public class CommemorateNftController {
         if (file == null || cover == null) {
             throw GlobalException.newException(ResultCode.VALIDATE_FAILED, "文件不能为空");
         }
-        String coverName = cover.getOriginalFilename().toLowerCase();
+        String originalFilename = cover.getOriginalFilename();
+        if (StringUtils.isBlank(originalFilename)) {
+            throw GlobalException.newException(ResultCode.VALIDATE_FAILED, "文件名不能为空");
+        }
+        String coverName = originalFilename.toLowerCase();
         if (!coverName.endsWith(".png") && !coverName.endsWith(".jpg")) {
             throw GlobalException.newException(ResultCode.FILE_UPLOAD_ERROR, "封面类型有误");
         }

joying-portal/src/main/java/com/fzm/portal/controller/CopyrightApplyController.java

@@ -9,16 +9,17 @@ import com.fzm.common.entity.vo.CopyrightVo;
 import com.fzm.common.enums.CopyrightApplyState;
 import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
+import com.fzm.common.interceptor.LoginUserInfo;
 import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.CopyrightApplyService;
-import com.fzm.common.utils.JwtUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -30,10 +31,10 @@ import java.util.concurrent.ExecutionException;
 @RestController
 @Api(tags = "版权申请")
 @RequestMapping("/copyright/apply")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CopyrightApplyController {
 
-    @Resource
-    private CopyrightApplyService copyrightApplyService;
+    private final CopyrightApplyService copyrightApplyService;
 
     @Authentication
     @PostMapping("/submit")
@@ -47,8 +48,8 @@ public class CopyrightApplyController {
     @Authentication
     @GetMapping("/list")
     @ApiOperation(value = "查询版权登记列表")
-    public ResponseModel<List<CopyrightApply>> list(@RequestHeader(value = "Authorization") String token, @ApiParam("状态 0-全部 1-进行中 2-已完成") @RequestParam Integer state) {
-        Integer userId = JwtUtil.getUserIdFromToken(token);
+    public ResponseModel<List<CopyrightApply>> list(@ApiParam("状态 0-全部 1-进行中 2-已完成") @RequestParam Integer state) {
+        Integer userId = LoginUserInfo.getLoginUser().getUserId();
         List<CopyrightApply> list = copyrightApplyService.list(userId, state);
         return ResponseModel.success(list);
     }

joying-portal/src/main/java/com/fzm/portal/controller/CopyrightFileController.java

@@ -8,12 +8,14 @@ import com.fzm.common.model.ResponseModel;
 import com.fzm.common.utils.ObsUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 
 /**
@@ -24,12 +26,12 @@ import java.io.IOException;
 @Authentication
 @RestController
 @RequestMapping(value = "/copyright/file")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CopyrightFileController {
 
     private static final long maxSize = 1024 * 1024 * 200;
 
-    @Resource
-    private ObsUtil obsUtil;
+    private final ObsUtil obsUtil;
 
     @PostMapping("/upload")
     @ApiOperation(value = "上传版权申请附件")
@@ -39,6 +41,9 @@ public class CopyrightFileController {
             throw GlobalException.newException(ResultCode.FILE_UPLOAD_ERROR, "单个文件最大支持200M");
         }
         String fileName = file.getOriginalFilename();
+        if (StringUtils.isBlank(fileName)) {
+            throw GlobalException.newException(ResultCode.VALIDATE_FAILED, "文件名不能为空");
+        }
         String fileSuffix = fileName.substring(fileName.lastIndexOf(".") + 1);
         if (!FileSuffix.validFileType(fileSuffix)) {
             throw GlobalException.newException(ResultCode.FILE_UPLOAD_ERROR, "不支持当前上传的文件类型");

joying-portal/src/main/java/com/fzm/portal/controller/CopyrightOwnerController.java

@@ -5,16 +5,17 @@ import com.fzm.common.entity.CopyrightOwner;
 import com.fzm.common.enums.OwnerType;
 import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
+import com.fzm.common.interceptor.LoginUserInfo;
 import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.CopyrightOwnerService;
-import com.fzm.common.utils.JwtUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -25,14 +26,14 @@ import java.util.List;
 @RestController
 @RequestMapping("/copyright/owner")
 @Api(tags = "著作权人")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CopyrightOwnerController {
 
-    @Resource
-    private CopyrightOwnerService copyrightOwnerService;
+    private final CopyrightOwnerService copyrightOwnerService;
 
     @PostMapping(value = "/add")
     @ApiOperation(value = "新增著作权人")
-    public ResponseModel<Integer> add(@RequestHeader String Authorization, @Validated @RequestBody CopyrightOwner owner) {
+    public ResponseModel<Integer> add(@Validated @RequestBody CopyrightOwner owner) {
         // 如果著作权人是个人的话,身份证正反面照片 著作权人手持身份证照片等信息必传
         if (owner.getType().equals(OwnerType.PERSON.getType())) {
             if (StringUtils.isAnyBlank(owner.getBackPhoto(), owner.getPositivePhoto(), owner.getPersonalPhoto())) {
@@ -44,7 +45,7 @@ public class CopyrightOwnerController {
                 throw GlobalException.newException(ResultCode.VALIDATE_FAILED);
             }
         }
-        Integer userId = JwtUtil.getUserIdFromToken(Authorization);
+        Integer userId = LoginUserInfo.getLoginUser().getUserId();
         owner.setUserId(userId);
         copyrightOwnerService.save(owner);
         return ResponseModel.success(owner.getId());
@@ -52,8 +53,8 @@ public class CopyrightOwnerController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "获取我的著作权人列表")
-    public ResponseModel<List<CopyrightOwner>> list(@RequestHeader(value = "Authorization") String token) {
-        Integer userId = JwtUtil.getUserIdFromToken(token);
+    public ResponseModel<List<CopyrightOwner>> list() {
+        Integer userId = LoginUserInfo.getLoginUser().getUserId();
         List<CopyrightOwner> list = copyrightOwnerService.getByUserId(userId);
         return ResponseModel.success(list);
     }

joying-portal/src/main/java/com/fzm/portal/controller/DraftController.java

@@ -3,14 +3,15 @@ package com.fzm.portal.controller;
 import com.fzm.common.annotation.Authentication;
 import com.fzm.common.entity.Draft;
 import com.fzm.common.entity.dto.DraftDTO;
+import com.fzm.common.interceptor.LoginUserInfo;
 import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.DraftService;
-import com.fzm.common.utils.JwtUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -21,23 +22,23 @@ import java.util.List;
 @RestController
 @RequestMapping("/Draft")
 @Api(tags = "草稿管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class DraftController {
 
-    @Resource
-    private DraftService draftService;
+    private final DraftService draftService;
 
     @PostMapping("/save")
     @ApiOperation(value = "保存草稿")
-    public ResponseModel<Integer> save(@RequestHeader(value = "Authorization") String token, @RequestBody DraftDTO draft) {
-        draft.setUserId(JwtUtil.getUserIdFromToken(token));
+    public ResponseModel<Integer> save(@RequestBody DraftDTO draft) {
+        draft.setUserId(LoginUserInfo.getLoginUser().getUserId());
         Integer id = draftService.saveDraft(draft);
         return ResponseModel.success(id);
     }
 
     @GetMapping("/list")
     @ApiOperation(value = "查询我的草稿列表")
-    public ResponseModel<List<Draft>> list(@RequestHeader(value = "Authorization") String token) {
-        Integer userId = JwtUtil.getUserIdFromToken(token);
+    public ResponseModel<List<Draft>> list() {
+        Integer userId = LoginUserInfo.getLoginUser().getUserId();
         List<Draft> list = draftService.getByUserId(userId);
         return ResponseModel.success(list);
     }

joying-portal/src/main/java/com/fzm/portal/controller/EntrustShelfController.java

@@ -8,11 +8,11 @@ import com.fzm.common.valid.InsertGroup;
 import com.fzm.common.valid.UpdateGroup;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
 /**
  * @author tangtuo
  * @date 2022/1/11 17:19
@@ -21,11 +21,10 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/entrust/shelf")
 @Api(tags = "委托上架")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class EntrustShelfController {
 
-
-    @Resource
-    private EntrustShelfService entrustShelfService;
+    private final EntrustShelfService entrustShelfService;
 
 
     @PostMapping("/submit")

joying-portal/src/main/java/com/fzm/portal/controller/FileTemplateController.java

@@ -6,12 +6,13 @@ import com.fzm.common.service.FileTemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -21,10 +22,10 @@ import java.util.List;
 @RestController
 @RequestMapping("/file/template")
 @Api(tags = "文件模板")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class FileTemplateController {
 
-    @Resource
-    private FileTemplateService fileTemplateService;
+    private final FileTemplateService fileTemplateService;
 
     @GetMapping("/list/{type}")
     @ApiOperation(value = "根据类型查询文件列表")

joying-portal/src/main/java/com/fzm/portal/controller/NftController.java

@@ -11,23 +11,23 @@ import com.fzm.common.entity.vo.NftVo;
 import com.fzm.common.enums.CopyrightApplyState;
 import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
+import com.fzm.common.interceptor.LoginUserInfo;
 import com.fzm.common.model.ResponseModel;
 import com.fzm.common.params.NftTransferParam;
 import com.fzm.common.service.NftService;
 import com.fzm.common.service.UserService;
 import com.fzm.common.utils.JsonUtil;
-import com.fzm.common.utils.JwtUtil;
 import com.fzm.common.utils.QRCodeUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -42,17 +42,11 @@ import java.util.concurrent.ExecutionException;
 @RestController
 @RequestMapping(value = "/nft")
 @Api(tags = "nft管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class NftController {
 
-    @Resource
-    private NftService nftService;
-
-    @Resource
-    private UserService userService;
-
-    @Resource
-    private HttpServletRequest request;
-
+    private final NftService nftService;
+    private final UserService userService;
 
     @Authentication
     @PostMapping("/save")
@@ -95,8 +89,8 @@ public class NftController {
     @Authentication
     @GetMapping("/list/current")
     @ApiOperation(value = "获取我的nft列表")
-    public ResponseModel<Map<String, Object>> listCurrent(@ApiParam(value = "类目id,查询全部的时候传null") @RequestParam(required = false) Integer categoryId) throws Exception {
-        Integer userId = JwtUtil.getUserIdFromToken(request.getHeader("Authorization"));
+    public ResponseModel<Map<String, Object>> listCurrent(@ApiParam(value = "类目id,查询全部的时候传null") @RequestParam(required = false) Integer categoryId) {
+        Integer userId = LoginUserInfo.getLoginUser().getUserId();
         List<CollectionNftVo> list = nftService.listCurrent(categoryId, userId);
         User user = userService.getById(userId);
         // 生成二维码
@@ -132,12 +126,12 @@ public class NftController {
     @Authentication
     @GetMapping("/certificate/{id}")
     @ApiOperation(value = "nft证书")
-    public ResponseModel<NftCertificateVo> certificate(@PathVariable Integer id, @RequestHeader String Authorization) throws Exception {
+    public ResponseModel<NftCertificateVo> certificate(@PathVariable Integer id) {
         Nft nft = nftService.getById(id);
         if (nft == null) {
             throw GlobalException.newException(ResultCode.DATA_ERROR, "没找到此nft的详情");
         }
-        int userId = JwtUtil.getUserIdFromToken(Authorization);
+        int userId = LoginUserInfo.getLoginUser().getUserId();
         if (!nft.getUserId().equals(userId)) {
             throw GlobalException.newException(ResultCode.FORBIDDEN, "您无权查看别人的nft证书");
         }
@@ -176,8 +170,8 @@ public class NftController {
     @Authentication
     @ApiOperation(value = "查询用户还未成功申请版权的nft列表")
     @GetMapping(value = "/list/copyright")
-    public ResponseModel<List<CollectionNftVo>> listCopyright(@RequestHeader(value = "Authorization") String token) {
-        Integer userId = JwtUtil.getUserIdFromToken(token);
+    public ResponseModel<List<CollectionNftVo>> listCopyright() {
+        Integer userId = LoginUserInfo.getLoginUser().getUserId();
         List<CollectionNftVo> list = nftService.listCopyright(userId);
         return ResponseModel.success(list);
     }

joying-portal/src/main/java/com/fzm/portal/controller/NftTransferRecordController.java

@@ -7,13 +7,14 @@ import com.fzm.common.service.NftTransferRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -25,10 +26,10 @@ import java.util.List;
 @Authentication
 @RequestMapping(value = "/nft/transfer/record")
 @Api(tags = "nft转让记录")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class NftTransferRecordController {
 
-    @Resource
-    private NftTransferRecordService nftTransferRecordService;
+    private final NftTransferRecordService nftTransferRecordService;
 
     @GetMapping("/list/{type}")
     @ApiOperation(value = "查询我的nft流转记录")

joying-portal/src/main/java/com/fzm/portal/controller/OpusCategoryController.java

@@ -5,11 +5,12 @@ import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.OpusCategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -19,10 +20,10 @@ import java.util.List;
 @Api(tags = "作品类别")
 @RestController
 @RequestMapping("/opus/category")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OpusCategoryController {
 
-    @Resource
-    private OpusCategoryService opusCategoryService;
+    private final OpusCategoryService opusCategoryService;
 
     @GetMapping("/list")
     @ApiOperation(value = "查询作品类别列表")

joying-portal/src/main/java/com/fzm/portal/controller/OrderController.java

@@ -9,9 +9,10 @@ import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.OrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.List;
 
@@ -23,10 +24,10 @@ import java.util.List;
 @Api(tags = "订单管理")
 @RestController
 @RequestMapping("/order")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OrderController {
 
-    @Resource
-    private OrderService orderService;
+    private final OrderService orderService;
 
 
     @PostMapping("/create")

joying-portal/src/main/java/com/fzm/portal/controller/OssController.java

@@ -5,13 +5,14 @@ import com.fzm.common.model.ResponseModel;
 import com.fzm.common.utils.ObsUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 
 /**
@@ -21,10 +22,10 @@ import java.io.IOException;
 @RestController
 @RequestMapping("/oss")
 @Api(tags = "oss相关")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OssController {
 
-    @Resource
-    private ObsUtil obsUtil;
+    private final ObsUtil obsUtil;
 
 
     @Authentication

joying-portal/src/main/java/com/fzm/portal/controller/UserController.java

@@ -6,6 +6,7 @@ import com.fzm.common.constant.TokenConstant;
 import com.fzm.common.entity.User;
 import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
+import com.fzm.common.interceptor.LoginUserInfo;
 import com.fzm.common.model.ResponseModel;
 import com.fzm.common.params.LoginParam;
 import com.fzm.common.service.UserService;
@@ -16,12 +17,13 @@ import com.tencentcloudapi.faceid.v20180301.models.IdCardOCRVerificationResponse
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -34,16 +36,12 @@ import java.util.concurrent.TimeUnit;
 @RestController
 @RequestMapping(value = "/user")
 @Api(tags = "用户管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class UserController {
 
-    @Resource
-    private UserService userService;
-
-    @Resource
-    private ObsUtil obsUtil;
-
-    @Resource
-    private RedisUtil redisUtil;
+    private final UserService userService;
+    private final ObsUtil obsUtil;
+    private final RedisUtil redisUtil;
 
     @PostMapping(value = "/login")
     @ApiOperation(value = "登录|注册")
@@ -85,8 +83,8 @@ public class UserController {
     @Authentication
     @PostMapping(value = "/logout")
     @ApiOperation(value = "退出登录")
-    public ResponseModel<Boolean> logout(@RequestHeader String Authorization) {
-        Integer userId = JwtUtil.getUserIdFromToken(Authorization);
+    public ResponseModel<Boolean> logout() {
+        Integer userId = LoginUserInfo.getLoginUser().getUserId();
         redisUtil.delete(RedisConstant.PORTAL_USER_TOKEN_PREFIX + userId);
         return ResponseModel.success();
     }
@@ -99,8 +97,8 @@ public class UserController {
     @Authentication
     @ApiOperation(value = "修改昵称 | 修改个性签名", notes = "用户修改哪项信息就传那一个参数就可以了")
     @PostMapping("/update")
-    public ResponseModel<User> update(@Validated @RequestBody User user, @RequestHeader String Authorization) {
-        Integer userId = JwtUtil.getUserIdFromToken(Authorization);
+    public ResponseModel<User> update(@Validated @RequestBody User user) {
+        Integer userId = LoginUserInfo.getLoginUser().getUserId();
         user.setId(userId);
         userService.updateById(user);
         return ResponseModel.success(userService.getById(userId));

joying-portal/src/main/java/com/fzm/portal/controller/VerificationCodeController.java

@@ -12,14 +12,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 /**
  * @author tangtuo
  * @date 2021/6/23 15:56
@@ -27,17 +27,12 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping(value = "/verificationCode")
 @Api(tags = "验证码管理")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class VerificationCodeController {
 
-
-    @Resource
-    private UserService userService;
-
-    @Resource
-    private SmsProperties smsProperties;
-
-    @Resource
-    private SmsUtil smsUtil;
+    private final UserService userService;
+    private final SmsProperties smsProperties;
+    private final SmsUtil smsUtil;
 
 
     @PostMapping(value = "/send/sms")
@@ -67,6 +62,8 @@ public class VerificationCodeController {
         switch (type) {
             case 1:
                 return smsProperties.getLoginMessageCodetype();
+            case 2:
+            case 3:
             default:
                 throw GlobalException.newException(ResultCode.CODE_ERROR);
         }

joying-portal/src/main/java/com/fzm/portal/controller/WxPayController.java

@@ -8,9 +8,10 @@ import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.WxPayService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -24,10 +25,10 @@ import java.util.Map;
 @Api(tags = "微信支付")
 @RestController
 @RequestMapping("/wx-pay")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class WxPayController {
 
-    @Resource
-    private WxPayService wxPayService;
+    private final WxPayService wxPayService;
 
     @Authentication
     @PostMapping("/pay/jsapi")

joying-portal/src/main/java/com/fzm/portal/controller/open/NftApiController.java

@@ -7,13 +7,13 @@ import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.NftService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 /**
  * @author tangtuo
  * @date 2021/12/22 14:13
@@ -21,10 +21,10 @@ import javax.annotation.Resource;
 @RestController
 @Api(tags = "对外服务")
 @RequestMapping("/open/nft")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class NftApiController {
 
-    @Resource
-    private NftService nftService;
+    private final NftService nftService;
 
     @GetMapping(value = "/hash")
     @ApiOperation(value = "根据tokenId获取nft哈希")

joying-portal/src/main/java/com/fzm/portal/listener/NftListener.java

@@ -16,41 +16,29 @@ import com.fzm.common.service.OrderService;
 import com.fzm.common.service.UserService;
 import com.fzm.common.service.WxPayService;
 import com.fzm.common.utils.RedisUtil;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
-
 /**
  * @author tangtuo
  * @date 2022/1/21 16:49
  */
 @Slf4j
 @Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class NftListener {
 
-    @Resource
-    private ParaChainClient paraChainClient;
-
-    @Resource
-    private NftService nftService;
-
-    @Resource
-    UserService userService;
-
-    @Resource
-    private RedisUtil redisUtil;
-
-    @Resource
-    private OrderService orderService;
-
-    @Resource
-    private WxPayService wxPayService;
-
-    @Resource
-    private NotifyPublisher notifyPublisher;
+    private final ParaChainClient paraChainClient;
+    private final NftService nftService;
+    private final UserService userService;
+    private final RedisUtil redisUtil;
+    private final OrderService orderService;
+    private final WxPayService wxPayService;
+    private final NotifyPublisher notifyPublisher;
 
     /**
      * 监听nft发行结果

joying-portal/src/main/java/com/fzm/portal/listener/OrderListener.java

@@ -9,28 +9,24 @@ import com.fzm.common.enums.RefundLaunchChannel;
 import com.fzm.common.service.CopyrightApplyService;
 import com.fzm.common.service.NftService;
 import com.fzm.common.service.WxPayService;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
-
 /**
  * @author tangtuo
  * @date 2022/1/21 11:44
  */
 @Slf4j
 @Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OrderListener {
 
-    @Resource
-    private NftService nftService;
-
-    @Resource
-    private CopyrightApplyService copyrightApplyService;
-
-    @Resource
-    private WxPayService wxPayService;
+    private final NftService nftService;
+    private final CopyrightApplyService copyrightApplyService;
+    private final WxPayService wxPayService;
 
     @RabbitListener(queues = "order.process.queue")
     public void listenProcessOrder(OrderProcessMsg msg) throws Exception {

joying-portal/src/main/java/com/fzm/portal/schedule/DraftTask.java

@@ -2,13 +2,14 @@ package com.fzm.portal.schedule;
 
 import com.fzm.common.entity.Draft;
 import com.fzm.common.service.DraftService;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.Redisson;
 import org.redisson.api.RLock;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -18,13 +19,11 @@ import java.util.concurrent.TimeUnit;
  */
 @Slf4j
 @Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class DraftTask {
 
-    @Resource
-    private DraftService draftService;
-
-    @Resource
-    private Redisson redisson;
+    private final DraftService draftService;
+    private final Redisson redisson;
 
     /**
      * 删除创建时间大于7天的草稿