update
This commit is contained in:
parent
f4bb52b6ce
commit
f53471bae6
@ -51,7 +51,7 @@ public class AttachmentController {
|
|||||||
map.put("msg",configService.addConfig(config));
|
map.put("msg",configService.addConfig(config));
|
||||||
map.put("code",200);
|
map.put("code",200);
|
||||||
}else {
|
}else {
|
||||||
out.println(config1.getValue());
|
// out.println(config1.getValue());
|
||||||
configService.updateConfig(config1);
|
configService.updateConfig(config1);
|
||||||
map=attachmentService.updateFile(multipartFile,cate,config1);
|
map=attachmentService.updateFile(multipartFile,cate,config1);
|
||||||
}
|
}
|
||||||
@ -79,8 +79,8 @@ public class AttachmentController {
|
|||||||
return new ResponseEntity<byte[]>(bytes1, headers, HttpStatus.OK);
|
return new ResponseEntity<byte[]>(bytes1, headers, HttpStatus.OK);
|
||||||
}
|
}
|
||||||
String fileUrl=attachment.getPath()+attachment.getFileName()+attachment.getSuffix();
|
String fileUrl=attachment.getPath()+attachment.getFileName()+attachment.getSuffix();
|
||||||
out.println(fileUrl);
|
// out.println(fileUrl);
|
||||||
out.println(attachment.getSuffix().replace(".",""));
|
// out.println(attachment.getSuffix().replace(".",""));
|
||||||
File file = new File(fileUrl);
|
File file = new File(fileUrl);
|
||||||
FileInputStream inputStream = new FileInputStream(file);
|
FileInputStream inputStream = new FileInputStream(file);
|
||||||
byte[] bytes = new byte[inputStream.available()];
|
byte[] bytes = new byte[inputStream.available()];
|
||||||
|
@ -136,6 +136,11 @@ public class UrlListController {
|
|||||||
}
|
}
|
||||||
List<Integer> ss=new ArrayList<>();
|
List<Integer> ss=new ArrayList<>();
|
||||||
ss= (List<Integer>) urlCateListService.countAllCateByUser(urlCateList).get("cateNum");
|
ss= (List<Integer>) urlCateListService.countAllCateByUser(urlCateList).get("cateNum");
|
||||||
|
if (ss.size()==0){
|
||||||
|
map.put("cateNum", "0");
|
||||||
|
map.put("urlListNum","0");
|
||||||
|
return map;
|
||||||
|
}
|
||||||
map.put("cateNum", String.valueOf(ss.size()));
|
map.put("cateNum", String.valueOf(ss.size()));
|
||||||
map.put("urlListNum", String.valueOf(urlListService.countUrlListByUserId(ss)));
|
map.put("urlListNum", String.valueOf(urlListService.countUrlListByUserId(ss)));
|
||||||
return map;
|
return map;
|
||||||
|
@ -176,9 +176,8 @@ public class UserController {
|
|||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (user1 != null) {
|
if (user1 != null) {
|
||||||
int result=userService.updatePassword(user1);
|
int result=userService.updatePassword(user);
|
||||||
if(result==1){
|
if(result==1){
|
||||||
map.put("Data",user1.getUserLogin());
|
map.put("Data",user1.getUserLogin());
|
||||||
map.put("Data",user1.getUserEmail());
|
map.put("Data",user1.getUserEmail());
|
||||||
|
Loading…
Reference in New Issue
Block a user