From 7d3f10a7dc2c62421cfd807632ac2a437ec056f0 Mon Sep 17 00:00:00 2001 From: sjm <2431685932@qq.com> Date: Fri, 22 Dec 2023 14:03:59 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=20=E4=BF=AE=E6=AD=A3comment=EF=BC=8Cbanner?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lovenav/controller/BannersController.java | 40 +++++++++++ .../lovenav/controller/CommentController.java | 14 ++-- src/main/java/com/lovenav/dao/BannersDao.java | 6 ++ src/main/java/com/lovenav/dao/CommentDao.java | 2 +- src/main/java/com/lovenav/entity/Banners.java | 54 +++++++++++++++ .../com/lovenav/service/BannersService.java | 14 ++++ .../com/lovenav/service/CommentService.java | 4 +- .../serviceImpl/BannersServiceImpl.java | 67 +++++++++++++++++++ .../serviceImpl/CommentServiceImpl.java | 30 +++++---- src/main/resources/mybatis/BannersDao.xml | 8 +++ src/main/resources/mybatis/CommentDao.xml | 8 ++- 11 files changed, 224 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/lovenav/controller/BannersController.java create mode 100644 src/main/java/com/lovenav/service/BannersService.java create mode 100644 src/main/java/com/lovenav/service/serviceImpl/BannersServiceImpl.java diff --git a/src/main/java/com/lovenav/controller/BannersController.java b/src/main/java/com/lovenav/controller/BannersController.java new file mode 100644 index 0000000..2d6b1f8 --- /dev/null +++ b/src/main/java/com/lovenav/controller/BannersController.java @@ -0,0 +1,40 @@ +package com.lovenav.controller; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.lovenav.entity.Banners; +import com.lovenav.service.BannersService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/banners") +public class BannersController { + @Autowired + private BannersService bannersService; +// 跳转链接 +@RequestMapping(method = RequestMethod.GET, value = "/jump_url") + public String jump(int id){ + return bannersService.Jump_url(id); + } + +// 添加banner +@RequestMapping(method = RequestMethod.POST, value = "/add_banner") + public String add(@RequestBody Banners banners){ + return bannersService.Add_banner(banners); + } + +// 删除banner +@RequestMapping(method = RequestMethod.GET, value = "/delete_url") + public String delete(int id){ + return bannersService.Delete_banner(id); + } + +// 首页显示banner +@RequestMapping(method = RequestMethod.GET, value = "/view_banner") + public String view(){ + return bannersService.View_banner(); + } +} diff --git a/src/main/java/com/lovenav/controller/CommentController.java b/src/main/java/com/lovenav/controller/CommentController.java index 25ec517..b37c606 100644 --- a/src/main/java/com/lovenav/controller/CommentController.java +++ b/src/main/java/com/lovenav/controller/CommentController.java @@ -21,15 +21,15 @@ public class CommentController { @Autowired private CommentService commentService; // 评论功能 -@RequestMapping(method = RequestMethod.POST, value = "/reply_comment") +@RequestMapping(method = RequestMethod.POST, value = "/comment") public String Reply1(@RequestBody Comment comment){ return commentService.Reply1(comment); } // 回复功能 -@RequestMapping(method = RequestMethod.POST, value = "/comment") - public String Reply2(@RequestBody Comment comment){ - return commentService.Reply2(comment); +@RequestMapping(method = RequestMethod.POST, value = "/reply_comment") + public String Reply2(@RequestBody Comment comment,int id){ + return commentService.Reply2(comment,id); } // 删除功能 @RequestMapping(method = RequestMethod.GET, value = "/delete_comment") @@ -40,4 +40,10 @@ public class CommentController { public String addLikeCount(int id){ return commentService.AddLikeCount(id); } + +// 显示评论 +@RequestMapping(method = RequestMethod.GET, value = "/view_comment") + public String View_comment(){ + return commentService.View_comment(); + } } diff --git a/src/main/java/com/lovenav/dao/BannersDao.java b/src/main/java/com/lovenav/dao/BannersDao.java index e25ea57..a3af52b 100644 --- a/src/main/java/com/lovenav/dao/BannersDao.java +++ b/src/main/java/com/lovenav/dao/BannersDao.java @@ -1,9 +1,13 @@ package com.lovenav.dao; import com.lovenav.entity.Banners; +import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository +@Mapper public interface BannersDao { int deleteByPrimaryKey(Integer id); @@ -16,4 +20,6 @@ public interface BannersDao { int updateByPrimaryKeySelective(Banners record); int updateByPrimaryKey(Banners record); + + List selectByAllBanners(); } \ No newline at end of file diff --git a/src/main/java/com/lovenav/dao/CommentDao.java b/src/main/java/com/lovenav/dao/CommentDao.java index ea08fd0..f0fba2e 100644 --- a/src/main/java/com/lovenav/dao/CommentDao.java +++ b/src/main/java/com/lovenav/dao/CommentDao.java @@ -22,5 +22,5 @@ public interface CommentDao { int updateByPrimaryKey(Comment record); - List selectByRootId(Integer rootid); + List selectByAllComment(); } \ No newline at end of file diff --git a/src/main/java/com/lovenav/entity/Banners.java b/src/main/java/com/lovenav/entity/Banners.java index 3dcf753..145d01d 100644 --- a/src/main/java/com/lovenav/entity/Banners.java +++ b/src/main/java/com/lovenav/entity/Banners.java @@ -2,6 +2,9 @@ package com.lovenav.entity; import java.io.Serializable; import java.util.Date; + +import com.alibaba.fastjson2.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; /** @@ -9,6 +12,57 @@ import lombok.Data; */ @Data public class Banners implements Serializable { + public Banners(){ + this.bannerStatus = 0; + } + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getImgUrl() { + return imgUrl; + } + + public void setImgUrl(String imgUrl) { + this.imgUrl = imgUrl; + } + + public Integer getWeigh() { + return weigh; + } + + public void setWeigh(Integer weigh) { + this.weigh = weigh; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public Byte getBannerStatus() { + return bannerStatus; + } + + public void setBannerStatus(Byte bannerStatus) { + this.bannerStatus = bannerStatus; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + /** * id */ diff --git a/src/main/java/com/lovenav/service/BannersService.java b/src/main/java/com/lovenav/service/BannersService.java new file mode 100644 index 0000000..47c1c83 --- /dev/null +++ b/src/main/java/com/lovenav/service/BannersService.java @@ -0,0 +1,14 @@ +package com.lovenav.service; + +import com.lovenav.entity.Banners; + +public interface BannersService { +// 跳转链接 + String Jump_url(int id); +// 添加banner + String Add_banner(Banners banners); +// 删除banner + String Delete_banner(int id); +// 展示banner + String View_banner(); +} diff --git a/src/main/java/com/lovenav/service/CommentService.java b/src/main/java/com/lovenav/service/CommentService.java index e142955..e29e2c3 100644 --- a/src/main/java/com/lovenav/service/CommentService.java +++ b/src/main/java/com/lovenav/service/CommentService.java @@ -10,7 +10,9 @@ public interface CommentService { // 评论 String Reply1(Comment comment); // 回复 - String Reply2(Comment comment); + String Reply2(Comment comment,int id); // 删除 String Delete(int id); +// 显示评论 + String View_comment(); } diff --git a/src/main/java/com/lovenav/service/serviceImpl/BannersServiceImpl.java b/src/main/java/com/lovenav/service/serviceImpl/BannersServiceImpl.java new file mode 100644 index 0000000..a79bc4e --- /dev/null +++ b/src/main/java/com/lovenav/service/serviceImpl/BannersServiceImpl.java @@ -0,0 +1,67 @@ +package com.lovenav.service.serviceImpl; + +import com.alibaba.fastjson.JSON; +import com.lovenav.dao.BannersDao; +import com.lovenav.entity.Banners; +import com.lovenav.service.BannersService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.HashMap; + +@Service +public class BannersServiceImpl implements BannersService { + @Autowired + private BannersDao bannersDao; + +// 跳转链接 + @Override + public String Jump_url(int id){ + Banners banners = bannersDao.selectByPrimaryKey(id); + HashMap hashMap = new HashMap<>(); + if(banners != null){ + hashMap.put("url",banners.getUrl()); + }else{ + hashMap.put("code",500); + hashMap.put("msg","找不到指定链接"); + } + return JSON.toJSONString(hashMap); + } + +// 添加banner + @Override + public String Add_banner(Banners banners) { + int result = bannersDao.insert(banners); + HashMap hashMap = new HashMap<>(); + if(result>0){ + return JSON.toJSONString(banners); + }else{ + hashMap.put("code",500); + hashMap.put("msg","添加banner失败"); + return JSON.toJSONString(hashMap); + } + } + +// 删除banner + @Override + public String Delete_banner(int id){ + int result = bannersDao.deleteByPrimaryKey(id); + HashMap hashMap = new HashMap<>(); + if(result>0){ + hashMap.put("code",200); + hashMap.put("msg","删除成功"); + return JSON.toJSONString(hashMap); + }else{ + hashMap.put("code",500); + hashMap.put("msg","删除失败"); + return JSON.toJSONString(hashMap); + } + } + +// 展示banner + @Override + public String View_banner(){ + List list = bannersDao.selectByAllBanners(); + return JSON.toJSONString(list); + } +} diff --git a/src/main/java/com/lovenav/service/serviceImpl/CommentServiceImpl.java b/src/main/java/com/lovenav/service/serviceImpl/CommentServiceImpl.java index c75654c..bd16ca4 100644 --- a/src/main/java/com/lovenav/service/serviceImpl/CommentServiceImpl.java +++ b/src/main/java/com/lovenav/service/serviceImpl/CommentServiceImpl.java @@ -3,6 +3,7 @@ package com.lovenav.service.serviceImpl; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.lovenav.dao.CommentDao; +import com.lovenav.dao.UserDao; import com.lovenav.entity.Comment; import com.lovenav.service.CommentService; import org.apache.ibatis.jdbc.Null; @@ -13,10 +14,12 @@ import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; -@Service("commentService") +@Service public class CommentServiceImpl implements CommentService { @Autowired private CommentDao commentDao; + @Autowired + private UserDao userDao; // 评论功能 @Override public String Reply1(Comment comment){ @@ -32,18 +35,11 @@ public class CommentServiceImpl implements CommentService { } // 回复功能 @Override - public String Reply2(Comment comment){ - List list = commentDao.selectByRootId(comment.getRootCommentId()); - if(list.size()<5){ - commentDao.insert(comment); - return JSON.toJSONString(comment); - }else{ - HashMap result = new HashMap<>(); - result.put("code", 500); - result.put("msg", "回复超过上限"); - String jsonString = JSONObject.toJSONString(result); - return JSON.toJSONString(result); - } + public String Reply2(Comment comment,int id){ + String name = (userDao.selectByPrimaryKey(id)).getNickname(); + HashMap hashMap = new HashMap<>(); + hashMap.put(comment, name); + return JSON.toJSONString(hashMap); } // 删除 @Override @@ -67,7 +63,13 @@ public class CommentServiceImpl implements CommentService { comment.setLikeCount(comment.getLikeCount()+1); commentDao.updateByPrimaryKeySelective(comment); HashMap hashMap = new HashMap<>(); - hashMap.put("点赞成功:",comment.getLikeCount()); + hashMap.put("点赞成功",comment.getLikeCount()); return JSON.toJSONString(hashMap); } + +// 显示评论 + public String View_comment(){ + List list = commentDao.selectByAllComment(); + return JSON.toJSONString(list); + } } diff --git a/src/main/resources/mybatis/BannersDao.xml b/src/main/resources/mybatis/BannersDao.xml index d2ff884..a2b8727 100644 --- a/src/main/resources/mybatis/BannersDao.xml +++ b/src/main/resources/mybatis/BannersDao.xml @@ -95,4 +95,12 @@ createtime = #{createtime,jdbcType=TIMESTAMP} where id = #{id,jdbcType=INTEGER} + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/CommentDao.xml b/src/main/resources/mybatis/CommentDao.xml index 0dd4a41..9c7cd13 100644 --- a/src/main/resources/mybatis/CommentDao.xml +++ b/src/main/resources/mybatis/CommentDao.xml @@ -145,11 +145,13 @@ where id = #{id,jdbcType=INTEGER} - select - id + * from ln_comment - where root_comment_id = #{rootCommentId,jdbcType=INTEGER} + where root_comment_id = 0 and comment_status = 0 + \ No newline at end of file From 8532364cb932ef492062239e34fe977ccb8a4b2c Mon Sep 17 00:00:00 2001 From: Qing Date: Fri, 22 Dec 2023 15:45:31 +0800 Subject: [PATCH 2/7] update SQL --- sql/love-nav.sql | 40 ++++++++++++------- .../com/lovenav/utils/RandomValidateCode.java | 4 +- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/sql/love-nav.sql b/sql/love-nav.sql index c9cf510..a343611 100644 --- a/sql/love-nav.sql +++ b/sql/love-nav.sql @@ -11,7 +11,7 @@ Target Server Version : 80031 (8.0.31) File Encoding : 65001 - Date: 21/12/2023 22:45:07 + Date: 22/12/2023 15:44:57 */ SET NAMES utf8mb4; @@ -31,7 +31,7 @@ CREATE TABLE `ln_attachment` ( `width` double(10, 0) NULL DEFAULT NULL COMMENT '宽', `height` double(10, 0) NULL DEFAULT NULL COMMENT '高', `storage` enum('local','online') CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'local' COMMENT '保存地址 local=本地 ', - `createtime` int NULL DEFAULT NULL COMMENT '创建时间', + `createtime` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '附件表' ROW_FORMAT = DYNAMIC; @@ -94,15 +94,17 @@ CREATE TABLE `ln_banners` ( DROP TABLE IF EXISTS `ln_collect_icon_list`; CREATE TABLE `ln_collect_icon_list` ( `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT, - `url_md5` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '网址', + `url_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '网址id', `icon_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '图片地址', + `qr_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '二维码地址', + `status` int NULL DEFAULT NULL COMMENT '状态', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '图标表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of ln_collect_icon_list -- ---------------------------- -INSERT INTO `ln_collect_icon_list` VALUES (1, 'e315e839dcdd9ce3cc27ee972dd96060', '/upload/icon/2023/10/15/8a7520e1b1b13da7ec25bd872d75d5aa.jpeg'); +INSERT INTO `ln_collect_icon_list` VALUES (1, '1', '/upload/icon/2023/10/15/8a7520e1b1b13da7ec25bd872d75d5aa.jpeg', NULL, NULL); -- ---------------------------- -- Table structure for ln_comment @@ -131,19 +133,27 @@ CREATE TABLE `ln_comment` ( -- ---------------------------- DROP TABLE IF EXISTS `ln_config`; CREATE TABLE `ln_config` ( - `id` int NOT NULL COMMENT 'id', - `type` enum('string','image') CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'string' COMMENT '类型', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '名称', - `value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '值', - `updatetime` datetime NULL DEFAULT NULL COMMENT '更新时间', - `file_id` int NULL DEFAULT NULL COMMENT '附件Id', + `id` int UNSIGNED NOT NULL AUTO_INCREMENT, + `type` enum('string','image') CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'string', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, + `value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL, + `updatetime` int NULL DEFAULT NULL, PRIMARY KEY (`id`, `name`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 27 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '配置项' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of ln_config -- ---------------------------- -INSERT INTO `ln_config` VALUES (16, 'string', 'configs', 'FPCNHBteMQQOJR%3DBxLdC-LOaVJCNiH8OHXwe5Jg9FJf-XPQCeMRZDI-FlauK1URYxLb--Y-mqIRJXBdOqXuNgRhtUCL2-YQyQPwFlHdGhXxe5CfB0O8G-KvS7Pe1QQOllSQitDARnIPSZc%3DKhKP5kC9SjTBSLLf9mI8C%3DZA6%3DISRhGbaqU%3DWAQ%3DlmHeeXK%3DegJRdPS--4TBe5HSpOJdKhUPehM-pXKuVrWQpgKQ92KPeHOeaaIBdHP-BnTOGJCSJzNua-LOaRKPxQKsOkRAqBRgQtLdaKTuaeM-xpBMaebgaJHfBmLdStTAKvKP5fBfWrWgawDPNpQ-yLPgmtORUyFd6hPQqMR-9tIb2GK-aQThNfGsOeUPSfGgQtIfOXPdagIBRsPNO6awWxLvhCK9OPRequRxdhQcukT-WsD%3DdQHPC-ZOuTOOs2RdeNZtCJCfRoNva-LOaVPetMGOGMRvGACQxQKPeHQuNXMQ5STcmKctG7H-NRItG7SfKgIC1GQMukWN9gUQRTDOyZPd6aIBRsPO-jTQyACQxxNuhmZuaQThNeL8ubWNCpRxxpDOiOUueZIBRsPNG7Xu-4MvNpIL2HTue7JP9hTMaoQApgTgRUCOOaZR1cIBRsPOFncxGKCSoyIcSlSeaQThNXGtOiU%3DW9Sh5DDL-WTfNaIBRsPNC7XxCKRRJWKMKPPutZTvVLPMaoQAqxUwIvBPePc-ZdIBc1PMm4QQaBLhZlNea-LOaSIO5WBcOmSd-9CPd3IeeCUue2Lu1XT8plLAW0CAxMKsSCbfFXE%3D9QTL6pTRe1UB5SCMiGUx2QJ%3DFDK8eJROK6MwRWIsCKcP-rRvJRPuGjWguODA0uO-yJKtWTJ-pPLMmKL-W7RvwvJcS-bfChMP9QTempTQe1JgNUP9GZPQW1J%3D82J9-6WdK0CPN3KuqLRfCSHOBUQf2BWOGsQ%3DZAHeqXKNZXMQJHOe-NRQuwQRlmLdC-aeaUUyBXBbWeRgaxJwBVLcyHKwmbKQ5CCNS6LAW4LgBQIMK%3DP%3DKhHRZTKsutTvKBJQ5oS%3D-HTf-sK-tlGtZoWd66H%3DBCJtKdRg-RKCFPB8eWWPGBL%3DdoJdOHPv6bLOpOB-GITBe5HQBAK71uZA6VGRteQN-AR96BLQFSIdeLZuZbKABsQ8plSOO9RBUtLOmKbg-tIQFRFr1oT%3DWBUvNmSuaPZ-NZOAFLSe-eQ9OwQhUxItGCZupXKRViGMtoSfKtJwNST%3DeIKgxcJgBHGdS6LBaIUQRWKtKPQ%3De6CBNTFr65R969KA8tKcuJTuexKQ82NO9mOAm0CwxuKOidag5ZRetXBdavTQuBQgNoCOmHK%3DexLxdpFsyJYvS9L-MtOOmcLw-tQi5QFtKvSOOpLAFVQ9WCTPe3PA5DJtdlUBe1Lw9pIL2GKOaQThNXGtOiU%3DW9Sh5DDLCPTeeNOAFLSe-eQ9OwRBJvKsO%3DWAG7LRNRKtetWOS5RfdrQvGWKNa-LwJXSN-4TBe5HhZ2NMO3KQ-UCyReBOWESfS9IA5DR%3DGDZO-SOQ9lLMy8ad2IH-93KsO3YQ6%3DIOpSL8erTReBSQ1pLdCYKwhaLhcySNOiRN-JR-ouNeu3TfGVIQNRH9eqWgqfKB0vCOaDZ9FaMOpDQdO7QOOwQCFmNr-LYwCUJRlVBt-rWeNgQAR2HLO-ZOagMOxCB8ugXxWIMvMuJdGDYfOQC%3DVKH9dmWd2xGfZUIb6XY96cJOplHdOMXxS5CRItKMODReusKCNMH9O8Sd2BCfhTQ%3D2OTuuvLQ5XJ9eJYt-4R-tNO7-sbw9aGCRWBfGlR%3DWtUx9UP76KTuesJBVwB--6UOyMLwRDNsRtK%3De8PiROK9e9X%3DW5JRtAHPC-ZP-dOfA2S9eML96wQRlmKuqLKfGqCCBSKcqvU%3DSbKBxEQ76ZP-OQLPFtKeCNTN61HgBvNOuHZwG%3DKPxWQ9-mTQq1KB1UHdeKUwmzIBN0PNeiMBOLHgB2L79mZw-VLBNMPMeGSRe1Kx9oBOaEPfOrMABDQd-JRPS1RwxVKsJuSA-tPxlTL9-MWOKwCxxBHcOOZwhaIQ5LGNCMXvaxLvhCKb-tP-aQThNeKsurWQlgShtVIb2-YQyQJg9lQeGMZum5Hi5GJsOLQvSsC%3D1PQPW5SOK8CA9UP9GWYgW9KOtHFe66SRG5CwxRHdGDP%3D68JP5OJtKvSOKtLB5mHPC-ZOuTMAJHPe67SROJCSJ3HOekY%3DCtKO9PL8eKT-KBMPgvS92LYhWUOA5DHtFnKAi-RvQyO-mZPv-8MQ5iQMuuTuOpDxtoO8KHKNa9PutlR9JmOPWILPxsKMKdUQKsRuBSBb6LUAmPRPlSD7KGT-tcLQBHJ-KLP9C5CwRWJOeZLPOULPxSGsKsUN2fIw9ET8yCZAGrMQ9xBNG6L%3DG2LgBQK76%3DT%3De8Ey5WBf2JSPOTUQBqKfCHP%3DepKexPGNeiLBW8IvRENsOZOf-tHRNJKdKsTgm1JQQuHemMYeOtLBRXRdChQOqIQepxJeu%3DS%3DFaSw9TQeW%3DQPG1HABET%3DOKYdWbO%3DBSCN6gbuS9HhJCKb2LS%3D5YGQ5hQ99oT-OxRQNTQ9SEP-O2MCRpJ8y6QNGMH-8vJveHSABaGSRTQdKvW-SxKw5TKdOLTPOZLPJXIsmJRPKJLgxCK72HavChPvJPB-WkRQuBKg4vId-IKN6xO-tLJ9e7OOaIQi5zK8ODbA-sUyReH-mGXwifCgFDHc-MTO-bKgBLIuG8Xwy2HQx1JemHLvCvJQthKtO8TvSBLB4uLd-LPgGPO-tDJdG8Xui0HABuIeqpS-e7JP9XQ8e6RvKLGg9ABMKLYdJYM-o2Jt5lPOW9Cu8tKtGdaOm-KQ5OPvSsTwifGh9TR7CJP-O0L-xhGtO9av-MHPxLJemCcwKSTwtPFr6eUN25Qg9rKdSZUwigMBZDQeKhQR2ACvRTLL2%3DS-aVCuc8', '2023-12-21 22:26:30', NULL); +INSERT INTO `ln_config` VALUES (16, 'string', 'configs', 'FPCNHBteMQQOJR%3DBxLdC-LOaVJCNiH8OHXwe5Jg9FJf-XPQCeMRZDI-FlauK1URYxLb--Y-mqIRJXBdOqXuNgRhtUCL2-YQyQPwFlHdGhXxe5CfB0O8G-KvS7Pe1QQOllSQitDARnIPSZc%3DKhKP5kC9SjTBSLLf9mI8C%3DZA6%3DISRhGbaqU%3DWAQ%3DlmHeeXK%3DegJRdPS--4TBe5HSpOJdKhUPehM-pXKuVrWQpgKQ92KPeHOeaaIBdHP-BnTOGJCSJzNua-LOaRKPxQKsOkRAqBRgQtLdaKTuaeM-xpBMaebgaJHfBmLdStTAKvKP5fBfWrWgawDPNpQ-yLPgmtORUyFd6hPQqMR-9tIb2GK-aQThNfGsOeUPSfGgQtIfOXPdagIBRsPNO6awWxLvhCK9OPRequRxdhQcukT-WsD%3DdQHPC-ZOuTOOs2RdeNZtCJCfRoNva-LOaVPetMGOGMRvGACQxQKPeHQuNXMQ5STcmKctG7H-NRItG7SfKgIC1GQMukWN9gUQRTDOyZPd6aIBRsPO-jTQyACQxxNuhmZuaQThNeL8ubWNCpRxxpDOiOUueZIBRsPNG7Xu-4MvNpIL2HTue7JP9hTMaoQApgTgRUCOOaZR1cIBRsPOFncxGKCSoyIcSlSeaQThNXGtOiU%3DW9Sh5DDL-WTfNaIBRsPNC7XxCKRRJWKMKPPutZTvVLPMaoQAqxUwIvBPePc-ZdIBc1PMm4QQaBLhZlNea-LOaSIO5WBcOmSd-9CPd3IeeCUue2Lu1XT8plLAW0CAxMKsSCbfFXE%3D9QTL6pTRe1UB5SCMiGUx2QJ%3DFDK8eJROK6MwRWIsCKcP-rRvJRPuGjWguODA0uO-yJKtWTJ-pPLMmKL-W7RvwvJcS-bfChMP9QTempTQe1JgNUP9GZPQW1J%3D82J9-6WdK0CPN3KuqLRfCSHOBUQf2BWOGsQ%3DZAHeqXKNZXMQJHOe-NRQuwQRlmLdC-aeaUUyBXBbWeRgaxJwBVLcyHKwmbKQ5CCNS6LAW4LgBQIMK%3DP%3DKhHRZTKsutTvKBJQ5oS%3D-HTf-sK-tlGtZoWd66H%3DBCJtKdRg-RKCFPB8eWWPGBL%3DdoJdOHPv6bLOpOB-GITBe5HQBAK71uZA6VGRteQN-AR96BLQFSIdeLZuZbKABsQ8plSOO9RBUtLOmKbg-tIQFRFr1oT%3DWBUvNmSuaPZ-NZOAFLSe-eQ9OwQhUxItGCZupXKRViGMtoSfKtJwNST%3DeIKgxcJgBHGdS6LBaIUQRWKtKPQ%3De6CBNTFr65R969KA8tKcuJTuexKQ82NO9mOAm0CwxuKOidag5ZRetXBdavTQuBQgNoCOmHK%3DexLxdpFsyJYvS9L-MtOOmcLw-tQi5QFtKvSOOpLAFVQ9WCTPe3PA5DJtdlUBe1Lw9pIL2GKOaQThNXGtOiU%3DW9Sh5DDLCPTeeNOAFLSe-eQ9OwRBJvKsO%3DWAG7LRNRKtetWOS5RfdrQvGWKNa-LwJXSN-4TBe5HhZ2NMO3KQ-UCyReBOWESfS9IA5DR%3DGDZO-SOQ9lLMy8ad2IH-93KsO3YQ6%3DIOpSL8erTReBSQ1pLdCYKwhaLhcySNOiRN-JR-ouNeu3TfGVIQNRH9eqWgqfKB0vCOaDZ9FaMOpDQdO7QOOwQCFmNr-LYwCUJRlVBt-rWeNgQAR2HLO-ZOagMOxCB8ugXxWIMvMuJdGDYfOQC%3DVKH9dmWd2xGfZUIb6XY96cJOplHdOMXxS5CRItKMODReusKCNMH9O8Sd2BCfhTQ%3D2OTuuvLQ5XJ9eJYt-4R-tNO7-sbw9aGCRWBfGlR%3DWtUx9UP76KTuesJBVwB--6UOyMLwRDNsRtK%3De8PiROK9e9X%3DW5JRtAHPC-ZP-dOfA2S9eML96wQRlmKuqLKfGqCCBSKcqvU%3DSbKBxEQ76ZP-OQLPFtKeCNTN61HgBvNOuHZwG%3DKPxWQ9-mTQq1KB1UHdeKUwmzIBN0PNeiMBOLHgB2L79mZw-VLBNMPMeGSRe1Kx9oBOaEPfOrMABDQd-JRPS1RwxVKsJuSA-tPxlTL9-MWOKwCxxBHcOOZwhaIQ5LGNCMXvaxLvhCKb-tP-aQThNeKsurWQlgShtVIb2-YQyQJg9lQeGMZum5Hi5GJsOLQvSsC%3D1PQPW5SOK8CA9UP9GWYgW9KOtHFe66SRG5CwxRHdGDP%3D68JP5OJtKvSOKtLB5mHPC-ZOuTMAJHPe67SROJCSJ3HOekY%3DCtKO9PL8eKT-KBMPgvS92LYhWUOA5DHtFnKAi-RvQyO-mZPv-8MQ5iQMuuTuOpDxtoO8KHKNa9PutlR9JmOPWILPxsKMKdUQKsRuBSBb6LUAmPRPlSD7KGT-tcLQBHJ-KLP9C5CwRWJOeZLPOULPxSGsKsUN2fIw9ET8yCZAGrMQ9xBNG6L%3DG2LgBQK76%3DT%3De8Ey5WBf2JSPOTUQBqKfCHP%3DepKexPGNeiLBW8IvRENsOZOf-tHRNJKdKsTgm1JQQuHemMYeOtLBRXRdChQOqIQepxJeu%3DS%3DFaSw9TQeW%3DQPG1HABET%3DOKYdWbO%3DBSCN6gbuS9HhJCKb2LS%3D5YGQ5hQ99oT-OxRQNTQ9SEP-O2MCRpJ8y6QNGMH-8vJveHSABaGSRTQdKvW-SxKw5TKdOLTPOZLPJXIsmJRPKJLgxCK72HavChPvJPB-WkRQuBKg4vId-IKN6xO-tLJ9e7OOaIQi5zK8ODbA-sUyReH-mGXwifCgFDHc-MTO-bKgBLIuG8Xwy2HQx1JemHLvCvJQthKtO8TvSBLB4uLd-LPgGPO-tDJdG8Xui0HABuIeqpS-e7JP9XQ8e6RvKLGg9ABMKLYdJYM-o2Jt5lPOW9Cu8tKtGdaOm-KQ5OPvSsTwifGh9TR7CJP-O0L-xhGtO9av-MHPxLJemCcwKSTwtPFr6eUN25Qg9rKdSZUwigMBZDQeKhQR2ACvRTLL2%3DS-aVCuc8', 1701749449); +INSERT INTO `ln_config` VALUES (18, 'string', 'auth_code', '289A02826C894278', 1700841147); +INSERT INTO `ln_config` VALUES (19, 'string', 'email_password', 'ksuebkfenixhdbbh', 1700841147); +INSERT INTO `ln_config` VALUES (20, 'string', 'email_sendEmail', 'landaiqing@qq.com', 1700841147); +INSERT INTO `ln_config` VALUES (21, 'string', 'email_host', 'smtp.qq.com', 1700841147); +INSERT INTO `ln_config` VALUES (22, 'string', 'email_username', 'landaiqing@qq.com', 1700841147); +INSERT INTO `ln_config` VALUES (23, 'string', 'open_registed', 'true', 1700841147); +INSERT INTO `ln_config` VALUES (24, 'string', 'open_login', 'true', 1700841147); +INSERT INTO `ln_config` VALUES (25, 'string', 'newest_version', '38', 1701751306); +INSERT INTO `ln_config` VALUES (26, 'string', 'last_apply_time', '1701751306', 1701751306); -- ---------------------------- -- Table structure for ln_login_logs @@ -223,7 +233,7 @@ DROP TABLE IF EXISTS `ln_url_cate_list`; CREATE TABLE `ln_url_cate_list` ( `id` int UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '名称', - `createtime` int NULL DEFAULT NULL COMMENT '创建时间', + `createtime` datetime NULL DEFAULT NULL COMMENT '创建时间', `url_number` bigint NULL DEFAULT 0 COMMENT 'url 数量', `weigh` bigint NULL DEFAULT NULL COMMENT '权重', `status` tinyint NULL DEFAULT 1 COMMENT '状态', @@ -252,7 +262,7 @@ CREATE TABLE `ln_url_list` ( `icon` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '网站图标', `cate_id` int NULL DEFAULT 0 COMMENT '标签id', `url` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT 'url', - `createtime` int NULL DEFAULT NULL COMMENT '创建时间', + `createtime` datetime NULL DEFAULT NULL COMMENT '创建时间', `views` bigint NULL DEFAULT 0 COMMENT '访问数量', `tags` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '标签', `weigh` bigint NULL DEFAULT NULL COMMENT '权重', @@ -262,7 +272,7 @@ CREATE TABLE `ln_url_list` ( `agent_hint` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '代理提示语', `is_need_agent` tinyint NULL DEFAULT 0 COMMENT '是否需要代理 1需要0不需要', `is_ad` tinyint NULL DEFAULT 0 COMMENT '是否广告1是0不是', - `is_top` tinyint NULL DEFAULT 0 COMMENT '是否全局置顶1是0不是', + `is_top` tinyint(3) UNSIGNED ZEROFILL NULL DEFAULT 000 COMMENT '是否公开', `is_encrypt` tinyint NULL DEFAULT NULL COMMENT '是否加密（1加密/0不加密）', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; diff --git a/src/main/java/com/lovenav/utils/RandomValidateCode.java b/src/main/java/com/lovenav/utils/RandomValidateCode.java index 074bb20..0bf6f78 100644 --- a/src/main/java/com/lovenav/utils/RandomValidateCode.java +++ b/src/main/java/com/lovenav/utils/RandomValidateCode.java @@ -17,7 +17,7 @@ public class RandomValidateCode { private Random random = new Random(); private String randString = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";//随机产生的字符串 private int width = 80;// 图片宽度 - private int height = 26;// 图片高度 + private int height = 36;// 图片高度 private int lineSize = 40;// 干扰线数量 private int stringNum = 4;// 随机产生的字符数量 @@ -25,7 +25,7 @@ public class RandomValidateCode { * 获得字体 */ private Font getFont() { - return new Font("Fixedsys", Font.CENTER_BASELINE, 18); + return new Font("Fixedsys", Font.CENTER_BASELINE, 20); } /** From b77f863fb5ec9019e888646be83b1f4c695a854b Mon Sep 17 00:00:00 2001 From: Qing Date: Fri, 22 Dec 2023 17:00:07 +0800 Subject: [PATCH 3/7] update --- .../com/lovenav/dao/CollectIconListDao.java | 19 ------ .../com/lovenav/entity/CollectIconList.java | 25 -------- .../resources/mybatis/CollectIconListDao.xml | 63 ------------------- 3 files changed, 107 deletions(-) delete mode 100644 src/main/java/com/lovenav/dao/CollectIconListDao.java delete mode 100644 src/main/java/com/lovenav/entity/CollectIconList.java delete mode 100644 src/main/resources/mybatis/CollectIconListDao.xml diff --git a/src/main/java/com/lovenav/dao/CollectIconListDao.java b/src/main/java/com/lovenav/dao/CollectIconListDao.java deleted file mode 100644 index c9bc5ff..0000000 --- a/src/main/java/com/lovenav/dao/CollectIconListDao.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.lovenav.dao; - -import com.lovenav.entity.CollectIconList; -import org.springframework.stereotype.Repository; - -@Repository -public interface CollectIconListDao { - int deleteByPrimaryKey(Long id); - - int insert(CollectIconList record); - - int insertSelective(CollectIconList record); - - CollectIconList selectByPrimaryKey(Long id); - - int updateByPrimaryKeySelective(CollectIconList record); - - int updateByPrimaryKey(CollectIconList record); -} \ No newline at end of file diff --git a/src/main/java/com/lovenav/entity/CollectIconList.java b/src/main/java/com/lovenav/entity/CollectIconList.java deleted file mode 100644 index 79cf1a1..0000000 --- a/src/main/java/com/lovenav/entity/CollectIconList.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.lovenav.entity; - -import java.io.Serializable; -import lombok.Data; - -/** - * 图标表 - * ln_collect_icon_list - */ -@Data -public class CollectIconList implements Serializable { - private Long id; - - /** - * 网址 - */ - private String urlMd5; - - /** - * 图片地址 - */ - private String iconUrl; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/src/main/resources/mybatis/CollectIconListDao.xml b/src/main/resources/mybatis/CollectIconListDao.xml deleted file mode 100644 index db28c11..0000000 --- a/src/main/resources/mybatis/CollectIconListDao.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - id, url_md5, icon_url - - - - delete from ln_collect_icon_list - where id = #{id,jdbcType=BIGINT} - - - insert into ln_collect_icon_list (url_md5, icon_url) - values (#{urlMd5,jdbcType=VARCHAR}, #{iconUrl,jdbcType=VARCHAR}) - - - insert into ln_collect_icon_list - - - url_md5, - - - icon_url, - - - - - #{urlMd5,jdbcType=VARCHAR}, - - - #{iconUrl,jdbcType=VARCHAR}, - - - - - update ln_collect_icon_list - - - url_md5 = #{urlMd5,jdbcType=VARCHAR}, - - - icon_url = #{iconUrl,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - update ln_collect_icon_list - set url_md5 = #{urlMd5,jdbcType=VARCHAR}, - icon_url = #{iconUrl,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file From b2cff4c97aea0ecfd7b4b971a70f1f54b5896d97 Mon Sep 17 00:00:00 2001 From: sjm <2431685932@qq.com> Date: Fri, 22 Dec 2023 17:05:37 +0800 Subject: [PATCH 4/7] update --- pom.xml | 16 + .../lovenav/controller/CommentController.java | 6 + .../lovenav/controller/QRCodeController.java | 27 ++ .../com/lovenav/dao/CollectIconListDao.java | 19 + src/main/java/com/lovenav/dao/CommentDao.java | 2 + .../com/lovenav/entity/CollectIconList.java | 34 ++ .../com/lovenav/service/CommentService.java | 2 + .../serviceImpl/CommentServiceImpl.java | 6 + .../java/com/lovenav/utils/QRCodeUtil.java | 374 ++++++++++++++++++ .../resources/mybatis/CollectIconListDao.xml | 65 +++ src/main/resources/mybatis/CommentDao.xml | 7 +- src/main/resources/static/logo/NAV.png | Bin 0 -> 12299 bytes 12 files changed, 557 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/lovenav/controller/QRCodeController.java create mode 100644 src/main/java/com/lovenav/dao/CollectIconListDao.java create mode 100644 src/main/java/com/lovenav/entity/CollectIconList.java create mode 100644 src/main/java/com/lovenav/utils/QRCodeUtil.java create mode 100644 src/main/resources/mybatis/CollectIconListDao.xml create mode 100644 src/main/resources/static/logo/NAV.png diff --git a/pom.xml b/pom.xml index 2905927..17aa7d9 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,23 @@ test + + + com.google.zxing + core + 3.3.0 + + + com.google.zxing + javase + 3.3.0 + + + org.apache.ws.commons.axiom + base64-utils + 1.4.0 + diff --git a/src/main/java/com/lovenav/controller/CommentController.java b/src/main/java/com/lovenav/controller/CommentController.java index b37c606..5675743 100644 --- a/src/main/java/com/lovenav/controller/CommentController.java +++ b/src/main/java/com/lovenav/controller/CommentController.java @@ -46,4 +46,10 @@ public class CommentController { public String View_comment(){ return commentService.View_comment(); } + +// 显示回复 +@RequestMapping(method = RequestMethod.GET, value = "/view_reply") + public String View_reply(int id){ + return commentService.View_Reply(id); + } } diff --git a/src/main/java/com/lovenav/controller/QRCodeController.java b/src/main/java/com/lovenav/controller/QRCodeController.java new file mode 100644 index 0000000..5c4e0a7 --- /dev/null +++ b/src/main/java/com/lovenav/controller/QRCodeController.java @@ -0,0 +1,27 @@ +package com.lovenav.controller; + +import com.alibaba.fastjson.JSON; +import com.lovenav.utils.QRCodeUtil; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +@RestController + +public class QRCodeController { + private QRCodeUtil qrCodeUtil; +@RequestMapping(method = RequestMethod.GET, value = "/qrc") + public String QRCode(String url){ + String text = url; + String logoPath ="src/main/resources/static/logo/NAV.png"; + String destPath = "src/main/resources/static/qr"; + try { + String url2 = qrCodeUtil.encode(text, logoPath, destPath, true); + String base64 = qrCodeUtil.getBase64(url2); + return JSON.toJSONString(base64); + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} diff --git a/src/main/java/com/lovenav/dao/CollectIconListDao.java b/src/main/java/com/lovenav/dao/CollectIconListDao.java new file mode 100644 index 0000000..c9bc5ff --- /dev/null +++ b/src/main/java/com/lovenav/dao/CollectIconListDao.java @@ -0,0 +1,19 @@ +package com.lovenav.dao; + +import com.lovenav.entity.CollectIconList; +import org.springframework.stereotype.Repository; + +@Repository +public interface CollectIconListDao { + int deleteByPrimaryKey(Long id); + + int insert(CollectIconList record); + + int insertSelective(CollectIconList record); + + CollectIconList selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(CollectIconList record); + + int updateByPrimaryKey(CollectIconList record); +} \ No newline at end of file diff --git a/src/main/java/com/lovenav/dao/CommentDao.java b/src/main/java/com/lovenav/dao/CommentDao.java index f0fba2e..0c3cfe6 100644 --- a/src/main/java/com/lovenav/dao/CommentDao.java +++ b/src/main/java/com/lovenav/dao/CommentDao.java @@ -23,4 +23,6 @@ public interface CommentDao { int updateByPrimaryKey(Comment record); List selectByAllComment(); + + List selectByAllReply(int id); } \ No newline at end of file diff --git a/src/main/java/com/lovenav/entity/CollectIconList.java b/src/main/java/com/lovenav/entity/CollectIconList.java new file mode 100644 index 0000000..3d999a7 --- /dev/null +++ b/src/main/java/com/lovenav/entity/CollectIconList.java @@ -0,0 +1,34 @@ +package com.lovenav.entity; + +import java.io.Serializable; +import lombok.Data; + +/** + * 图标表 + * ln_collect_icon_list + */ +@Data +public class CollectIconList implements Serializable { + private Long id; + + /** + * 网址id + */ + private String urlid; + + /** + * 图片地址 + */ + private String iconUrl; + + /** + * 二维码地址 + */ + private String qrUrl; + /** + * 状态 + */ + private int status; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/lovenav/service/CommentService.java b/src/main/java/com/lovenav/service/CommentService.java index e29e2c3..5d5d04b 100644 --- a/src/main/java/com/lovenav/service/CommentService.java +++ b/src/main/java/com/lovenav/service/CommentService.java @@ -15,4 +15,6 @@ public interface CommentService { String Delete(int id); // 显示评论 String View_comment(); +// 显示回复 + String View_Reply(int id); } diff --git a/src/main/java/com/lovenav/service/serviceImpl/CommentServiceImpl.java b/src/main/java/com/lovenav/service/serviceImpl/CommentServiceImpl.java index bd16ca4..9b07f99 100644 --- a/src/main/java/com/lovenav/service/serviceImpl/CommentServiceImpl.java +++ b/src/main/java/com/lovenav/service/serviceImpl/CommentServiceImpl.java @@ -72,4 +72,10 @@ public class CommentServiceImpl implements CommentService { List list = commentDao.selectByAllComment(); return JSON.toJSONString(list); } + +// 显示回复 + public String View_Reply(int id){ + List list = commentDao.selectByAllReply(id); + return JSON.toJSONString(list); + } } diff --git a/src/main/java/com/lovenav/utils/QRCodeUtil.java b/src/main/java/com/lovenav/utils/QRCodeUtil.java new file mode 100644 index 0000000..05e9330 --- /dev/null +++ b/src/main/java/com/lovenav/utils/QRCodeUtil.java @@ -0,0 +1,374 @@ +package com.lovenav.utils; + +import com.google.zxing.*; +import com.google.zxing.client.j2se.BufferedImageLuminanceSource; +import com.google.zxing.common.BitMatrix; +import com.google.zxing.common.HybridBinarizer; +import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import org.apache.tomcat.util.codec.binary.Base64; + + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.geom.RoundRectangle2D; +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Map; +import java.util.Random; + + +public class QRCodeUtil { + private static final String CHARSET = "utf-8"; + private static final String FORMAT_NAME = "JPG"; + // 二维码尺寸 + private static final int QRCODE_SIZE = 300; + // LOGO宽度 + private static final int WIDTH = 60; + // LOGO高度 + private static final int HEIGHT = 60; + + private static BufferedImage createImage(String content, String imgPath, + boolean needCompress) throws Exception { + Hashtable hints = new Hashtable(); + hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H); + hints.put(EncodeHintType.CHARACTER_SET, CHARSET); + hints.put(EncodeHintType.MARGIN, 1); + BitMatrix bitMatrix = new MultiFormatWriter().encode(content, + BarcodeFormat.QR_CODE, QRCODE_SIZE, QRCODE_SIZE, hints); + int width = bitMatrix.getWidth(); + int height = bitMatrix.getHeight(); + BufferedImage image = new BufferedImage(width, height, + BufferedImage.TYPE_INT_RGB); + for (int x = 0; x < width; x++) { + for (int y = 0; y < height; y++) { + image.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000 + : 0xFFFFFFFF); + } + } + if (imgPath == null || "".equals(imgPath)) { + return image; + } + // 插入图片 + QRCodeUtil.insertImage(image, imgPath, needCompress); + return image; + } + + /** + * 插入LOGO + * + * @param source + * 二维码图片 + * @param imgPath + * LOGO图片地址 + * @param needCompress + * 是否压缩 + * @throws Exception + */ + private static void insertImage(BufferedImage source, String imgPath, + boolean needCompress) throws Exception { + File file = new File(imgPath); + if (!file.exists()) { + System.err.println(""+imgPath+" 该文件不存在！"); + return; + } + Image src = ImageIO.read(new File(imgPath)); + int width = src.getWidth(null); + int height = src.getHeight(null); + if (needCompress) { // 压缩LOGO + if (width > WIDTH) { + width = WIDTH; + } + if (height > HEIGHT) { + height = HEIGHT; + } + Image image = src.getScaledInstance(width, height, + Image.SCALE_SMOOTH); + BufferedImage tag = new BufferedImage(width, height, + BufferedImage.TYPE_INT_RGB); + Graphics g = tag.getGraphics(); + g.drawImage(image, 0, 0, null); // 绘制缩小后的图 + g.dispose(); + src = image; + } + // 插入LOGO + Graphics2D graph = source.createGraphics(); + int x = (QRCODE_SIZE - width) / 2; + int y = (QRCODE_SIZE - height) / 2; + graph.drawImage(src, x, y, width, height, null); + Shape shape = new RoundRectangle2D.Float(x, y, width, width, 6, 6); + graph.setStroke(new BasicStroke(3f)); + graph.draw(shape); + graph.dispose(); + } + + /** + * 生成二维码(内嵌LOGO) + * + * @param content + * 内容 + * @param imgPath + * LOGO地址 + * @param destPath + * 存放目录 + * @param needCompress + * 是否压缩LOGO + * @throws Exception + */ + public static String encode(String content, String imgPath, String destPath, + boolean needCompress) throws Exception { + BufferedImage image = QRCodeUtil.createImage(content, imgPath, + needCompress); + mkdirs(destPath); + String file = new Random().nextInt(99999999)+".jpg"; + ImageIO.write(image, FORMAT_NAME, new File(destPath+"/"+file)); + return destPath+"/"+file; + } + + /** + * 当文件夹不存在时，mkdirs会自动创建多层目录，区别于mkdir．(mkdir如果父目录不存在则会抛出异常) + * @param destPath 存放目录 + */ + public static void mkdirs(String destPath) { + File file =new File(destPath); + //当文件夹不存在时，mkdirs会自动创建多层目录，区别于mkdir．(mkdir如果父目录不存在则会抛出异常) + if (!file.exists() && !file.isDirectory()) { + file.mkdirs(); + } + } + + /** + * 生成二维码(内嵌LOGO) + * + * @param content + * 内容 + * @param imgPath + * LOGO地址 + * @param destPath + * 存储地址 + * @throws Exception + */ + public static void encode(String content, String imgPath, String destPath) + throws Exception { + QRCodeUtil.encode(content, imgPath, destPath, false); + } + + /** + * 生成二维码 + * + * @param content + * 内容 + * @param destPath + * 存储地址 + * @param needCompress + * 是否压缩LOGO + * @throws Exception + */ + public static void encode(String content, String destPath, + boolean needCompress) throws Exception { + QRCodeUtil.encode(content, null, destPath, needCompress); + } + + /** + * 生成二维码 + * + * @param content + * 内容 + * @param destPath + * 存储地址 + * @throws Exception + */ + public static void encode(String content, String destPath) throws Exception { + QRCodeUtil.encode(content, null, destPath, false); + } + + /** + * 生成二维码(内嵌LOGO) + * + * @param content + * 内容 + * @param imgPath + * LOGO地址 + * @param output + * 输出流 + * @param needCompress + * 是否压缩LOGO + * @throws Exception + */ + public static void encode(String content, String imgPath, + OutputStream output, boolean needCompress) throws Exception { + BufferedImage image = QRCodeUtil.createImage(content, imgPath, + needCompress); + ImageIO.write(image, FORMAT_NAME, output); + } + + /** + * 生成二维码 + * + * @param content + * 内容 + * @param output + * 输出流 + * @throws Exception + */ + public static void encode(String content, OutputStream output) + throws Exception { + QRCodeUtil.encode(content, null, output, false); + } + + /** + * 解析二维码 + * + * @param file + * 二维码图片 + * @return + * @throws Exception + */ + public static String decode(File file) throws Exception { + BufferedImage image; + image = ImageIO.read(file); + if (image == null) { + return null; + } + BufferedImageLuminanceSource source = new BufferedImageLuminanceSource( + image); + BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); + Result result; + Hashtable hints = new Hashtable(); + hints.put(DecodeHintType.CHARACTER_SET, CHARSET); + result = new MultiFormatReader().decode(bitmap, hints); + String resultStr = result.getText(); + return resultStr; + } + + /** + * 解析二维码 + * + * @param path + * 二维码图片地址 + * @return + * @throws Exception + */ + public static String decode(String path) throws Exception { + return QRCodeUtil.decode(new File(path)); + } + + /** + * + * @param content + * @param imgPath + * @param destPath + * @param localUrl 当前环境的域名或者ip地址 + * @param needCompress + * @return + * @throws Exception + */ + public static String encode(String content, String imgPath, String destPath,String localUrl, + boolean needCompress) throws Exception { + BufferedImage image = QRCodeUtil.createImage(content, imgPath, + needCompress); + mkdirs(destPath); + String file = new Random().nextInt(99999999)+".jpg"; + ImageIO.write(image, FORMAT_NAME, new File(destPath+"/"+file)); + return localUrl+file; + } + + public static String encodeDZ(String content, String imgPath, String destPath,String localUrl,int length,int width, + boolean needCompress) throws Exception { + BufferedImage image = QRCodeUtil.createImageDZ(content, imgPath,length,width, + needCompress); + mkdirs(destPath); + String file = new Random().nextInt(99999999)+".jpg"; + ImageIO.write(image, FORMAT_NAME, new File(destPath+"/"+file)); + return localUrl+file; + } + + private static BufferedImage createImageDZ(String content, String imgPath,int newlength,int newWidth, + boolean needCompress) throws Exception { + Hashtable hints = new Hashtable(); + hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H); + hints.put(EncodeHintType.CHARACTER_SET, CHARSET); + hints.put(EncodeHintType.MARGIN, 1); + BitMatrix bitMatrix = new MultiFormatWriter().encode(content, + BarcodeFormat.QR_CODE, newlength, newWidth, hints); + int width = bitMatrix.getWidth(); + int height = bitMatrix.getHeight(); + BufferedImage image = new BufferedImage(width, height, + BufferedImage.TYPE_INT_RGB); + for (int x = 0; x < width; x++) { + for (int y = 0; y < height; y++) { + image.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000 + : 0xFFFFFFFF); + } + } + if (imgPath == null || "".equals(imgPath)) { + return image; + } + // 插入图片 + QRCodeUtil.insertImage(image, imgPath, needCompress); + return image; + } + + public static void main(String[] args) throws Exception { + String text = "https://www.baidu.com"; //这里设置自定义网站url + String logoPath ="src/main/resources/static/logo/NAV.png"; + String destPath = "src/main/resources/static/qr"; + String url=QRCodeUtil.encode(text, logoPath, destPath, true); + System.out.println(url); + + /* String file="D:\\11.jpg"; + String info=QRCodeUtil.decode(file); + System.out.println(info);*/ + } + + /** + * 将图片url转换成base64流 + * @param url + * @return + */ + public String getBase64(String url){ + MultiFormatWriter multiFormatWriter = new MultiFormatWriter(); + Map hints = new HashMap(); + hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); //设置字符集编码类型 + hints.put(EncodeHintType.MARGIN, 1); //设置白边 + BitMatrix bitMatrix = null; + try { + bitMatrix = multiFormatWriter.encode(url, BarcodeFormat.QR_CODE, 300, 300,hints); + BufferedImage image = toBufferedImage(bitMatrix); + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + //输出二维码图片流 + try { + ImageIO.write(image, "jpg",outputStream); + String base = new Base64().encodeAsString(outputStream.toByteArray()); +// new Base64().encode(outputStream.toByteArray()); + return base; + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } catch (WriterException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + return null; + } + + + public static BufferedImage toBufferedImage(BitMatrix matrix) { + int width = matrix.getWidth(); + int height = matrix.getHeight(); + BufferedImage image = new BufferedImage(width, height, + BufferedImage.TYPE_INT_RGB); + for (int x = 0; x < width; x++) { + for (int y = 0; y < height; y++) { + image.setRGB(x, y, matrix.get(x, y) ? 0xFF000000 : 0xFFFFFFFF);//0xFF000000黑；0xFFFFFFFF白 + } + } + return image; + } + +} \ No newline at end of file diff --git a/src/main/resources/mybatis/CollectIconListDao.xml b/src/main/resources/mybatis/CollectIconListDao.xml new file mode 100644 index 0000000..310dd14 --- /dev/null +++ b/src/main/resources/mybatis/CollectIconListDao.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + id, url_id, icon_url,qrUrl,status + + + + delete from ln_collect_icon_list + where id = #{id,jdbcType=BIGINT} + + + insert into ln_collect_icon_list (url_md5, icon_url) + values (#{urlMd5,jdbcType=VARCHAR}, #{iconUrl,jdbcType=VARCHAR}) + + + insert into ln_collect_icon_list + + + url_md5, + + + icon_url, + + + + + #{urlMd5,jdbcType=VARCHAR}, + + + #{iconUrl,jdbcType=VARCHAR}, + + + + + update ln_collect_icon_list + + + url_md5 = #{urlMd5,jdbcType=VARCHAR}, + + + icon_url = #{iconUrl,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update ln_collect_icon_list + set url_md5 = #{urlMd5,jdbcType=VARCHAR}, + icon_url = #{iconUrl,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/resources/mybatis/CommentDao.xml b/src/main/resources/mybatis/CommentDao.xml index 9c7cd13..e1a4fbf 100644 --- a/src/main/resources/mybatis/CommentDao.xml +++ b/src/main/resources/mybatis/CommentDao.xml @@ -153,5 +153,10 @@ where root_comment_id = 0 and comment_status = 0 - + \ No newline at end of file diff --git a/src/main/resources/static/logo/NAV.png b/src/main/resources/static/logo/NAV.png new file mode 100644 index 0000000000000000000000000000000000000000..d9385116e2035704b1835b5a90af203f311a35ae GIT binary patch literal 12299 zcmV+mF!axfP)PyA07*naRCr$PeF=D6S9SmIyxBKxGm^DgvgAdM6DM)(#BuB-bs*Rp*-6V@3Z;;= z;cHR|gcbtnpHLt)$-nT20?iI#OQ8W0Y>iCZIGf`T?@Mf1USv!1s+rNgk7n-wyE7VV zB+c^Pn>U;M?)Ul22XpUPe)k>S<(zvCL2W5T;K|)gS5b>PfuWojtN?5TSp5_KWfT7; zf|Uhe13}M#0Ra633=pB8|8GL*zbp{?EdUG%CLC?B(uI^NaG4XQ%UplO)NdSMrGa5A z7Jxbks3V|`1+bV1wTdx`PNwu%`tTl-v=2J*js%Eto1 z45YD>m6Cw30k{vde05CcM6X z9!9RV>_p&QZYa5WHJpl}16Cj_1lGN%lLF-BXu z@EBwGaxQ_a%6bU_FJt(6Loq#>E12Yrfw;QaG71EZ2VFT~ zAX~ibGXdZ+FgVnYZq^{MjRo*PLkaEAW{tAiKwOL&D72;ed^Urq$|f6ui(q)bSxmo@ zO(Detv(`ZV7f72l!O^I5SND? z2h{NNOig|c@%@U^LHt%T?JZ*l;&QVQ^|fEx=R0Q^65-)`JAE_V3S`7UTpre|`Z&@( z)w$0v5Ww9VO6b{iYLa#XX>>E5P`M_ZN~*kO4+4x(-(aUL>Cz~z2IBItT>w_3OF5O# ztVQ5`P6usEhjwW*5SNE>t6!H6rBoiX9{~#B=K2!ao@!0gVjwOLd+PgOki z2oR3wHQ4z60%}bKvy>UgmTq=uz>k+wA+$}J*E$14C9 zr9xb{8_1SkwjeNuw?HUOMi6zZih$AxD3Na~ zX#;V27%#i^8Ksp|>8S`Pfj}UDTQ-!?TXJb7Wgtyn_7TP~>nokg1y>!H1qcwDoOW`` zl|;6Iyw=IA!vfv}uuLv7bj$iYCcGTyDla=4-?fSNo|5WFrCue5&3-zZ4^z zXai~LVt>s7$ap$>F-oa@R0I+r@P^Yte<21X(FWr3uvY=xCWffmM@1mp5fBI;TW_a? zQ6QoWWQ&)5D8TSywkxg5ry?K$fvrvleIQYPQ3lfFWlfA>eIjD&?n!QKsLMC9RlIyTvA+&tiHZcG2N8!GvtS^)T}(+G*KMz1=7T6CL60xP?R?j8td(} zAt?iCbhBR*;ja~yEYrkZzlismTF^H*oOVg7Ri<^}N2rU4VmrRWGsp|9aA$Z3}(WV>5h~l-u>+<1zl?7|>ESEEx85`pdF#LPt1qh`^ z_!&!^9OV`*>}DCA}^A=iD##3p+@0=XO+b0GvQm9j!bWD1sW)1dw z$MNW@LfG`mo^)y%+Y)ewtLRQ zJ)4|s_rl=aj1y&4qjbhQY)d-A+Zh%J0O*q=^!!VW5CDoos|VBG^W@n39Y6g)U72NpN?P5)nPVz&e?stL4Cd% z-_WTA8k{_I7M4mIG+F`U!!!HH`S8X|^U>MTjm2wgp&g9aB9s}izh@jey?~7$n+v@m zb=wCya!()gqgOl8JLE_C90R8Qc~OG;R2uv$w{M)`!cYLWmK*W0g{fUV!rWu|M4}o< zV>i2&{Me_w`WdA7W+(8>$>;(Igzbjz;5o!rod0$Hj_kd&lF?pSvufvh|I)cCF)fB)#HV!89 zV-TteaOMy{WdPMH%3%|x-oR*VTI`9iKj()lkyntu!><&;pV-z3?_lVIt(t2>+gR!h z#AeW-r6&Z;O=Sjra#30@F*-*zsQarz>WRcB>I%~2Wjh$dDk(r_b>Egg;5&yCin!B0 zjJ`9Wzn1w63n9nbuC2&J`;keEuiLN$W1UmaH6#!Y7&HifYSr^CShcn!p?vA?aIj+- zoAyuYQdMn6+em7hgm#k_hay(lhgRf+U-721MGIh@VIW((Sd}k;wsZ=Xa$ZlJ0Jggm zvgw?s#lhyu%=ra%c8v9i_mSv|EjZIY1pip*BPyDgkMfe@sC-Z7>(LYO*Z8)EGL)1V z6Uvy*4o|<~MrYsTQdc?8jE-UD4P=f*i+!HSE$9t%4EVdnXQ#Dpegkgz>@XhyCzXZ=_7C))u3Ben$Rs&Vc5pZ+UR8XXh|-x zVm^%TiiY1u!{l2&d@JjP-9I0hEclhEI)e5gF z#;AKRs=EHNd|W)*J>|E$zo>z3DE41LR$<10uBme67wS>}p^A({+I(&pzuz-;_25ET zE6wQlDYL~YwP>+-+RDLse0f2_J{=wKQ{#*b}k85C698 zMmy@R%2NsfS#*B>wig}KjF%JAmKos-Bp-)WV%Fk-*N5qpuD0v&xeV(L;MYzE{Y_K@ znRQu99ytsgo!s_F`C3lS7jWvmb2En6uPwpw`B2FTZB-%KqZmi!wWTP~$KNVx@^#oV zHuGaM7zJ$nconp1@K{H~b8Z9RR#@ zjOd7R4&k(F7uj&bEe=I=5KH7Y?{?utXY{AY$;M$>^%@-Ojeet7SD?ceuF34VYZ^u` zIUV#@Qw*fh!#+j8&&7h7)%`Y|1^%a95fM9UbU1h<;@Y>&hO>t!_vllMgn(tYUjg5= z>(N+(3|E-Y65&0b-tT=I%1~UI9_L}ZcMQMSG4rw^EYsWyBihHs8UA!VrhCb!|NgnF zY`9v1^Nk`C9=hsnZ78PsQw+q_#lDRIVm>`oig{Y-e0d+xsodL+z2!c1o%BLK-;Pte zre6PYeJXFRK=;XBEV!i_#u4$`1XgLrfjC#trE^XAi*@O79=^D{8!hK!V^%%agwrzO zu%>&-r_cZVd>tORHmg>Tpokr(p}%JZ`7Uj-8a?bq0zQ*-fc6xyyUGnoN!l}DL zhh`eW@poq$N0>q7>I&2@t;FaB@!3)|rAF+DvF!-cUGu&YRMw<6KUG5a*&cSSJ;e&dlfgB>>s%#TfvOJGB1BasDE=i^}F<`vL ziXG#9IQ8e5*S=wzjwN{z%Y zHQSI2eLg(6tz%TEnWri+B4f;sHhVCYB0y9#rQzt55-$*LPu}nC%#uME5Op_p{yuMHBbLIo_sy= zGXT!dT4_Rmf~<;#1_A9cyyVkm{+mTstS-yW)q~5*fSnBvS{XEuS&^Wj=^XHaa?e-> zONX&TuionTpfmtIWeUWbf)RF}b}?2Ni@2#LJ!_hI^Fy%ajp1 zU)c|w7yq~^o{Ym)7W5y99mDlb{vdkVL%&z7EQh|p9+jLaUx$1m1mdLXWR<31;GUQ^ zzs`p1Z&t>6*gfROPhJ%lX~5&cd~y5~iM-^~b>oQ`ctVD3Z_J3Ypn@@(Q3W{W< zQhU09AMg}j$+xju8+s1LzXkIwF<{p_p;ctzh9wyH#XcNZigd7!F|Zh0KW(`QySv31 z2C%-j$<-I=aIu$*9e>#dbiw1qx*g=F=y%xtrY!f-%BBOwBuT*xcnEb3q zr{HH;8(Kj;Y&QYRQ^hFdbia2L*grD@RVrWqd@H;MriPBhqOp&sEe$Z(suQOWwK)th z#dtWSvm3B0O7LDRz7^GG+X*X+d$eZ}A6&Bz_ zwPw6;t|=+`(>0heYz(g;M|lRCbTL+x55Ix=`hlcLhOcwQ66%|$$AvOI0!-XiA%Bhm zhA44Y{6N2lq$RK92Eq+RZu{TEeRwy@`6?E@(m4j4kMd(8FZuK#d3pigT~(MfsX7_M zCqf3|W@kZ2{HIXvjHGhhuTBGhiZ*=`m^zH`c8(lDes;tDoi*tEd>(KxW30Nerw2Omy$T?}TTX~;f1pig}*z?>e zkEB;^FzDT_WIF&ynQ_M;7e?qTV+Cfgs(=dBQTP_ zSxfltO-0a2TP($jn38@(_)^F~yvz@V#4g>Gh>--*trvh_Nc%via~mu-V=zuaxoFan zNrU2Fh0=zd+;$OXcS}3}I4VpKBA&Dk&o!gPBhLFCmWN;W@@roy-`j|fpFKL^ljtj| znrBAa#C5eCW*kfq)E7;D?l|NQM6vCy zmVUf>O!`z;)|k;T@W zMhjG$;5jONn-OMJ@QtgWzh>sP=Hh$3XmQEAO)IT3Vef$aq|iJZo`=Q9YW#gXUp)q7 zTxMtl!hlVSu4vgMMBxAaN)tXfKgZ4f*NTL-cAu=wlf zNIF)X2JIFNM1)vHW&fQU3&DdJbF{rmTRiNB0Pt?kDBx#c_wE8o@L6!(NJHq$H(Sz=*SfMZ;EV`QgEuzM` zSYgK(<)LeDa>l`V75(S(;B~B+c4F&AoResfRBpntvyHCvc*41G zJJ3Fi%@S|xN^Dv*pNWv8*nkraNO1;lC{vO=4`&k9VIq5i`U+8X>`MnBh&Ym~TOk z#H(YTvXrMTYilnS~w8L5NJ>;*41)RpycmX6(jF?c?eL;aL{+OxEDZvV zkIZz!Ni`DwxQU0L9QTgm<-Ov4Jw+BRjz@_{tEn`hSz@&DSC{9bD$e^6#lMXd5oExF z;b>kr2-3cQ6bTiRY?K=3G5Z$i(KE_07V(~3uDC*>9*$>kkUX6G9(F!;5~C9Sf_E6T z7>RP#TRz{6-ihLtVg%vk6I>EPSMrS-obUEU^|IGgo6#)6MYFubfV-~9jv_!}u!`45 z0PYJKNRyYfGKQLD38r-XeY*jXnL_$YO&C5Q?I0gZcFQNKVfpY}S*l$)*o$LZ#5)hW zc-Z|!eAaY^<+T>{iZnK(g>c@c7v-f8`_UD{lV3g0f))wEjhQZhBWt2!3?ks~ z!don!OiKJFTS+Oz(BfIzdA4>DZMepYei_%Au}GKv_e}tgwv*ZR{jv@H36ipfN%LI2 zXCe;Bkt}&Sp^_>S`eP)!j_f-)G6bGvyThKKMu`Au7~y=Ja}IYxo)DRn_Zo*D_gpDG z1Yah!DIdl&jfPi{w;97tDd#Ac0k8AH>wP3>ql;|lm9XzlM9+9jG4k$D?xCgkKH`}zZ6zVZFEfIv#Ea1rDsi}M_t}n$I&D4w}4vQ8oB41Ey zsx254aT9poQX7`U37Av@$8^)+8Q#MyNOsl+;oju?(8_>P5_>#)ed>ygy z5CmYTB5@>c78bw}GsSWHglmL^QjdDr4Vr8WSp35o;16+XoZGbM(Fhom89^HhAu>1lnA0*|Yd2~!Dl)1!uTT$-NrSObKa3{Akt5L`ZB<=Yj5fUiB~~4p z&x(&Wwwg5Xh={|=wgNawTL&jVa5?SN5HyhAcCmbG0OGw$ibx=W2wy$o#3T(?S}}N3 zdLUjR&gMHSVEwf6x87}Ud%*w2Yh4Zlyb^pEg~bMpjtAf;AKFhx4{0|VH88KL#4!oA zOSp{1d0KSj$FJQnKVORnuFcL828rf5-tUa?{RTUQk~Z+>@-Y6uVrDpKGF*}wo1n(| z@O&HkCB_+v702!Wdk2ZzheI3wY&Jm)Fs0&w>ZVm!umY{48e z#%xBk>!cN`DR&sqnjjkY@0ZxHEDH9$)eXrc{f!h!uEZ+-RrJoH7}Y?*C3@FGv)(D?<63vk9F zE+U!JtEn)dnLjFz(f;lV8*V6(wkjpkCtH5!iK`o|bYap!+&n5n5&!@Xxk*GpRP2jH z_+C~B7^B8{pvDT1f?o3Jy7HQV_MfasIRu_#{W$Vc^lDXNuX@8m26R3gJ3Lumux3#{ zdis3O=mhvodYrp3^-w-cFE8G~QOYdf)%XuZ1@W~aQAo?>}~`@Q#K2fCu<$K^L@$D%~_M%@lZtR9iS z&tF`Keys+lqC79InrB02f)JETTda9zwD_ZI_Q^UcZYq`c(oiZ^>Fysco-@TjUUoB{ znMK~qekC>d<5_@5?nX3b)}r66#mH&-@5#l8DCSA67&>D5^qn2X{$E8e_#^tNSMS5o z_hwe7Ev(5yz@Wvs7%^arR?b2Dc;fi7SaDb-CIJuMkQ*fo#LUI?KH(dzDF(v-hs(ou z00`yO%v5_|Z!no!WK-fjc_MX;>q?P#&w@nV6#c!W={zn**)qn9>J1BEFl%sN|IBS# z$-)A>H9_;n>xyvZ%*@P_C38&Zt4zE-Dz34hBg)O##}`^~OAZvkkv&-qcQ}h_(@X>L zvTuUn|Hvks>_GlnkiQy?Xd{dA(5JwY*+in*|7!&_bJF`}Y`A9(yPj&DA)1)0UNVfM z`Os9KO4-5!ygtp~Zo1Bn_A@hA-o-15ahk<0io=Dn)mY)4met*E(%@U!Up_6-bjST& zV~2GeQ4q8#r?o9^wl+Z6mK61520wZP;P1{S+Spf~V8mD%k-YDSU!Krz{Di-Er+o9+?9(mxviKT1PHUrI)AA34XPu91`Fa75bX__MpaaB|yZ6t31`M01RH z8r&IvxcMRi6R-SAt892fWXASrMlxq*8G55Q4=n}(-jb;+#b4H%@qrvEpC)@k23176M`({1;2r!eFR zT}}u_Em~p(ENabuyth9Tl;|imzW`@Ve)x}mLfbD5jCS2p(q(NVv9wR4} zc~34zhmsdp16eTX?&dx;Z<;(;M7!$M=z!xV+`;HwTY(Kn^& zaoYQ%o=IF>}7 z;ngebXqy;6uhxbOg;U?JN5)|pG=xWPEX=tAI8vvJG5kwIF+CnRE^5p{qlf*1fKN(g zAgljGjq{PZJoKd~05O(aMc-Qn?Y!(skJ-~cgoFPba*_^Lm~kfJoeNJ*b-KfY;h}Mu zD)X>k#2fuY^KsMiBDC`=!2lMlEXA3K5R`cpCLEnuS=U#Ya7Rtzhf|68W&7^}uyVbF zb|y5CEnfD~0K;$6qR{_shHor@Zi#jNl9f$cV?oh>EK8P*;^SKy&*S3ZUQAEmptmv{ z+Cq9y#$l!**ve z-8@~^s4K{(bIh#Kqb23rto9-JpKpa%W+}8}fY19<9gJ%xpQ0v1OUbcA-ZAWcwiS_4 zy?l~7&Ue9FYQkGFd>wLS&}am#SXzLy=Y~+Xq6BR$l#P8}wFO554DYKn;zRSZXO)$! zr-*T1bvo!#Q3k?0xjgK@0DMjaVcA{$|E~qzJG&5wcvmf(n3RE9LdkDeOBs>YzOAoy z;(Y5Mj!sm*HQ0d8zG1wsuyKTy;x7)bUX+i)As@yUapxgJMXebpeZY5C7NXFYIBqMg z0HuN%;Yz2Sj)*pp&2H8p5H_bm7EY7(`q1;>0r)PY=Q=l151uKJXH3l2<{t@Q$I~Zq zY$z0K-Zwss*OIJll1SJ5JS`Sf*-%hnL7SjMNv#z%CHmYhfRjk+iQkE^rQS~U(YnWd z7|`Tld>gu0Bp*rLhF(64f#;cXG4x#1ffg{vj? z;Wk`ON0ADTq8y%;|& zzs9)~UXgucRjHLrFO}mq{ntsn+w8?bZ~9i*(h?))FU&{jE#>(1RkJ6JXv}$H7-c@x zHI!4-w+C@o5SN?X3c~A3e*|OuyWx{jrc4Pr4A&GwyEr!{e&5q4adM7M3AH8B7#JMK z2NvX^{QB%p_%BJRSe*$kI_>n4*gq%W(&%Bk35Z?VRS_vwA}RuzL4ap)uXoV%vJIrk z%f7)F9?p#TDpwVOlp=6mugB8&=h4h(nG^lIyCX%h%O+_FV5b&}wERS_K4=W(bKsH}wwWPrw0un!D&IM>x z8C3*;N1YD(Y9b&+8AxyyN#T`mA|ch^RRk19px+_Q+itxqD!L>mYv)Z}45V8G`S5mkRz5y)Bu7)BxBx@d7%(PWlnAdOvY zDFv_>K>U0$S&NP;*yWA@0Y9#H(0yWYkYpeeH(Du=@)aw*+D}D5A_9zQa9u+o?H4;v zx`A}EWgu)<&mv+WR{LcU0zYy(=%1v>BiTSEZnXXn7``cmk=j>9Aj1f>fw0DDCvi2o zCxn$}AfW_vJo8EFYXxK&Rh9j$LEs;q4&uiHNlli4Ospaw2E+eI;-+?15y%7rgeIq* zoN`#pHW1FN(ZhaDz^CLeR>!Caqzi#?IW;-_k}{AjUUsFQVY?cFA_sbPOga!?4Bu-g zrU&HmO3FYu(Nqj|Q)VEX`DQm; zE)f0*pj?bFY9AE=$p{E|#92gNmpo47fRq{tmtjj6YX~s>Q9ZPaoDsE~XatDx!+JY? zLG%C_9aC-~T&6}hyPF74%aBhUq9PC-0m5@mJKdFPc+z4Z!9%-;sh;*!&*tSr|8=K> z)}}+6Cj#^q(-2gCj8P)y}9YY{jHJ8GRoqv_Bvtp*a@ZmEx~(lM{ImWN&sN4#w8 zN-Lgr1DQCJY$ig3(#ojxW;X&%gLw^w(JMivO7n~u$i$iCB?jD?D#cW~vkL)1z%A>G z=&f{Xl`#Veo=H56*QNfKbStg$%P|CElxR+e78x~=iG%xR!I0FeuXF&V@<=}d1e^;5 zu)Lv!E~KA(h-1bLWWq?)6hfK$0HVFA3q17HXFcEWyk;mgr}T#x+epiqq58@1K|>Gy2!54Xz^n( ztj-pYR5{Xv01+Opw^LT-e9k%p2^tAwW~~>GG2q_xOpVGV!w7VM@Fl06Ud*r@GuUUP zfrO>p;$?RSfXBd4m~FtR@+gAX0U%K5v&B{Z!A?IFJt9LLbHYHv z*tk6GZ^5@*z?=->rLs*H0m61a!vh-~v@=;!=@_3=2EqYp>S9;303HJHk#qp0@=y)| zMtEH7!#CHJ(x7rwQ%fo53?vLkqnCY#0{9vT3sMV_N?id2HU|QDY(q)%tn1@);>PdqK8Ngrk2fdo(dIZIvRR+Qpa`8Iu z0{#IAW_8rghDpi=9T>2a2+ug}G^?`L%sKy}A zfF~N`Td$HVn}?hchX`8;cxJtwewQ;sCn4x%V<4Aqyu7TEfV%<=8wpsR1a_Cx(0<0S znF0U3p_q8C<;$jBb_NnTvo1Hg6#_O8!v+Q{zHDY)oT7~Q%LBq@A%M-feqAe0<(a)M zYXgadW3!tz2!stl@L#1|Kxe_YZG5!|Fl^pfLdR!;K1r#d8pt&GHl1T;odFyC3>yXD zHg*}5ZXm)tEPy7a#ioWr+Mm=HHOmI81`=mNAAXn#H{Od|0|IX5UU~so!vNzf_y!IG z;I~jaw7`zri>Q4T=#&x_R0EL!>uZb|2i&+#qrqBYSj%$dkk8NwU@H-}QUGtSFQF3> z)V{2{ss@t8^#8Vt<(tN_S|HRxKpipE0l|M|NsvuusE+|H09r`EQ5HZ;z>k9)=g@&< zh+fWPRRc-E><0}efI0!FBLQ_RfW-o#j4{}VU}XW=K*4x1aoaUQ01N}ce}sMp3=q)I z2rb}7z|cZ^9Nkbrttn9FvL>k-NCv0>$=ys>u>jV<5NuiltOA2|JOBgf&_C|OfW?e{ l{{RMZ>48xO;Y Date: Fri, 22 Dec 2023 17:07:38 +0800 Subject: [PATCH 5/7] update --- .../com/lovenav/entity/CollectIconList.java | 56 +++++++++++++++-- src/main/resources/application.yml | 2 +- .../resources/mybatis/CollectIconListDao.xml | 62 +++++++++++++------ 3 files changed, 95 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/lovenav/entity/CollectIconList.java b/src/main/java/com/lovenav/entity/CollectIconList.java index 3d999a7..783005c 100644 --- a/src/main/java/com/lovenav/entity/CollectIconList.java +++ b/src/main/java/com/lovenav/entity/CollectIconList.java @@ -14,21 +14,69 @@ public class CollectIconList implements Serializable { /** * 网址id */ - private String urlid; + private String url_id; /** * 图片地址 */ - private String iconUrl; + private String icon_url; /** * 二维码地址 */ - private String qrUrl; + private String qr_url; + /** * 状态 */ - private int status; + private Integer status; private static final long serialVersionUID = 1L; + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + CollectIconList other = (CollectIconList) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getUrl_id() == null ? other.getUrl_id() == null : this.getUrl_id().equals(other.getUrl_id())) + && (this.getIcon_url() == null ? other.getIcon_url() == null : this.getIcon_url().equals(other.getIcon_url())) + && (this.getQr_url() == null ? other.getQr_url() == null : this.getQr_url().equals(other.getQr_url())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getUrl_id() == null) ? 0 : getUrl_id().hashCode()); + result = prime * result + ((getIcon_url() == null) ? 0 : getIcon_url().hashCode()); + result = prime * result + ((getQr_url() == null) ? 0 : getQr_url().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", url_id=").append(url_id); + sb.append(", icon_url=").append(icon_url); + sb.append(", qr_url=").append(qr_url); + sb.append(", status=").append(status); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } } \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e9f506d..1ee784d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,7 +2,7 @@ spring: datasource: url: jdbc:mysql://localhost:3306/love-nav username: root - password: Cheng123... + password: 1611 driver-class-name: com.mysql.cj.jdbc.Driver redis: host: localhost diff --git a/src/main/resources/mybatis/CollectIconListDao.xml b/src/main/resources/mybatis/CollectIconListDao.xml index 310dd14..eb1e353 100644 --- a/src/main/resources/mybatis/CollectIconListDao.xml +++ b/src/main/resources/mybatis/CollectIconListDao.xml @@ -3,13 +3,13 @@ - - - - + + + + - id, url_id, icon_url,qrUrl,status + id, url_id, icon_url, qr_url, `status` + + + + delete from ln_auth where id = #{id,jdbcType=INTEGER}