From a803227125cc14b086d3c205e55394289b4e2289 Mon Sep 17 00:00:00 2001
From: chengkun <2500338766@qq.com>
Date: Fri, 29 Jul 2022 16:16:12 +0800
Subject: [PATCH] =?UTF-8?q?feature1.0.0-img:=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bnyer/file/controller/SysFileController.java  | 2 +-
 .../com/bnyer/file/service/MinioSysFileServiceImpl.java    | 2 +-
 .../java/com/bnyer/img/controller/FhUserController.java    | 7 -------
 .../com/bnyer/img/controller/TiktokUserController.java     | 7 -------
 .../java/com/bnyer/img/controller/WxUserController.java    | 7 -------
 5 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java
index 9415d12..0c8c0aa 100644
--- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java
+++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java
@@ -105,7 +105,7 @@ public class SysFileController {
         }
     }
     @ApiOperation(value="批量上传到minio")
-    @PostMapping("/uploadBanner")
+    @PostMapping("/upload")
     @ResponseBody
     public R uploadBanner(@RequestParam("file") MultipartFile file) {
         String url = null;
diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java
index 84fd167..531ea95 100644
--- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java
+++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java
@@ -59,7 +59,7 @@ public class MinioSysFileServiceImpl implements MinioService
     public String uploadBanner(MultipartFile file) throws Exception {
         String fileName = FileUploadUtils.extractFilename(file);
         PutObjectArgs args = PutObjectArgs.builder()
-                .bucket("banner")
+                .bucket("tiktok")
                 .object(fileName)
                 .stream(file.getInputStream(), file.getSize(), -1)
                 .contentType(file.getContentType())
diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhUserController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhUserController.java
index e36628b..fb2749b 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhUserController.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhUserController.java
@@ -37,13 +37,6 @@ public class FhUserController extends BaseController {
     public TableDataInfo pageFhUser(@RequestBody @ApiParam("分页对象") FhUserPageDto dto){
         PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
         List<FhUser> fhUsers = fhUserService.queryPage(dto);
-        for (FhUser fhUser : fhUsers) {
-            if(fhUser != null){
-                if(StringUtils.isNotBlank(fhUser.getFhCode())){
-                    fhUser.setFhCode(Sm4Util.sm4Decrypt(fhUser.getFhCode()));
-                }
-            }
-        }
         return getDataTable(fhUsers);
     }
 
diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java
index 1121381..67bedaa 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java
@@ -37,13 +37,6 @@ public class TiktokUserController extends BaseController {
     public TableDataInfo pageTiktokUser(@RequestBody @ApiParam("分页对象") TiktokUserPageDto dto){
         PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
         List<TiktokUser> tiktokUsers = tiktokUserService.queryPage(dto);
-        for (TiktokUser tiktokUser : tiktokUsers) {
-            if(tiktokUser != null){
-                if(StringUtils.isNotBlank(tiktokUser.getTiktokCode())){
-                    tiktokUser.setTiktokCode(Sm4Util.sm4Decrypt(tiktokUser.getTiktokCode()));
-                }
-            }
-        }
         return getDataTable(tiktokUsers);
     }
 
diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxUserController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxUserController.java
index 961508d..403be24 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxUserController.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxUserController.java
@@ -37,13 +37,6 @@ public class WxUserController extends BaseController {
     public TableDataInfo pageWxUser(@RequestBody @ApiParam("分页对象") WxUserPageDto dto){
         PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
         List<WxUser> wxUsers = wxUserService.queryPage(dto);
-        for (WxUser wxUser : wxUsers) {
-            if(wxUser != null){
-                if(StringUtils.isNotBlank(wxUser.getWxCode())){
-                    wxUser.setWxCode(Sm4Util.sm4Decrypt(wxUser.getWxCode()));
-                }
-            }
-        }
         return getDataTable(wxUsers);
     }