From d3844ee25fbb06b656b5521978f083695d194b07 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 29 Apr 2025 09:56:11 +0800
Subject: [PATCH] feat(mall): 添加门票核销功能

---
 src/main/java/cc/mrbird/febs/mall/controller/CommonController.java |   82 ++++++++++++++++++++++++++++------------
 1 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
index d686a02..7d7ad7f 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
@@ -150,35 +150,36 @@
      */
     @PostMapping(value = "/uploadFileBase64")
     @ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
-    public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) {
+    public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) throws IOException {
         if (file == null || file.isEmpty()) {
             return new FebsResponse().message("上传文件为空");
         }
+        return FileUtil.fileUploadEsc(file,resourceUrl,resourcePath);
 
-        //文件加密
-        BASE64Encoder base64Encoder =new BASE64Encoder();
-        String base64EncoderImg = null;
-        try {
-            base64EncoderImg = base64Encoder.encode(file.getBytes());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        String imageFuffix = ".png";
-        String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageFuffix;
-        String imageName = "uploadeFile/" + imageNames;
-        OssUtils.uploadFileWithBase64(base64EncoderImg, imageName);
-        String bucket_name ="https://excoin.oss-cn-hangzhou.aliyuncs.com";
-        String url = bucket_name + "/" + imageName;
-
-        Map<String,Object> map = new HashMap<String,Object>();
-        Map<String,Object> map2 = new HashMap<String,Object>();
-        map.put("code",0);//0表示成功,1失败
-        map.put("msg","上传成功");//提示消息
-        map.put("data",map2);
-        map2.put("src",url);//图片url
-        map2.put("title",imageNames);//图片名称,这个会显示在输入框里
-        return map;
+//        //文件加密
+//        BASE64Encoder base64Encoder =new BASE64Encoder();
+//        String base64EncoderImg = null;
+//        try {
+//            base64EncoderImg = base64Encoder.encode(file.getBytes());
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//
+//        String imageFuffix = ".png";
+//        String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageFuffix;
+//        String imageName = "uploadeFile/" + imageNames;
+//        OssUtils.uploadFileWithBase64(base64EncoderImg, imageName);
+//        String bucket_name ="https://excoin.oss-cn-hangzhou.aliyuncs.com";
+//        String url = bucket_name + "/" + imageName;
+//
+//        Map<String,Object> map = new HashMap<String,Object>();
+//        Map<String,Object> map2 = new HashMap<String,Object>();
+//        map.put("code",0);//0表示成功,1失败
+//        map.put("msg","上传成功");//提示消息
+//        map.put("data",map2);
+//        map2.put("src",url);//图片url
+//        map2.put("title",imageNames);//图片名称,这个会显示在输入框里
+//        return map;
     }
 
     @ApiOperation(value = "数据字典")
@@ -188,6 +189,37 @@
         return new FebsResponse().success().data(dic);
     }
 
+    @ApiOperation(value = "base64FileUpload上传")
+    @PostMapping(value = "/base64FileUpload")
+    public Map<String,Object> base64FileUpload(@RequestBody @Validated MultipartFile file) throws IOException {
+        if (file == null || file.isEmpty()) {
+            return new FebsResponse().message("上传文件为空").fail();
+        }
+
+        try {
+            byte[] fileBytes = file.getBytes();
+            String base64Str = java.util.Base64.getEncoder().encodeToString(fileBytes);
+            String imageSuffix = "." + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1);
+            String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageSuffix;
+            String imageName = "hc/" + imageNames;
+            OssUtils.uploadFileWithBase64(base64Str, imageName);
+            String bucket_name = "https://excoin.oss-cn-hangzhou.aliyuncs.com";
+            String url = bucket_name + "/" + imageName;
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            Map<String,Object> map2 = new HashMap<String,Object>();
+            map2.put("src",url);//图片url
+            map2.put("title",imageNames);//图片名称,这个会显示在输入框里
+            map.put("code",0);//0表示成功,1失败
+            map.put("msg","上传成功");//提示消息
+            map.put("data",map2);
+            return map;
+        } catch (IOException e) {
+            log.error("上传失败: {}", e.getMessage());
+            return new FebsResponse().message("上传失败").fail();
+        }
+    }
+
     @ApiOperation(value = "base64上传")
     @PostMapping(value = "/base64Upload")
     public FebsResponse base64Upload(@RequestBody @Validated Base64UploadDto base64UploadDto) {

--
Gitblit v1.9.1