Pārlūkot izejas kodu

推广员bug修复,调试

xgb 1 nedēļu atpakaļ
vecāks
revīzija
a9542355a5

+ 56 - 0
fs-service/src/main/java/com/fs/utils/FileCacheService.java

@@ -0,0 +1,56 @@
+package com.fs.utils;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+@Service
+public class FileCacheService {
+
+    @Value("${getTuiImg:''}")
+    private String getTuiImg;
+
+    @Value("${getTuiFont:''}")
+    private String getTuiFont;
+
+    @Value("${tuiImgCache:0}")
+    private String tuiImgCache;
+
+    private byte[] templateBytes;
+    private byte[] fontBytes;
+
+    @PostConstruct
+    public void init() throws IOException {
+        if(StringUtils.equals("1",tuiImgCache)) {
+            // 缓存模板图片文件
+            this.templateBytes = Files.readAllBytes(Paths.get(getTuiImg));
+            // 缓存字体文件
+            this.fontBytes = Files.readAllBytes(Paths.get(getTuiFont));
+        }
+    }
+
+    /**
+     * 获取模板图片的 InputStream
+     */
+    public InputStream getTemplateStream() {
+        return new ByteArrayInputStream(templateBytes);
+    }
+
+    /**
+     * 获取字体文件的 InputStream
+     */
+    public InputStream getFontStream() {
+        return new ByteArrayInputStream(fontBytes);
+    }
+
+    // 可选:提供重新加载方法(如需热更新)
+    public void reload() throws IOException {
+        this.templateBytes = Files.readAllBytes(Paths.get(getTuiImg));
+        this.fontBytes = Files.readAllBytes(Paths.get(getTuiFont));
+    }
+}

+ 20 - 2
fs-user-app/src/main/java/com/fs/app/controller/store/UserScrmController.java

@@ -1,9 +1,11 @@
 package com.fs.app.controller.store;
 
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.extra.qrcode.QrCodeUtil;
+import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSON;
 import com.fs.app.annotation.Login;
 import com.fs.app.controller.AppBaseController;
@@ -13,18 +15,21 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.ResponseResult;
 import com.fs.common.exception.CustomException;
 import com.fs.common.param.BaseQueryParam;
+import com.fs.core.config.WxMaConfiguration;
 import com.fs.course.param.newfs.FsUserCourseBeMemberParam;
 import com.fs.course.service.IFsUserCourseVideoService;
 import com.fs.hisStore.domain.FsStoreOrderScrm;
-import com.fs.hisStore.domain.FsUserScrm;
 import com.fs.hisStore.domain.FsUserBillScrm;
 import com.fs.hisStore.domain.FsUserPromoterApplyScrm;
+import com.fs.hisStore.domain.FsUserScrm;
 import com.fs.hisStore.param.*;
 import com.fs.hisStore.service.*;
 import com.fs.hisStore.vo.FsStoreOrderTuiVO;
 import com.fs.hisStore.vo.FsStoreProductRelationQueryVO;
 import com.fs.hisStore.vo.FsUserExtractVO;
 import com.fs.hisStore.vo.FsUserTuiVO;
+import com.fs.utils.FileCacheService;
+import com.fs.wx.miniapp.config.WxMaProperties;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -36,14 +41,24 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.FileImageOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 
 
 @Api("个人中心")
@@ -71,7 +86,10 @@ public class UserScrmController extends AppBaseController {
     private IFsUserCourseVideoService courseVideoService;
     @Autowired
     private IFsUserScrmService fsUserService;
-
+    @Autowired
+    private FileCacheService fileCacheService;
+    @Autowired
+    private WxMaProperties maProperties;
     /**
      * 获取用户信息
      * @param request

BIN
fs-user-app/src/main/resources/qr.jpg