From c7a96d48fb9cb2493b6ebe64980727dec3df16b4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 09 Jul 2022 16:42:53 +0800
Subject: [PATCH] 溯源码生成修改
---
src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java | 4 ----
src/main/resources/application-dev.yml | 4 ++++
src/main/resources/application-prod.yml | 4 ++++
src/main/resources/application-test.yml | 3 ++-
src/main/java/org/springblade/modules/qrcode/QrCodeController.java | 7 ++++---
5 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
index e8d02ca..2cc52b9 100644
--- a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
+++ b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
@@ -2,6 +2,7 @@
import com.google.zxing.WriterException;
import lombok.AllArgsConstructor;
+import org.springblade.common.config.TraceabilityCodeConfig;
import org.springblade.common.utils.QRCodeUtil;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
@@ -28,8 +29,6 @@
@RequestMapping("/qrCode")
@AllArgsConstructor
public class QrCodeController {
-
- private final IUserService userService;
/**
* 二维码生成-字节流
@@ -69,12 +68,14 @@
*/
@GetMapping("/getQrCodeBase64")
public String getQrCodeBase64(String code) throws Exception{
- String url = "http://61.131.136.25:2080/securityInfo.html";
+ //获取访问路径
+ String url = TraceabilityCodeConfig.getCodeUrl();
if (null!=code) {
String encoded = URLEncoder.encode(code,"UTF-8");
String content = url + "?code=" + encoded;
byte[] qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
String encode = new BASE64Encoder().encode(qrCodeImage);
+ //返回图片
return "data:image/png;base64,"+encode;
}
return null;
diff --git a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
index 002d236..ceea852 100644
--- a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
+++ b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
@@ -1,5 +1,4 @@
package org.springblade.modules.traceability.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiOperation;
@@ -10,17 +9,14 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.recovery.entity.Recovery;
import org.springblade.modules.recovery.service.RecoveryService;
import org.springblade.modules.traceability.dto.TraceabilityDTO;
import org.springblade.modules.traceability.dto.TraceabilityDetailDTO;
import org.springblade.modules.traceability.entity.Traceability;
import org.springblade.modules.traceability.service.TraceabilityService;
import org.springblade.modules.traceability.vo.TraceabilityVO;
-import org.springframework.retry.annotation.Recover;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-
import javax.validation.Valid;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fc6c7d4..16f2749 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -52,3 +52,7 @@
upload-domain: http://localhost:8999
remote-path: /usr/share/nginx/html
+# 溯源码扫描读取页面 url
+zhny:
+ codeUrl: http://182.106.212.58:8013/draw/traceablityInfo.html
+
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index fab7885..cf00ce5 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -38,3 +38,7 @@
remote-mode: true
upload-domain: http://localhost:8999
remote-path: /usr/share/nginx/html
+
+# 溯源码扫描读取页面 url
+zhny:
+ codeUrl: http://182.106.212.58:8013/draw/traceablityInfo.html
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 968981d..c3a5ebb 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -39,5 +39,6 @@
upload-domain: http://localhost:8999
remote-path: /usr/share/nginx/html
+# 溯源码扫描读取页面 url
zhny:
- codeUrl: http://61.131.136.25:2080/securityInfo.html
+ codeUrl: http://182.106.212.58:8013/draw/traceablityInfo.html
--
Gitblit v1.9.3