Commit 41fece9c authored by daniel's avatar daniel

fix(qrcode): 小程序二维码生成

parent c1aec8ae
...@@ -11,6 +11,7 @@ import lombok.AllArgsConstructor; ...@@ -11,6 +11,7 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
...@@ -26,9 +27,13 @@ import java.util.zip.ZipOutputStream; ...@@ -26,9 +27,13 @@ import java.util.zip.ZipOutputStream;
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j
public class AliOssUtil { public class AliOssUtil {
@Value("${geexek.alioss.endpoint}")
private String endpoint; private String endpoint;
@Value("${geexek.alioss.access-key-id}")
private String accessKeyId; private String accessKeyId;
@Value("${geexek.alioss.access-key-secret}")
private String accessKeySecret; private String accessKeySecret;
@Value("${geexek.alioss.bucket-name}")
private String bucketName; private String bucketName;
/** /**
* 文件上传 * 文件上传
......
...@@ -17,10 +17,7 @@ import org.springframework.data.redis.core.ValueOperations; ...@@ -17,10 +17,7 @@ import org.springframework.data.redis.core.ValueOperations;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
...@@ -105,13 +102,13 @@ public class ResourcesController { ...@@ -105,13 +102,13 @@ public class ResourcesController {
@RequestMapping("/download/{cmptid}") @RequestMapping("/download/{cmptid}")
public void download(@PathVariable("cmptid") Integer cmptid, HttpServletResponse response) throws IOException { public void download(@PathVariable("cmptid") Integer cmptid, @RequestParam(value = "page",defaultValue = "pages/race/raceHome") String page, HttpServletResponse response) throws IOException {
response.addHeader("Content-Type", "application/octet-stream"); response.addHeader("Content-Type", "application/octet-stream");
response.addHeader("Content-Disposition", "attachment; filename=qrcode.jpg"); response.addHeader("Content-Disposition", "attachment; filename=qrcode.jpg");
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("scene", "raceId=" + cmptid); obj.put("scene", "raceId=" + cmptid);
// 修改为小程序页面路径 by 2025-06-12 // 修改为小程序页面路径 by 2025-06-12
obj.put("page", "pages/race/raceHome"); obj.put("page", page);
obj.put("width", "1280"); obj.put("width", "1280");
obj.put("check_path", false); obj.put("check_path", false);
String partnerId = cmptService.getPartnerId(cmptid); String partnerId = cmptService.getPartnerId(cmptid);
......
...@@ -21,7 +21,7 @@ import java.util.*; ...@@ -21,7 +21,7 @@ import java.util.*;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@RequestMapping("/api-common/v1") @RequestMapping("/api-common/v1")
@Api(tags = "公共相关",value = "分销相关接口") @Api(tags = "公共相关",value = "上传相关接口")
@Slf4j @Slf4j
public class CommonController { public class CommonController {
......
spring.profiles.active=dev spring.profiles.active=dev
spring.session.store-type=REDIS spring.session.store-type=REDIS
spring.session.timeout=PT30M spring.session.timeout=PT30M
# ???oss??
geexek.alioss.access-key-id=LTAI5t5datcjmyTp1hbd3T3k geexek.alioss.access-key-id=LTAI5t5datcjmyTp1hbd3T3k
geexek.alioss.access-key-secret=iN3T1eN5u35XCkJgrjzLqSKtY3NV81 geexek.alioss.access-key-secret=iN3T1eN5u35XCkJgrjzLqSKtY3NV81
geexek.alioss.endpoint=oss-cn-hangzhou.aliyuncs.com geexek.alioss.endpoint=oss-cn-hangzhou.aliyuncs.com
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment