From d7b41834a8ec8b0829eddb3dd90b62d3841f2568 Mon Sep 17 00:00:00 2001 From: liudeyu Date: Wed, 12 Jun 2019 11:05:03 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=8A=A0=E4=B8=8Ajava=20version=201.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quark-common/pom.xml | 3 +++ quark-parent/pom.xml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/quark-common/pom.xml b/quark-common/pom.xml index 07f3a0c..a86471c 100644 --- a/quark-common/pom.xml +++ b/quark-common/pom.xml @@ -13,6 +13,9 @@ quark-common + + 1.8 + org.springframework.boot diff --git a/quark-parent/pom.xml b/quark-parent/pom.xml index fd6e573..5f33014 100644 --- a/quark-parent/pom.xml +++ b/quark-parent/pom.xml @@ -24,8 +24,12 @@ 1.9.22 2.8.0 2.2.2 + 1.8 + 1.8 + + From 88650827613d7517719a56c036129b59818ceaa9 Mon Sep 17 00:00:00 2001 From: liudeyu Date: Wed, 12 Jun 2019 11:22:28 +0800 Subject: [PATCH 02/17] =?UTF-8?q?sql=20ddl=E8=AF=AD=E5=8F=A5=E5=92=8C?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=AF=AD=E5=8F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.properties | 4 +- resource/sql/quarkcommunity.sql | 541 ++++++++++++------ 2 files changed, 378 insertions(+), 167 deletions(-) diff --git a/quark-common/src/main/resources/application.properties b/quark-common/src/main/resources/application.properties index 39ffd43..df3133f 100644 --- a/quark-common/src/main/resources/application.properties +++ b/quark-common/src/main/resources/application.properties @@ -1,8 +1,8 @@ #Mysql配置 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.url=jdbc:mysql://127.0.0.1:3306/quarkCommunity?useUnicode=true&characterEncoding=UTF-8&useSSL=false -spring.datasource.username=root -spring.datasource.password=root +spring.datasource.username=ldy +spring.datasource.password=abcd1234 spring.datasource.driver-class-name=com.mysql.jdbc.Driver #jpa配置 diff --git a/resource/sql/quarkcommunity.sql b/resource/sql/quarkcommunity.sql index fc7dcab..c3b76cb 100644 --- a/resource/sql/quarkcommunity.sql +++ b/resource/sql/quarkcommunity.sql @@ -13,20 +13,27 @@ File Encoding : 65001 Date: 2017-09-07 14:34:10 */ -SET FOREIGN_KEY_CHECKS=0; +CREATE DATABASE IF NOT EXISTS quarkCommunity + CHARACTER SET utf8 + COLLATE utf8_general_ci; +USE quarkCommunity; +SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- -- Table structure for quark_adminuser -- ---------------------------- DROP TABLE IF EXISTS `quark_adminuser`; CREATE TABLE `quark_adminuser` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `enable` int(11) NOT NULL, - `password` varchar(255) NOT NULL, - `username` varchar(255) NOT NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `enable` INT(11) NOT NULL, + `password` VARCHAR(255) NOT NULL, + `username` VARCHAR(255) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `UK_4erqa44qkwwkl539xouso7v4c` (`username`) -) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8; +) + ENGINE = InnoDB + AUTO_INCREMENT = 51 + DEFAULT CHARSET = utf8; -- ---------------------------- -- Records of quark_adminuser @@ -69,13 +76,15 @@ INSERT INTO `quark_adminuser` VALUES ('50', '1', '0db82a65c8f98f62e9670ba35ab7a1 -- ---------------------------- DROP TABLE IF EXISTS `quark_adminuser_role`; CREATE TABLE `quark_adminuser_role` ( - `adminuser_id` int(11) NOT NULL, - `role_id` int(11) NOT NULL, - PRIMARY KEY (`adminuser_id`,`role_id`), + `adminuser_id` INT(11) NOT NULL, + `role_id` INT(11) NOT NULL, + PRIMARY KEY (`adminuser_id`, `role_id`), KEY `FK26lllx1jn0c1k8f8oj2qt4io1` (`role_id`), CONSTRAINT `FK26lllx1jn0c1k8f8oj2qt4io1` FOREIGN KEY (`role_id`) REFERENCES `quark_role` (`id`), CONSTRAINT `FKatv5o94k3fooskwr53rvqfven` FOREIGN KEY (`adminuser_id`) REFERENCES `quark_adminuser` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) + ENGINE = InnoDB + DEFAULT CHARSET = utf8; -- ---------------------------- -- Records of quark_adminuser_role @@ -87,16 +96,18 @@ INSERT INTO `quark_adminuser_role` VALUES ('3', '1'); -- ---------------------------- DROP TABLE IF EXISTS `quark_collect`; CREATE TABLE `quark_collect` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `init_time` datetime DEFAULT NULL, - `posts_id` int(11) NOT NULL, - `user_id` int(11) NOT NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `init_time` DATETIME DEFAULT NULL, + `posts_id` INT(11) NOT NULL, + `user_id` INT(11) NOT NULL, PRIMARY KEY (`id`), KEY `FK5a8rh83fve6ug3utggpy8wdvi` (`posts_id`), KEY `FKg4gtyqabrsuwr5y35lxvjy515` (`user_id`), CONSTRAINT `FK5a8rh83fve6ug3utggpy8wdvi` FOREIGN KEY (`posts_id`) REFERENCES `quark_posts` (`id`), CONSTRAINT `FKg4gtyqabrsuwr5y35lxvjy515` FOREIGN KEY (`user_id`) REFERENCES `quark_user` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) + ENGINE = InnoDB + DEFAULT CHARSET = utf8; -- ---------------------------- -- Records of quark_collect @@ -107,13 +118,16 @@ CREATE TABLE `quark_collect` ( -- ---------------------------- DROP TABLE IF EXISTS `quark_label`; CREATE TABLE `quark_label` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `details` varchar(255) DEFAULT NULL, - `name` varchar(255) NOT NULL, - `posts_count` int(11) DEFAULT NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `details` VARCHAR(255) DEFAULT NULL, + `name` VARCHAR(255) NOT NULL, + `posts_count` INT(11) DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `UK_6vml4ba2itmaor84892v92b1f` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8; +) + ENGINE = InnoDB + AUTO_INCREMENT = 10 + DEFAULT CHARSET = utf8; -- ---------------------------- -- Records of quark_label @@ -132,12 +146,12 @@ INSERT INTO `quark_label` VALUES ('9', '关于Android的话题', 'Android', '2') -- ---------------------------- DROP TABLE IF EXISTS `quark_notification`; CREATE TABLE `quark_notification` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `is_read` bit(1) DEFAULT NULL, - `fromuser_id` int(11) NOT NULL, - `posts_id` int(11) NOT NULL, - `touser_id` int(11) NOT NULL, - `init_time` datetime NOT NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `is_read` BIT(1) DEFAULT NULL, + `fromuser_id` INT(11) NOT NULL, + `posts_id` INT(11) NOT NULL, + `touser_id` INT(11) NOT NULL, + `init_time` DATETIME NOT NULL, PRIMARY KEY (`id`), KEY `FKac4wjs0b3992ohkf61jy4ilmj` (`fromuser_id`), KEY `FKilg05a7ki3vkv7lfjnn57pdw2` (`posts_id`), @@ -145,7 +159,10 @@ CREATE TABLE `quark_notification` ( CONSTRAINT `FKac4wjs0b3992ohkf61jy4ilmj` FOREIGN KEY (`fromuser_id`) REFERENCES `quark_user` (`id`), CONSTRAINT `FKilg05a7ki3vkv7lfjnn57pdw2` FOREIGN KEY (`posts_id`) REFERENCES `quark_posts` (`id`), CONSTRAINT `FKquscxmtiqggsch7w833ywubux` FOREIGN KEY (`touser_id`) REFERENCES `quark_user` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8; +) + ENGINE = InnoDB + AUTO_INCREMENT = 23 + DEFAULT CHARSET = utf8; -- ---------------------------- -- Records of quark_notification @@ -158,14 +175,17 @@ INSERT INTO `quark_notification` VALUES ('22', '', '71', '4', '2', '2017-09-07 -- ---------------------------- DROP TABLE IF EXISTS `quark_permission`; CREATE TABLE `quark_permission` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) DEFAULT NULL, - `perurl` varchar(255) DEFAULT NULL, - `sort` int(11) DEFAULT NULL, - `type` int(11) DEFAULT NULL, - `parentid` int(11) NOT NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `name` VARCHAR(255) DEFAULT NULL, + `perurl` VARCHAR(255) DEFAULT NULL, + `sort` INT(11) DEFAULT NULL, + `type` INT(11) DEFAULT NULL, + `parentid` INT(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=29 DEFAULT CHARSET=utf8; +) + ENGINE = InnoDB + AUTO_INCREMENT = 29 + DEFAULT CHARSET = utf8; -- ---------------------------- -- Records of quark_permission @@ -201,30 +221,37 @@ INSERT INTO `quark_permission` VALUES ('28', '修改标签', '/labels/update', ' -- ---------------------------- DROP TABLE IF EXISTS `quark_posts`; CREATE TABLE `quark_posts` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `content` text, - `good` bit(1) NOT NULL, - `init_time` datetime NOT NULL, - `label_id` int(11) DEFAULT NULL, - `reply_count` int(11) DEFAULT NULL, - `title` varchar(255) NOT NULL, - `top` bit(1) NOT NULL, - `user_id` int(11) NOT NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `content` TEXT, + `good` BIT(1) NOT NULL, + `init_time` DATETIME NOT NULL, + `label_id` INT(11) DEFAULT NULL, + `reply_count` INT(11) DEFAULT NULL, + `title` VARCHAR(255) NOT NULL, + `top` BIT(1) NOT NULL, + `user_id` INT(11) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `UK_46eh0lt2x9ftqcv9tjs8meqj8` (`title`), KEY `FK41ebsa5jpn18egdtjo6uiaugn` (`user_id`), KEY `FKnxd3qh1m3c0o6tc3ojfa8fm6o` (`label_id`), CONSTRAINT `FK41ebsa5jpn18egdtjo6uiaugn` FOREIGN KEY (`user_id`) REFERENCES `quark_user` (`id`), CONSTRAINT `FKnxd3qh1m3c0o6tc3ojfa8fm6o` FOREIGN KEY (`label_id`) REFERENCES `quark_label` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=214 DEFAULT CHARSET=utf8; +) + ENGINE = InnoDB + AUTO_INCREMENT = 214 + DEFAULT CHARSET = utf8; -- ---------------------------- -- Records of quark_posts -- ---------------------------- INSERT INTO `quark_posts` VALUES ('1', 'hahaha hello world Java', '\0', '2017-08-26 15:33:39', '1', '32', 'Hello World', '\0', '2'); INSERT INTO `quark_posts` VALUES ('2', 'hahaha hello world Java', '\0', '2017-08-26 15:46:53', '1', '0', 'Hello World Scala', '\0', '2'); -INSERT INTO `quark_posts` VALUES ('3', '

测试发布内容\"[鼓掌]\"\"[鼓掌]\"\"[鼓掌]\"\"[鼓掌]\"\"[鼓掌]\"

', '\0', '2017-08-27 15:13:44', '1', '0', '测试发布', '\0', '2'); -INSERT INTO `quark_posts` VALUES ('4', '\"null\"', '', '2017-08-27 15:49:42', '3', '22', '推荐连续剧《请回答1988》', '', '2'); +INSERT INTO `quark_posts` VALUES ('3', + '

测试发布内容\"[鼓掌]\"\"[鼓掌]\"\"[鼓掌]\"\"[鼓掌]\"\"[鼓掌]\"

', + '\0', '2017-08-27 15:13:44', '1', '0', '测试发布', '\0', '2'); +INSERT INTO `quark_posts` VALUES + ('4', '\"null\"', '', '2017-08-27 15:49:42', + '3', '22', '推荐连续剧《请回答1988》', '', '2'); INSERT INTO `quark_posts` VALUES ('105', '希鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁1', '\0', '2017-08-28 16:03:00', '1', '1', '测试帖子1', '\0', '2'); INSERT INTO `quark_posts` VALUES ('106', '希鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁2', '\0', '2017-08-28 16:03:00', '1', '0', '测试帖子2', '\0', '2'); INSERT INTO `quark_posts` VALUES ('107', '希鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁3', '\0', '2017-08-28 16:03:00', '1', '0', '测试帖子3', '\0', '2'); @@ -324,32 +351,50 @@ INSERT INTO `quark_posts` VALUES ('200', '希鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁 INSERT INTO `quark_posts` VALUES ('201', '希鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁97', '\0', '2017-08-28 16:03:06', '1', '0', '测试帖子97', '\0', '2'); INSERT INTO `quark_posts` VALUES ('202', '希鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁98', '\0', '2017-08-28 16:03:06', '1', '0', '测试帖子98', '\0', '2'); INSERT INTO `quark_posts` VALUES ('203', '希鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁鲁99', '\0', '2017-08-28 16:03:06', '1', '0', '测试帖子99', '\0', '2'); -INSERT INTO `quark_posts` VALUES ('205', '

<dependency>

<groupId>org.springframework.boot</groupId>

<artifactId>spring-boot-starter-thymeleaf</artifactId>

</dependency>

', '', '2017-08-28 21:52:55', '4', '1', '在Spring boot中配置Thymeleaf', '\0', '2'); -INSERT INTO `quark_posts` VALUES ('206', '

\"null\"

', '', '2017-08-28 22:46:59', '3', '1', 'Class文件装载流程', '\0', '2'); -INSERT INTO `quark_posts` VALUES ('208', '

\"null\"


', '', '2017-09-01 22:01:27', '3', '2', 'JVM体系', '', '2'); -INSERT INTO `quark_posts` VALUES ('209', '\"[爱你]\"', '\0', '2017-09-03 11:05:25', '5', '2', '探索R闪背后的奥秘', '\0', '71'); -INSERT INTO `quark_posts` VALUES ('210', '

