From 4a4bb437eb2a210de44bf1fc5b8c8125a24b144c Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Thu, 9 May 2024 17:04:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=A3=E7=A0=81=E5=9D=8F=E5=91=B3?=
 =?UTF-8?q?=E9=81=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hyp/web/controller/reward/AuditController.java     | 1 -
 .../com/hyp/web/controller/reward/FileRelationController.java   | 2 +-
 .../java/com/hyp/web/controller/reward/ScoreInfoController.java | 1 -
 hyp-admin/src/test/java/com/hyp/EncFactory.java                 | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hyp-admin/src/main/java/com/hyp/web/controller/reward/AuditController.java b/hyp-admin/src/main/java/com/hyp/web/controller/reward/AuditController.java
index d652c31..d7ade58 100644
--- a/hyp-admin/src/main/java/com/hyp/web/controller/reward/AuditController.java
+++ b/hyp-admin/src/main/java/com/hyp/web/controller/reward/AuditController.java
@@ -8,7 +8,6 @@ import com.hyp.system.domain.vo.ApplyInfoListVO;
 import com.hyp.web.controller.manager.ApplyInfoListManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
diff --git a/hyp-admin/src/main/java/com/hyp/web/controller/reward/FileRelationController.java b/hyp-admin/src/main/java/com/hyp/web/controller/reward/FileRelationController.java
index 907e3cf..c2b65f5 100644
--- a/hyp-admin/src/main/java/com/hyp/web/controller/reward/FileRelationController.java
+++ b/hyp-admin/src/main/java/com/hyp/web/controller/reward/FileRelationController.java
@@ -53,7 +53,7 @@ public class FileRelationController extends BaseController {
     @Resource
     private FileRelationManager fileRelationManager;
 
-    @Autowired
+    @Resource
     private ServerConfig serverConfig;
 
     @ApiOperation("文件上传")
diff --git a/hyp-admin/src/main/java/com/hyp/web/controller/reward/ScoreInfoController.java b/hyp-admin/src/main/java/com/hyp/web/controller/reward/ScoreInfoController.java
index d4072f1..2754c86 100644
--- a/hyp-admin/src/main/java/com/hyp/web/controller/reward/ScoreInfoController.java
+++ b/hyp-admin/src/main/java/com/hyp/web/controller/reward/ScoreInfoController.java
@@ -12,7 +12,6 @@ import com.hyp.web.controller.manager.ApplyInfoListManager;
 import com.hyp.web.controller.manager.ScoreInfoManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/hyp-admin/src/test/java/com/hyp/EncFactory.java b/hyp-admin/src/test/java/com/hyp/EncFactory.java
index e60c038..204a49a 100644
--- a/hyp-admin/src/test/java/com/hyp/EncFactory.java
+++ b/hyp-admin/src/test/java/com/hyp/EncFactory.java
@@ -6,7 +6,7 @@ import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
 public class EncFactory {
     public static void main(String[] args) {
         String securityKey = "NBPLUS"; // 加密秘钥
-        String data = "qwer1234"; // 需要加密的字符串
+        String data = "wangxy123@"; // 需要加密的字符串
 
         PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
         SimpleStringPBEConfig config = new SimpleStringPBEConfig();