From 3c9c1411a8f590aa057dcde7042fe283013bcad0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 25 三月 2024 08:12:39 +0800
Subject: [PATCH] # app version
---
src/main/webapp/static/js/appVersion/appVersion.js | 11 ++++++++++-
src/main/java/com/zy/asrs/controller/AppVersionController.java | 27 +++++++++++++++++++++++++++
src/main/webapp/views/appVersion/appVersion.html | 9 +++++++++
3 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AppVersionController.java b/src/main/java/com/zy/asrs/controller/AppVersionController.java
index dd879b2..961410b 100644
--- a/src/main/java/com/zy/asrs/controller/AppVersionController.java
+++ b/src/main/java/com/zy/asrs/controller/AppVersionController.java
@@ -218,4 +218,31 @@
response.setStatus(404);
}
}
+ @RequestMapping("/appVersion/downloadApp/{filename}/qrDownload")
+ public void qrDownload(@PathVariable String filename, HttpServletResponse response) {
+ 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) {
+ e.printStackTrace();
+ response.setStatus(404);
+ }
+ }
}
diff --git a/src/main/webapp/static/js/appVersion/appVersion.js b/src/main/webapp/static/js/appVersion/appVersion.js
index d036a0e..eb9c691 100644
--- a/src/main/webapp/static/js/appVersion/appVersion.js
+++ b/src/main/webapp/static/js/appVersion/appVersion.js
@@ -177,7 +177,16 @@
parent.location.reload()
})
}else{
- window.open(baseUrl + "/appVersion/downloadApp/" + data.path);
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: 'APP涓嬭浇',
+ content: $('#qrCode').html(),
+ success: function (layero, dIndex) {
+
+ }
+ })
+ // window.open(baseUrl + "/appVersion/downloadApp/" + data.path);
}
break;
}
diff --git a/src/main/webapp/views/appVersion/appVersion.html b/src/main/webapp/views/appVersion/appVersion.html
index e839f80..ea74dad 100644
--- a/src/main/webapp/views/appVersion/appVersion.html
+++ b/src/main/webapp/views/appVersion/appVersion.html
@@ -67,6 +67,7 @@
<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>
</body>
+
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
<form id="detail" lay-filter="detail" class="layui-form admin-form model-form" >
@@ -109,5 +110,13 @@
</div>
</form>
</script>
+
+<!-- 浜岀淮鐮佷笅杞藉脊绐� -->
+<script type="text/html" id="qrCode">
+ <div>123</div>
+ {{#each data}}
+ <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
+ {{/each}}
+</script>
</html>
--
Gitblit v1.9.1