guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

修复MD5

pet
shanao 2024-10-23 17:24:25 +08:00
parent 87520d5b8f
commit 162b25bb87
3 changed files with 313 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zcloud/controller/app/AppHiddenController.java
View File

@ -1,5 +1,6 @@
package com.zcloud.controller.app;
import cn.hutool.core.io.FileUtil;
import cn.hutool.crypto.digest.DigestUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@ -552,7 +553,7 @@ public class AppHiddenController extends BaseController {
}
File tempFile = new File(file.getOriginalFilename());
FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
String md5 = DigestUtil.md5Hex(tempFile);
String md5 = FileUtil.isEmpty(tempFile) ? "" : DigestUtil.md5Hex(tempFile);
if (!FileUpload.isImage(tempFile)) {
tempFile.delete();
map.put("result", "failed");

161
src/main/java/com/zcloud/controller/app/AppImgFilesController.java
View File

@ -1,5 +1,6 @@
package com.zcloud.controller.app;
import cn.hutool.core.io.FileUtil;
import cn.hutool.crypto.digest.DigestUtil;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
@ -36,23 +37,25 @@ public class AppImgFilesController extends BaseController {
@Autowired
private ImgFilesService imgfilesService;
/**完成
/**
* 完成
*
* @param
* @throws Exception
*/
@RequestMapping(value="/add", headers = "content-type=multipart/form-data")
@RequestMapping(value = "/add", headers = "content-type=multipart/form-data")
@ResponseBody
@Transactional
public Object finish(
@RequestParam(value="FFILE",required=false) MultipartFile[] files,
@RequestParam(value="TYPE",required=false) String TYPE,
@RequestParam(value="FOREIGN_KEY",required=false) String FOREIGN_KEY
) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
@RequestParam(value = "FFILE", required = false) MultipartFile[] files,
@RequestParam(value = "TYPE", required = false) String TYPE,
@RequestParam(value = "FOREIGN_KEY", required = false) String FOREIGN_KEY
) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"json".equals(suffixName) && !"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
@ -64,9 +67,9 @@ public class AppImgFilesController extends BaseController {
MultipartFile file = files[i];
// 保存文件
File tempFile = new File(file.getOriginalFilename());
String md5 = DigestUtil.md5Hex(tempFile);
FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
if(!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("102")) {//四色图改为json文件,不用判断类型
String md5 = FileUtil.isEmpty(tempFile) ? "" : DigestUtil.md5Hex(tempFile);
if (!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("102")) {//四色图改为json文件,不用判断类型
tempFile.delete();
map.put("result", "failed");
map.put("exception", "上传图片格式不正确，请重新上传");
@ -76,13 +79,13 @@ public class AppImgFilesController extends BaseController {
tempFile.delete();
}
if(TYPE.equals("2") || TYPE.equals("102")) {//先删除原四色图
if (TYPE.equals("2") || TYPE.equals("102")) {//先删除原四色图
PageData pd2 = new PageData();
pd2.put("FOREIGN_KEY",FOREIGN_KEY);
pd2.put("TYPE",TYPE);
pd2.put("FOREIGN_KEY", FOREIGN_KEY);
pd2.put("TYPE", TYPE);
List<PageData> four = imgfilesService.listAll(pd2);
for (PageData pageData : four) {
File old = new File(PathUtil.getProjectpath()+pageData.getString("FILEPATH"));
File old = new File(PathUtil.getProjectpath() + pageData.getString("FILEPATH"));
old.delete();
imgfilesService.delete(pageData);
}
@ -92,8 +95,8 @@ public class AppImgFilesController extends BaseController {
String ffile = DateUtil.getDays();
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName,Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("IMGFILES_ID", this.get32UUID());
pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
@ -109,19 +112,21 @@ public class AppImgFilesController extends BaseController {
}
/**新增
/**
* 新增
*
* @param
* @throws Exception
*/
@RequestMapping(value="/add64")
@RequestMapping(value = "/add64")
@ResponseBody
public Object add64() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
public Object add64() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
MultipartFile img = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("FILEPATH"));
String suffixName = img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
String suffixName = img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
@ -129,7 +134,7 @@ public class AppImgFilesController extends BaseController {
return map;
}
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf("."));
String fileName = this.get32UUID() + img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(img, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("IMGFILES_ID", this.get32UUID());
@ -142,23 +147,25 @@ public class AppImgFilesController extends BaseController {
}
/**完成
/**
* 完成
*
* @param
* @throws Exception
*/
@RequestMapping(value="/edit", headers = "content-type=multipart/form-data")
@RequestMapping(value = "/edit", headers = "content-type=multipart/form-data")
@ResponseBody
@Transactional
public Object edit(
@RequestParam(value="FFILE",required=false) MultipartFile[] files,
@RequestParam(value="TYPE",required=false) String TYPE,
@RequestParam(value="FOREIGN_KEY",required=false) String FOREIGN_KEY
) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
@RequestParam(value = "FFILE", required = false) MultipartFile[] files,
@RequestParam(value = "TYPE", required = false) String TYPE,
@RequestParam(value = "FOREIGN_KEY", required = false) String FOREIGN_KEY
) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"json".equals(suffixName) && !"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
@ -167,11 +174,11 @@ public class AppImgFilesController extends BaseController {
}
}
PageData pd2 = new PageData();
pd2.put("FOREIGN_KEY",FOREIGN_KEY);
pd2.put("TYPE",TYPE);
pd2.put("FOREIGN_KEY", FOREIGN_KEY);
pd2.put("TYPE", TYPE);
List<PageData> four = imgfilesService.listAll(pd2);
for (PageData pageData : four) {
File old = new File(PathUtil.getProjectpath()+pageData.getString("FILEPATH"));
File old = new File(PathUtil.getProjectpath() + pageData.getString("FILEPATH"));
old.delete();
imgfilesService.delete(pageData);
}
@ -180,7 +187,7 @@ public class AppImgFilesController extends BaseController {
// 保存文件
File tempFile = new File(file.getOriginalFilename());
FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
if(!FileUpload.isImage(tempFile) && !TYPE.equals("2")) {//四色图改为json文件,不用判断类型
if (!FileUpload.isImage(tempFile) && !TYPE.equals("2")) {//四色图改为json文件,不用判断类型
tempFile.delete();
map.put("result", "failed");
map.put("exception", "上传图片格式不正确，请重新上传");
@ -194,8 +201,8 @@ public class AppImgFilesController extends BaseController {
String ffile = DateUtil.getDays();
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName,Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("IMGFILES_ID", this.get32UUID());
pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
@ -209,34 +216,38 @@ public class AppImgFilesController extends BaseController {
return map;
}
/**删除
/**
* 删除
*
* @param out
* @throws Exception
*/
@RequestMapping(value="/delete")
@RequestMapping(value = "/delete")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
public Object delete() throws Exception {
Map<String, String> map = new HashMap<String, String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = imgfilesService.findById(pd); //根据ID读取
File file = new File(PathUtil.getProjectpath()+pd.getString("FILEPATH"));
File file = new File(PathUtil.getProjectpath() + pd.getString("FILEPATH"));
file.delete();
imgfilesService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
}
/**修改
/**
* 修改
*
* @param
* @throws Exception
*/
@RequestMapping(value="/edit")
@RequestMapping(value = "/edit")
@RequiresPermissions("imgfiles:edit")
@ResponseBody
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
public Object edit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
@ -245,20 +256,22 @@ public class AppImgFilesController extends BaseController {
return map;
}
/**列表
/**
* 列表
*
* @param page
* @throws Exception
*/
@RequestMapping(value="/list")
@RequestMapping(value = "/list")
@RequiresPermissions("imgfiles:list")
@ResponseBody
public Object list(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
public Object list(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd);
List<PageData> varList = imgfilesService.list(page); //列出ImgFiles列表
map.put("varList", varList);
@ -267,15 +280,17 @@ public class AppImgFilesController extends BaseController {
return map;
}
/**去修改页面获取数据
/**
* 去修改页面获取数据
*
* @param
* @throws Exception
*/
@RequestMapping(value="/goEdit")
@RequestMapping(value = "/goEdit")
@RequiresPermissions("imgfiles:edit")
@ResponseBody
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
public Object goEdit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
@ -285,41 +300,45 @@ public class AppImgFilesController extends BaseController {
return map;
}
/**批量删除
/**
* 批量删除
*
* @param
* @throws Exception
*/
@RequestMapping(value="/deleteAll")
@RequestMapping(value = "/deleteAll")
@RequiresPermissions("imgfiles:del")
@ResponseBody
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
public Object deleteAll() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
if (Tools.notEmpty(DATA_IDS)) {
String ArrayDATA_IDS[] = DATA_IDS.split(",");
imgfilesService.deleteAll(ArrayDATA_IDS);
errInfo = "success";
}else{
} else {
errInfo = "fail";
}
map.put("result", errInfo); //返回结果
return map;
}
/**导出到excel
/**
* 导出到excel
*
* @param
* @throws Exception
*/
@RequestMapping(value="/excel")
@RequestMapping(value = "/excel")
@RequiresPermissions("toExcel")
public ModelAndView exportExcel() throws Exception{
public ModelAndView exportExcel() throws Exception {
ModelAndView mv = new ModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
Map<String,Object> dataMap = new HashMap<String,Object>();
Map<String, Object> dataMap = new HashMap<String, Object>();
List<String> titles = new ArrayList<String>();
titles.add("路径"); //1
titles.add("类型"); //2
@ -327,7 +346,7 @@ public class AppImgFilesController extends BaseController {
dataMap.put("titles", titles);
List<PageData> varOList = imgfilesService.listAll(pd);
List<PageData> varList = new ArrayList<PageData>();
for(int i=0;i<varOList.size();i++){
for (int i = 0; i < varOList.size(); i++) {
PageData vpd = new PageData();
vpd.put("var1", varOList.get(i).getString("FILEPATH")); //1
vpd.put("var2", varOList.get(i).get("TYPE").toString()); //2
@ -336,19 +355,21 @@ public class AppImgFilesController extends BaseController {
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap);
mv = new ModelAndView(erv, dataMap);
return mv;
}
/**查询图片集合
/**
* 查询图片集合
*
* @param
* @throws Exception
*/
@RequestMapping(value="/listImgs")
@RequestMapping(value = "/listImgs")
@ResponseBody
public Object listImgs() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
public Object listImgs() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();

5
src/main/java/com/zcloud/controller/system/LoginController.java
View File

@ -153,7 +153,6 @@ public class LoginController extends BaseController {
} catch (AuthenticationException ae) {
errInfo = "usererror";
}
Integer port = SpringUtil.getApplicationContext().getEnvironment().getProperty("server.port", Integer.class);
if (subject.isAuthenticated()) { //验证是否登录成功
removeSession(USERNAME);
@ -178,8 +177,7 @@ public class LoginController extends BaseController {
if (backEndPath.get("result").toString().equals("success")) {
backEndPath.put("baseImgPath",map.get("baseImgPath").toString());
backEndPath.put("USER_IDENTITY",map.get("USER_IDENTITY").toString());
backEndPath.put("BACKENDADDR", "http://" + ip + ":" + port + "/");
backEndPath.put("BACKENDADDR", map.get("BACKENDADDR").toString());
System.out.println("登录返回参数：" + backEndPath);
return backEndPath;
} else {
@ -190,7 +188,6 @@ public class LoginController extends BaseController {
return map;
}
}
map.put("BACKENDADDR", "http://" + ip + ":" + port + "/");
if ("99".equals(pd.getString("STATUS"))) {
errInfo = "userlock";
map.put("result", "fail");