diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysAppController.java new file mode 100644 index 0000000..2ff9402 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysAppController.java @@ -0,0 +1,21 @@ +package com.ruoyi.web.controller.system; + +import com.ruoyi.common.core.domain.AjaxResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; + +@RestController +@RequestMapping("/system/app") +public class SysAppController { + + @GetMapping("/version") + public AjaxResult version() { + Map result = new HashMap<>(); + result.put("downloadUrl", "/common/download?fileName=ry.apk&delete=false"); + return AjaxResult.success(result); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java index f968f1a..c7db4ce 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java @@ -2,7 +2,7 @@ package com.ruoyi.common.utils.file; /** * 媒体类型工具类 - * + * * @author ruoyi */ public class MimeTypeUtils @@ -16,7 +16,7 @@ public class MimeTypeUtils public static final String IMAGE_BMP = "image/bmp"; public static final String IMAGE_GIF = "image/gif"; - + public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" }; public static final String[] FLASH_EXTENSION = { "swf", "flv" }; @@ -36,7 +36,10 @@ public class MimeTypeUtils // 视频格式 "mp4", "avi", "rmvb", // pdf - "pdf" }; + "pdf", + //apk + "apk" + }; public static String getExtension(String prefix) { diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 650cbb7..89e5354 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -49,7 +49,8 @@ "vue-qr": "^4.0.9", "vue-router": "3.4.9", "vuedraggable": "2.24.3", - "vuex": "3.6.0" + "vuex": "3.6.0", + "@fortawesome/fontawesome-free": "^6.5.1" }, "devDependencies": { "@vue/cli-plugin-babel": "4.4.6", diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index ebef026..19cbfe2 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -1736,7 +1736,11 @@ export default { barcodeInformationDelete: ' 条码信息删除 ', barcodeInformationExport: ' 条码信息导出 ', barcodeInformationPrint: ' 条码信息打印 ' - } + }, + downloadApkInfo: { + downloadApkInfo: ' 下载APK信息 ' + }, + downloadApk: '下载手持机' }, diff --git a/ruoyi-ui/src/lang/hu.js b/ruoyi-ui/src/lang/hu.js index ebef026..19cbfe2 100644 --- a/ruoyi-ui/src/lang/hu.js +++ b/ruoyi-ui/src/lang/hu.js @@ -1736,7 +1736,11 @@ export default { barcodeInformationDelete: ' 条码信息删除 ', barcodeInformationExport: ' 条码信息导出 ', barcodeInformationPrint: ' 条码信息打印 ' - } + }, + downloadApkInfo: { + downloadApkInfo: ' 下载APK信息 ' + }, + downloadApk: '下载手持机' }, diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index ebef026..19cbfe2 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -1736,7 +1736,11 @@ export default { barcodeInformationDelete: ' 条码信息删除 ', barcodeInformationExport: ' 条码信息导出 ', barcodeInformationPrint: ' 条码信息打印 ' - } + }, + downloadApkInfo: { + downloadApkInfo: ' 下载APK信息 ' + }, + downloadApk: '下载手持机' }, diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index b13a2e6..fa7d163 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -7,6 +7,7 @@ import './assets/styles/element-variables.scss' import '@/assets/styles/index.scss' // global css import '@/assets/styles/ruoyi.scss' // ruoyi css +import '@fortawesome/fontawesome-free/css/all.css' // font-awesome import App from './App' import store from './store' import router from './router' diff --git a/ruoyi-ui/src/views/tool/apk/index.vue b/ruoyi-ui/src/views/tool/apk/index.vue new file mode 100644 index 0000000..f1da26d --- /dev/null +++ b/ruoyi-ui/src/views/tool/apk/index.vue @@ -0,0 +1,228 @@ + + + + +