From 75b61873f08f3eb81251da5d292c6fa75901b799 Mon Sep 17 00:00:00 2001 From: User_cyk <1020691186@qq.com> Date: Wed, 27 Dec 2023 19:19:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lovenav/controller/SearchController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lovenav/controller/SearchController.java b/src/main/java/com/lovenav/controller/SearchController.java index 961b55d..06e0174 100644 --- a/src/main/java/com/lovenav/controller/SearchController.java +++ b/src/main/java/com/lovenav/controller/SearchController.java @@ -29,6 +29,9 @@ public class SearchController { @RequestMapping("/searchByInput") public String searchByInput(String searchKey,String userId ) throws IOException { + if(searchKey == null ){ + return setResult(500,"未添加搜索内容"); + } String placeholder = "***"; //非法敏感词汇判断 SensitiveFilter filter = SensitiveFilter.getInstance(); @@ -38,7 +41,7 @@ public class SearchController { //存在非法字符 if(n > 0){ logger.info("这个人输入了非法字符--> {},不知道他到底要查什么~ userid--> {}",searchKey,1); - return setResult(500,"查询失败"); + return setResult(500,"非法搜索"); } From 3ad8c1cb03b8d546b255fae733e3667c7d2c1fbe Mon Sep 17 00:00:00 2001 From: User_cyk <1020691186@qq.com> Date: Wed, 27 Dec 2023 19:33:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0shanchu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lovenav/controller/UrlListController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lovenav/controller/UrlListController.java b/src/main/java/com/lovenav/controller/UrlListController.java index c1fd025..24c9c1c 100644 --- a/src/main/java/com/lovenav/controller/UrlListController.java +++ b/src/main/java/com/lovenav/controller/UrlListController.java @@ -35,18 +35,20 @@ public class UrlListController { UrlList urlList = urlListService.selectUrlListByUrlId(Long.valueOf(urlId)); String parentString = urlCateListService.selectUrListCateByUrlCateId(urlList.getCateId()); String [] parentList = parentString.split(","); - //System.out.println(parentString); + System.out.println(parentString); for(String parent : parentList) { if(parent.equals("0")){ continue; } UrlCateList urlCateList =urlCateListService.selectByPrimaryKey(Integer.valueOf(parent)); - if(urlCateListService.updateByUrlCateList(urlCateList) == 0) + System.out.println(urlCateList); + urlCateList.setUrlNumber(urlCateList.getUrlNumber()-1); + if(String.valueOf(urlCateListService.updateByUrlCateList(urlCateList)).equals("0")) { flag = 0; }else{ - flag = 1; + flag = urlListService.deleteByPrimaryKey(Long.valueOf(urlId)); } } if(flag == 1) From 1508c6d184fbf1dbd6aebdbdfadf28bcc809b3c3 Mon Sep 17 00:00:00 2001 From: User_cyk <1020691186@qq.com> Date: Wed, 27 Dec 2023 20:38:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0CHARU?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lovenav/controller/UrlListController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lovenav/controller/UrlListController.java b/src/main/java/com/lovenav/controller/UrlListController.java index 24c9c1c..b6d7885 100644 --- a/src/main/java/com/lovenav/controller/UrlListController.java +++ b/src/main/java/com/lovenav/controller/UrlListController.java @@ -81,7 +81,7 @@ public class UrlListController { continue; } UrlCateList urlCateList =urlCateListService.selectByPrimaryKey(Integer.valueOf(parent)); - if(urlCateListService.updateByUrlCateList(urlCateList) == 0) + if(String.valueOf(urlCateListService.updateByUrlCateList(urlCateList)).equals("0") ) { flag = 0; }else{ From 2c7d7a5d2dcc762dc4e34e35dfdcbb58851b8787 Mon Sep 17 00:00:00 2001 From: Qing Date: Wed, 27 Dec 2023 22:42:18 +0800 Subject: [PATCH 4/5] update --- .../service/serviceImpl/QRCServiceImpl.java | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/lovenav/service/serviceImpl/QRCServiceImpl.java b/src/main/java/com/lovenav/service/serviceImpl/QRCServiceImpl.java index 58f193c..1a7a16f 100644 --- a/src/main/java/com/lovenav/service/serviceImpl/QRCServiceImpl.java +++ b/src/main/java/com/lovenav/service/serviceImpl/QRCServiceImpl.java @@ -23,23 +23,28 @@ public class QRCServiceImpl implements QRCService{ private CollectIconListDao collectIconListDao; public String QR(Integer url_id) throws Exception { - String logoPath = "src/main/resources/static/logo/NAV.png"; - String destPath = "src/main/resources/static/qr"; - UrlList urlList = urlListDao.selectByPrimaryKey(Long.valueOf(url_id)); - CollectIconList collectIconList = new CollectIconList(); - String url = urlList.getUrl(); - collectIconList.setUrl_id(url_id); - String list = collectIconListDao.selectByUrlid(url_id); - if (list == null) { - String base64 = QRCodeUtil.ImageToBase64(QRCodeUtil.encode(url, logoPath, destPath, true)); - collectIconList.setQr_url(base64); - collectIconListDao.insertSelective(collectIconList); + if(url_id!=null){ + String logoPath = "src/main/resources/static/logo/NAV.png"; + String destPath = "src/main/resources/static/qr"; + UrlList urlList = urlListDao.selectByPrimaryKey(Long.valueOf(url_id)); + CollectIconList collectIconList = new CollectIconList(); + String url = urlList.getUrl(); + collectIconList.setUrl_id(url_id); + String list = collectIconListDao.selectByUrlid(url_id); + if (list == null) { + String base64 = QRCodeUtil.ImageToBase64(QRCodeUtil.encode(url, logoPath, destPath, true)); + collectIconList.setQr_url(base64); + collectIconListDao.insertSelective(collectIconList); // return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id)); - return JSON.toJSONString(base64); + return JSON.toJSONString(base64); // return null; - }else { - return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id)); + }else { + return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id)); + } + }else{ + return null; } + // //// 通过collect的url_id查找网址id对应网址 // UrlList urlList = urlListDao.selectByPrimaryKey(Long.valueOf(collect.getUrl_id())); From 72497c9ecf00ee896ab5dd3a13d776d0e3747f16 Mon Sep 17 00:00:00 2001 From: Qing Date: Wed, 27 Dec 2023 23:59:13 +0800 Subject: [PATCH 5/5] update --- .../java/com/lovenav/controller/AttachmentController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lovenav/controller/AttachmentController.java b/src/main/java/com/lovenav/controller/AttachmentController.java index f12239a..b398620 100644 --- a/src/main/java/com/lovenav/controller/AttachmentController.java +++ b/src/main/java/com/lovenav/controller/AttachmentController.java @@ -70,13 +70,13 @@ public class AttachmentController { if (config1==null){ bytes1= "没有该Config!".getBytes(); headers.setContentType(MediaType.APPLICATION_JSON); - return new ResponseEntity(bytes1, headers, HttpStatus.NOT_FOUND); + return new ResponseEntity(bytes1, headers, HttpStatus.OK); } Attachment attachment =attachmentService.selectAttachment(Long.valueOf(config1.getValue())); if (attachment==null){ bytes1= "没有该Attachment!".getBytes(); headers.setContentType(MediaType.APPLICATION_JSON); - return new ResponseEntity(bytes1, headers, HttpStatus.NOT_FOUND); + return new ResponseEntity(bytes1, headers, HttpStatus.OK); } String fileUrl=attachment.getPath()+attachment.getFileName()+attachment.getSuffix(); out.println(fileUrl);