wangh
/
beijing_daxing_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加 版本更新

Browse Source
master
wanghao 2 weeks ago
parent 69ecc818c0
commit a7d899583f
11 changed files with 56 additions and 88 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/resources/application.yml
Unescape Escape View File

@ -9,7 +9,7 @@ ruoyi:
# 实例演示开关 # 实例演示开关
demoEnabled: false demoEnabled: false
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: D:/ruoyi/uploadPath profile: F:/lundang/uploadPath
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: false addressEnabled: false

2
ruoyi-admin/src/main/resources/logback.xml
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<property name="log.path" value="/home/ruoyi/logs" /> <property name="log.path" value="/lundang/ruoyi/logs" />
<!-- 日志输出格式 --> <!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" /> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

71
ruoyi-api/src/main/java/com/ruoyi/api/controller/PdaApkVersionController.java
Unescape Escape View File

@ -6,8 +6,10 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.IpUtils;
import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.api.utils.Md5Utils; import com.ruoyi.api.utils.Md5Utils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.api.domain.*; import com.ruoyi.api.domain.*;
import com.ruoyi.api.service.IPdaApkVersionService; import com.ruoyi.api.service.IPdaApkVersionService;
@ -24,14 +26,13 @@ import java.util.List;
/** /**
* 手持版本升级Controller * 手持版本升级Controller
* *
* @author ruoyi * @author ruoyi
* @date 2023-04-06 * @date 2023-04-06
*/ */
@Controller @Controller
@RequestMapping("/pda/pda_version") @RequestMapping("/pda/pda_version")
public class PdaApkVersionController extends BaseController public class PdaApkVersionController extends BaseController {
{
private String prefix = "pda/pda_version"; private String prefix = "pda/pda_version";
@Autowired @Autowired
@ -39,8 +40,7 @@ public class PdaApkVersionController extends BaseController
@RequiresPermissions("pda:pda_version:view") @RequiresPermissions("pda:pda_version:view")
@GetMapping() @GetMapping()
public String pda_version() public String pda_version() {
{
return prefix + "/pda_version"; return prefix + "/pda_version";
} }
@ -50,8 +50,7 @@ public class PdaApkVersionController extends BaseController
@RequiresPermissions("pda:pda_version:list") @RequiresPermissions("pda:pda_version:list")
@PostMapping("/list") @PostMapping("/list")
@ResponseBody @ResponseBody
public TableDataInfo list(PdaApkVersion pdaApkVersion) public TableDataInfo list(PdaApkVersion pdaApkVersion) {
{
startPage(); startPage();
List<PdaApkVersion> list = pdaApkVersionService.selectPdaApkVersionList(pdaApkVersion); List<PdaApkVersion> list = pdaApkVersionService.selectPdaApkVersionList(pdaApkVersion);
return getDataTable(list); return getDataTable(list);
@ -64,8 +63,7 @@ public class PdaApkVersionController extends BaseController
@Log(title = "手持版本升级", businessType = BusinessType.EXPORT) @Log(title = "手持版本升级", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
@ResponseBody @ResponseBody
public AjaxResult export(PdaApkVersion pdaApkVersion) public AjaxResult export(PdaApkVersion pdaApkVersion) {
{
List<PdaApkVersion> list = pdaApkVersionService.selectPdaApkVersionList(pdaApkVersion); List<PdaApkVersion> list = pdaApkVersionService.selectPdaApkVersionList(pdaApkVersion);
ExcelUtil<PdaApkVersion> util = new ExcelUtil<PdaApkVersion>(PdaApkVersion.class); ExcelUtil<PdaApkVersion> util = new ExcelUtil<PdaApkVersion>(PdaApkVersion.class);
return util.exportExcel(list, "手持版本升级数据"); return util.exportExcel(list, "手持版本升级数据");
@ -75,8 +73,7 @@ public class PdaApkVersionController extends BaseController
* 新增手持版本升级 * 新增手持版本升级
*/ */
@GetMapping("/add") @GetMapping("/add")
public String add() public String add() {
{
return prefix + "/add"; return prefix + "/add";
} }
@ -87,26 +84,25 @@ public class PdaApkVersionController extends BaseController
@Log(title = "手持版本升级", businessType = BusinessType.INSERT) @Log(title = "手持版本升级", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
@ResponseBody @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 { try {
String fileName = FileUploadUtils.upload(filePath, file); String fileName = FileUploadUtils.upload(filePath, file);
// System.out.println("上传路径"+filePath+fileName); // System.out.println("上传路径"+filePath+fileName);
// D:/ruoyi/uploadPath/upload/profile/upload/2023/04/06/app-debug_20230406170208A001.apk // D:/ruoyi/uploadPath/upload/profile/upload/2023/04/06/app-debug_20230406170208A001.apk
String pathname = filePath + fileName; String pathname = filePath + fileName;
System.out.println("地址1"+pathname); System.out.println("地址1" + pathname);
pathname= pathname.replace("/profile/upload/apk",""); pathname = pathname.replace("/profile/upload/apk", "");
System.out.println("地址2："+pathname); System.out.println("地址2：" + pathname);
File file1=new File(pathname); File file1 = new File(pathname);
System.out.println("文件获取："+file1.exists()); System.out.println("文件获取：" + file1.exists());
System.out.println(file1.length()/1024); System.out.println(file1.length() / 1024);
pdaApkVersion.setApkSize(file1.length()/1024); pdaApkVersion.setApkSize(file1.length() / 1024);
pdaApkVersion.setApkMd5(Md5Utils.getFileMD5(file1)); 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) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -119,11 +115,19 @@ public class PdaApkVersionController extends BaseController
*/ */
@RequiresPermissions("pda:pda_version:edit") @RequiresPermissions("pda:pda_version:edit")
@GetMapping("/edit/{objid}") @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); PdaApkVersion pdaApkVersion = pdaApkVersionService.selectPdaApkVersionByObjid(objid);
mmap.put("pdaApkVersion", pdaApkVersion); String downloadUrl = pdaApkVersion.getDownloadUrl();
return prefix + "/edit"; 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) @Log(title = "手持版本升级", businessType = BusinessType.UPDATE)
@PostMapping("/edit") @PostMapping("/edit")
@ResponseBody @ResponseBody
public AjaxResult editSave(PdaApkVersion pdaApkVersion) public AjaxResult editSave(PdaApkVersion pdaApkVersion) {
{
return toAjax(pdaApkVersionService.updatePdaApkVersion(pdaApkVersion)); return toAjax(pdaApkVersionService.updatePdaApkVersion(pdaApkVersion));
} }
@ -143,10 +146,16 @@ public class PdaApkVersionController extends BaseController
*/ */
@RequiresPermissions("pda:pda_version:remove") @RequiresPermissions("pda:pda_version:remove")
@Log(title = "手持版本升级", businessType = BusinessType.DELETE) @Log(title = "手持版本升级", businessType = BusinessType.DELETE)
@PostMapping( "/remove") @PostMapping("/remove")
@ResponseBody @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)); return toAjax(pdaApkVersionService.deletePdaApkVersionByObjids(ids));
} }
} }

38
ruoyi-api/src/main/java/com/ruoyi/api/controller/PdaVersionController.java
Unescape Escape View File

@ -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;
}
}

