From 90a9ddd0a869e8d1c5319c83b560c411dfba655b Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期六, 07 九月 2024 15:15:43 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/controller/QRCodeController.java | 18 ++++++++++++------
src/main/java/com/whyc/App.java | 2 +-
src/main/java/com/whyc/config/WebConfig.java | 18 ++++++++++++++++++
3 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/App.java b/src/main/java/com/whyc/App.java
index ce41089..449e6a5 100644
--- a/src/main/java/com/whyc/App.java
+++ b/src/main/java/com/whyc/App.java
@@ -32,7 +32,7 @@
private Integer httpPort;
@Bean
- @ConditionalOnProperty(prefix = "spring.profiles",name = "active",havingValue = "prod-ssl")
+ //@ConditionalOnProperty(prefix = "spring.profiles",name = "active",havingValue = "prod-ssl")
public ServletWebServerFactory servletContainer() {
TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
// 娣诲姞http
diff --git a/src/main/java/com/whyc/config/WebConfig.java b/src/main/java/com/whyc/config/WebConfig.java
new file mode 100644
index 0000000..a8f4dd2
--- /dev/null
+++ b/src/main/java/com/whyc/config/WebConfig.java
@@ -0,0 +1,18 @@
+package com.whyc.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.ByteArrayHttpMessageConverter;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+ @Override
+ public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+ converters.add(new ByteArrayHttpMessageConverter());
+ }
+}
diff --git a/src/main/java/com/whyc/controller/QRCodeController.java b/src/main/java/com/whyc/controller/QRCodeController.java
index 573463f..813106a 100644
--- a/src/main/java/com/whyc/controller/QRCodeController.java
+++ b/src/main/java/com/whyc/controller/QRCodeController.java
@@ -3,10 +3,9 @@
import com.whyc.dto.Response;
import com.whyc.service.QRCodeService;
import org.springframework.beans.factory.annotation.Autowired;
-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.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
/**
* 浜岀淮鐮佺殑璇嗗埆鍜岀敓鎴�
@@ -24,9 +23,16 @@
return new Response().set(1,res);
}
- @PostMapping("extractAndGetData")
+ @PostMapping(value = "extractAndGetData")
private Response extractAndGetData(@RequestBody byte[] data){
- return service.extractAndGetData(data);
+ //private Response extractAndGetData(@RequestBody String data){
+ return new Response().set(1,"ok");
+ //return service.extractAndGetData(data);
+ }
+
+ @GetMapping("test")
+ private Response test(){
+ return new Response().set(1,"test");
}
}
--
Gitblit v1.9.1