From 619b45d00468b35509f5138b2dfa5131e2963e34 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 25 三月 2024 13:16:39 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/appVersion/appVersion.js | 42 ++++++++++++++++++---
src/main/java/com/zy/asrs/controller/AppVersionController.java | 38 +++++++-----------
src/main/webapp/views/appVersion/appVersion.html | 12 ++++-
3 files changed, 60 insertions(+), 32 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..b65b7ae 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;
@@ -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);
}
}
diff --git a/src/main/webapp/static/js/appVersion/appVersion.js b/src/main/webapp/static/js/appVersion/appVersion.js
index eb9c691..db58cec 100644
--- a/src/main/webapp/static/js/appVersion/appVersion.js
+++ b/src/main/webapp/static/js/appVersion/appVersion.js
@@ -1,4 +1,5 @@
var pageCurr;
+var odtotr;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin','upload'], function(){
@@ -135,6 +136,7 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(appVersion)', function(obj){
var data = obj.data;
+ odtotr = data
switch (obj.event) {
case 'edit':
showEditModel(data);
@@ -177,15 +179,36 @@
parent.location.reload()
})
}else{
- admin.open({
- type: 1,
- area: '600px',
- title: 'APP涓嬭浇',
- content: $('#qrCode').html(),
- success: function (layero, dIndex) {
+ var ipAddress = '';
+ $.ajax({
+ url: baseUrl+"/appVersion/downloadApp/getIp",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ cache: false,
+ processData: false,
+ contentType: false,
+ success: function (res) {
+ ipAddress = res.data
+ admin.open({
+ type: 1,
+ area: '400px',
+ title: 'APP涓嬭浇',
+ content:
+ `<div>
+ <img class="template-code"
+ src="${baseUrl}/mac/code/auth?type=2¶m=${ipAddress}/${baseUrl}/appVersion/downloadApp/${data.path}"
+ width="100%">
+ </div>
+ <div style="height: 50px;display: flex;align-items: center;justify-content: center">
+ <button class="layui-btn layui-btn-sm" lay-event="down" onclick="download()">涓嬭浇鍒版湰鍦�</button>
+ </div>`,
+ success: function (layero, dIndex) {
+ }
+ })
}
})
+
// window.open(baseUrl + "/appVersion/downloadApp/" + data.path);
}
break;
@@ -301,3 +324,10 @@
page: {curr: pageCurr}
});
}
+
+function download() {
+ console.log(1)
+ layer.closeAll();
+ window.open(baseUrl + "/appVersion/downloadApp/" + odtotr.path);
+}
+
diff --git a/src/main/webapp/views/appVersion/appVersion.html b/src/main/webapp/views/appVersion/appVersion.html
index ea74dad..c238456 100644
--- a/src/main/webapp/views/appVersion/appVersion.html
+++ b/src/main/webapp/views/appVersion/appVersion.html
@@ -42,6 +42,7 @@
</div>
</div>
+
<form id="uploadFile" enctype="multipart/form-data" style="display: none;" >
<input type="file" name="file" id="appFile">
<input type="button" value="涓婁紶"/>
@@ -63,9 +64,14 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/appVersion/appVersion.js" charset="utf-8"></script>
+
+<div id="qrCode" class="template-barcode">
+ <div>123</div>
+</div>
</body>
<!-- 琛ㄥ崟寮圭獥 -->
@@ -112,11 +118,11 @@
</script>
<!-- 浜岀淮鐮佷笅杞藉脊绐� -->
-<script type="text/html" id="qrCode">
- <div>123</div>
+<script type="text/template" id="templatePreview1" class="template-barcode">
{{#each data}}
- <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
+ <img class="template-code" src="{{this.barcodeUrl}}" width="90%">
{{/each}}
</script>
+
</html>
--
Gitblit v1.9.1