2
ruoyi-api/src/main/java/com/ruoyi/api/mapper/PdaApkVersionMapper.java
Unescape Escape View File

@ -63,5 +63,5 @@ public interface PdaApkVersionMapper
*/ */
public int deletePdaApkVersionByObjids(String[] objids); public int deletePdaApkVersionByObjids(String[] objids);
APKVersion getVersion();
} }

2
ruoyi-api/src/main/java/com/ruoyi/api/service/IPdaApkVersionService.java
Unescape Escape View File

@ -61,5 +61,5 @@ public interface IPdaApkVersionService {
*/ */
public int deletePdaApkVersionByObjid(Long objid); public int deletePdaApkVersionByObjid(Long objid);
APKVersion getVersion();
} }

5
ruoyi-api/src/main/java/com/ruoyi/api/service/impl/PdaApkVersionServiceImpl.java
Unescape Escape View File

@ -97,8 +97,5 @@ public class PdaApkVersionServiceImpl implements IPdaApkVersionService
return pdaApkVersionMapper.deletePdaApkVersionByObjid(objid); return pdaApkVersionMapper.deletePdaApkVersionByObjid(objid);
} }
@Override
public APKVersion getVersion() {
return pdaApkVersionMapper.getVersion();
}
} }

3
ruoyi-api/src/main/resources/mapper/PdaApkVersionMapper.xml
Unescape Escape View File

@ -78,8 +78,5 @@
</foreach> </foreach>
</delete> </delete>
<select id="getVersion" resultType="com.ruoyi.api.domain.APKVersion">
select version_code, version_name, modify_content, download_url, apk_size, apk_md5 from pda_apk_version order by create_time desc limit 1
</select>
</mapper> </mapper>

14
ruoyi-api/src/main/resources/templates/pda/pda_version/pda_version.html
Unescape Escape View File

@ -27,12 +27,12 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="pda:pda_version:add"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="pda:pda_version:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="pda:pda_version:edit"> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="pda:pda_version:edit">-->
<i class="fa fa-edit"></i> 修改 <!-- <i class="fa fa-edit"></i> 删除-->
</a> <!-- </a>-->
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="pda:pda_version:remove"> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="pda:pda_version:remove">-->
<i class="fa fa-remove"></i> 删除 <!-- <i class="fa fa-remove"></i> 删除-->
</a> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="pda:pda_version:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="pda:pda_version:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
@ -99,7 +99,7 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> '); // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>删除</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); return actions.join('');
} }

4
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
Unescape Escape View File

@ -36,7 +36,9 @@ public class MimeTypeUtils
// 视频格式 // 视频格式
"mp4", "avi", "rmvb", "mp4", "avi", "rmvb",
// pdf // pdf
"pdf" }; "pdf",
// 安装包
"apk"};
public static String getExtension(String prefix) public static String getExtension(String prefix)
{ {

1
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
Unescape Escape View File

@ -285,6 +285,7 @@ public class ShiroConfig
filterChainDefinitionMap.put("/fonts/**", "anon"); filterChainDefinitionMap.put("/fonts/**", "anon");
filterChainDefinitionMap.put("/img/**", "anon"); filterChainDefinitionMap.put("/img/**", "anon");
filterChainDefinitionMap.put("/ajax/**", "anon"); filterChainDefinitionMap.put("/ajax/**", "anon");
filterChainDefinitionMap.put("/profile/**", "anon");
filterChainDefinitionMap.put("/js/**", "anon"); filterChainDefinitionMap.put("/js/**", "anon");
filterChainDefinitionMap.put("/ruoyi/**", "anon"); filterChainDefinitionMap.put("/ruoyi/**", "anon");
filterChainDefinitionMap.put("/api/**", "anon"); filterChainDefinitionMap.put("/api/**", "anon");

Write Preview
Loading…
Cancel
Save