From a7d899583f189ca12c6a61ff07cb80e6667a6bd5 Mon Sep 17 00:00:00 2001 From: wanghao Date: Fri, 6 Sep 2024 14:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- ruoyi-admin/src/main/resources/logback.xml | 2 +- .../controller/PdaApkVersionController.java | 71 +++++++++++-------- .../api/controller/PdaVersionController.java | 38 ---------- .../ruoyi/api/mapper/PdaApkVersionMapper.java | 2 +- .../api/service/IPdaApkVersionService.java | 2 +- .../impl/PdaApkVersionServiceImpl.java | 5 +- .../resources/mapper/PdaApkVersionMapper.xml | 3 - .../pda/pda_version/pda_version.html | 14 ++-- .../common/utils/file/MimeTypeUtils.java | 4 +- .../ruoyi/framework/config/ShiroConfig.java | 1 + 11 files changed, 56 insertions(+), 88 deletions(-) delete mode 100644 ruoyi-api/src/main/java/com/ruoyi/api/controller/PdaVersionController.java diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index ac59f60..632da07 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,7 +9,7 @@ ruoyi: # 实例演示开关 demoEnabled: false # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + profile: F:/lundang/uploadPath # 获取ip地址开关 addressEnabled: false diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index a360583..a2b3abf 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/PdaApkVersionController.java b/ruoyi-api/src/main/java/com/ruoyi/api/controller/PdaApkVersionController.java index 30d34f0..2a586ef 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/PdaApkVersionController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/controller/PdaApkVersionController.java @@ -6,8 +6,10 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.IpUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.api.utils.Md5Utils; +import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.api.domain.*; import com.ruoyi.api.service.IPdaApkVersionService; @@ -24,14 +26,13 @@ import java.util.List; /** * 手持版本升级Controller - * + * * @author ruoyi * @date 2023-04-06 */ @Controller @RequestMapping("/pda/pda_version") -public class PdaApkVersionController extends BaseController -{ +public class PdaApkVersionController extends BaseController { private String prefix = "pda/pda_version"; @Autowired @@ -39,8 +40,7 @@ public class PdaApkVersionController extends BaseController @RequiresPermissions("pda:pda_version:view") @GetMapping() - public String pda_version() - { + public String pda_version() { return prefix + "/pda_version"; } @@ -50,8 +50,7 @@ public class PdaApkVersionController extends BaseController @RequiresPermissions("pda:pda_version:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(PdaApkVersion pdaApkVersion) - { + public TableDataInfo list(PdaApkVersion pdaApkVersion) { startPage(); List list = pdaApkVersionService.selectPdaApkVersionList(pdaApkVersion); return getDataTable(list); @@ -64,8 +63,7 @@ public class PdaApkVersionController extends BaseController @Log(title = "手持版本升级", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(PdaApkVersion pdaApkVersion) - { + public AjaxResult export(PdaApkVersion pdaApkVersion) { List list = pdaApkVersionService.selectPdaApkVersionList(pdaApkVersion); ExcelUtil util = new ExcelUtil(PdaApkVersion.class); return util.exportExcel(list, "手持版本升级数据"); @@ -75,8 +73,7 @@ public class PdaApkVersionController extends BaseController * 新增手持版本升级 */ @GetMapping("/add") - public String add() - { + public String add() { return prefix + "/add"; } @@ -87,26 +84,25 @@ public class PdaApkVersionController extends BaseController @Log(title = "手持版本升级", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(MultipartFile file, PdaApkVersion pdaApkVersion) - { + public AjaxResult addSave(MultipartFile file, PdaApkVersion pdaApkVersion) { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath()+"/apk"; + String filePath = RuoYiConfig.getUploadPath() + "/apk"; // 上传并返回新文件名称 try { String fileName = FileUploadUtils.upload(filePath, file); // System.out.println("上传路径"+filePath+fileName); // D:/ruoyi/uploadPath/upload/profile/upload/2023/04/06/app-debug_20230406170208A001.apk String pathname = filePath + fileName; - System.out.println("地址1"+pathname); - pathname= pathname.replace("/profile/upload/apk",""); - System.out.println("地址2："+pathname); - File file1=new File(pathname); - System.out.println("文件获取："+file1.exists()); - System.out.println(file1.length()/1024); - pdaApkVersion.setApkSize(file1.length()/1024); + System.out.println("地址1" + pathname); + pathname = pathname.replace("/profile/upload/apk", ""); + System.out.println("地址2：" + pathname); + File file1 = new File(pathname); + System.out.println("文件获取：" + file1.exists()); + System.out.println(file1.length() / 1024); + pdaApkVersion.setApkSize(file1.length() / 1024); pdaApkVersion.setApkMd5(Md5Utils.getFileMD5(file1)); - pdaApkVersion.setDownloadUrl("http://10.32.128.150:90"+fileName); + pdaApkVersion.setDownloadUrl( "http://119.45.202.115:8090"+fileName); } catch (IOException e) { e.printStackTrace(); } @@ -119,11 +115,19 @@ public class PdaApkVersionController extends BaseController */ @RequiresPermissions("pda:pda_version:edit") @GetMapping("/edit/{objid}") - public String edit(@PathVariable("objid") Long objid, ModelMap mmap) - { + @ResponseBody + public AjaxResult edit(@PathVariable("objid") Long objid) { PdaApkVersion pdaApkVersion = pdaApkVersionService.selectPdaApkVersionByObjid(objid); - mmap.put("pdaApkVersion", pdaApkVersion); - return prefix + "/edit"; + String downloadUrl = pdaApkVersion.getDownloadUrl(); + String substring = downloadUrl.substring(downloadUrl.indexOf("/apk"), downloadUrl.length()); + try { + FileUtils.deleteFile(RuoYiConfig.getUploadPath() + substring); + }catch (Exception e){ + + } + + return toAjax(pdaApkVersionService.deletePdaApkVersionByObjid(objid)); + } /** @@ -133,8 +137,7 @@ public class PdaApkVersionController extends BaseController @Log(title = "手持版本升级", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(PdaApkVersion pdaApkVersion) - { + public AjaxResult editSave(PdaApkVersion pdaApkVersion) { return toAjax(pdaApkVersionService.updatePdaApkVersion(pdaApkVersion)); } @@ -143,10 +146,16 @@ public class PdaApkVersionController extends BaseController */ @RequiresPermissions("pda:pda_version:remove") @Log(title = "手持版本升级", businessType = BusinessType.DELETE) - @PostMapping( "/remove") + @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { + System.out.println(ids); + PdaApkVersion pdaApkVersion = pdaApkVersionService.selectPdaApkVersionByObjid(Long.valueOf(ids)); + String downloadUrl = pdaApkVersion.getDownloadUrl(); + if (downloadUrl!=null&&!downloadUrl.isEmpty()){ + String substring = downloadUrl.substring(downloadUrl.indexOf("/apk"), downloadUrl.length()); + FileUtils.deleteFile(RuoYiConfig.getUploadPath() + substring); + } return toAjax(pdaApkVersionService.deletePdaApkVersionByObjids(ids)); } } diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/PdaVersionController.java b/ruoyi-api/src/main/java/com/ruoyi/api/controller/PdaVersionController.java deleted file mode 100644 index e383471..0000000 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/PdaVersionController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.ruoyi.api.controller; - -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.api.domain.APKVersion; -import com.ruoyi.api.service.IPdaApkVersionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/api") -public class PdaVersionController { - @Autowired - private IPdaApkVersionService service; - - @GetMapping("/getVersion") - public String getVersion(){ - APKVersion apkVersion=service.getVersion(); - apkVersion.setCode(0); - apkVersion.setMsg(""); - if (apkVersion==null){ - apkVersion=new APKVersion(); - apkVersion.setUpdateStatus(0); - - - }else { - apkVersion.setUpdateStatus(1); - } - - - String s = JSONObject.toJSONString(apkVersion); - System.out.println("请求版本信息"+s); - return s; - } - -} diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/PdaApkVersionMapper.java b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/PdaApkVersionMapper.java index 76c0afa..701bf6d 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/PdaApkVersionMapper.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/PdaApkVersionMapper.java @@ -63,5 +63,5 @@ public interface PdaApkVersionMapper */ public int deletePdaApkVersionByObjids(String[] objids); - APKVersion getVersion(); + } diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/service/IPdaApkVersionService.java b/ruoyi-api/src/main/java/com/ruoyi/api/service/IPdaApkVersionService.java index 334f157..8021215 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/service/IPdaApkVersionService.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/service/IPdaApkVersionService.java @@ -61,5 +61,5 @@ public interface IPdaApkVersionService { */ public int deletePdaApkVersionByObjid(Long objid); - APKVersion getVersion(); + } diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/PdaApkVersionServiceImpl.java b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/PdaApkVersionServiceImpl.java index 2338028..6a65dee 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/PdaApkVersionServiceImpl.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/PdaApkVersionServiceImpl.java @@ -97,8 +97,5 @@ public class PdaApkVersionServiceImpl implements IPdaApkVersionService return pdaApkVersionMapper.deletePdaApkVersionByObjid(objid); } - @Override - public APKVersion getVersion() { - return pdaApkVersionMapper.getVersion(); - } + } diff --git a/ruoyi-api/src/main/resources/mapper/PdaApkVersionMapper.xml b/ruoyi-api/src/main/resources/mapper/PdaApkVersionMapper.xml index c30bab3..ae153bb 100644 --- a/ruoyi-api/src/main/resources/mapper/PdaApkVersionMapper.xml +++ b/ruoyi-api/src/main/resources/mapper/PdaApkVersionMapper.xml @@ -78,8 +78,5 @@ - \ No newline at end of file diff --git a/ruoyi-api/src/main/resources/templates/pda/pda_version/pda_version.html b/ruoyi-api/src/main/resources/templates/pda/pda_version/pda_version.html index 97d7537..1aaee4e 100644 --- a/ruoyi-api/src/main/resources/templates/pda/pda_version/pda_version.html +++ b/ruoyi-api/src/main/resources/templates/pda/pda_version/pda_version.html @@ -27,12 +27,12 @@ 添加 - - 修改 - - - 删除 - + + + + + + 导出 @@ -99,7 +99,7 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); + // actions.push('删除 '); actions.push('删除'); return actions.join(''); } 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 371e823..2ffc14a 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 @@ -36,7 +36,9 @@ public class MimeTypeUtils // 视频格式 "mp4", "avi", "rmvb", // pdf - "pdf" }; + "pdf", + // 安装包 + "apk"}; public static String getExtension(String prefix) { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java index 21f498f..de56994 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java @@ -285,6 +285,7 @@ public class ShiroConfig filterChainDefinitionMap.put("/fonts/**", "anon"); filterChainDefinitionMap.put("/img/**", "anon"); filterChainDefinitionMap.put("/ajax/**", "anon"); + filterChainDefinitionMap.put("/profile/**", "anon"); filterChainDefinitionMap.put("/js/**", "anon"); filterChainDefinitionMap.put("/ruoyi/**", "anon"); filterChainDefinitionMap.put("/api/**", "anon");