From 7c46678401674f3ce4ec1c6bfe304f0d868aa643 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 28 二月 2025 15:27:25 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/AppVersionController.java | 42 +++++++++++++++++-------------------------
1 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AppVersionController.java b/src/main/java/com/zy/asrs/controller/AppVersionController.java
index 961410b..3787c4c 100644
--- a/src/main/java/com/zy/asrs/controller/AppVersionController.java
+++ b/src/main/java/com/zy/asrs/controller/AppVersionController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.service.AppVersionService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
import org.springframework.util.ClassUtils;
import org.springframework.web.bind.annotation.*;
@@ -20,12 +21,16 @@
import javax.servlet.http.HttpServletResponse;
import java.io.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.text.SimpleDateFormat;
import java.util.*;
@RestController
public class AppVersionController extends BaseController {
+ @Value("${server.port}")
+ private String port;
@Autowired
private AppVersionService appVersionService;
@@ -61,7 +66,7 @@
}
AppVersion latestApp = appVersionService.getLatestApp(type);
if (latestApp == null) {
- return R.error();
+ return R.error("鐗堟湰涓嶅瓨鍦�");
}
if (latestApp.getVersion().equals(version)) {
@@ -99,7 +104,7 @@
@ManagerAuth
public R update(AppVersion appVersion){
if (Cools.isEmpty(appVersion) || null==appVersion.getId()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
if (appVersion.getLatest() == 1) {
//淇敼鏈�鏂扮増鏈椂锛岄渶瑕佸皢鍏朵粬鐗堟湰璁剧疆涓洪潪鏈�鏂扮増
@@ -218,31 +223,18 @@
response.setStatus(404);
}
}
- @RequestMapping("/appVersion/downloadApp/{filename}/qrDownload")
- public void qrDownload(@PathVariable String filename, HttpServletResponse response) {
+ @RequestMapping("/appVersion/downloadApp/getIp")
+ public R qrDownload() {
+ String ipAddress = "";
+ String url = "";
try {
- ClassPathResource pathResource = new ClassPathResource("appVersion/" + filename);
- File file = pathResource.getFile();
- InputStream inputStream = pathResource.getInputStream();
- //杈撳嚭鏂囦欢
- InputStream fis = new BufferedInputStream(inputStream);
- byte[] buffer = new byte[fis.available()];
- fis.read(buffer);
- fis.close();
- response.reset();
-
- //鑾峰彇鏂囦欢鐨勫悕瀛楀啀娴忚鍣ㄤ笅杞介〉闈�
- String name = file.getName();
- response.addHeader("Content-Disposition", "attachment;filename=" + new String(name.getBytes(), "iso-8859-1"));
- response.addHeader("Content-Length", "" + file.length());
- OutputStream out = new BufferedOutputStream(response.getOutputStream());
- response.setContentType("application/octet-stream");
- out.write(buffer);
- out.flush();
- out.close();
- } catch (Exception e) {
+ InetAddress inetAddress = InetAddress.getLocalHost();
+ ipAddress = inetAddress.getHostAddress();
+ System.out.println("鏈満IP鍦板潃锛�" + ipAddress);
+ } catch (UnknownHostException e) {
e.printStackTrace();
- response.setStatus(404);
}
+ url = "http://" + ipAddress + ":" + port;
+ return R.ok().add(url);
}
}
--
Gitblit v1.9.1