filterChainDefinitionMap.put(\"/favicon.ico\",\"anon\");//解决弹出favicon.ico下载

\"null\"

', '\0', '2017-09-03 11:07:21', '2', '4', 'shiro在登录的时候下载favicon.ico问题', '\0', '71'); -INSERT INTO `quark_posts` VALUES ('211', 'view结构\"null\"', '\0', '2017-09-05 10:38:27', '9', '1', 'Android View机制', '\0', '72'); -INSERT INTO `quark_posts` VALUES ('212', '\"[兔子]\"', '\0', '2017-09-05 10:38:59', '9', '4', '新人报到', '\0', '72'); -INSERT INTO `quark_posts` VALUES ('213', '

1 先来先服务 - 时间片轮转调度
\n这个很简单，就是谁先来，就给谁分配时间片运行，缺点是有些紧急的任务要很久才能得到运行。

2. 优先级调度
\n每个线程有一个优先级，CPU每次去拿优先级高的运行，优先级低的等等，为了避免优先级低的等太久，每等一定时间，就给优先级低的线程提高一个级别

3.最短作业优先
\n把线程任务量排序，每次拿处理时间短的线程运行，就像我去银行办业务一样，我的事情很快就处理完了，所以让我插队先办完，后面时间长的人先等等，时间长的人就很难得到响应了。

4. 最高响应比优先
\n用线程的等待时间除以服务时间，得到响应比，响应比小的优先运行。这样不会造成某些任务一直得不到响应。

\n\n\n\n\n\n\n\n

5.多级反馈队列调度
\n有多个优先级不同的队列，每个队列里面有多个等待线程。
\nCPU每次从优先级高的遍历到低的，取队首的线程运行，运行完了放回队尾，优先级越高，时间片越短，即响应越快，时间片大小就不是固定的了。
\n每个队列的内部还是用先来先服务的策略。

', '\0', '2017-09-07 10:21:06', '8', '6', '并发的CPU调度策略', '\0', '2'); +INSERT INTO `quark_posts` VALUES ('205', + '

<dependency>

<groupId>org.springframework.boot</groupId>

<artifactId>spring-boot-starter-thymeleaf</artifactId>

</dependency>

', + '', '2017-08-28 21:52:55', '4', '1', '在Spring boot中配置Thymeleaf', '\0', '2'); +INSERT INTO `quark_posts` VALUES + ('206', '

\"null\"

', '', + '2017-08-28 22:46:59', '3', '1', 'Class文件装载流程', '\0', '2'); +INSERT INTO `quark_posts` VALUES + ('208', '

\"null\"


', '', + '2017-09-01 22:01:27', '3', '2', 'JVM体系', '', '2'); +INSERT INTO `quark_posts` VALUES + ('209', '\"[爱你]\"', '\0', '2017-09-03 11:05:25', '5', '2', '探索R闪背后的奥秘', '\0', + '71'); +INSERT INTO `quark_posts` VALUES ('210', + '

filterChainDefinitionMap.put(\"/favicon.ico\",\"anon\");//解决弹出favicon.ico下载

\"null\"

', + '\0', '2017-09-03 11:07:21', '2', '4', 'shiro在登录的时候下载favicon.ico问题', '\0', '71'); +INSERT INTO `quark_posts` VALUES + ('211', 'view结构\"null\"', '\0', + '2017-09-05 10:38:27', '9', '1', 'Android View机制', '\0', '72'); +INSERT INTO `quark_posts` VALUES + ('212', '\"[兔子]\"', '\0', '2017-09-05 10:38:59', '9', '4', '新人报到', '\0', '72'); +INSERT INTO `quark_posts` VALUES ('213', + '

1 先来先服务 - 时间片轮转调度
\n这个很简单，就是谁先来，就给谁分配时间片运行，缺点是有些紧急的任务要很久才能得到运行。

2. 优先级调度
\n每个线程有一个优先级，CPU每次去拿优先级高的运行，优先级低的等等，为了避免优先级低的等太久，每等一定时间，就给优先级低的线程提高一个级别

3.最短作业优先
\n把线程任务量排序，每次拿处理时间短的线程运行，就像我去银行办业务一样，我的事情很快就处理完了，所以让我插队先办完，后面时间长的人先等等，时间长的人就很难得到响应了。

4. 最高响应比优先
\n用线程的等待时间除以服务时间，得到响应比，响应比小的优先运行。这样不会造成某些任务一直得不到响应。

\n\n\n\n\n\n\n\n

5.多级反馈队列调度
\n有多个优先级不同的队列，每个队列里面有多个等待线程。
\nCPU每次从优先级高的遍历到低的，取队首的线程运行，运行完了放回队尾，优先级越高，时间片越短，即响应越快，时间片大小就不是固定的了。
\n每个队列的内部还是用先来先服务的策略。

', + '\0', '2017-09-07 10:21:06', '8', '6', '并发的CPU调度策略', '\0', '2'); -- ---------------------------- -- Table structure for quark_reply -- ---------------------------- DROP TABLE IF EXISTS `quark_reply`; CREATE TABLE `quark_reply` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `content` text NOT NULL, - `init_time` datetime DEFAULT NULL, - `up` int(11) NOT NULL, - `posts_id` int(11) NOT NULL, - `user_id` int(11) NOT NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `content` TEXT NOT NULL, + `init_time` DATETIME DEFAULT NULL, + `up` INT(11) NOT NULL, + `posts_id` INT(11) NOT NULL, + `user_id` INT(11) NOT NULL, PRIMARY KEY (`id`), KEY `FKnr6a7xtk9rm31ptn6gchi9113` (`posts_id`), KEY `FKnt12hb9oqfm5eamjpg27bkpvv` (`user_id`), CONSTRAINT `FKnr6a7xtk9rm31ptn6gchi9113` FOREIGN KEY (`posts_id`) REFERENCES `quark_posts` (`id`), CONSTRAINT `FKnt12hb9oqfm5eamjpg27bkpvv` FOREIGN KEY (`user_id`) REFERENCES `quark_user` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=77 DEFAULT CHARSET=utf8; +) + ENGINE = InnoDB + AUTO_INCREMENT = 77 + DEFAULT CHARSET = utf8; -- ---------------------------- -- Records of quark_reply @@ -389,38 +434,60 @@ INSERT INTO `quark_reply` VALUES ('35', '希鲁鲁', '2017-08-30 22:42:38', '0', INSERT INTO `quark_reply` VALUES ('36', '测试', '2017-08-30 22:44:50', '0', '105', '2'); INSERT INTO `quark_reply` VALUES ('37', '不错啊不错哇', '2017-08-30 22:45:31', '0', '4', '2'); INSERT INTO `quark_reply` VALUES ('38', '不错啊不错哇', '2017-08-30 22:47:36', '0', '206', '2'); -INSERT INTO `quark_reply` VALUES ('39', '好剧，谢谢推荐\"[心]\"', '2017-08-30 23:20:37', '0', '4', '2'); -INSERT INTO `quark_reply` VALUES ('40', '

垃圾哥乱入\"[偷笑]\"

\"null\"

', '2017-08-30 23:25:33', '0', '4', '2'); +INSERT INTO `quark_reply` +VALUES ('39', '好剧，谢谢推荐\"[心]\"', '2017-08-30 23:20:37', '0', '4', '2'); +INSERT INTO `quark_reply` VALUES ('40', + '

垃圾哥乱入\"[偷笑]\"

\"null\"

', + '2017-08-30 23:25:33', '0', '4', '2'); INSERT INTO `quark_reply` VALUES ('41', '不错', '2017-08-30 23:26:34', '0', '4', '2'); INSERT INTO `quark_reply` VALUES ('42', '哈哈', '2017-08-30 23:27:55', '0', '4', '2'); -INSERT INTO `quark_reply` VALUES ('43', '铁打的父母流水的孩子~\"[挤眼]\"', '2017-08-30 23:29:51', '0', '4', '2'); -INSERT INTO `quark_reply` VALUES ('44', '

\"[太开心]\"\"[太开心]\"\"[太开心]\"\"[太开心]\"好看

', '2017-08-31 14:57:03', '0', '4', '2'); +INSERT INTO `quark_reply` +VALUES ('43', '铁打的父母流水的孩子~\"[挤眼]\"', '2017-08-30 23:29:51', '0', '4', '2'); +INSERT INTO `quark_reply` VALUES ('44', + '

\"[太开心]\"\"[太开心]\"\"[太开心]\"\"[太开心]\"好看

', + '2017-08-31 14:57:03', '0', '4', '2'); INSERT INTO `quark_reply` VALUES ('45', '好好好', '2017-08-31 15:05:10', '0', '4', '2'); -INSERT INTO `quark_reply` VALUES ('46', '牛逼\"[微笑]\"', '2017-08-31 15:35:15', '0', '4', '2'); -INSERT INTO `quark_reply` VALUES ('47', '不错，很清晰\"[猪头]\"', '2017-09-01 22:01:43', '0', '208', '2'); -INSERT INTO `quark_reply` VALUES ('48', '厉害啊\"[酷]\"', '2017-09-03 11:32:23', '0', '210', '2'); -INSERT INTO `quark_reply` VALUES ('49', '\"[怒]\"', '2017-09-05 10:26:14', '0', '209', '2'); -INSERT INTO `quark_reply` VALUES ('50', '有意思\"null\"', '2017-09-05 10:32:42', '0', '210', '72'); -INSERT INTO `quark_reply` VALUES ('51', '很清晰\"[爱你]\"', '2017-09-05 10:39:18', '0', '211', '2'); +INSERT INTO `quark_reply` +VALUES ('46', '牛逼\"[微笑]\"', '2017-08-31 15:35:15', '0', '4', '2'); +INSERT INTO `quark_reply` +VALUES ('47', '不错，很清晰\"[猪头]\"', '2017-09-01 22:01:43', '0', '208', '2'); +INSERT INTO `quark_reply` +VALUES ('48', '厉害啊\"[酷]\"', '2017-09-03 11:32:23', '0', '210', '2'); +INSERT INTO `quark_reply` +VALUES ('49', '\"[怒]\"', '2017-09-05 10:26:14', '0', '209', '2'); +INSERT INTO `quark_reply` VALUES + ('50', '有意思\"null\"', '2017-09-05 10:32:42', + '0', '210', '72'); +INSERT INTO `quark_reply` +VALUES ('51', '很清晰\"[爱你]\"', '2017-09-05 10:39:18', '0', '211', '2'); INSERT INTO `quark_reply` VALUES ('52', '?', '2017-09-06 15:43:18', '0', '212', '2'); -INSERT INTO `quark_reply` VALUES ('53', '不错嘛\"null\"', '2017-09-06 15:45:58', '0', '205', '2'); -INSERT INTO `quark_reply` VALUES ('54', '新人爆照\"[思考]\"', '2017-09-06 16:27:28', '0', '212', '2'); -INSERT INTO `quark_reply` VALUES ('55', '希鲁鲁鲁\"[酷]\"', '2017-09-06 16:36:25', '0', '212', '71'); -INSERT INTO `quark_reply` VALUES ('56', '希鲁鲁鲁\"[酷]\"', '2017-09-06 16:36:26', '0', '212', '71'); +INSERT INTO `quark_reply` VALUES + ('53', '不错嘛\"null\"', '2017-09-06 15:45:58', + '0', '205', '2'); +INSERT INTO `quark_reply` +VALUES ('54', '新人爆照\"[思考]\"', '2017-09-06 16:27:28', '0', '212', '2'); +INSERT INTO `quark_reply` +VALUES ('55', '希鲁鲁鲁\"[酷]\"', '2017-09-06 16:36:25', '0', '212', '71'); +INSERT INTO `quark_reply` +VALUES ('56', '希鲁鲁鲁\"[酷]\"', '2017-09-06 16:36:26', '0', '212', '71'); INSERT INTO `quark_reply` VALUES ('57', '不错嘛
', '2017-09-06 20:22:16', '0', '4', '71'); INSERT INTO `quark_reply` VALUES ('58', '对啊', '2017-09-06 20:28:36', '0', '210', '2'); INSERT INTO `quark_reply` VALUES ('59', '不错', '2017-09-06 20:36:17', '0', '4', '2'); INSERT INTO `quark_reply` VALUES ('60', '居然自问自答，呵呵
', '2017-09-06 20:36:32', '0', '4', '71'); INSERT INTO `quark_reply` VALUES ('61', '再看看自问自答是否修复了', '2017-09-06 20:41:01', '0', '4', '2'); INSERT INTO `quark_reply` VALUES ('62', '很强势啊，试试推送功能', '2017-09-06 20:41:42', '0', '208', '71'); -INSERT INTO `quark_reply` VALUES ('63', '测试推送？\"[微笑]\"', '2017-09-07 10:03:03', '0', '210', '2'); +INSERT INTO `quark_reply` +VALUES ('63', '测试推送？\"[微笑]\"', '2017-09-07 10:03:03', '0', '210', '2'); INSERT INTO `quark_reply` VALUES ('64', '很实用
', '2017-09-07 10:21:23', '0', '213', '71'); -INSERT INTO `quark_reply` VALUES ('65', '简直无解\"[太开心]\"\"[太开心]\"\"[抱抱]\"', '2017-09-07 10:21:47', '0', '213', '71'); +INSERT INTO `quark_reply` VALUES ('65', + '简直无解\"[太开心]\"\"[太开心]\"\"[抱抱]\"', + '2017-09-07 10:21:47', '0', '213', '71'); INSERT INTO `quark_reply` VALUES ('66', '很好', '2017-09-07 10:22:19', '0', '213', '71'); INSERT INTO `quark_reply` VALUES ('67', '测试推送', '2017-09-07 10:24:43', '0', '213', '71'); INSERT INTO `quark_reply` VALUES ('68', '测试测试测试', '2017-09-07 10:25:30', '0', '213', '71'); INSERT INTO `quark_reply` VALUES ('69', '测试推送', '2017-09-07 10:27:51', '0', '213', '71'); -INSERT INTO `quark_reply` VALUES ('70', '\"[抓狂]\"', '2017-09-07 10:39:33', '0', '209', '2'); +INSERT INTO `quark_reply` +VALUES ('70', '\"[抓狂]\"', '2017-09-07 10:39:33', '0', '209', '2'); INSERT INTO `quark_reply` VALUES ('71', '测试推送
', '2017-09-07 11:02:23', '0', '4', '71'); INSERT INTO `quark_reply` VALUES ('72', '测试推送', '2017-09-07 11:04:15', '0', '4', '71'); INSERT INTO `quark_reply` VALUES ('73', '测试推送
', '2017-09-07 11:12:22', '0', '4', '71'); @@ -433,12 +500,15 @@ INSERT INTO `quark_reply` VALUES ('76', '真.最后一次测试了', '2017-09-07 -- ---------------------------- DROP TABLE IF EXISTS `quark_role`; CREATE TABLE `quark_role` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `description` varchar(255) DEFAULT NULL, - `name` varchar(255) NOT NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `description` VARCHAR(255) DEFAULT NULL, + `name` VARCHAR(255) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `UK_ff572j64wr6y4taed1c27vfo6` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8; +) + ENGINE = InnoDB + AUTO_INCREMENT = 7 + DEFAULT CHARSET = utf8; -- ---------------------------- -- Records of quark_role @@ -451,13 +521,15 @@ INSERT INTO `quark_role` VALUES ('6', '管理用户', '用户管理员'); -- ---------------------------- DROP TABLE IF EXISTS `quark_role_permission`; CREATE TABLE `quark_role_permission` ( - `role_id` int(11) NOT NULL, - `permissions_id` int(11) NOT NULL, - PRIMARY KEY (`role_id`,`permissions_id`), + `role_id` INT(11) NOT NULL, + `permissions_id` INT(11) NOT NULL, + PRIMARY KEY (`role_id`, `permissions_id`), KEY `FKlsdkf5vtsq5qvepw45r0y89jw` (`permissions_id`), CONSTRAINT `FK763ep4ix05naeoliv21sm6m81` FOREIGN KEY (`role_id`) REFERENCES `quark_role` (`id`), CONSTRAINT `FKlsdkf5vtsq5qvepw45r0y89jw` FOREIGN KEY (`permissions_id`) REFERENCES `quark_permission` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) + ENGINE = InnoDB + DEFAULT CHARSET = utf8; -- ---------------------------- -- Records of quark_role_permission @@ -496,88 +568,227 @@ INSERT INTO `quark_role_permission` VALUES ('1', '28'); -- ---------------------------- DROP TABLE IF EXISTS `quark_user`; CREATE TABLE `quark_user` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `icon` varchar(255) NOT NULL, - `enable` int(11) NOT NULL, - `init_time` datetime NOT NULL, - `password` varchar(255) NOT NULL, - `sex` int(11) DEFAULT NULL, - `signature` varchar(255) DEFAULT NULL, - `username` varchar(255) NOT NULL, - `email` varchar(255) NOT NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `icon` VARCHAR(255) NOT NULL, + `enable` INT(11) NOT NULL, + `init_time` DATETIME NOT NULL, + `password` VARCHAR(255) NOT NULL, + `sex` INT(11) DEFAULT NULL, + `signature` VARCHAR(255) DEFAULT NULL, + `username` VARCHAR(255) NOT NULL, + `email` VARCHAR(255) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `UK_2uqfoo05i1p5qm4ntysj2ivbs` (`username`) -) ENGINE=InnoDB AUTO_INCREMENT=73 DEFAULT CHARSET=utf8; +) + ENGINE = InnoDB + AUTO_INCREMENT = 73 + DEFAULT CHARSET = utf8; -- ---------------------------- -- Records of quark_user -- ---------------------------- -INSERT INTO `quark_user` VALUES ('2', 'http://127.0.0.1/images/upload/2017-09-06/70e5b07c-4609-4925-bb1f-e965daa65899.jpeg', '1', '2017-08-22 23:10:17', '25d55ad283aa400af464c76d713c07ad', '0', 'Java从入门到弃坑', 'lhr1988', '1420432344@qq.com'); -INSERT INTO `quark_user` VALUES ('5', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 10:37:28', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '丁三石', '163@163.com'); -INSERT INTO `quark_user` VALUES ('6', 'http://127.0.0.1/images/upload/default.png', '0', '2017-08-25 11:56:38', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '马化腾', 'qq@qq.com'); -INSERT INTO `quark_user` VALUES ('7', 'http://127.0.0.1/images/upload/default.png', '0', '2017-08-25 20:51:23', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵0号', '0tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('8', 'http://127.0.0.1/images/upload/default.png', '0', '2017-08-25 20:51:23', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵1号', '1tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('9', 'http://127.0.0.1/images/upload/default.png', '0', '2017-08-25 20:51:23', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵2号', '2tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('10', 'http://127.0.0.1/images/upload/default.png', '0', '2017-08-25 20:51:23', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵3号', '3tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('11', 'http://127.0.0.1/images/upload/default.png', '0', '2017-08-25 20:51:23', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵4号', '4tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('12', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:23', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵5号', '5tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('13', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵6号', '6tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('14', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵7号', '7tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('15', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵8号', '8tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('16', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵9号', '9tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('17', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵10号', '10tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('18', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵11号', '11tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('19', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵12号', '12tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('20', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵13号', '13tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('21', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵14号', '14tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('22', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵15号', '15tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('23', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵16号', '16tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('24', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵17号', '17tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('25', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵18号', '18tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('26', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵19号', '19tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('27', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵20号', '20tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('28', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵21号', '21tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('29', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵22号', '22tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('30', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵23号', '23tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('31', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵24号', '24tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('32', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵25号', '25tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('33', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵26号', '26tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('34', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵27号', '27tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('35', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵28号', '28tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('36', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:25', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵29号', '29tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('37', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵30号', '30tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('38', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵31号', '31tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('39', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵32号', '32tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('40', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵33号', '33tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('41', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵34号', '34tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('42', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵35号', '35tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('43', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵36号', '36tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('44', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵37号', '37tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('45', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵38号', '38tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('46', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵39号', '39tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('47', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵40号', '40tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('48', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵41号', '41tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('49', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵42号', '42tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('50', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵43号', '43tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('51', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵44号', '44tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('52', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵45号', '45tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('53', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵46号', '46tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('54', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵47号', '47tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('55', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵48号', '48tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('56', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵49号', '49tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('57', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵50号', '50tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('58', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵51号', '51tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('59', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵52号', '52tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('60', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵53号', '53tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('61', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵54号', '54tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('62', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:20', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵55号', '55tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('63', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:20', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵56号', '56tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('64', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:20', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵57号', '57tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('65', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:20', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵58号', '58tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('66', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:20', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '图灵59号', '59tulin@gmail.com'); -INSERT INTO `quark_user` VALUES ('67', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-26 15:03:21', 'f379eaf3c831b04de153469d1bec345e', '0', null, '拉里·佩奇', 'gmail@gmail.com'); -INSERT INTO `quark_user` VALUES ('68', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-26 22:29:11', 'e10adc3949ba59abbe56e057f20f883e', '0', null, '比尔盖茨', 'Microsoft@Outlook.com'); -INSERT INTO `quark_user` VALUES ('69', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-27 10:35:14', 'c8837b23ff8aaa8a2dde915473ce0991', '0', null, 'cc', '111@cc.com'); -INSERT INTO `quark_user` VALUES ('70', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-31 12:13:54', 'e10adc3949ba59abbe56e057f20f883e', '0', null, 'CCTV旗下品牌', 'ccav@china.com'); -INSERT INTO `quark_user` VALUES ('71', 'http://127.0.0.1/images/upload/2017-09-03/51fb238d-00a3-49d2-91c5-25d1e54fff3e.jpeg', '1', '2017-09-03 11:04:03', 'e10adc3949ba59abbe56e057f20f883e', '1', '一库~~~~', '盲僧李青', 'lol@lol.com'); -INSERT INTO `quark_user` VALUES ('72', 'http://127.0.0.1/images/upload/2017-09-05/679e2736-54b5-4d73-b38f-b7b7ab61e3c1.jpeg', '1', '2017-09-05 10:31:27', 'e10adc3949ba59abbe56e057f20f883e', '1', '汪汪汪~~~', '萨摩王~', 'sa@sa.com'); +INSERT INTO `quark_user` VALUES + ('2', 'http://127.0.0.1/images/upload/2017-09-06/70e5b07c-4609-4925-bb1f-e965daa65899.jpeg', '1', '2017-08-22 23:10:17', + '25d55ad283aa400af464c76d713c07ad', '0', 'Java从入门到弃坑', 'lhr1988', '1420432344@qq.com'); +INSERT INTO `quark_user` VALUES + ('5', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 10:37:28', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '丁三石', + '163@163.com'); +INSERT INTO `quark_user` VALUES + ('6', 'http://127.0.0.1/images/upload/default.png', '0', '2017-08-25 11:56:38', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '马化腾', 'qq@qq.com'); +INSERT INTO `quark_user` VALUES + ('7', 'http://127.0.0.1/images/upload/default.png', '0', '2017-08-25 20:51:23', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵0号', + '0tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('8', 'http://127.0.0.1/images/upload/default.png', '0', '2017-08-25 20:51:23', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵1号', + '1tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('9', 'http://127.0.0.1/images/upload/default.png', '0', '2017-08-25 20:51:23', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵2号', + '2tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('10', 'http://127.0.0.1/images/upload/default.png', '0', '2017-08-25 20:51:23', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵3号', + '3tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('11', 'http://127.0.0.1/images/upload/default.png', '0', '2017-08-25 20:51:23', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵4号', + '4tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('12', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:23', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵5号', + '5tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('13', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵6号', + '6tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('14', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵7号', + '7tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('15', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵8号', + '8tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('16', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵9号', + '9tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('17', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵10号', + '10tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('18', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵11号', + '11tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('19', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵12号', + '12tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('20', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵13号', + '13tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('21', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵14号', + '14tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('22', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵15号', + '15tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('23', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵16号', + '16tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('24', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵17号', + '17tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('25', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵18号', + '18tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('26', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵19号', + '19tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('27', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵20号', + '20tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('28', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵21号', + '21tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('29', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵22号', + '22tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('30', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵23号', + '23tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('31', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵24号', + '24tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('32', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵25号', + '25tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('33', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵26号', + '26tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('34', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵27号', + '27tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('35', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:24', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵28号', + '28tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('36', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:51:25', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵29号', + '29tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('37', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵30号', + '30tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('38', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵31号', + '31tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('39', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵32号', + '32tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('40', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵33号', + '33tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('41', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵34号', + '34tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('42', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵35号', + '35tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('43', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:18', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵36号', + '36tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('44', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵37号', + '37tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('45', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵38号', + '38tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('46', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵39号', + '39tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('47', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵40号', + '40tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('48', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵41号', + '41tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('49', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵42号', + '42tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('50', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵43号', + '43tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('51', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵44号', + '44tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('52', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵45号', + '45tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('53', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵46号', + '46tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('54', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵47号', + '47tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('55', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵48号', + '48tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('56', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵49号', + '49tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('57', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵50号', + '50tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('58', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵51号', + '51tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('59', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵52号', + '52tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('60', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵53号', + '53tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('61', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:19', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵54号', + '54tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('62', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:20', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵55号', + '55tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('63', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:20', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵56号', + '56tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('64', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:20', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵57号', + '57tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('65', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:20', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵58号', + '58tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('66', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-25 20:52:20', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '图灵59号', + '59tulin@gmail.com'); +INSERT INTO `quark_user` VALUES + ('67', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-26 15:03:21', 'f379eaf3c831b04de153469d1bec345e', '0', NULL, '拉里·佩奇', + 'gmail@gmail.com'); +INSERT INTO `quark_user` VALUES + ('68', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-26 22:29:11', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, '比尔盖茨', + 'Microsoft@Outlook.com'); +INSERT INTO `quark_user` VALUES + ('69', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-27 10:35:14', 'c8837b23ff8aaa8a2dde915473ce0991', '0', NULL, 'cc', '111@cc.com'); +INSERT INTO `quark_user` VALUES + ('70', 'http://127.0.0.1/images/upload/default.png', '1', '2017-08-31 12:13:54', 'e10adc3949ba59abbe56e057f20f883e', '0', NULL, 'CCTV旗下品牌', + 'ccav@china.com'); +INSERT INTO `quark_user` VALUES + ('71', 'http://127.0.0.1/images/upload/2017-09-03/51fb238d-00a3-49d2-91c5-25d1e54fff3e.jpeg', '1', '2017-09-03 11:04:03', + 'e10adc3949ba59abbe56e057f20f883e', '1', '一库~~~~', '盲僧李青', 'lol@lol.com'); +INSERT INTO `quark_user` VALUES + ('72', 'http://127.0.0.1/images/upload/2017-09-05/679e2736-54b5-4d73-b38f-b7b7ab61e3c1.jpeg', '1', '2017-09-05 10:31:27', + 'e10adc3949ba59abbe56e057f20f883e', '1', '汪汪汪~~~', '萨摩王~', 'sa@sa.com'); From 88119d72a9677294f34e82c22a9b60c328cddb0a Mon Sep 17 00:00:00 2001 From: liudeyu Date: Wed, 12 Jun 2019 11:29:57 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E5=8A=A0=E5=85=A5erm=E6=96=87=E6=A1=A3?= =?UTF-8?q?=EF=BC=8C=E6=96=B9=E4=BE=BF=E8=A7=82=E5=AF=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forumER1.mwb | Bin 0 -> 18208 bytes forumErpdf.pdf | Bin 0 -> 20427 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 forumER1.mwb create mode 100644 forumErpdf.pdf diff --git a/forumER1.mwb b/forumER1.mwb new file mode 100644 index 0000000000000000000000000000000000000000..498d35d5085f38387822ad48ffafaf271b1b4db0 GIT binary patch literal 18208 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 literal 0 HcmV?d00001 diff --git a/forumErpdf.pdf b/forumErpdf.pdf new file mode 100644 index 0000000000000000000000000000000000000000..3ac310df51d69823d015e6ebf44a3df23dd0eb18 GIT binary patch literal 20427 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 YIvF@P-L7sR7b`Op5+$XWyg1VT0kpsc;Q#;t literal 0 HcmV?d00001 From 7ff326ec5f61ec587d649c462da02334191b0614 Mon Sep 17 00:00:00 2001 From: liudeyu Date: Sun, 16 Jun 2019 20:36:36 +0800 Subject: [PATCH 04/17] file constants change --- .../java/com/quark/rest/utils/Constants.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/quark-rest/src/main/java/com/quark/rest/utils/Constants.java b/quark-rest/src/main/java/com/quark/rest/utils/Constants.java index df6d82a..ae50a90 100644 --- a/quark-rest/src/main/java/com/quark/rest/utils/Constants.java +++ b/quark-rest/src/main/java/com/quark/rest/utils/Constants.java @@ -1,12 +1,26 @@ package com.quark.rest.utils; +import java.io.File; + /** * @Author LHR * Create By 2017/8/22 */ public class Constants { - //Upload常量 - public static final String UPLOAD_PATH = "D:\\home\\images\\upload\\"; - public static final String STATIC_URL ="http://127.0.0.1/images/upload/"; + + public static final String RELEATIVE_UPLOAD_PATH = "images/upload"; + //Upload常 + public static String UPLOAD_PATH = ""; + public static final String STATIC_URL = "http://127.0.0.1/" + RELEATIVE_UPLOAD_PATH; + + static { + UPLOAD_PATH = System.getProperty("user.home"); + if (UPLOAD_PATH.endsWith(File.separator)) { + UPLOAD_PATH = UPLOAD_PATH = File.separator; + } + UPLOAD_PATH = UPLOAD_PATH + RELEATIVE_UPLOAD_PATH; + + + } } From d409d30984553befc12d2ca060e15969ead055e3 Mon Sep 17 00:00:00 2001 From: liudeyu Date: Thu, 27 Jun 2019 18:52:11 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=BA=9Bentity=20?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbssource/pom.xml | 82 ++++++++++++ .../main/java/common/entity/AdminUser.java | 78 +++++++++++ .../src/main/java/common/entity/Collect.java | 60 +++++++++ .../src/main/java/common/entity/Label.java | 62 +++++++++ .../main/java/common/entity/Notification.java | 85 ++++++++++++ .../src/main/java/common/entity/Post.java | 118 +++++++++++++++++ .../src/main/java/common/entity/Reply.java | 81 ++++++++++++ .../src/main/java/common/entity/Role.java | 63 +++++++++ .../src/main/java/common/entity/User.java | 121 ++++++++++++++++++ bbssource/src/main/java/common/test | 0 bbssource/src/main/java/test | 0 11 files changed, 750 insertions(+) create mode 100644 bbssource/pom.xml create mode 100644 bbssource/src/main/java/common/entity/AdminUser.java create mode 100644 bbssource/src/main/java/common/entity/Collect.java create mode 100644 bbssource/src/main/java/common/entity/Label.java create mode 100644 bbssource/src/main/java/common/entity/Notification.java create mode 100644 bbssource/src/main/java/common/entity/Post.java create mode 100644 bbssource/src/main/java/common/entity/Reply.java create mode 100644 bbssource/src/main/java/common/entity/Role.java create mode 100644 bbssource/src/main/java/common/entity/User.java create mode 100644 bbssource/src/main/java/common/test create mode 100644 bbssource/src/main/java/test diff --git a/bbssource/pom.xml b/bbssource/pom.xml new file mode 100644 index 0000000..6e1bad5 --- /dev/null +++ b/bbssource/pom.xml @@ -0,0 +1,82 @@ + + + 4.0.0 + + bbspratise + bbssource + 1.0-SNAPSHOT + + + quark-parent + com.quark + 1.0-SNAPSHOT + ../quark-parent/pom.xml + + + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.springframework.boot + spring-boot-starter-cache + + + + net.sf.ehcache + ehcache + + + mysql + mysql-connector-java + runtime + + + com.alibaba + druid + + + net.sourceforge.nekohtml + nekohtml + + + org.springframework.boot + spring-boot-starter-test + test + + + + com.alibaba + fastjson + + + com.google.guava + guava + + + com.fasterxml.jackson.core + jackson-annotations + + + + + + bbsproject + + + org.springframework.boot + spring-boot-maven-plugin + + + + + \ No newline at end of file diff --git a/bbssource/src/main/java/common/entity/AdminUser.java b/bbssource/src/main/java/common/entity/AdminUser.java new file mode 100644 index 0000000..a925f20 --- /dev/null +++ b/bbssource/src/main/java/common/entity/AdminUser.java @@ -0,0 +1,78 @@ +package common.entity; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; + +/** + * Created by liudeyu on 2019/6/27. + */ +@Entity +@Table(name = "quark_adminuser") +public class AdminUser implements Serializable { + @Column(name = "id") + @GeneratedValue + private int id; + + @Column(name = "enable") + private int enable; + + @Column(name = "password") + @JsonIgnore + private String password; + + @Column(name = "username") + private String userName; + + @JsonIgnore + @JoinTable(name = "quark_adminuser_role", joinColumns = {@JoinColumn + (name = "adminuser_id", referencedColumnName = "id")}, inverseJoinColumns = { + @JoinColumn(name = "role_id", referencedColumnName = "id") + }) + @ManyToOne(cascade = CascadeType.ALL) + private Set adminUsers = new HashSet<>(); + + + public Set getAdminUsers() { + return adminUsers; + } + + public void setAdminUsers(Set adminUsers) { + this.adminUsers = adminUsers; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getEnable() { + return enable; + } + + public void setEnable(int enable) { + this.enable = enable; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } +} diff --git a/bbssource/src/main/java/common/entity/Collect.java b/bbssource/src/main/java/common/entity/Collect.java new file mode 100644 index 0000000..66073ec --- /dev/null +++ b/bbssource/src/main/java/common/entity/Collect.java @@ -0,0 +1,60 @@ +package common.entity; + +import javafx.geometry.Pos; + +import javax.persistence.*; +import java.io.Serializable; +import java.sql.Timestamp; + +/** + * Created by liudeyu on 2019/6/27. + */ +public class Collect implements Serializable{ + + @GeneratedValue + @Column(name = "id") + private int id; + + @Column(name = "init_time") + private Timestamp initTime; + + @ManyToOne + @Column(name = "posts_id") + private Post post; + + @ManyToOne + @Column(name = "user_id") + private User user; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public Timestamp getInitTime() { + return initTime; + } + + public void setInitTime(Timestamp initTime) { + this.initTime = initTime; + } + + public Post getPost() { + return post; + } + + public void setPost(Post post) { + this.post = post; + } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } +} diff --git a/bbssource/src/main/java/common/entity/Label.java b/bbssource/src/main/java/common/entity/Label.java new file mode 100644 index 0000000..2cbb95b --- /dev/null +++ b/bbssource/src/main/java/common/entity/Label.java @@ -0,0 +1,62 @@ +package common.entity; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * Created by liudeyu on 2019/6/27. + */ +@Entity +@Table(name = "quark_label") +public class Label implements Serializable { + + @Column(name = "id") + @GeneratedValue + private int id; + + @Column(name = "name") + private String name; + + @Column(name = "details") + private String detail; + + @Column(name = "posts_count") + private int postCount; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDetail() { + return detail; + } + + public void setDetail(String detail) { + this.detail = detail; + } + + public int getPostCount() { + return postCount; + } + + public void setPostCount(int postCount) { + this.postCount = postCount; + } +} diff --git a/bbssource/src/main/java/common/entity/Notification.java b/bbssource/src/main/java/common/entity/Notification.java new file mode 100644 index 0000000..231040c --- /dev/null +++ b/bbssource/src/main/java/common/entity/Notification.java @@ -0,0 +1,85 @@ +package common.entity; + +import javax.persistence.Column; +import javax.persistence.GeneratedValue; +import javax.persistence.OneToOne; +import java.io.Serializable; +import java.sql.Timestamp; + +/** + * Created by liudeyu on 2019/6/27. + */ +public class Notification implements Serializable { + + @GeneratedValue + @Column(name = "id") + private int id; + + @Column(name = "is_read") + private boolean isRead; + + + @Column(name = "fromuser_id") + @OneToOne + private int fromUserId; + + @Column(name = "posts_id") + @OneToOne + private int postsId; + + @Column(name = "touser_id") + @OneToOne + private int toUserId; + + @Column(name = "init_time") + private Timestamp initTime; + + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public boolean isRead() { + return isRead; + } + + public void setRead(boolean read) { + isRead = read; + } + + public int getFromUserId() { + return fromUserId; + } + + public void setFromUserId(int fromUserId) { + this.fromUserId = fromUserId; + } + + public int getPostsId() { + return postsId; + } + + public void setPostsId(int postsId) { + this.postsId = postsId; + } + + public int getToUserId() { + return toUserId; + } + + public void setToUserId(int toUserId) { + this.toUserId = toUserId; + } + + public Timestamp getInitTime() { + return initTime; + } + + public void setInitTime(Timestamp initTime) { + this.initTime = initTime; + } +} diff --git a/bbssource/src/main/java/common/entity/Post.java b/bbssource/src/main/java/common/entity/Post.java new file mode 100644 index 0000000..5fd138a --- /dev/null +++ b/bbssource/src/main/java/common/entity/Post.java @@ -0,0 +1,118 @@ +package common.entity; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +import javax.persistence.*; +import java.io.Serializable; +import java.sql.Timestamp; + +/** + * Created by liudeyu on 2019/6/27. + */ +@Entity +@Table(name = "quark_posts") +public class Post implements Serializable { + + @GeneratedValue + @Column(name = "id") + private int id; + + @Column(name = + "content") + private String content; + + @Column(name = "good") + private boolean isGood; + + @Column(name = "init_time") + private Timestamp initTime; + + @Column(name = "label_id") + @ManyToOne + private Label label; + + @Column(name = "reply_count") + private int replyCount; + + @Column(name = "title") + private String title; + + @Column(name = "top") + private boolean isTop; + + @ManyToOne + @Column(name = "user_id") + private User user; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public boolean isGood() { + return isGood; + } + + public void setGood(boolean good) { + isGood = good; + } + + public Timestamp getInitTime() { + return initTime; + } + + public void setInitTime(Timestamp initTime) { + this.initTime = initTime; + } + + public Label getLabel() { + return label; + } + + public void setLabel(Label label) { + this.label = label; + } + + public int getReplyCount() { + return replyCount; + } + + public void setReplyCount(int replyCount) { + this.replyCount = replyCount; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public boolean isTop() { + return isTop; + } + + public void setTop(boolean top) { + isTop = top; + } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } +} diff --git a/bbssource/src/main/java/common/entity/Reply.java b/bbssource/src/main/java/common/entity/Reply.java new file mode 100644 index 0000000..54482d1 --- /dev/null +++ b/bbssource/src/main/java/common/entity/Reply.java @@ -0,0 +1,81 @@ +package common.entity; + +import javax.persistence.*; +import java.io.Serializable; +import java.sql.Timestamp; + +/** + * Created by liudeyu on 2019/6/27. + */ +@Entity +@Table(name = "quark_reply") +public class Reply implements Serializable{ + + @GeneratedValue + @Column(name = "id") + private int id; + + @Column(name = "content") + private String content; + @Column(name = "init_time") + private Timestamp initTime; + + @Column(name = "up") + private int upState; + + @ManyToOne + @Column(name = "post_id") + private Post post; + + @ManyToOne + @Column(name = "user_id") + private User user; + + public int getUpState() { + return upState; + } + + public void setUpState(int upState) { + this.upState = upState; + } + + public Post getPost() { + return post; + } + + public void setPost(Post post) { + this.post = post; + } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public Timestamp getInitTime() { + return initTime; + } + + public void setInitTime(Timestamp initTime) { + this.initTime = initTime; + } +} diff --git a/bbssource/src/main/java/common/entity/Role.java b/bbssource/src/main/java/common/entity/Role.java new file mode 100644 index 0000000..2de3acd --- /dev/null +++ b/bbssource/src/main/java/common/entity/Role.java @@ -0,0 +1,63 @@ +package common.entity; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +import javax.persistence.Column; +import javax.persistence.GeneratedValue; +import javax.persistence.ManyToMany; +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; + +/** + * Created by liudeyu on 2019/6/27. + */ +public class Role implements Serializable { + + @JsonIgnore + @Column(name = "id") + @GeneratedValue + private int id; + + @Column(name = "description") + private String des; + + @Column(name = "name",unique = true) + private String name; + + @ManyToMany(mappedBy = "adminUsers") + private Set adminUsers=new HashSet<>(); + + + public Set getAdminUsers() { + return adminUsers; + } + + public void setAdminUsers(Set adminUsers) { + this.adminUsers = adminUsers; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getDes() { + return des; + } + + public void setDes(String des) { + this.des = des; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/bbssource/src/main/java/common/entity/User.java b/bbssource/src/main/java/common/entity/User.java new file mode 100644 index 0000000..af691f9 --- /dev/null +++ b/bbssource/src/main/java/common/entity/User.java @@ -0,0 +1,121 @@ +package common.entity; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Table; +import java.io.Serializable; +import java.sql.Timestamp; + +/** + * Created by liudeyu on 2019/6/27. + */ +@Entity +@Table(name = "quark_user") +public class User implements Serializable{ + + @GeneratedValue + @Column(name = "id") + private int id; + + + @Column(name = "icon") + private String icon; + + @Column(name = "enable") + private int enable; + @Column(name = "init_time") + private Timestamp initTime; + + + @JsonIgnore + @Column(name = "password") + private String password; + + @Column(name = "sex") + private int sex; + + @Column(name = "signature") + private String signature; + + @Column(name = "username") + private String userName; + + @Column(name = "email") + private String email; + + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public int getEnable() { + return enable; + } + + public void setEnable(int enable) { + this.enable = enable; + } + + public Timestamp getInitTime() { + return initTime; + } + + public void setInitTime(Timestamp initTime) { + this.initTime = initTime; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public int getSex() { + return sex; + } + + public void setSex(int sex) { + this.sex = sex; + } + + public String getSignature() { + return signature; + } + + public void setSignature(String signature) { + this.signature = signature; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } +} diff --git a/bbssource/src/main/java/common/test b/bbssource/src/main/java/common/test new file mode 100644 index 0000000..e69de29 diff --git a/bbssource/src/main/java/test b/bbssource/src/main/java/test new file mode 100644 index 0000000..e69de29 From dfa8d441b13697342eb9f856f0ee6a5789ffd944 Mon Sep 17 00:00:00 2001 From: liudeyu Date: Fri, 28 Jun 2019 17:41:40 +0800 Subject: [PATCH 06/17] fix some entity --- .../src/main/java/common/entity/Collect.java | 7 +++---- .../main/java/common/entity/Notification.java | 16 +++++++--------- bbssource/src/main/java/common/entity/Post.java | 4 ++-- bbssource/src/main/java/common/entity/Reply.java | 4 ++-- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/bbssource/src/main/java/common/entity/Collect.java b/bbssource/src/main/java/common/entity/Collect.java index 66073ec..c683a01 100644 --- a/bbssource/src/main/java/common/entity/Collect.java +++ b/bbssource/src/main/java/common/entity/Collect.java @@ -1,7 +1,5 @@ package common.entity; -import javafx.geometry.Pos; - import javax.persistence.*; import java.io.Serializable; import java.sql.Timestamp; @@ -19,13 +17,14 @@ public class Collect implements Serializable{ private Timestamp initTime; @ManyToOne - @Column(name = "posts_id") + @JoinColumn(name = "posts_id") private Post post; @ManyToOne - @Column(name = "user_id") + @JoinColumn(name = "user_id") private User user; + public int getId() { return id; } diff --git a/bbssource/src/main/java/common/entity/Notification.java b/bbssource/src/main/java/common/entity/Notification.java index 231040c..f525e1a 100644 --- a/bbssource/src/main/java/common/entity/Notification.java +++ b/bbssource/src/main/java/common/entity/Notification.java @@ -1,8 +1,6 @@ package common.entity; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.OneToOne; +import javax.persistence.*; import java.io.Serializable; import java.sql.Timestamp; @@ -19,16 +17,16 @@ public class Notification implements Serializable { private boolean isRead; - @Column(name = "fromuser_id") - @OneToOne + @JoinColumn(name = "fromuser_id") + @ManyToOne private int fromUserId; - @Column(name = "posts_id") - @OneToOne + @JoinColumn(name = "posts_id") + @ManyToOne private int postsId; - @Column(name = "touser_id") - @OneToOne + @JoinColumn(name = "touser_id") + @ManyToOne private int toUserId; @Column(name = "init_time") diff --git a/bbssource/src/main/java/common/entity/Post.java b/bbssource/src/main/java/common/entity/Post.java index 5fd138a..ff086d8 100644 --- a/bbssource/src/main/java/common/entity/Post.java +++ b/bbssource/src/main/java/common/entity/Post.java @@ -27,7 +27,7 @@ public class Post implements Serializable { @Column(name = "init_time") private Timestamp initTime; - @Column(name = "label_id") + @JoinColumn(name = "label_id") @ManyToOne private Label label; @@ -41,7 +41,7 @@ public class Post implements Serializable { private boolean isTop; @ManyToOne - @Column(name = "user_id") + @JoinColumn(name = "user_id") private User user; public int getId() { diff --git a/bbssource/src/main/java/common/entity/Reply.java b/bbssource/src/main/java/common/entity/Reply.java index 54482d1..9f9aae0 100644 --- a/bbssource/src/main/java/common/entity/Reply.java +++ b/bbssource/src/main/java/common/entity/Reply.java @@ -24,11 +24,11 @@ public class Reply implements Serializable{ private int upState; @ManyToOne - @Column(name = "post_id") + @JoinColumn(name = "post_id") private Post post; @ManyToOne - @Column(name = "user_id") + @JoinColumn(name = "user_id") private User user; public int getUpState() { From 98df9f8ca264fe57737464df08b4a2985976a2f0 Mon Sep 17 00:00:00 2001 From: ldy Date: Sat, 29 Jun 2019 13:21:17 +0800 Subject: [PATCH 07/17] many entity correctfiy ,orm atri --- bbssource/src/main/java/common/entity/Permission.java | 4 ++++ bbssource/src/main/java/common/utils/Constants.java | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 bbssource/src/main/java/common/entity/Permission.java create mode 100644 bbssource/src/main/java/common/utils/Constants.java diff --git a/bbssource/src/main/java/common/entity/Permission.java b/bbssource/src/main/java/common/entity/Permission.java new file mode 100644 index 0000000..e010ac7 --- /dev/null +++ b/bbssource/src/main/java/common/entity/Permission.java @@ -0,0 +1,4 @@ +package common.entity; + +public class Permission { +} diff --git a/bbssource/src/main/java/common/utils/Constants.java b/bbssource/src/main/java/common/utils/Constants.java new file mode 100644 index 0000000..964ed32 --- /dev/null +++ b/bbssource/src/main/java/common/utils/Constants.java @@ -0,0 +1,4 @@ +package common.utils; + +public class Constants { +} From bfbc2f56e92d301229f07bc4a7db7218dd4fb96f Mon Sep 17 00:00:00 2001 From: ldy Date: Sun, 30 Jun 2019 09:57:45 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E7=9F=AB=E6=AD=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbssource/src/test/java/testcommon/TestOne.java | 4 ++++ bbssource/src/test/test | 0 2 files changed, 4 insertions(+) create mode 100644 bbssource/src/test/java/testcommon/TestOne.java create mode 100644 bbssource/src/test/test diff --git a/bbssource/src/test/java/testcommon/TestOne.java b/bbssource/src/test/java/testcommon/TestOne.java new file mode 100644 index 0000000..05aed1e --- /dev/null +++ b/bbssource/src/test/java/testcommon/TestOne.java @@ -0,0 +1,4 @@ +package testcommon; + +public class TestOne { +} diff --git a/bbssource/src/test/test b/bbssource/src/test/test new file mode 100644 index 0000000..e69de29 From 6cb5e45adf0584b3a8cec7ea13a603344f592c25 Mon Sep 17 00:00:00 2001 From: liudeyu Date: Sun, 30 Jun 2019 11:20:25 +0800 Subject: [PATCH 09/17] =?UTF-8?q?git=20=E4=BD=BF=E7=94=A8=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=88=90=E5=8A=9F=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E4=B8=A4=E4=B8=AA=E7=94=B5=E8=84=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E6=95=B4=E4=B8=AAentity=20copy,for=20progress?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/common/entity/AdminUser.java | 80 ++++++---- .../src/main/java/common/entity/Collect.java | 62 ++++---- .../src/main/java/common/entity/Label.java | 48 +++--- .../main/java/common/entity/Notification.java | 82 +++++----- .../main/java/common/entity/Permission.java | 105 ++++++++++++- .../src/main/java/common/entity/Post.java | 118 -------------- .../src/main/java/common/entity/Posts.java | 145 ++++++++++++++++++ .../src/main/java/common/entity/Reply.java | 98 +++++++----- .../src/main/java/common/entity/Role.java | 95 ++++++++---- .../src/main/java/common/entity/User.java | 132 +++++++++------- .../src/main/java/common/utils/Constants.java | 2 + 11 files changed, 607 insertions(+), 360 deletions(-) delete mode 100644 bbssource/src/main/java/common/entity/Post.java create mode 100644 bbssource/src/main/java/common/entity/Posts.java diff --git a/bbssource/src/main/java/common/entity/AdminUser.java b/bbssource/src/main/java/common/entity/AdminUser.java index a925f20..6b433a4 100644 --- a/bbssource/src/main/java/common/entity/AdminUser.java +++ b/bbssource/src/main/java/common/entity/AdminUser.java @@ -1,5 +1,6 @@ package common.entity; + import com.fasterxml.jackson.annotation.JsonIgnore; import javax.persistence.*; @@ -8,56 +9,50 @@ import java.util.Set; /** - * Created by liudeyu on 2019/6/27. + * Created by lhr on 17-7-31. */ + @Entity @Table(name = "quark_adminuser") -public class AdminUser implements Serializable { - @Column(name = "id") +public class AdminUser implements Serializable{ + + @Id @GeneratedValue - private int id; + private Integer id; - @Column(name = "enable") - private int enable; + @Column(unique = true,nullable = false) + private String username; - @Column(name = "password") + @Column(nullable = false) @JsonIgnore private String password; - @Column(name = "username") - private String userName; - - @JsonIgnore - @JoinTable(name = "quark_adminuser_role", joinColumns = {@JoinColumn - (name = "adminuser_id", referencedColumnName = "id")}, inverseJoinColumns = { - @JoinColumn(name = "role_id", referencedColumnName = "id") - }) - @ManyToOne(cascade = CascadeType.ALL) - private Set adminUsers = new HashSet<>(); - - public Set getAdminUsers() { - return adminUsers; - } + //是否可以使用,默认为１ + @Column(nullable = false) + private Integer enable = 1; - public void setAdminUsers(Set adminUsers) { - this.adminUsers = adminUsers; - } + @JsonIgnore + @JoinTable(name = "quark_adminuser_role", + joinColumns = {@JoinColumn(name = "adminuser_id",referencedColumnName = "id")}, + inverseJoinColumns = {@JoinColumn(name = "role_id",referencedColumnName = "id")}) + @ManyToMany(cascade = CascadeType.ALL) + private Set roles = new HashSet<>(); - public int getId() { + public Integer getId() { return id; } - public void setId(int id) { + public void setId(Integer id) { this.id = id; } - public int getEnable() { - return enable; + public String getUsername() { + return username; } - public void setEnable(int enable) { - this.enable = enable; + public void setUsername(String username) { + this.username = username; } public String getPassword() { @@ -68,11 +63,28 @@ public void setPassword(String password) { this.password = password; } - public String getUserName() { - return userName; + public Integer getEnable() { + return enable; + } + + public void setEnable(Integer enable) { + this.enable = enable; + } + + public Set getRoles() { + return roles; + } + + public void setRoles(Set roles) { + this.roles = roles; } - public void setUserName(String userName) { - this.userName = userName; + @Override + public String toString() { + return "AdminUser{" + + "Id=" + id + + ", username='" + username + '\'' + + ", password='" + password + '\'' + + ", enable=" + enable; } } diff --git a/bbssource/src/main/java/common/entity/Collect.java b/bbssource/src/main/java/common/entity/Collect.java index c683a01..10c50ac 100644 --- a/bbssource/src/main/java/common/entity/Collect.java +++ b/bbssource/src/main/java/common/entity/Collect.java @@ -1,52 +1,54 @@ package common.entity; +import com.fasterxml.jackson.annotation.JsonFormat; +import common.utils.Constants; + import javax.persistence.*; import java.io.Serializable; -import java.sql.Timestamp; +import java.util.Date; /** - * Created by liudeyu on 2019/6/27. + * @Author LHR + * Create By 2017/8/18 + * + * 收藏 */ +@Entity +@Table(name = "quark_collect") public class Collect implements Serializable{ + @Id @GeneratedValue - @Column(name = "id") - private int id; - - @Column(name = "init_time") - private Timestamp initTime; + private Integer id; - @ManyToOne - @JoinColumn(name = "posts_id") - private Post post; + //与帖子的关联关系：立即加载 + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(nullable = false, name = "posts_id") + private Posts posts; - @ManyToOne - @JoinColumn(name = "user_id") + //与用户的关联关系：立即加载 + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(nullable = false, name = "user_id") private User user; + //收藏时间 + @JsonFormat(pattern = Constants.DATETIME_FORMAT) + private Date initTime; - public int getId() { + public Integer getId() { return id; } - public void setId(int id) { + public void setId(Integer id) { this.id = id; } - public Timestamp getInitTime() { - return initTime; - } - - public void setInitTime(Timestamp initTime) { - this.initTime = initTime; - } - - public Post getPost() { - return post; + public Posts getPosts() { + return posts; } - public void setPost(Post post) { - this.post = post; + public void setPosts(Posts posts) { + this.posts = posts; } public User getUser() { @@ -56,4 +58,12 @@ public User getUser() { public void setUser(User user) { this.user = user; } + + public Date getInitTime() { + return initTime; + } + + public void setInitTime(Date initTime) { + this.initTime = initTime; + } } diff --git a/bbssource/src/main/java/common/entity/Label.java b/bbssource/src/main/java/common/entity/Label.java index 2cbb95b..4b2689f 100644 --- a/bbssource/src/main/java/common/entity/Label.java +++ b/bbssource/src/main/java/common/entity/Label.java @@ -1,38 +1,38 @@ package common.entity; -import com.fasterxml.jackson.annotation.JsonIgnore; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** - * Created by liudeyu on 2019/6/27. + * @Author LHR + * Create By 2017/8/18 + * + * 标签 */ @Entity @Table(name = "quark_label") public class Label implements Serializable { - @Column(name = "id") + @Id @GeneratedValue - private int id; + private Integer id; - @Column(name = "name") + //标签名称 + @Column(nullable = false, unique = true) private String name; - @Column(name = "details") - private String detail; - + //主题数量 @Column(name = "posts_count") - private int postCount; + private Integer postsCount = 0; + + //详情 + private String details; - public int getId() { + public Integer getId() { return id; } - public void setId(int id) { + public void setId(Integer id) { this.id = id; } @@ -44,19 +44,19 @@ public void setName(String name) { this.name = name; } - public String getDetail() { - return detail; + public Integer getPostsCount() { + return postsCount; } - public void setDetail(String detail) { - this.detail = detail; + public void setPostsCount(Integer postsCount) { + this.postsCount = postsCount; } - public int getPostCount() { - return postCount; + public String getDetails() { + return details; } - public void setPostCount(int postCount) { - this.postCount = postCount; + public void setDetails(String details) { + this.details = details; } } diff --git a/bbssource/src/main/java/common/entity/Notification.java b/bbssource/src/main/java/common/entity/Notification.java index f525e1a..072f992 100644 --- a/bbssource/src/main/java/common/entity/Notification.java +++ b/bbssource/src/main/java/common/entity/Notification.java @@ -1,43 +1,53 @@ package common.entity; +import com.fasterxml.jackson.annotation.JsonFormat; +import common.utils.Constants; + import javax.persistence.*; -import java.io.Serializable; -import java.sql.Timestamp; +import java.util.Date; /** - * Created by liudeyu on 2019/6/27. + * @Author LHR + * Create By 2017/8/18 + * + * 通知 */ -public class Notification implements Serializable { +@Entity +@Table(name = "quark_notification") +public class Notification { + @Id @GeneratedValue - @Column(name = "id") - private int id; + private Integer id; + //通知是否已读 @Column(name = "is_read") - private boolean isRead; - - - @JoinColumn(name = "fromuser_id") - @ManyToOne - private int fromUserId; + private boolean isRead = false; - @JoinColumn(name = "posts_id") - @ManyToOne - private int postsId; + //要通知的用户：立即加载 + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(nullable = false,name = "touser_id") + private User touser; - @JoinColumn(name = "touser_id") - @ManyToOne - private int toUserId; + //发起通知的用户 + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(nullable = false,name = "fromuser_id") + private User fromuser; - @Column(name = "init_time") - private Timestamp initTime; + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(nullable = false,name = "posts_id") + private Posts posts; + //发布时间 + @Column(nullable = false) + @JsonFormat(pattern = Constants.DATETIME_FORMAT, timezone = "GMT+8") + private Date initTime; - public int getId() { + public Integer getId() { return id; } - public void setId(int id) { + public void setId(Integer id) { this.id = id; } @@ -49,35 +59,35 @@ public void setRead(boolean read) { isRead = read; } - public int getFromUserId() { - return fromUserId; + public User getTouser() { + return touser; } - public void setFromUserId(int fromUserId) { - this.fromUserId = fromUserId; + public void setTouser(User touser) { + this.touser = touser; } - public int getPostsId() { - return postsId; + public User getFromuser() { + return fromuser; } - public void setPostsId(int postsId) { - this.postsId = postsId; + public void setFromuser(User fromuser) { + this.fromuser = fromuser; } - public int getToUserId() { - return toUserId; + public Posts getPosts() { + return posts; } - public void setToUserId(int toUserId) { - this.toUserId = toUserId; + public void setPosts(Posts posts) { + this.posts = posts; } - public Timestamp getInitTime() { + public Date getInitTime() { return initTime; } - public void setInitTime(Timestamp initTime) { + public void setInitTime(Date initTime) { this.initTime = initTime; } } diff --git a/bbssource/src/main/java/common/entity/Permission.java b/bbssource/src/main/java/common/entity/Permission.java index e010ac7..d737444 100644 --- a/bbssource/src/main/java/common/entity/Permission.java +++ b/bbssource/src/main/java/common/entity/Permission.java @@ -1,4 +1,107 @@ package common.entity; -public class Permission { +import com.fasterxml.jackson.annotation.JsonIgnore; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; + +/** + * Created by lhr on 17-7-31. + */ + +@Entity +@Table(name = "quark_permission") +public class Permission implements Serializable{ + + @Id + @GeneratedValue + private Integer id; + + private String name; + + private String perurl; + + //资源类型　　1：菜单　2：按钮 + private Integer type; + + //父权限 + @Column(nullable = false) + private Integer parentid; + + //排序 + private Integer sort; + + //是否选中 + @Transient + private String checked; + + @JsonIgnore + @ManyToMany(mappedBy = "permissions") + private Set roles = new HashSet<>(); + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPerurl() { + return perurl; + } + + public void setPerurl(String perurl) { + this.perurl = perurl; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getParentid() { + return parentid; + } + + public void setParentid(Integer parentid) { + this.parentid = parentid; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public Set getRoles() { + return roles; + } + + public void setRoles(Set roles) { + this.roles = roles; + } + + public String getChecked() { + return checked; + } + + public void setChecked(String checked) { + this.checked = checked; + } } diff --git a/bbssource/src/main/java/common/entity/Post.java b/bbssource/src/main/java/common/entity/Post.java deleted file mode 100644 index ff086d8..0000000 --- a/bbssource/src/main/java/common/entity/Post.java +++ /dev/null @@ -1,118 +0,0 @@ -package common.entity; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import javax.persistence.*; -import java.io.Serializable; -import java.sql.Timestamp; - -/** - * Created by liudeyu on 2019/6/27. - */ -@Entity -@Table(name = "quark_posts") -public class Post implements Serializable { - - @GeneratedValue - @Column(name = "id") - private int id; - - @Column(name = - "content") - private String content; - - @Column(name = "good") - private boolean isGood; - - @Column(name = "init_time") - private Timestamp initTime; - - @JoinColumn(name = "label_id") - @ManyToOne - private Label label; - - @Column(name = "reply_count") - private int replyCount; - - @Column(name = "title") - private String title; - - @Column(name = "top") - private boolean isTop; - - @ManyToOne - @JoinColumn(name = "user_id") - private User user; - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public boolean isGood() { - return isGood; - } - - public void setGood(boolean good) { - isGood = good; - } - - public Timestamp getInitTime() { - return initTime; - } - - public void setInitTime(Timestamp initTime) { - this.initTime = initTime; - } - - public Label getLabel() { - return label; - } - - public void setLabel(Label label) { - this.label = label; - } - - public int getReplyCount() { - return replyCount; - } - - public void setReplyCount(int replyCount) { - this.replyCount = replyCount; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public boolean isTop() { - return isTop; - } - - public void setTop(boolean top) { - isTop = top; - } - - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } -} diff --git a/bbssource/src/main/java/common/entity/Posts.java b/bbssource/src/main/java/common/entity/Posts.java new file mode 100644 index 0000000..fc3e8cc --- /dev/null +++ b/bbssource/src/main/java/common/entity/Posts.java @@ -0,0 +1,145 @@ +package common.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import common.utils.Constants; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * @Author LHR + * Create By 2017/8/18 + * + * 帖子 + */ +@Entity +@Table(name = "quark_posts") +public class Posts implements Serializable { + + @Id + @GeneratedValue + private Integer id; + + //与标签的关系 + @ManyToOne + @JoinColumn(nullable = false, name = "label_id") + private Label label; + + //标题 + @Column(unique = true, nullable = false) + private String title; + + //内容 + @Column(columnDefinition = "text") + private String content; + + //发布时间 + @Column(nullable = false) + @JsonFormat(pattern = Constants.DATETIME_FORMAT, timezone = "GMT+8") + private Date initTime; + + //是否置顶 + private boolean top; + + //是否精华 + private boolean good; + + //与用户的关联关系 + @ManyToOne + @JoinColumn(nullable = false, name = "user_id") + private User user; + + + //回复数量 + @Column(name = "reply_count") + private int replyCount = 0; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Label getLabel() { + return label; + } + + public void setLabel(Label label) { + this.label = label; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public Date getInitTime() { + return initTime; + } + + public void setInitTime(Date initTime) { + this.initTime = initTime; + } + + public Boolean getTop() { + return top; + } + + public void setTop(Boolean top) { + this.top = top; + } + + public Boolean getGood() { + return good; + } + + public void setGood(Boolean good) { + this.good = good; + } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + public int getReplyCount() { + return replyCount; + } + + public void setReplyCount(int replyCount) { + this.replyCount = replyCount; + } + + @Override + public String toString() { + return "Posts{" + + "id=" + id + + ", label=" + label + + ", title='" + title + '\'' + + ", content='" + content + '\'' + + ", initTime=" + initTime + + ", top=" + top + + ", good=" + good + + ", user=" + user + + ", replyCount=" + replyCount + + '}'; + } +} diff --git a/bbssource/src/main/java/common/entity/Reply.java b/bbssource/src/main/java/common/entity/Reply.java index 9f9aae0..e86b46f 100644 --- a/bbssource/src/main/java/common/entity/Reply.java +++ b/bbssource/src/main/java/common/entity/Reply.java @@ -1,81 +1,105 @@ package common.entity; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import common.utils.Constants; + import javax.persistence.*; import java.io.Serializable; -import java.sql.Timestamp; +import java.util.Date; /** - * Created by liudeyu on 2019/6/27. + * @Author LHR + * Create By 2017/8/18 + * + * 回复 */ @Entity @Table(name = "quark_reply") -public class Reply implements Serializable{ +public class Reply implements Serializable { + @Id @GeneratedValue - @Column(name = "id") - private int id; + private Integer id; - @Column(name = "content") + //回复的内容 + @Column(columnDefinition = "text", nullable = false) private String content; - @Column(name = "init_time") - private Timestamp initTime; - @Column(name = "up") - private int upState; + //回复时间 + @JsonFormat(pattern = Constants.DATETIME_FORMAT, timezone = "GMT+8") + private Date initTime; + + //点赞个数 + private Integer up = 0; + //与话题的关联关系 @ManyToOne - @JoinColumn(name = "post_id") - private Post post; + @JoinColumn(nullable = false, name = "posts_id") + @JsonIgnore + private Posts posts; + //与用户的关联关系 @ManyToOne - @JoinColumn(name = "user_id") + @JoinColumn(nullable = false, name = "user_id") private User user; - public int getUpState() { - return upState; + public Integer getId() { + return id; } - public void setUpState(int upState) { - this.upState = upState; + public void setId(Integer id) { + this.id = id; } - public Post getPost() { - return post; + public String getContent() { + return content; } - public void setPost(Post post) { - this.post = post; + public void setContent(String content) { + this.content = content; } - public User getUser() { - return user; + public Date getInitTime() { + return initTime; } - public void setUser(User user) { - this.user = user; + public void setInitTime(Date initTime) { + this.initTime = initTime; } - public int getId() { - return id; + public Integer getUp() { + return up; } - public void setId(int id) { - this.id = id; + public void setUp(Integer up) { + this.up = up; } - public String getContent() { - return content; + public Posts getPosts() { + return posts; } - public void setContent(String content) { - this.content = content; + public void setPosts(Posts posts) { + this.posts = posts; } - public Timestamp getInitTime() { - return initTime; + public User getUser() { + return user; } - public void setInitTime(Timestamp initTime) { - this.initTime = initTime; + public void setUser(User user) { + this.user = user; + } + + @Override + public String toString() { + return "Reply{" + + "id=" + id + + ", content='" + content + '\'' + + ", initTime=" + initTime + + ", up=" + up + + ", user=" + user + + '}'; } } diff --git a/bbssource/src/main/java/common/entity/Role.java b/bbssource/src/main/java/common/entity/Role.java index 2de3acd..5db3f9f 100644 --- a/bbssource/src/main/java/common/entity/Role.java +++ b/bbssource/src/main/java/common/entity/Role.java @@ -2,32 +2,69 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.ManyToMany; +import javax.persistence.*; import java.io.Serializable; import java.util.HashSet; import java.util.Set; /** - * Created by liudeyu on 2019/6/27. + * Created by lhr on 17-7-31. */ -public class Role implements Serializable { - @JsonIgnore - @Column(name = "id") - @GeneratedValue - private int id; +@Entity +@Table(name = "quark_role") +public class Role implements Serializable{ - @Column(name = "description") - private String des; + @Id + @GeneratedValue + private Integer id; - @Column(name = "name",unique = true) + @Column(unique = true,nullable = false) private String name; - @ManyToMany(mappedBy = "adminUsers") - private Set adminUsers=new HashSet<>(); + //角色描述 + private String description; + //是否持有角色标志 + @Transient + private Integer selected; + + //角色与用户的关联关系 + @JsonIgnore + @ManyToMany(mappedBy = "roles") + private Set adminUsers = new HashSet<>(); + + //角色与权限的关联关系 + @JsonIgnore + @JoinTable(name = "quark_role_permission", + joinColumns = {@JoinColumn(name = "role_id",referencedColumnName = "id")}, + inverseJoinColumns = {@JoinColumn(name = "permissions_id",referencedColumnName = "id")}) + @ManyToMany(cascade = CascadeType.ALL) + private Set permissions = new HashSet<>(); + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } public Set getAdminUsers() { return adminUsers; @@ -37,27 +74,29 @@ public void setAdminUsers(Set adminUsers) { this.adminUsers = adminUsers; } - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; + public Set getPermissions() { + return permissions; } - public String getDes() { - return des; + public void setPermissions(Set permissions) { + this.permissions = permissions; } - public void setDes(String des) { - this.des = des; + public Integer getSelected() { + return selected; } - public String getName() { - return name; + public void setSelected(Integer selected) { + this.selected = selected; } - public void setName(String name) { - this.name = name; + @Override + public String toString() { + return "Role{" + + "id=" + id + + ", name='" + name + '\'' + + ", description='" + description + '\'' + + ", selected=" + selected + + '}'; } } diff --git a/bbssource/src/main/java/common/entity/User.java b/bbssource/src/main/java/common/entity/User.java index af691f9..1bb706c 100644 --- a/bbssource/src/main/java/common/entity/User.java +++ b/bbssource/src/main/java/common/entity/User.java @@ -1,82 +1,72 @@ package common.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import common.utils.Constants; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; -import java.sql.Timestamp; +import java.util.Date; /** - * Created by liudeyu on 2019/6/27. + * @Author LHR + * Create By 2017/8/18 + * + * 用户 */ @Entity -@Table(name = "quark_user") -public class User implements Serializable{ +@Table(name="quark_user") +public class User implements Serializable { + @Id @GeneratedValue - @Column(name = "id") - private int id; + private Integer id; + //注册邮箱 + @Column(nullable = false) + private String email; - @Column(name = "icon") - private String icon; - - @Column(name = "enable") - private int enable; - @Column(name = "init_time") - private Timestamp initTime; - + // 用户名 + @Column(unique = true, nullable = false) + private String username; + // 密码 + @Column(nullable = false) @JsonIgnore - @Column(name = "password") private String password; - @Column(name = "sex") - private int sex; + // 头像 + private String icon ="http://127.0.0.1/images/upload/default.png"; - @Column(name = "signature") + // 个人签名 private String signature; - @Column(name = "username") - private String userName; + // 注册时间 + @Column(nullable = false) + @JsonFormat(pattern = Constants.DATE_FORMAT, timezone = "GMT+8") + private Date initTime; - @Column(name = "email") - private String email; + //性别 0 ：男 1：女 + private Integer sex = 0; + //是否被封禁,默认为１：开启 + @Column(nullable = false) + private Integer enable = 1; - public int getId() { + public Integer getId() { return id; } - public void setId(int id) { + public void setId(Integer id) { this.id = id; } - public String getIcon() { - return icon; + public String getUsername() { + return username; } - public void setIcon(String icon) { - this.icon = icon; - } - - public int getEnable() { - return enable; - } - - public void setEnable(int enable) { - this.enable = enable; - } - - public Timestamp getInitTime() { - return initTime; - } - - public void setInitTime(Timestamp initTime) { - this.initTime = initTime; + public void setUsername(String username) { + this.username = username; } public String getPassword() { @@ -87,12 +77,12 @@ public void setPassword(String password) { this.password = password; } - public int getSex() { - return sex; + public String getIcon() { + return icon; } - public void setSex(int sex) { - this.sex = sex; + public void setIcon(String icon) { + this.icon = icon; } public String getSignature() { @@ -103,12 +93,28 @@ public void setSignature(String signature) { this.signature = signature; } - public String getUserName() { - return userName; + public Date getInitTime() { + return initTime; } - public void setUserName(String userName) { - this.userName = userName; + public void setInitTime(Date initTime) { + this.initTime = initTime; + } + + public Integer getSex() { + return sex; + } + + public void setSex(Integer sex) { + this.sex = sex; + } + + public Integer getEnable() { + return enable; + } + + public void setEnable(Integer enable) { + this.enable = enable; } public String getEmail() { @@ -118,4 +124,18 @@ public String getEmail() { public void setEmail(String email) { this.email = email; } + + @Override + public String toString() { + return "User{" + + "id=" + id + + ", username='" + username + '\'' + + ", password='" + password + '\'' + + ", Icon='" + icon + '\'' + + ", signature='" + signature + '\'' + + ", initTime=" + initTime + + ", sex=" + sex + + ", enable=" + enable + + '}'; + } } diff --git a/bbssource/src/main/java/common/utils/Constants.java b/bbssource/src/main/java/common/utils/Constants.java index 964ed32..6aa7c25 100644 --- a/bbssource/src/main/java/common/utils/Constants.java +++ b/bbssource/src/main/java/common/utils/Constants.java @@ -1,4 +1,6 @@ package common.utils; public class Constants { + public static final String DATE_FORMAT = "yyyy-MM-dd"; + public static final String DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss"; } From 50126b861cd2dc88ec138fcc2aab5facc7cf0c32 Mon Sep 17 00:00:00 2001 From: liudeyu Date: Sun, 30 Jun 2019 12:55:48 +0800 Subject: [PATCH 10/17] test module adjust --- .../main/java/common/CommonApplication.java | 19 +++ .../src/main/java/common/dao/UserDao.java | 25 ++++ .../src/main/resources/application.properties | 25 ++++ bbssource/src/main/resources/ehcache.xml | 138 ++++++++++++++++++ .../java/testcommon/AbsTestConfigure.java | 19 +++ .../src/test/java/testcommon/TestOne.java | 33 ++++- .../java/com/quark/common/dao/UserDao.java | 4 +- .../quark/common/CommonApplicationTest.java | 13 +- 8 files changed, 266 insertions(+), 10 deletions(-) create mode 100644 bbssource/src/main/java/common/CommonApplication.java create mode 100644 bbssource/src/main/java/common/dao/UserDao.java create mode 100644 bbssource/src/main/resources/application.properties create mode 100644 bbssource/src/main/resources/ehcache.xml create mode 100644 bbssource/src/test/java/testcommon/AbsTestConfigure.java diff --git a/bbssource/src/main/java/common/CommonApplication.java b/bbssource/src/main/java/common/CommonApplication.java new file mode 100644 index 0000000..86cf2af --- /dev/null +++ b/bbssource/src/main/java/common/CommonApplication.java @@ -0,0 +1,19 @@ +package common; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Configuration; + +/** + * Created by liudeyu on 2019/6/30. + */ + +@SpringBootApplication +@EnableCaching +public class CommonApplication { + public static void main(String[]argv){ + SpringApplication.run(CommonApplication.class,argv); + } +} diff --git a/bbssource/src/main/java/common/dao/UserDao.java b/bbssource/src/main/java/common/dao/UserDao.java new file mode 100644 index 0000000..317f2ff --- /dev/null +++ b/bbssource/src/main/java/common/dao/UserDao.java @@ -0,0 +1,25 @@ +package common.dao; + +import common.entity.User; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * Created by liudeyu on 2019/6/30. + */ +@Repository +@CacheConfig(cacheNames = "users") +public interface UserDao extends JpaRepository, JpaSpecificationExecutor { + + User findUserByEmail(String email); + + User findUserByUsername(String name); + + @Query(value = "select * from quark_user u where DATE_SUB(CURDATE(),INTERVAL 3000 DAY)<=DATE(u.init_time) ORDER BY u.id DESC limit 12", nativeQuery = true) + List findNewUser(); +} diff --git a/bbssource/src/main/resources/application.properties b/bbssource/src/main/resources/application.properties new file mode 100644 index 0000000..df3133f --- /dev/null +++ b/bbssource/src/main/resources/application.properties @@ -0,0 +1,25 @@ +#Mysql配置 +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/quarkCommunity?useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=ldy +spring.datasource.password=abcd1234 +spring.datasource.driver-class-name=com.mysql.jdbc.Driver + +#jpa配置 +spring.jpa.database = MYSQL +spring.jpa.show-sql = true +spring.jpa.hibernate.ddl-auto = update +spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy +spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect + +#datasource +spring.datasource.initialSize=5 +spring.datasource.minIdle=5 +spring.datasource.maxActive=20 +# 配置获取连接等待超时的时间 +spring.datasource.maxWait=60000 + + + + + diff --git a/bbssource/src/main/resources/ehcache.xml b/bbssource/src/main/resources/ehcache.xml new file mode 100644 index 0000000..4922ae7 --- /dev/null +++ b/bbssource/src/main/resources/ehcache.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bbssource/src/test/java/testcommon/AbsTestConfigure.java b/bbssource/src/test/java/testcommon/AbsTestConfigure.java new file mode 100644 index 0000000..f0be361 --- /dev/null +++ b/bbssource/src/test/java/testcommon/AbsTestConfigure.java @@ -0,0 +1,19 @@ +package testcommon; + +import common.CommonApplication; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * Created by liudeyu on 2019/6/30. + */ + +@RunWith(SpringJUnit4ClassRunner.class) +@EnableCaching +@SpringBootTest(classes = CommonApplication.class) +public abstract class AbsTestConfigure { +} diff --git a/bbssource/src/test/java/testcommon/TestOne.java b/bbssource/src/test/java/testcommon/TestOne.java index 05aed1e..8204b5e 100644 --- a/bbssource/src/test/java/testcommon/TestOne.java +++ b/bbssource/src/test/java/testcommon/TestOne.java @@ -1,4 +1,35 @@ package testcommon; -public class TestOne { +import common.CommonApplication; +import common.dao.UserDao; +import common.entity.User; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.List; + +public class TestOne extends AbsTestConfigure{ + + @Autowired + UserDao userDao; + @Test + public void testHello(){ + System.out.println("hello"); + } + + + @Test + public void testDataBase(){ + ListnewUsers=userDao.findNewUser(); + for(User u:newUsers){ + System.out.println(u.getUsername()); + } + } + } diff --git a/quark-common/src/main/java/com/quark/common/dao/UserDao.java b/quark-common/src/main/java/com/quark/common/dao/UserDao.java index 41623cb..eef98c5 100644 --- a/quark-common/src/main/java/com/quark/common/dao/UserDao.java +++ b/quark-common/src/main/java/com/quark/common/dao/UserDao.java @@ -17,7 +17,7 @@ public interface UserDao extends JpaRepository ,JpaSpecificationEx User findByEmail(String email); - @Query(value = "select u.id, u.username , u.icon from quark_user u where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <=DATE(u.init_time) ORDER BY u.id DESC limit 12" ,nativeQuery = true) - List findNewUser(); + @Query(value = "select * from quark_user u where DATE_SUB(CURDATE(), INTERVAL 3000 DAY) <=DATE(u.init_time) ORDER BY u.id DESC limit 12" ,nativeQuery = true) + List findNewUser(); } diff --git a/quark-common/src/test/java/com/quark/common/CommonApplicationTest.java b/quark-common/src/test/java/com/quark/common/CommonApplicationTest.java index 1dfa416..b10c2a5 100644 --- a/quark-common/src/test/java/com/quark/common/CommonApplicationTest.java +++ b/quark-common/src/test/java/com/quark/common/CommonApplicationTest.java @@ -4,6 +4,7 @@ import com.quark.common.dao.NotificationDao; import com.quark.common.dao.PostsDao; import com.quark.common.dao.UserDao; +import com.quark.common.entity.User; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -12,6 +13,7 @@ import org.springframework.test.context.junit4.SpringRunner; import javax.sql.DataSource; +import java.util.List; /** * Created by lhr on 17-7-30. @@ -38,12 +40,9 @@ public class CommonApplicationTest { @Test public void TestDataSource(){ -// long count = notificationDao.getNotificationCount(72); -// System.out.println(count); -// List list = notificationDao.getByTouser(UserDao.findOne(2)); -// System.out.println(list); -// list.forEach(t->{ -// System.out.println(t.getPosts().getTitle()); -// }); + Listusers= UserDao.findNewUser(); + users.forEach(user -> { + System.out.println(user.getUsername()); + }); } } From 701b79857d69e681180727bf69b30097b9ad929f Mon Sep 17 00:00:00 2001 From: liudeyu Date: Sun, 30 Jun 2019 19:01:59 +0800 Subject: [PATCH 11/17] dao,base service tmp save --- .../common/baseservice/BaseController.java | 22 ++++++++ .../java/common/baseservice/BaseService.java | 27 ++++++++++ .../common/baseservice/BaseServiceImp.java | 51 +++++++++++++++++++ .../java/common/baseservice/Processor.java | 9 ++++ .../main/java/common/dao/AdminUserDao.java | 12 +++++ .../src/main/java/common/dao/LabelDao.java | 14 +++++ .../main/java/common/dao/NotificationDao.java | 13 +++++ .../src/main/java/common/dao/PostDao.java | 35 +++++++++++++ .../src/main/java/common/dao/ReplyDao.java | 20 ++++++++ .../src/main/java/common/dto/QuarkResult.kt | 15 ++++++ .../java/common/exceptions/ApiException.java | 25 +++++++++ .../src/main/java/common/utils/Logger.kt | 13 +++++ 12 files changed, 256 insertions(+) create mode 100644 bbssource/src/main/java/common/baseservice/BaseController.java create mode 100644 bbssource/src/main/java/common/baseservice/BaseService.java create mode 100644 bbssource/src/main/java/common/baseservice/BaseServiceImp.java create mode 100644 bbssource/src/main/java/common/baseservice/Processor.java create mode 100644 bbssource/src/main/java/common/dao/AdminUserDao.java create mode 100644 bbssource/src/main/java/common/dao/LabelDao.java create mode 100644 bbssource/src/main/java/common/dao/NotificationDao.java create mode 100644 bbssource/src/main/java/common/dao/PostDao.java create mode 100644 bbssource/src/main/java/common/dao/ReplyDao.java create mode 100644 bbssource/src/main/java/common/dto/QuarkResult.kt create mode 100644 bbssource/src/main/java/common/exceptions/ApiException.java create mode 100644 bbssource/src/main/java/common/utils/Logger.kt diff --git a/bbssource/src/main/java/common/baseservice/BaseController.java b/bbssource/src/main/java/common/baseservice/BaseController.java new file mode 100644 index 0000000..29a29ff --- /dev/null +++ b/bbssource/src/main/java/common/baseservice/BaseController.java @@ -0,0 +1,22 @@ +package common.baseservice; + +import common.exceptions.ApiException; +import common.utils.Logger; + +/** + * Created by liudeyu on 2019/6/30. + */ +public class BaseController { + + public void process(Processor processor){ + try { + processor.process(); + }catch (ApiException ex){ + + + }catch (Exception ex){ + + } + } + +} diff --git a/bbssource/src/main/java/common/baseservice/BaseService.java b/bbssource/src/main/java/common/baseservice/BaseService.java new file mode 100644 index 0000000..e85dc39 --- /dev/null +++ b/bbssource/src/main/java/common/baseservice/BaseService.java @@ -0,0 +1,27 @@ +package common.baseservice; + +import java.util.Iterator; +import java.util.List; + +/** + * Created by liudeyu on 2019/6/30. + */ +public interface BaseService { + + T save(T entity); + + void delete(Object key); + + T findOne(int key); + + List findAll(); + + + void deleteInBatch(Iterable entities); + + List findInBatch(Iterable keys); + + List saveInBatch(Iterable keys); + + +} diff --git a/bbssource/src/main/java/common/baseservice/BaseServiceImp.java b/bbssource/src/main/java/common/baseservice/BaseServiceImp.java new file mode 100644 index 0000000..de80f42 --- /dev/null +++ b/bbssource/src/main/java/common/baseservice/BaseServiceImp.java @@ -0,0 +1,51 @@ +package common.baseservice; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +/** + * Created by liudeyu on 2019/6/30. + */ +public class BaseServiceImp implements BaseService { + + @Autowired + protected E reposity; + + + @Override + public T save(T entity) { + return (T) reposity.save(entity); + } + + @Override + public void delete(Object key) { + reposity.delete(key); + } + + @Override + public T findOne(int key) { + return (T) reposity.findOne(key); + } + + @Override + public List findAll() { + return reposity.findAll(); + } + + @Override + public void deleteInBatch(Iterable entities) { + reposity.deleteInBatch(entities); + } + + @Override + public List findInBatch(Iterable keys) { + return reposity.findAll(keys); + } + + @Override + public List saveInBatch(Iterable keys) { + return reposity.save(keys); + } +} diff --git a/bbssource/src/main/java/common/baseservice/Processor.java b/bbssource/src/main/java/common/baseservice/Processor.java new file mode 100644 index 0000000..337eb4f --- /dev/null +++ b/bbssource/src/main/java/common/baseservice/Processor.java @@ -0,0 +1,9 @@ +package common.baseservice; + +/** + * Created by liudeyu on 2019/6/30. + */ +public interface Processor { + + void process(); +} diff --git a/bbssource/src/main/java/common/dao/AdminUserDao.java b/bbssource/src/main/java/common/dao/AdminUserDao.java new file mode 100644 index 0000000..46844a2 --- /dev/null +++ b/bbssource/src/main/java/common/dao/AdminUserDao.java @@ -0,0 +1,12 @@ +package common.dao; + +import common.entity.AdminUser; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +/** + * Created by liudeyu on 2019/6/30. + */ +@Repository +public interface AdminUserDao extends JpaRepository { +} diff --git a/bbssource/src/main/java/common/dao/LabelDao.java b/bbssource/src/main/java/common/dao/LabelDao.java new file mode 100644 index 0000000..8511afa --- /dev/null +++ b/bbssource/src/main/java/common/dao/LabelDao.java @@ -0,0 +1,14 @@ +package common.dao; + +import common.entity.Label; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.stereotype.Repository; + +/** + * Created by liudeyu on 2019/6/30. + */ +@Repository +public interface LabelDao extends JpaRepository,JpaSpecificationExecutor{ + +} diff --git a/bbssource/src/main/java/common/dao/NotificationDao.java b/bbssource/src/main/java/common/dao/NotificationDao.java new file mode 100644 index 0000000..805ae7b --- /dev/null +++ b/bbssource/src/main/java/common/dao/NotificationDao.java @@ -0,0 +1,13 @@ +package common.dao; + +import common.entity.Notification; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +/** + * Created by liudeyu on 2019/6/30. + */ +public interface NotificationDao extends JpaRepository,JpaSpecificationExecutor{ + + +} diff --git a/bbssource/src/main/java/common/dao/PostDao.java b/bbssource/src/main/java/common/dao/PostDao.java new file mode 100644 index 0000000..70324da --- /dev/null +++ b/bbssource/src/main/java/common/dao/PostDao.java @@ -0,0 +1,35 @@ +package common.dao; + +import common.entity.Label; +import common.entity.Posts; +import common.entity.User; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * Created by liudeyu on 2019/6/30. + */ +@Repository +@CacheConfig(cacheNames = "postses") +public interface PostDao extends JpaRepository ,JpaSpecificationExecutor{ + @Override + @Cacheable + List findAll(); + + Page findByUser(User user,Pageable page); + Page findByLabel(Label label,Pageable pageable); + + @Query(value = "select p.id,p.title,p.reply_count from quark_posts p where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <=DATE(p.init_time) ORDER by reply_count desc limit 10" + ,nativeQuery = true) + List findHotPosts(); + +} diff --git a/bbssource/src/main/java/common/dao/ReplyDao.java b/bbssource/src/main/java/common/dao/ReplyDao.java new file mode 100644 index 0000000..d900cc8 --- /dev/null +++ b/bbssource/src/main/java/common/dao/ReplyDao.java @@ -0,0 +1,20 @@ +package common.dao; + +import common.entity.Reply; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * Created by liudeyu on 2019/6/30. + */ +@Repository +public interface ReplyDao extends JpaRepository,JpaSpecificationExecutor { + + @Cacheable + @Override + List findAll(); +} diff --git a/bbssource/src/main/java/common/dto/QuarkResult.kt b/bbssource/src/main/java/common/dto/QuarkResult.kt new file mode 100644 index 0000000..1728203 --- /dev/null +++ b/bbssource/src/main/java/common/dto/QuarkResult.kt @@ -0,0 +1,15 @@ +package common.dto + +import org.omg.CORBA.Object +import java.io.Serializable + +/** + * Created by liudeyu on 2019/6/30. + */ +class QuarkResult() : Serializable { + var status = 0; + var data: Object? = null + var error: String = "" + + +} \ No newline at end of file diff --git a/bbssource/src/main/java/common/exceptions/ApiException.java b/bbssource/src/main/java/common/exceptions/ApiException.java new file mode 100644 index 0000000..5963a0a --- /dev/null +++ b/bbssource/src/main/java/common/exceptions/ApiException.java @@ -0,0 +1,25 @@ +package common.exceptions; + +/** + * Created by liudeyu on 2019/6/30. + */ +public class ApiException extends RuntimeException{ + private int status; + private Throwable throwable; + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public Throwable getThrowable() { + return throwable; + } + + public void setThrowable(Throwable throwable) { + this.throwable = throwable; + } +} diff --git a/bbssource/src/main/java/common/utils/Logger.kt b/bbssource/src/main/java/common/utils/Logger.kt new file mode 100644 index 0000000..1e0eeb5 --- /dev/null +++ b/bbssource/src/main/java/common/utils/Logger.kt @@ -0,0 +1,13 @@ +package common.utils + +import org.slf4j.LoggerFactory + +/** + * Created by liudeyu on 2019/6/30. + */ + +class Logger{ + companion object{ + val logger=LoggerFactory.getLogger("Logger") + } +} \ No newline at end of file From dd9401e176781b2d94308cac666e3c44257fbcd1 Mon Sep 17 00:00:00 2001 From: liudeyu Date: Sun, 30 Jun 2019 20:02:00 +0800 Subject: [PATCH 12/17] simple common package basic done --- .../src/main/java/common/dao/CollectDao.java | 10 ++++++ .../main/java/common/dao/PermissionDao.java | 10 ++++++ .../src/main/java/common/dto/PageResult.kt | 14 ++++++++ .../src/main/java/common/dto/QuarkResult.kt | 33 ++++++++++++++++++- .../src/main/java/common/dto/SocketMessage.kt | 11 +++++++ .../src/main/java/common/dto/UploadResult.kt | 25 ++++++++++++++ 6 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 bbssource/src/main/java/common/dao/CollectDao.java create mode 100644 bbssource/src/main/java/common/dao/PermissionDao.java create mode 100644 bbssource/src/main/java/common/dto/PageResult.kt create mode 100644 bbssource/src/main/java/common/dto/SocketMessage.kt create mode 100644 bbssource/src/main/java/common/dto/UploadResult.kt diff --git a/bbssource/src/main/java/common/dao/CollectDao.java b/bbssource/src/main/java/common/dao/CollectDao.java new file mode 100644 index 0000000..f51e927 --- /dev/null +++ b/bbssource/src/main/java/common/dao/CollectDao.java @@ -0,0 +1,10 @@ +package common.dao; + +import common.entity.Collect; +import org.springframework.data.jpa.repository.JpaRepository; + +/** + * Created by liudeyu on 2019/6/30. + */ +public interface CollectDao extends JpaRepository { +} diff --git a/bbssource/src/main/java/common/dao/PermissionDao.java b/bbssource/src/main/java/common/dao/PermissionDao.java new file mode 100644 index 0000000..7c37842 --- /dev/null +++ b/bbssource/src/main/java/common/dao/PermissionDao.java @@ -0,0 +1,10 @@ +package common.dao; + +import common.entity.Permission; +import org.springframework.data.jpa.repository.JpaRepository; + +/** + * Created by liudeyu on 2019/6/30. + */ +public interface PermissionDao extends JpaRepository { +} diff --git a/bbssource/src/main/java/common/dto/PageResult.kt b/bbssource/src/main/java/common/dto/PageResult.kt new file mode 100644 index 0000000..dc45edd --- /dev/null +++ b/bbssource/src/main/java/common/dto/PageResult.kt @@ -0,0 +1,14 @@ +package common.dto + +import java.io.Serializable + +/** + * Created by liudeyu on 2019/6/30. + */ +class PageResult : Serializable { + var totalRecord = 0 + var filterRecord = 0 + var draw = 0 + var data: T? = null + +} \ No newline at end of file diff --git a/bbssource/src/main/java/common/dto/QuarkResult.kt b/bbssource/src/main/java/common/dto/QuarkResult.kt index 1728203..cab6d8c 100644 --- a/bbssource/src/main/java/common/dto/QuarkResult.kt +++ b/bbssource/src/main/java/common/dto/QuarkResult.kt @@ -1,15 +1,46 @@ package common.dto +import com.google.common.net.HttpHeaders +import com.sun.deploy.net.HttpUtils +import com.sun.net.httpserver.HttpServer import org.omg.CORBA.Object import java.io.Serializable +import java.net.HttpURLConnection +import javax.xml.ws.spi.http.HttpHandler /** * Created by liudeyu on 2019/6/30. */ class QuarkResult() : Serializable { + + + companion object { + + fun ok(data: Any): QuarkResult { + val data = QuarkResult(HttpURLConnection.HTTP_OK, data) + return data + } + fun error(errorMsg:String):QuarkResult{ + return QuarkResult(HttpURLConnection.HTTP_INTERNAL_ERROR,errorMsg) + } + + } + + constructor(status: Int, data: Any) : this() { + this.status = status + this.data = data + } + + constructor(status: Int, error: String) : this() { + this.status = status + this.error = error + } + var status = 0; - var data: Object? = null + var data: Any? = null var error: String = "" + var pageSize: Int = 0 + var total: Int = 0 } \ No newline at end of file diff --git a/bbssource/src/main/java/common/dto/SocketMessage.kt b/bbssource/src/main/java/common/dto/SocketMessage.kt new file mode 100644 index 0000000..3329ed3 --- /dev/null +++ b/bbssource/src/main/java/common/dto/SocketMessage.kt @@ -0,0 +1,11 @@ +package common.dto + +import java.io.Serializable + +/** + * Created by liudeyu on 2019/6/30. + */ +class SocketMessage : Serializable { + var message: String = "" + var code = 0 +} \ No newline at end of file diff --git a/bbssource/src/main/java/common/dto/UploadResult.kt b/bbssource/src/main/java/common/dto/UploadResult.kt new file mode 100644 index 0000000..e94d08b --- /dev/null +++ b/bbssource/src/main/java/common/dto/UploadResult.kt @@ -0,0 +1,25 @@ +package common.dto + +import java.io.Serializable + +/** + * Created by liudeyu on 2019/6/30. + */ + + +class UploadResult() : Serializable { + + constructor(status: Int) : this() { + this.status = status + } + + class UploadData { + var title = "" + var src = "" + } + + var status = 0 + var data:UploadData?=null + var errorMessage="" // error message + +} \ No newline at end of file From 55369e12b628487f38aadaa61bc59cc5ff1e7bae Mon Sep 17 00:00:00 2001 From: liudeyu Date: Mon, 1 Jul 2019 20:02:51 +0800 Subject: [PATCH 13/17] rest service doing --- bbs_restservice/pom.xml | 70 +++++++++++++++++++ bbs_restservice/src/main/java/Test.java | 8 +++ .../src/main/java/service/RedisService.java | 44 ++++++++++++ {bbssource => bbssource_common}/pom.xml | 0 .../main/java/common/CommonApplication.java | 0 .../common/baseservice/BaseController.java | 1 - .../java/common/baseservice/BaseService.java | 0 .../common/baseservice/BaseServiceImp.java | 0 .../java/common/baseservice/Processor.java | 0 .../main/java/common/dao/AdminUserDao.java | 0 .../src/main/java/common/dao/CollectDao.java | 0 .../src/main/java/common/dao/LabelDao.java | 0 .../main/java/common/dao/NotificationDao.java | 0 .../main/java/common/dao/PermissionDao.java | 0 .../src/main/java/common/dao/PostDao.java | 0 .../src/main/java/common/dao/ReplyDao.java | 0 .../src/main/java/common/dao/UserDao.java | 0 .../src/main/java/common/dto/PageResult.kt | 0 .../src/main/java/common/dto/QuarkResult.kt | 0 .../src/main/java/common/dto/SocketMessage.kt | 0 .../src/main/java/common/dto/UploadResult.kt | 0 .../main/java/common/entity/AdminUser.java | 0 .../src/main/java/common/entity/Collect.java | 0 .../src/main/java/common/entity/Label.java | 0 .../main/java/common/entity/Notification.java | 0 .../main/java/common/entity/Permission.java | 0 .../src/main/java/common/entity/Posts.java | 0 .../src/main/java/common/entity/Reply.java | 0 .../src/main/java/common/entity/Role.java | 0 .../src/main/java/common/entity/User.java | 0 .../java/common/exceptions/ApiException.java | 0 .../src/main/java/common/test | 0 .../src/main/java/common/utils/Constants.java | 0 .../src/main/java/common/utils/Logger.kt | 0 .../src/main/java/test | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/ehcache.xml | 0 .../java/testcommon/AbsTestConfigure.java | 0 .../src/test/java/testcommon/TestOne.java | 0 {bbssource => bbssource_common}/src/test/test | 0 40 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 bbs_restservice/pom.xml create mode 100644 bbs_restservice/src/main/java/Test.java create mode 100644 bbs_restservice/src/main/java/service/RedisService.java rename {bbssource => bbssource_common}/pom.xml (100%) rename {bbssource => bbssource_common}/src/main/java/common/CommonApplication.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/baseservice/BaseController.java (92%) rename {bbssource => bbssource_common}/src/main/java/common/baseservice/BaseService.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/baseservice/BaseServiceImp.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/baseservice/Processor.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/dao/AdminUserDao.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/dao/CollectDao.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/dao/LabelDao.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/dao/NotificationDao.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/dao/PermissionDao.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/dao/PostDao.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/dao/ReplyDao.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/dao/UserDao.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/dto/PageResult.kt (100%) rename {bbssource => bbssource_common}/src/main/java/common/dto/QuarkResult.kt (100%) rename {bbssource => bbssource_common}/src/main/java/common/dto/SocketMessage.kt (100%) rename {bbssource => bbssource_common}/src/main/java/common/dto/UploadResult.kt (100%) rename {bbssource => bbssource_common}/src/main/java/common/entity/AdminUser.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/entity/Collect.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/entity/Label.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/entity/Notification.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/entity/Permission.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/entity/Posts.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/entity/Reply.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/entity/Role.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/entity/User.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/exceptions/ApiException.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/test (100%) rename {bbssource => bbssource_common}/src/main/java/common/utils/Constants.java (100%) rename {bbssource => bbssource_common}/src/main/java/common/utils/Logger.kt (100%) rename {bbssource => bbssource_common}/src/main/java/test (100%) rename {bbssource => bbssource_common}/src/main/resources/application.properties (100%) rename {bbssource => bbssource_common}/src/main/resources/ehcache.xml (100%) rename {bbssource => bbssource_common}/src/test/java/testcommon/AbsTestConfigure.java (100%) rename {bbssource => bbssource_common}/src/test/java/testcommon/TestOne.java (100%) rename {bbssource => bbssource_common}/src/test/test (100%) diff --git a/bbs_restservice/pom.xml b/bbs_restservice/pom.xml new file mode 100644 index 0000000..cf82143 --- /dev/null +++ b/bbs_restservice/pom.xml @@ -0,0 +1,70 @@ + + + + quark-parent + com.quark + 1.0-SNAPSHOT + ../quark-parent/pom.xml + + 4.0.0 + + bbs_rest + restservice + 1.0-SNAPSHOT + + + + + bbspratise + bbssource + 1.0-SNAPSHOT + + + + org.springframework.boot + + spring-boot-starter + + + + + org.springframework.boot + + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-test + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework + spring-messaging + + + io.springfox + springfox-swagger2 + + + io.springfox + springfox-swagger-ui + + + + + + \ No newline at end of file diff --git a/bbs_restservice/src/main/java/Test.java b/bbs_restservice/src/main/java/Test.java new file mode 100644 index 0000000..a921821 --- /dev/null +++ b/bbs_restservice/src/main/java/Test.java @@ -0,0 +1,8 @@ + +/** + * Created by liudeyu on 2019/7/1. + */ +public class Test { + + +} diff --git a/bbs_restservice/src/main/java/service/RedisService.java b/bbs_restservice/src/main/java/service/RedisService.java new file mode 100644 index 0000000..9f5ed67 --- /dev/null +++ b/bbs_restservice/src/main/java/service/RedisService.java @@ -0,0 +1,44 @@ +package service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Service; + +import java.util.concurrent.TimeUnit; + +/** + * Created by liudeyu on 2019/7/1. + */ +@Service +public class RedisService { + + @Autowired + private RedisTemplate template; + + + /** + * time is hour + */ + public void putDataInCache(String key, T value, int time) { + ValueOperations valueOperations = template.opsForValue(); + valueOperations.set(key, value, time, TimeUnit.HOURS); + } + + public T getDataFromCache(String key) { + ValueOperations valueOperations = template.opsForValue(); + return valueOperations.get(key); + } + + + public T getDataAndUpdateTime(String key, int time) { + ValueOperations valueOperations = template.opsForValue(); + if (valueOperations.get(key) == null) { + return valueOperations.get(key); + } + T data = valueOperations.get(key); + valueOperations.set(key, data, time); + return data; + } + +} diff --git a/bbssource/pom.xml b/bbssource_common/pom.xml similarity index 100% rename from bbssource/pom.xml rename to bbssource_common/pom.xml diff --git a/bbssource/src/main/java/common/CommonApplication.java b/bbssource_common/src/main/java/common/CommonApplication.java similarity index 100% rename from bbssource/src/main/java/common/CommonApplication.java rename to bbssource_common/src/main/java/common/CommonApplication.java diff --git a/bbssource/src/main/java/common/baseservice/BaseController.java b/bbssource_common/src/main/java/common/baseservice/BaseController.java similarity index 92% rename from bbssource/src/main/java/common/baseservice/BaseController.java rename to bbssource_common/src/main/java/common/baseservice/BaseController.java index 29a29ff..b34b8fe 100644 --- a/bbssource/src/main/java/common/baseservice/BaseController.java +++ b/bbssource_common/src/main/java/common/baseservice/BaseController.java @@ -1,7 +1,6 @@ package common.baseservice; import common.exceptions.ApiException; -import common.utils.Logger; /** * Created by liudeyu on 2019/6/30. diff --git a/bbssource/src/main/java/common/baseservice/BaseService.java b/bbssource_common/src/main/java/common/baseservice/BaseService.java similarity index 100% rename from bbssource/src/main/java/common/baseservice/BaseService.java rename to bbssource_common/src/main/java/common/baseservice/BaseService.java diff --git a/bbssource/src/main/java/common/baseservice/BaseServiceImp.java b/bbssource_common/src/main/java/common/baseservice/BaseServiceImp.java similarity index 100% rename from bbssource/src/main/java/common/baseservice/BaseServiceImp.java rename to bbssource_common/src/main/java/common/baseservice/BaseServiceImp.java diff --git a/bbssource/src/main/java/common/baseservice/Processor.java b/bbssource_common/src/main/java/common/baseservice/Processor.java similarity index 100% rename from bbssource/src/main/java/common/baseservice/Processor.java rename to bbssource_common/src/main/java/common/baseservice/Processor.java diff --git a/bbssource/src/main/java/common/dao/AdminUserDao.java b/bbssource_common/src/main/java/common/dao/AdminUserDao.java similarity index 100% rename from bbssource/src/main/java/common/dao/AdminUserDao.java rename to bbssource_common/src/main/java/common/dao/AdminUserDao.java diff --git a/bbssource/src/main/java/common/dao/CollectDao.java b/bbssource_common/src/main/java/common/dao/CollectDao.java similarity index 100% rename from bbssource/src/main/java/common/dao/CollectDao.java rename to bbssource_common/src/main/java/common/dao/CollectDao.java diff --git a/bbssource/src/main/java/common/dao/LabelDao.java b/bbssource_common/src/main/java/common/dao/LabelDao.java similarity index 100% rename from bbssource/src/main/java/common/dao/LabelDao.java rename to bbssource_common/src/main/java/common/dao/LabelDao.java diff --git a/bbssource/src/main/java/common/dao/NotificationDao.java b/bbssource_common/src/main/java/common/dao/NotificationDao.java similarity index 100% rename from bbssource/src/main/java/common/dao/NotificationDao.java rename to bbssource_common/src/main/java/common/dao/NotificationDao.java diff --git a/bbssource/src/main/java/common/dao/PermissionDao.java b/bbssource_common/src/main/java/common/dao/PermissionDao.java similarity index 100% rename from bbssource/src/main/java/common/dao/PermissionDao.java rename to bbssource_common/src/main/java/common/dao/PermissionDao.java diff --git a/bbssource/src/main/java/common/dao/PostDao.java b/bbssource_common/src/main/java/common/dao/PostDao.java similarity index 100% rename from bbssource/src/main/java/common/dao/PostDao.java rename to bbssource_common/src/main/java/common/dao/PostDao.java diff --git a/bbssource/src/main/java/common/dao/ReplyDao.java b/bbssource_common/src/main/java/common/dao/ReplyDao.java similarity index 100% rename from bbssource/src/main/java/common/dao/ReplyDao.java rename to bbssource_common/src/main/java/common/dao/ReplyDao.java diff --git a/bbssource/src/main/java/common/dao/UserDao.java b/bbssource_common/src/main/java/common/dao/UserDao.java similarity index 100% rename from bbssource/src/main/java/common/dao/UserDao.java rename to bbssource_common/src/main/java/common/dao/UserDao.java diff --git a/bbssource/src/main/java/common/dto/PageResult.kt b/bbssource_common/src/main/java/common/dto/PageResult.kt similarity index 100% rename from bbssource/src/main/java/common/dto/PageResult.kt rename to bbssource_common/src/main/java/common/dto/PageResult.kt diff --git a/bbssource/src/main/java/common/dto/QuarkResult.kt b/bbssource_common/src/main/java/common/dto/QuarkResult.kt similarity index 100% rename from bbssource/src/main/java/common/dto/QuarkResult.kt rename to bbssource_common/src/main/java/common/dto/QuarkResult.kt diff --git a/bbssource/src/main/java/common/dto/SocketMessage.kt b/bbssource_common/src/main/java/common/dto/SocketMessage.kt similarity index 100% rename from bbssource/src/main/java/common/dto/SocketMessage.kt rename to bbssource_common/src/main/java/common/dto/SocketMessage.kt diff --git a/bbssource/src/main/java/common/dto/UploadResult.kt b/bbssource_common/src/main/java/common/dto/UploadResult.kt similarity index 100% rename from bbssource/src/main/java/common/dto/UploadResult.kt rename to bbssource_common/src/main/java/common/dto/UploadResult.kt diff --git a/bbssource/src/main/java/common/entity/AdminUser.java b/bbssource_common/src/main/java/common/entity/AdminUser.java similarity index 100% rename from bbssource/src/main/java/common/entity/AdminUser.java rename to bbssource_common/src/main/java/common/entity/AdminUser.java diff --git a/bbssource/src/main/java/common/entity/Collect.java b/bbssource_common/src/main/java/common/entity/Collect.java similarity index 100% rename from bbssource/src/main/java/common/entity/Collect.java rename to bbssource_common/src/main/java/common/entity/Collect.java diff --git a/bbssource/src/main/java/common/entity/Label.java b/bbssource_common/src/main/java/common/entity/Label.java similarity index 100% rename from bbssource/src/main/java/common/entity/Label.java rename to bbssource_common/src/main/java/common/entity/Label.java diff --git a/bbssource/src/main/java/common/entity/Notification.java b/bbssource_common/src/main/java/common/entity/Notification.java similarity index 100% rename from bbssource/src/main/java/common/entity/Notification.java rename to bbssource_common/src/main/java/common/entity/Notification.java diff --git a/bbssource/src/main/java/common/entity/Permission.java b/bbssource_common/src/main/java/common/entity/Permission.java similarity index 100% rename from bbssource/src/main/java/common/entity/Permission.java rename to bbssource_common/src/main/java/common/entity/Permission.java diff --git a/bbssource/src/main/java/common/entity/Posts.java b/bbssource_common/src/main/java/common/entity/Posts.java similarity index 100% rename from bbssource/src/main/java/common/entity/Posts.java rename to bbssource_common/src/main/java/common/entity/Posts.java diff --git a/bbssource/src/main/java/common/entity/Reply.java b/bbssource_common/src/main/java/common/entity/Reply.java similarity index 100% rename from bbssource/src/main/java/common/entity/Reply.java rename to bbssource_common/src/main/java/common/entity/Reply.java diff --git a/bbssource/src/main/java/common/entity/Role.java b/bbssource_common/src/main/java/common/entity/Role.java similarity index 100% rename from bbssource/src/main/java/common/entity/Role.java rename to bbssource_common/src/main/java/common/entity/Role.java diff --git a/bbssource/src/main/java/common/entity/User.java b/bbssource_common/src/main/java/common/entity/User.java similarity index 100% rename from bbssource/src/main/java/common/entity/User.java rename to bbssource_common/src/main/java/common/entity/User.java diff --git a/bbssource/src/main/java/common/exceptions/ApiException.java b/bbssource_common/src/main/java/common/exceptions/ApiException.java similarity index 100% rename from bbssource/src/main/java/common/exceptions/ApiException.java rename to bbssource_common/src/main/java/common/exceptions/ApiException.java diff --git a/bbssource/src/main/java/common/test b/bbssource_common/src/main/java/common/test similarity index 100% rename from bbssource/src/main/java/common/test rename to bbssource_common/src/main/java/common/test diff --git a/bbssource/src/main/java/common/utils/Constants.java b/bbssource_common/src/main/java/common/utils/Constants.java similarity index 100% rename from bbssource/src/main/java/common/utils/Constants.java rename to bbssource_common/src/main/java/common/utils/Constants.java diff --git a/bbssource/src/main/java/common/utils/Logger.kt b/bbssource_common/src/main/java/common/utils/Logger.kt similarity index 100% rename from bbssource/src/main/java/common/utils/Logger.kt rename to bbssource_common/src/main/java/common/utils/Logger.kt diff --git a/bbssource/src/main/java/test b/bbssource_common/src/main/java/test similarity index 100% rename from bbssource/src/main/java/test rename to bbssource_common/src/main/java/test diff --git a/bbssource/src/main/resources/application.properties b/bbssource_common/src/main/resources/application.properties similarity index 100% rename from bbssource/src/main/resources/application.properties rename to bbssource_common/src/main/resources/application.properties diff --git a/bbssource/src/main/resources/ehcache.xml b/bbssource_common/src/main/resources/ehcache.xml similarity index 100% rename from bbssource/src/main/resources/ehcache.xml rename to bbssource_common/src/main/resources/ehcache.xml diff --git a/bbssource/src/test/java/testcommon/AbsTestConfigure.java b/bbssource_common/src/test/java/testcommon/AbsTestConfigure.java similarity index 100% rename from bbssource/src/test/java/testcommon/AbsTestConfigure.java rename to bbssource_common/src/test/java/testcommon/AbsTestConfigure.java diff --git a/bbssource/src/test/java/testcommon/TestOne.java b/bbssource_common/src/test/java/testcommon/TestOne.java similarity index 100% rename from bbssource/src/test/java/testcommon/TestOne.java rename to bbssource_common/src/test/java/testcommon/TestOne.java diff --git a/bbssource/src/test/test b/bbssource_common/src/test/test similarity index 100% rename from bbssource/src/test/test rename to bbssource_common/src/test/test From b7ca6d8688b5846c5e66e28a540a81520aff7217 Mon Sep 17 00:00:00 2001 From: liudeyu Date: Tue, 2 Jul 2019 20:23:47 +0800 Subject: [PATCH 14/17] base configure redis --- bbs_restservice/pom.xml | 6 ++++ .../src/main/java/BBsRestApplication.java | 17 ++++++++++ .../main/java/configure/RedisConfigure.java | 16 ++++++++++ .../src/main/java/service/RedisService.java | 31 +++++++++++++++++-- .../src/main/resources/application.properties | 29 +++++++++++++++++ .../src/main/resources/rest.properties | 0 6 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 bbs_restservice/src/main/java/BBsRestApplication.java create mode 100644 bbs_restservice/src/main/java/configure/RedisConfigure.java create mode 100644 bbs_restservice/src/main/resources/application.properties create mode 100644 bbs_restservice/src/main/resources/rest.properties diff --git a/bbs_restservice/pom.xml b/bbs_restservice/pom.xml index cf82143..78e2a44 100644 --- a/bbs_restservice/pom.xml +++ b/bbs_restservice/pom.xml @@ -47,6 +47,12 @@ + + redis.clients + jedis + LATEST + + org.springframework.boot spring-boot-starter-websocket diff --git a/bbs_restservice/src/main/java/BBsRestApplication.java b/bbs_restservice/src/main/java/BBsRestApplication.java new file mode 100644 index 0000000..7c7483c --- /dev/null +++ b/bbs_restservice/src/main/java/BBsRestApplication.java @@ -0,0 +1,17 @@ +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cache.annotation.EnableCaching; + +/** + * Created by liudeyu on 2019/7/2. + */ + +@SpringBootApplication +@EnableCaching +public class BBsRestApplication { + + public static void main(String[] argv) { + SpringApplication.run( + BBsRestApplication.class, argv); + } +} diff --git a/bbs_restservice/src/main/java/configure/RedisConfigure.java b/bbs_restservice/src/main/java/configure/RedisConfigure.java new file mode 100644 index 0000000..5ec9f59 --- /dev/null +++ b/bbs_restservice/src/main/java/configure/RedisConfigure.java @@ -0,0 +1,16 @@ +package configure; + +import org.springframework.cache.annotation.CachingConfigurationSelector; +import org.springframework.cache.annotation.CachingConfigurerSupport; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Configuration; + +/** + * Created by liudeyu on 2019/7/2. + */ +@Configuration +@EnableCaching +public class RedisConfigure extends CachingConfigurerSupport{ + + +} diff --git a/bbs_restservice/src/main/java/service/RedisService.java b/bbs_restservice/src/main/java/service/RedisService.java index 9f5ed67..c38fa94 100644 --- a/bbs_restservice/src/main/java/service/RedisService.java +++ b/bbs_restservice/src/main/java/service/RedisService.java @@ -2,6 +2,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.SetOperations; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Service; @@ -20,12 +21,12 @@ public class RedisService { /** * time is hour */ - public void putDataInCache(String key, T value, int time) { + public void putDataInMap(String key, T value, int time) { ValueOperations valueOperations = template.opsForValue(); valueOperations.set(key, value, time, TimeUnit.HOURS); } - public T getDataFromCache(String key) { + public T getDataFromMap(String key) { ValueOperations valueOperations = template.opsForValue(); return valueOperations.get(key); } @@ -41,4 +42,30 @@ public T getDataAndUpdateTime(String key, int time) { return data; } + public void deleteFromMap(String key) { + ValueOperations valueOperations = template.opsForValue(); + template.delete(key); + } + + public void putDataInSet(String key, T t) { + SetOperations setOp = template.opsForSet(); + setOp.add(key, t); + } + + public void removeDataFromSet(String key, T t) { + SetOperations setOp = template.opsForSet(); + setOp.remove(key, t); + } + + public boolean isDataInSet(String key, T t) { + SetOperations setOp = template.opsForSet(); + return setOp.isMember(key, t); + } + + public void putSetIfNotExists(String key,T t){ + if(!isDataInSet(key,t)) { + putDataInSet(key,t); + } + } + } diff --git a/bbs_restservice/src/main/resources/application.properties b/bbs_restservice/src/main/resources/application.properties new file mode 100644 index 0000000..321daa4 --- /dev/null +++ b/bbs_restservice/src/main/resources/application.properties @@ -0,0 +1,29 @@ +server.port=8081 +logging.level.org.springframework.web=DEBUG + + +#redis +# REDIS (RedisProperties) +# Redis数据库索引（默认为0） +spring.redis.database=5 +# Redis服务器地址 +spring.redis.host=127.0.0.1 +# Redis服务器连接端口 +spring.redis.port=6379 +# Redis服务器连接密码（默认为空） +spring.redis.password=***** +# 连接池最大连接数（使用负值表示没有限制） +spring.redis.pool.max-active=8 +# 连接池最大阻塞等待时间（使用负值表示没有限制） +spring.redis.pool.max-wait=-1 +# 连接池中的最大空闲连接 +spring.redis.pool.max-idle=8 +# 连接池中的最小空闲连接 +spring.redis.pool.min-idle=0 +# 连接超时时间（毫秒） +spring.redis.timeout=10 + + +#encode +spring.http.encoding.charset=utf-8 +spring.http.encoding.force=true \ No newline at end of file diff --git a/bbs_restservice/src/main/resources/rest.properties b/bbs_restservice/src/main/resources/rest.properties new file mode 100644 index 0000000..e69de29 From e31b01c3b48839421cdbec1812388ad7d71b8976 Mon Sep 17 00:00:00 2001 From: liudeyu Date: Wed, 3 Jul 2019 18:00:04 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E8=B0=83rest=20=E6=B3=A8=E5=85=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=9C=89=E7=82=B9=E7=83=A6=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 2 +- bbs_restservice/pom.xml | 2 + .../src/main/java/BBsRestApplication.java | 17 ----- bbs_restservice/src/main/java/Test.java | 8 --- .../com/restservice/BBSRestApplication.java | 35 +++++++++ .../restservice/configure/RedisConfigure.java | 71 +++++++++++++++++++ .../com/restservice/configure/RestConfig.java | 12 ++++ .../restservice}/service/RedisService.java | 2 +- .../main/java/configure/RedisConfigure.java | 16 ----- .../src/main/resources/application.properties | 28 +++++++- .../src/main/resources/rest.properties | 25 +++++++ bbs_restservice/src/test/java/Test.java | 20 ++++++ bbssource_common/pom.xml | 53 ++++++++++++++ .../common/baseservice/BaseController.java | 16 ++--- .../java/common/baseservice/Processor.java | 4 +- .../src/main/java/common/dto/QuarkResult.kt | 9 ++- .../src/test/java/testcommon/TestOne.java | 7 -- .../java/com/quark/common/dao/UserDao.java | 2 +- .../quark/common/CommonApplicationTest.java | 6 +- quark-rest/pom.xml | 9 ++- .../rest/service/impl/RankServiceImpl.java | 2 +- .../com/quark/rest/RestApplicationTest.java | 1 + 22 files changed, 279 insertions(+), 68 deletions(-) delete mode 100644 bbs_restservice/src/main/java/BBsRestApplication.java delete mode 100644 bbs_restservice/src/main/java/Test.java create mode 100644 bbs_restservice/src/main/java/com/restservice/BBSRestApplication.java create mode 100644 bbs_restservice/src/main/java/com/restservice/configure/RedisConfigure.java create mode 100644 bbs_restservice/src/main/java/com/restservice/configure/RestConfig.java rename bbs_restservice/src/main/java/{ => com/restservice}/service/RedisService.java (98%) delete mode 100644 bbs_restservice/src/main/java/configure/RedisConfigure.java create mode 100644 bbs_restservice/src/test/java/Test.java diff --git a/LICENSE b/LICENSE index 8dada3e..a921bc8 100644 --- a/LICENSE +++ b/LICENSE @@ -136,7 +136,7 @@ with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, + names, trademarks, com.restservice.service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. diff --git a/bbs_restservice/pom.xml b/bbs_restservice/pom.xml index 78e2a44..5288e1f 100644 --- a/bbs_restservice/pom.xml +++ b/bbs_restservice/pom.xml @@ -22,6 +22,8 @@ 1.0-SNAPSHOT + + org.springframework.boot diff --git a/bbs_restservice/src/main/java/BBsRestApplication.java b/bbs_restservice/src/main/java/BBsRestApplication.java deleted file mode 100644 index 7c7483c..0000000 --- a/bbs_restservice/src/main/java/BBsRestApplication.java +++ /dev/null @@ -1,17 +0,0 @@ -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cache.annotation.EnableCaching; - -/** - * Created by liudeyu on 2019/7/2. - */ - -@SpringBootApplication -@EnableCaching -public class BBsRestApplication { - - public static void main(String[] argv) { - SpringApplication.run( - BBsRestApplication.class, argv); - } -} diff --git a/bbs_restservice/src/main/java/Test.java b/bbs_restservice/src/main/java/Test.java deleted file mode 100644 index a921821..0000000 --- a/bbs_restservice/src/main/java/Test.java +++ /dev/null @@ -1,8 +0,0 @@ - -/** - * Created by liudeyu on 2019/7/1. - */ -public class Test { - - -} diff --git a/bbs_restservice/src/main/java/com/restservice/BBSRestApplication.java b/bbs_restservice/src/main/java/com/restservice/BBSRestApplication.java new file mode 100644 index 0000000..0501851 --- /dev/null +++ b/bbs_restservice/src/main/java/com/restservice/BBSRestApplication.java @@ -0,0 +1,35 @@ +package com.restservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cache.annotation.EnableCaching; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +/** + * Created by liudeyu on 2019/7/2. + */ + +@SpringBootApplication +@EnableCaching +public class BBSRestApplication { + + public static void main(String[] argv) { + SpringApplication springApplication = new SpringApplication(BBSRestApplication.class); +// InputStream inputStream = BBSRestApplication.class.getClassLoader().getResourceAsStream("rest.properties"); +// Properties properties = new Properties(); +// try { +// properties.load(inputStream); +// springApplication.setDefaultProperties(properties); +// } catch (IOException e) { +// e.printStackTrace(); +// } + + springApplication.run(argv); + + } +} diff --git a/bbs_restservice/src/main/java/com/restservice/configure/RedisConfigure.java b/bbs_restservice/src/main/java/com/restservice/configure/RedisConfigure.java new file mode 100644 index 0000000..0ed9647 --- /dev/null +++ b/bbs_restservice/src/main/java/com/restservice/configure/RedisConfigure.java @@ -0,0 +1,71 @@ +package com.restservice.configure; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.CachingConfigurerSupport; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cache.interceptor.KeyGenerator; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.cache.RedisCacheManager; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; + +import java.lang.reflect.Method; + +/** + * Created by liudeyu on 2019/7/2. + */ +@Configuration +@EnableCaching +public class RedisConfigure extends CachingConfigurerSupport { + + + @Bean + @Override + public KeyGenerator keyGenerator() { + return new KeyGenerator() { + @Override + public Object generate(Object o, Method method, Object... objects) { + StringBuilder builder = new StringBuilder(); + builder.append(o.getClass().toString()).append(method.getName()); + for (Object object : objects) { + builder.append(object.toString()); + } + return builder.toString(); + } + }; + } + + + + + @Bean + public CacheManager cacheManager(RedisTemplate redisTemplate) { + RedisCacheManager rcm = new RedisCacheManager(redisTemplate); + //设置缓存过期时间 + //rcm.setDefaultExpiration(60);//秒 + return rcm; + } + + + + + @Bean + public RedisTemplate redisemplate(RedisConnectionFactory factory){ + StringRedisTemplate stringRedisTemplate=new StringRedisTemplate(factory); + Jackson2JsonRedisSerializer jackson2JsonRedisSerializer=new Jackson2JsonRedisSerializer(Object.class); + ObjectMapper mapper=new ObjectMapper(); + mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + jackson2JsonRedisSerializer.setObjectMapper(mapper); + stringRedisTemplate.setValueSerializer(jackson2JsonRedisSerializer); + stringRedisTemplate.afterPropertiesSet(); + return stringRedisTemplate; + + } +} diff --git a/bbs_restservice/src/main/java/com/restservice/configure/RestConfig.java b/bbs_restservice/src/main/java/com/restservice/configure/RestConfig.java new file mode 100644 index 0000000..1162a8b --- /dev/null +++ b/bbs_restservice/src/main/java/com/restservice/configure/RestConfig.java @@ -0,0 +1,12 @@ +package com.restservice.configure; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +/** + * Created by liudeyu on 2019/7/3. + */ +@Configuration +@ComponentScan(basePackages = "common") +public class RestConfig { +} diff --git a/bbs_restservice/src/main/java/service/RedisService.java b/bbs_restservice/src/main/java/com/restservice/service/RedisService.java similarity index 98% rename from bbs_restservice/src/main/java/service/RedisService.java rename to bbs_restservice/src/main/java/com/restservice/service/RedisService.java index c38fa94..b65124c 100644 --- a/bbs_restservice/src/main/java/service/RedisService.java +++ b/bbs_restservice/src/main/java/com/restservice/service/RedisService.java @@ -1,4 +1,4 @@ -package service; +package com.restservice.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/bbs_restservice/src/main/java/configure/RedisConfigure.java b/bbs_restservice/src/main/java/configure/RedisConfigure.java deleted file mode 100644 index 5ec9f59..0000000 --- a/bbs_restservice/src/main/java/configure/RedisConfigure.java +++ /dev/null @@ -1,16 +0,0 @@ -package configure; - -import org.springframework.cache.annotation.CachingConfigurationSelector; -import org.springframework.cache.annotation.CachingConfigurerSupport; -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.context.annotation.Configuration; - -/** - * Created by liudeyu on 2019/7/2. - */ -@Configuration -@EnableCaching -public class RedisConfigure extends CachingConfigurerSupport{ - - -} diff --git a/bbs_restservice/src/main/resources/application.properties b/bbs_restservice/src/main/resources/application.properties index 321daa4..e6d5d43 100644 --- a/bbs_restservice/src/main/resources/application.properties +++ b/bbs_restservice/src/main/resources/application.properties @@ -26,4 +26,30 @@ spring.redis.timeout=10 #encode spring.http.encoding.charset=utf-8 -spring.http.encoding.force=true \ No newline at end of file +spring.http.encoding.force=true + +#Mysql配置 +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/quarkCommunity?useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=ldy +spring.datasource.password=abcd1234 +spring.datasource.driver-class-name=com.mysql.jdbc.Driver + +#jpa配置 +spring.jpa.database = MYSQL +spring.jpa.show-sql = true +spring.jpa.hibernate.ddl-auto = update +spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy +spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect + +#datasource +spring.datasource.initialSize=5 +spring.datasource.minIdle=5 +spring.datasource.maxActive=20 +# 配置获取连接等待超时的时间 +spring.datasource.maxWait=60000 + + + + + diff --git a/bbs_restservice/src/main/resources/rest.properties b/bbs_restservice/src/main/resources/rest.properties index e69de29..df3133f 100644 --- a/bbs_restservice/src/main/resources/rest.properties +++ b/bbs_restservice/src/main/resources/rest.properties @@ -0,0 +1,25 @@ +#Mysql配置 +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/quarkCommunity?useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=ldy +spring.datasource.password=abcd1234 +spring.datasource.driver-class-name=com.mysql.jdbc.Driver + +#jpa配置 +spring.jpa.database = MYSQL +spring.jpa.show-sql = true +spring.jpa.hibernate.ddl-auto = update +spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy +spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect + +#datasource +spring.datasource.initialSize=5 +spring.datasource.minIdle=5 +spring.datasource.maxActive=20 +# 配置获取连接等待超时的时间 +spring.datasource.maxWait=60000 + + + + + diff --git a/bbs_restservice/src/test/java/Test.java b/bbs_restservice/src/test/java/Test.java new file mode 100644 index 0000000..cf1df35 --- /dev/null +++ b/bbs_restservice/src/test/java/Test.java @@ -0,0 +1,20 @@ +import com.restservice.BBSRestApplication; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * Created by liudeyu on 2019/7/3. + */ +@RunWith(SpringRunner.class) +@EnableCaching +@SpringBootTest(classes = BBSRestApplication.class) +public class Test { + + @org.junit.Test + public void sayHello(){ + System.out.println("hello"); + } + +} diff --git a/bbssource_common/pom.xml b/bbssource_common/pom.xml index 6e1bad5..9d8c4ad 100644 --- a/bbssource_common/pom.xml +++ b/bbssource_common/pom.xml @@ -18,6 +18,7 @@ 1.8 + 1.0.0 @@ -66,6 +67,17 @@ com.fasterxml.jackson.core jackson-annotations + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-test + ${kotlin.version} + test + @@ -76,6 +88,47 @@ org.springframework.boot spring-boot-maven-plugin + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + compile + + compile + + + + test-compile + test-compile + + test-compile + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + compile + compile + + compile + + + + testCompile + test-compile + + testCompile + + + + diff --git a/bbssource_common/src/main/java/common/baseservice/BaseController.java b/bbssource_common/src/main/java/common/baseservice/BaseController.java index b34b8fe..b5f6666 100644 --- a/bbssource_common/src/main/java/common/baseservice/BaseController.java +++ b/bbssource_common/src/main/java/common/baseservice/BaseController.java @@ -1,20 +1,20 @@ package common.baseservice; +import common.dto.QuarkResult; import common.exceptions.ApiException; /** * Created by liudeyu on 2019/6/30. */ -public class BaseController { +public class BaseController { - public void process(Processor processor){ + public QuarkResult process(Processor processor) { try { - processor.process(); - }catch (ApiException ex){ - - - }catch (Exception ex){ - + return processor.process(); + } catch (ApiException ex) { + return QuarkResult.Companion.error(ex.getStackTrace().toString()); + } catch (Exception ex) { + return QuarkResult.errorSystem(ex.getStackTrace().toString()); } } diff --git a/bbssource_common/src/main/java/common/baseservice/Processor.java b/bbssource_common/src/main/java/common/baseservice/Processor.java index 337eb4f..a9048a2 100644 --- a/bbssource_common/src/main/java/common/baseservice/Processor.java +++ b/bbssource_common/src/main/java/common/baseservice/Processor.java @@ -1,9 +1,11 @@ package common.baseservice; +import common.dto.QuarkResult; + /** * Created by liudeyu on 2019/6/30. */ public interface Processor { - void process(); + QuarkResult process(); } diff --git a/bbssource_common/src/main/java/common/dto/QuarkResult.kt b/bbssource_common/src/main/java/common/dto/QuarkResult.kt index cab6d8c..d5f43c1 100644 --- a/bbssource_common/src/main/java/common/dto/QuarkResult.kt +++ b/bbssource_common/src/main/java/common/dto/QuarkResult.kt @@ -16,12 +16,19 @@ class QuarkResult() : Serializable { companion object { + @JvmStatic fun ok(data: Any): QuarkResult { val data = QuarkResult(HttpURLConnection.HTTP_OK, data) return data } + @JvmStatic fun error(errorMsg:String):QuarkResult{ - return QuarkResult(HttpURLConnection.HTTP_INTERNAL_ERROR,errorMsg) + return QuarkResult(HttpURLConnection.HTTP_BAD_REQUEST,errorMsg) + } + + @JvmStatic + fun errorSystem(errorMsg:String):QuarkResult{ + return QuarkResult(HttpURLConnection.HTTP_INTERNAL_ERROR,errorMsg); } } diff --git a/bbssource_common/src/test/java/testcommon/TestOne.java b/bbssource_common/src/test/java/testcommon/TestOne.java index 8204b5e..40aeee0 100644 --- a/bbssource_common/src/test/java/testcommon/TestOne.java +++ b/bbssource_common/src/test/java/testcommon/TestOne.java @@ -1,16 +1,9 @@ package testcommon; -import common.CommonApplication; import common.dao.UserDao; import common.entity.User; -import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import java.util.List; diff --git a/quark-common/src/main/java/com/quark/common/dao/UserDao.java b/quark-common/src/main/java/com/quark/common/dao/UserDao.java index eef98c5..dbe9353 100644 --- a/quark-common/src/main/java/com/quark/common/dao/UserDao.java +++ b/quark-common/src/main/java/com/quark/common/dao/UserDao.java @@ -18,6 +18,6 @@ public interface UserDao extends JpaRepository ,JpaSpecificationEx User findByEmail(String email); @Query(value = "select * from quark_user u where DATE_SUB(CURDATE(), INTERVAL 3000 DAY) <=DATE(u.init_time) ORDER BY u.id DESC limit 12" ,nativeQuery = true) - List findNewUser(); + List findNewUser(); } diff --git a/quark-common/src/test/java/com/quark/common/CommonApplicationTest.java b/quark-common/src/test/java/com/quark/common/CommonApplicationTest.java index b10c2a5..25cda20 100644 --- a/quark-common/src/test/java/com/quark/common/CommonApplicationTest.java +++ b/quark-common/src/test/java/com/quark/common/CommonApplicationTest.java @@ -40,9 +40,7 @@ public class CommonApplicationTest { @Test public void TestDataSource(){ - Listusers= UserDao.findNewUser(); - users.forEach(user -> { - System.out.println(user.getUsername()); - }); + Listusers= UserDao.findNewUser(); + } } diff --git a/quark-rest/pom.xml b/quark-rest/pom.xml index 3d9f3e6..f144a2a 100644 --- a/quark-rest/pom.xml +++ b/quark-rest/pom.xml @@ -14,8 +14,13 @@ quark-rest war - + + ${java.version} + ${java.version} + + + com.quark quark-common @@ -58,4 +63,6 @@ spring-messaging + + \ No newline at end of file diff --git a/quark-rest/src/main/java/com/quark/rest/service/impl/RankServiceImpl.java b/quark-rest/src/main/java/com/quark/rest/service/impl/RankServiceImpl.java index b332742..87261ae 100644 --- a/quark-rest/src/main/java/com/quark/rest/service/impl/RankServiceImpl.java +++ b/quark-rest/src/main/java/com/quark/rest/service/impl/RankServiceImpl.java @@ -27,6 +27,6 @@ public List findPostsRank() { @Override public List findUserRank() { - return userDao.findNewUser(); + return userDao.findNewUser(); } } diff --git a/quark-rest/src/test/java/com/quark/rest/RestApplicationTest.java b/quark-rest/src/test/java/com/quark/rest/RestApplicationTest.java index 843cefe..0b1c462 100644 --- a/quark-rest/src/test/java/com/quark/rest/RestApplicationTest.java +++ b/quark-rest/src/test/java/com/quark/rest/RestApplicationTest.java @@ -61,6 +61,7 @@ public void testDataSource() { // redisService.deleteSet(REDIS_USERID_KEY,8); // System.out.println(redisService.setHasValue(REDIS_USERID_KEY,5)); // postsDao.findAll(); + System.out.println("say hello"); } } From 8f863699f861506550b575d2c4b7ffc7488728c4 Mon Sep 17 00:00:00 2001 From: liudeyu Date: Thu, 4 Jul 2019 11:41:14 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E9=9D=A0=EF=BC=8C=E8=B0=83=E4=B8=AAredis?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=B3=A8=E5=85=A5=EF=BC=8C=E8=B0=83=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs_restservice/pom.xml | 5 -- .../com/restservice/BBSRestApplication.java | 16 +++--- .../restservice/configure/RedisConfigure.java | 2 +- .../com/restservice/service/RedisService.java | 5 +- .../src/main/resources/application.properties | 55 ------------------- .../src/main/resources/resource.properties | 15 +++++ .../src/main/resources/rest.properties | 41 +++++++------- bbs_restservice/src/test/java/Test.java | 3 + 8 files changed, 50 insertions(+), 92 deletions(-) delete mode 100644 bbs_restservice/src/main/resources/application.properties create mode 100644 bbs_restservice/src/main/resources/resource.properties diff --git a/bbs_restservice/pom.xml b/bbs_restservice/pom.xml index 5288e1f..a3da33e 100644 --- a/bbs_restservice/pom.xml +++ b/bbs_restservice/pom.xml @@ -49,11 +49,6 @@ - - redis.clients - jedis - LATEST - org.springframework.boot diff --git a/bbs_restservice/src/main/java/com/restservice/BBSRestApplication.java b/bbs_restservice/src/main/java/com/restservice/BBSRestApplication.java index 0501851..8d9e486 100644 --- a/bbs_restservice/src/main/java/com/restservice/BBSRestApplication.java +++ b/bbs_restservice/src/main/java/com/restservice/BBSRestApplication.java @@ -20,14 +20,14 @@ public class BBSRestApplication { public static void main(String[] argv) { SpringApplication springApplication = new SpringApplication(BBSRestApplication.class); -// InputStream inputStream = BBSRestApplication.class.getClassLoader().getResourceAsStream("rest.properties"); -// Properties properties = new Properties(); -// try { -// properties.load(inputStream); -// springApplication.setDefaultProperties(properties); -// } catch (IOException e) { -// e.printStackTrace(); -// } + InputStream inputStream = BBSRestApplication.class.getClassLoader().getResourceAsStream("rest.properties"); + Properties properties = new Properties(); + try { + properties.load(inputStream); + springApplication.setDefaultProperties(properties); + } catch (IOException e) { + e.printStackTrace(); + } springApplication.run(argv); diff --git a/bbs_restservice/src/main/java/com/restservice/configure/RedisConfigure.java b/bbs_restservice/src/main/java/com/restservice/configure/RedisConfigure.java index 0ed9647..dca0b8e 100644 --- a/bbs_restservice/src/main/java/com/restservice/configure/RedisConfigure.java +++ b/bbs_restservice/src/main/java/com/restservice/configure/RedisConfigure.java @@ -55,7 +55,7 @@ public CacheManager cacheManager(RedisTemplate redisTemplate) { - @Bean + @Bean(name = "redis_custom") public RedisTemplate redisemplate(RedisConnectionFactory factory){ StringRedisTemplate stringRedisTemplate=new StringRedisTemplate(factory); Jackson2JsonRedisSerializer jackson2JsonRedisSerializer=new Jackson2JsonRedisSerializer(Object.class); diff --git a/bbs_restservice/src/main/java/com/restservice/service/RedisService.java b/bbs_restservice/src/main/java/com/restservice/service/RedisService.java index b65124c..a7d4510 100644 --- a/bbs_restservice/src/main/java/com/restservice/service/RedisService.java +++ b/bbs_restservice/src/main/java/com/restservice/service/RedisService.java @@ -6,6 +6,7 @@ import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.concurrent.TimeUnit; /** @@ -14,8 +15,8 @@ @Service public class RedisService { - @Autowired - private RedisTemplate template; + @Resource(name="redis_custom") + private RedisTemplate template; /** diff --git a/bbs_restservice/src/main/resources/application.properties b/bbs_restservice/src/main/resources/application.properties deleted file mode 100644 index e6d5d43..0000000 --- a/bbs_restservice/src/main/resources/application.properties +++ /dev/null @@ -1,55 +0,0 @@ -server.port=8081 -logging.level.org.springframework.web=DEBUG - - -#redis -# REDIS (RedisProperties) -# Redis数据库索引（默认为0） -spring.redis.database=5 -# Redis服务器地址 -spring.redis.host=127.0.0.1 -# Redis服务器连接端口 -spring.redis.port=6379 -# Redis服务器连接密码（默认为空） -spring.redis.password=***** -# 连接池最大连接数（使用负值表示没有限制） -spring.redis.pool.max-active=8 -# 连接池最大阻塞等待时间（使用负值表示没有限制） -spring.redis.pool.max-wait=-1 -# 连接池中的最大空闲连接 -spring.redis.pool.max-idle=8 -# 连接池中的最小空闲连接 -spring.redis.pool.min-idle=0 -# 连接超时时间（毫秒） -spring.redis.timeout=10 - - -#encode -spring.http.encoding.charset=utf-8 -spring.http.encoding.force=true - -#Mysql配置 -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/quarkCommunity?useUnicode=true&characterEncoding=UTF-8&useSSL=false -spring.datasource.username=ldy -spring.datasource.password=abcd1234 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver - -#jpa配置 -spring.jpa.database = MYSQL -spring.jpa.show-sql = true -spring.jpa.hibernate.ddl-auto = update -spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy -spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect - -#datasource -spring.datasource.initialSize=5 -spring.datasource.minIdle=5 -spring.datasource.maxActive=20 -# 配置获取连接等待超时的时间 -spring.datasource.maxWait=60000 - - - - - diff --git a/bbs_restservice/src/main/resources/resource.properties b/bbs_restservice/src/main/resources/resource.properties new file mode 100644 index 0000000..d7b98e1 --- /dev/null +++ b/bbs_restservice/src/main/resources/resource.properties @@ -0,0 +1,15 @@ +#User_Redis_Key +REDIS_USER_KEY = quark:user: +REDIS_USER_TIME = 24 + +#Rank_Redis_Key +REDIS_RANK_POSTS = quark:rank:posts +REDIS_RANK_USERS = quark:rank:users + +#Userid_Redis_Key +REDIS_USERID_KEY = quark:uid + +#upload +UPLOAD_PATH=D:\\home\\images\\upload\\ +STATIC_URL=http://127.0.0.1/images/upload/ + diff --git a/bbs_restservice/src/main/resources/rest.properties b/bbs_restservice/src/main/resources/rest.properties index df3133f..a36aef8 100644 --- a/bbs_restservice/src/main/resources/rest.properties +++ b/bbs_restservice/src/main/resources/rest.properties @@ -1,25 +1,24 @@ -#Mysql配置 -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/quarkCommunity?useUnicode=true&characterEncoding=UTF-8&useSSL=false -spring.datasource.username=ldy -spring.datasource.password=abcd1234 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver - -#jpa配置 -spring.jpa.database = MYSQL -spring.jpa.show-sql = true -spring.jpa.hibernate.ddl-auto = update -spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy -spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect - -#datasource -spring.datasource.initialSize=5 -spring.datasource.minIdle=5 -spring.datasource.maxActive=20 -# 配置获取连接等待超时的时间 -spring.datasource.maxWait=60000 - +#port +server.port=8081 +#log +logging.level.org.springframework.web=DEBUG +#redis���� +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +#spring.redis.password=root +spring.redis.pool.max-active=8 +spring.redis.pool.max-wait=-1 +spring.redis.pool.max-idle=8 +spring.redis.pool.min-idle=0 +spring.redis.timeout=0 +#�ļ��ϴ� +spring.http.multipart.max-file-size= 2MB +#�����޸� +spring.http.encoding.force=true +spring.http.encoding.charset=UTF-8 +spring.http.encoding.enabled=true +server.tomcat.uri-encoding=UTF-8 \ No newline at end of file diff --git a/bbs_restservice/src/test/java/Test.java b/bbs_restservice/src/test/java/Test.java index cf1df35..0fae382 100644 --- a/bbs_restservice/src/test/java/Test.java +++ b/bbs_restservice/src/test/java/Test.java @@ -2,6 +2,7 @@ import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cache.annotation.EnableCaching; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; /** @@ -10,6 +11,8 @@ @RunWith(SpringRunner.class) @EnableCaching @SpringBootTest(classes = BBSRestApplication.class) +@TestPropertySource(locations = {"classpath:rest.properties"}) + public class Test { @org.junit.Test From 639eb21822ca1f8ba39c82636a60448b4ed7f40b Mon Sep 17 00:00:00 2001 From: liudeyu Date: Tue, 9 Jul 2019 15:10:35 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E5=8A=A0=E5=87=A0=E4=B8=AAconfigure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs_restservice/pom.xml | 7 +++ .../com/restservice/configure/CorsFilter.java | 44 +++++++++++++++++++ .../restservice/configure/MyMvcAdapter.java | 18 ++++++++ .../configure/PropertiesConfigure.java | 19 ++++++++ .../src/main/resources/resource.properties | 5 --- bbs_restservice/src/test/java/Test.java | 30 +++++++++++-- .../src/main/resources/resource.properties | 1 + quark-rest/src/main/resources/rest.properties | 13 ++++-- .../com/quark/rest/RestApplicationTest.java | 44 +++++++++++++++++++ 9 files changed, 168 insertions(+), 13 deletions(-) create mode 100644 bbs_restservice/src/main/java/com/restservice/configure/CorsFilter.java create mode 100644 bbs_restservice/src/main/java/com/restservice/configure/MyMvcAdapter.java create mode 100644 bbs_restservice/src/main/java/com/restservice/configure/PropertiesConfigure.java diff --git a/bbs_restservice/pom.xml b/bbs_restservice/pom.xml index a3da33e..aea8ff6 100644 --- a/bbs_restservice/pom.xml +++ b/bbs_restservice/pom.xml @@ -67,6 +67,13 @@ springfox-swagger-ui + + + io.netty + netty-all + 4.1.37.Final + + diff --git a/bbs_restservice/src/main/java/com/restservice/configure/CorsFilter.java b/bbs_restservice/src/main/java/com/restservice/configure/CorsFilter.java new file mode 100644 index 0000000..27460c1 --- /dev/null +++ b/bbs_restservice/src/main/java/com/restservice/configure/CorsFilter.java @@ -0,0 +1,44 @@ +package com.restservice.configure; + +import io.netty.handler.codec.http.HttpResponse; +import io.netty.handler.codec.http.HttpResponseStatus; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; + +import javax.servlet.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * Created by liudeyu on 2019/7/9. + */ + +@Configuration +public class CorsFilter implements Filter { + + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + + } + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { + if ((servletResponse instanceof HttpServletResponse)) { + HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse; + httpServletResponse.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, "*"); + httpServletResponse.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, "GET, POST, PATCH, PUT, DELETE, OPTIONS"); + httpServletResponse.setHeader(HttpHeaders.ACCESS_CONTROL_MAX_AGE, 6 * 60+""); + httpServletResponse.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, "X-Requested-With"); + + } + filterChain.doFilter(servletRequest, servletResponse); + } + + @Override + public void destroy() { + + } +} diff --git a/bbs_restservice/src/main/java/com/restservice/configure/MyMvcAdapter.java b/bbs_restservice/src/main/java/com/restservice/configure/MyMvcAdapter.java new file mode 100644 index 0000000..0c10363 --- /dev/null +++ b/bbs_restservice/src/main/java/com/restservice/configure/MyMvcAdapter.java @@ -0,0 +1,18 @@ +package com.restservice.configure; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; + +/** + * Created by liudeyu on 2019/7/9. + */ +@Configuration +public class MyMvcAdapter extends WebMvcConfigurerAdapter{ + + @Override + public void addViewControllers(ViewControllerRegistry registry) { + super.addViewControllers(registry); + + } +} diff --git a/bbs_restservice/src/main/java/com/restservice/configure/PropertiesConfigure.java b/bbs_restservice/src/main/java/com/restservice/configure/PropertiesConfigure.java new file mode 100644 index 0000000..37fb17f --- /dev/null +++ b/bbs_restservice/src/main/java/com/restservice/configure/PropertiesConfigure.java @@ -0,0 +1,19 @@ +package com.restservice.configure; + +import org.springframework.boot.env.PropertySourcesLoader; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; +import org.springframework.test.context.ContextConfiguration; + +/** + * Created by liudeyu on 2019/7/4. + */ +@Configuration +@ContextConfiguration(locations = {"classpath:rest.properties"}) +public class PropertiesConfigure { + @Bean + public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { + return new PropertySourcesPlaceholderConfigurer(); + } +} diff --git a/bbs_restservice/src/main/resources/resource.properties b/bbs_restservice/src/main/resources/resource.properties index d7b98e1..98e38e8 100644 --- a/bbs_restservice/src/main/resources/resource.properties +++ b/bbs_restservice/src/main/resources/resource.properties @@ -8,8 +8,3 @@ REDIS_RANK_USERS = quark:rank:users #Userid_Redis_Key REDIS_USERID_KEY = quark:uid - -#upload -UPLOAD_PATH=D:\\home\\images\\upload\\ -STATIC_URL=http://127.0.0.1/images/upload/ - diff --git a/bbs_restservice/src/test/java/Test.java b/bbs_restservice/src/test/java/Test.java index 0fae382..b111aca 100644 --- a/bbs_restservice/src/test/java/Test.java +++ b/bbs_restservice/src/test/java/Test.java @@ -1,5 +1,9 @@ import com.restservice.BBSRestApplication; +import com.restservice.service.RedisService; +import common.dao.UserDao; +import org.junit.Before; import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cache.annotation.EnableCaching; import org.springframework.test.context.TestPropertySource; @@ -13,11 +17,29 @@ @SpringBootTest(classes = BBSRestApplication.class) @TestPropertySource(locations = {"classpath:rest.properties"}) -public class Test { - +public class Test { + + @Autowired + RedisService redisService; + + @Autowired + UserDao userDao; + + @Before + public void beforeConfigure() { + System.out.println("before configure"); + } + @org.junit.Test - public void sayHello(){ + public void sayHello() { System.out.println("hello"); } - + + + @org.junit.Test + public void saveValue() { + final String key = "apple"; + redisService.putDataInMap(key, "no way", 1); + System.out.println(redisService.getDataFromMap(key)); + } } diff --git a/quark-rest/src/main/resources/resource.properties b/quark-rest/src/main/resources/resource.properties index d7b98e1..916cdba 100644 --- a/quark-rest/src/main/resources/resource.properties +++ b/quark-rest/src/main/resources/resource.properties @@ -13,3 +13,4 @@ REDIS_USERID_KEY = quark:uid UPLOAD_PATH=D:\\home\\images\\upload\\ STATIC_URL=http://127.0.0.1/images/upload/ +server.httpurl="localhost:8081" diff --git a/quark-rest/src/main/resources/rest.properties b/quark-rest/src/main/resources/rest.properties index de5dfb7..3892b6c 100644 --- a/quark-rest/src/main/resources/rest.properties +++ b/quark-rest/src/main/resources/rest.properties @@ -1,10 +1,13 @@ #port server.port=8081 +#http url + + #log logging.level.org.springframework.web=DEBUG -#redis +#redis���� spring.redis.host=127.0.0.1 spring.redis.port=6379 #spring.redis.password=root @@ -14,11 +17,13 @@ spring.redis.pool.max-idle=8 spring.redis.pool.min-idle=0 spring.redis.timeout=0 -#ļϴ +#�ļ��ϴ� spring.http.multipart.max-file-size= 2MB -#޸ +#�����޸� spring.http.encoding.force=true spring.http.encoding.charset=UTF-8 spring.http.encoding.enabled=true -server.tomcat.uri-encoding=UTF-8 \ No newline at end of file +server.tomcat.uri-encoding=UTF-8 + + diff --git a/quark-rest/src/test/java/com/quark/rest/RestApplicationTest.java b/quark-rest/src/test/java/com/quark/rest/RestApplicationTest.java index 0b1c462..66cb31c 100644 --- a/quark-rest/src/test/java/com/quark/rest/RestApplicationTest.java +++ b/quark-rest/src/test/java/com/quark/rest/RestApplicationTest.java @@ -6,17 +6,30 @@ import com.quark.rest.service.RedisService; import com.quark.rest.service.ReplyService; import com.quark.rest.service.UserService; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.http.HttpMethod; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.*; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.result.PrintingResultHandler; +import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.context.WebApplicationContext; import javax.sql.DataSource; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; + /** * Created by lhr on 17-7-31. * user.setUsername("lhr"); @@ -53,6 +66,21 @@ public class RestApplicationTest { @Value("${REDIS_USERID_KEY}") private String REDIS_USERID_KEY; + + + private MockMvc mockMvc; + + private Logger logger= LoggerFactory.getLogger(this.getClass()); + + @Autowired + WebApplicationContext context; + + @Before + public void beforeConfigure() { + mockMvc = MockMvcBuilders.webAppContextSetup(context).build(); + + } + @Test public void testDataSource() { // userService.updateUserPassword("2a8e48c8-9d09-4ef4-892c-b3436070297c","12345678","123456"); @@ -64,4 +92,20 @@ public void testDataSource() { System.out.println("say hello"); } + + @Test + public void testRestHeaders(){ + String userlogin="http://localhost:8081/user/login"; + RequestBuilder requestBuilder=MockMvcRequestBuilders.get(userlogin) + .param("name","jemmy") + .param("email","jemmy@oo.com"); + try { + mockMvc.perform(requestBuilder) + .andDo(print()); + } catch (Exception e) { + e.printStackTrace(); + } + + } + }