Skip to content

Commit f625b89

Browse files
z77zz77z
committed
Conflicts: src/test/java/io/z77z/test/MybatisPlusTest.java
2 parents 7984a06 + 1d46819 commit f625b89

39 files changed

+12215
-496
lines changed

‎pom.xml‎

Lines changed: 112 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,113 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.baomidou</groupId>
5-
<artifactId>mybatisplus-spring-boot</artifactId>
6-
<packaging>war</packaging>
7-
<version>1.0</version>
8-
9-
<parent>
10-
<groupId>org.springframework.boot</groupId>
11-
<artifactId>spring-boot-starter-parent</artifactId>
12-
<version>1.4.1.RELEASE</version>
13-
</parent>
14-
15-
<dependencies>
16-
17-
<!-- redis数据库 -->
18-
<dependency>
19-
<groupId>org.springframework.boot</groupId>
20-
<artifactId>spring-boot-starter-data-redis</artifactId>
21-
</dependency>
22-
23-
<dependency>
24-
<groupId>org.springframework.boot</groupId>
25-
<artifactId>spring-boot-starter-cache</artifactId>
26-
</dependency>
27-
28-
<dependency>
29-
<groupId>org.springframework.boot</groupId>
30-
<artifactId>spring-boot-starter-web</artifactId>
31-
</dependency>
32-
33-
<dependency>
34-
<groupId>org.apache.tomcat.embed</groupId>
35-
<artifactId>tomcat-embed-jasper</artifactId>
36-
<scope>provided</scope>
37-
</dependency>
38-
39-
<dependency>
40-
<groupId>org.mybatis.spring.boot</groupId>
41-
<artifactId>mybatis-spring-boot-starter</artifactId>
42-
<version>1.1.1</version>
43-
</dependency>
44-
45-
<dependency>
46-
<groupId>Mysql</groupId>
47-
<artifactId>mysql-connector-java</artifactId>
48-
<version>5.1.38</version>
49-
</dependency>
50-
51-
<!-- mybatisPlus代码生成模板引擎 -->
52-
<!-- <dependency>
53-
<groupId>org.apache.velocity</groupId>
54-
<artifactId>velocity</artifactId>
55-
</dependency> -->
56-
57-
<!-- druid阿里巴巴数据库连接池 -->
58-
<dependency>
59-
<groupId>com.alibaba</groupId>
60-
<artifactId>druid</artifactId>
61-
<version>1.0.26</version>
62-
</dependency>
63-
64-
<dependency>
65-
<groupId>com.zaxxer</groupId>
66-
<artifactId>HikariCP</artifactId>
67-
</dependency>
68-
69-
<!-- MP 核心库 -->
70-
<dependency>
71-
<groupId>com.baomidou</groupId>
72-
<artifactId>mybatis-plus</artifactId>
73-
<version>2.0.1</version>
74-
</dependency>
75-
76-
<!-- JUnit test dependency -->
77-
<dependency>
78-
<groupId>org.springframework.boot</groupId>
79-
<artifactId>spring-boot-starter-test</artifactId>
80-
</dependency>
81-
<dependency>
82-
<groupId>com.jayway.restassured</groupId>
83-
<artifactId>rest-assured</artifactId>
84-
<version>2.3.3</version>
85-
<scope>test</scope>
86-
</dependency>
87-
<!-- fastjson阿里巴巴jSON处理器 -->
88-
<dependency>
89-
<groupId>com.alibaba</groupId>
90-
<artifactId>fastjson</artifactId>
91-
<version>1.2.13</version>
92-
</dependency>
93-
94-
<dependency>
95-
<groupId>org.jsoup</groupId>
96-
<artifactId>jsoup</artifactId>
97-
<version>1.10.2</version>
98-
</dependency>
99-
100-
</dependencies>
101-
<build>
102-
<plugins>
103-
<plugin>
104-
<groupId>org.springframework.boot</groupId>
105-
<artifactId>spring-boot-maven-plugin</artifactId>
106-
</plugin>
107-
</plugins>
108-
</build>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.baomidou</groupId>
5+
<artifactId>mybatisplus-spring-boot</artifactId>
6+
<packaging>war</packaging>
7+
<version>1.0</version>
8+
9+
<parent>
10+
<groupId>org.springframework.boot</groupId>
11+
<artifactId>spring-boot-starter-parent</artifactId>
12+
<version>1.4.1.RELEASE</version>
13+
</parent>
14+
15+
<dependencies>
16+
17+
<!-- redis数据库 -->
18+
<dependency>
19+
<groupId>org.springframework.boot</groupId>
20+
<artifactId>spring-boot-starter-data-redis</artifactId>
21+
</dependency>
22+
23+
<dependency>
24+
<groupId>org.springframework.boot</groupId>
25+
<artifactId>spring-boot-starter-cache</artifactId>
26+
</dependency>
27+
28+
<dependency>
29+
<groupId>org.springframework.boot</groupId>
30+
<artifactId>spring-boot-starter-web</artifactId>
31+
</dependency>
32+
33+
<!-- 使用Jasper引擎解析JSP -->
34+
<dependency>
35+
<groupId>org.apache.tomcat.embed</groupId>
36+
<artifactId>tomcat-embed-jasper</artifactId>
37+
<scope>provided</scope>
38+
</dependency>
39+
40+
<dependency>
41+
<groupId>org.mybatis.spring.boot</groupId>
42+
<artifactId>mybatis-spring-boot-starter</artifactId>
43+
<version>1.1.1</version>
44+
</dependency>
45+
46+
<dependency>
47+
<groupId>Mysql</groupId>
48+
<artifactId>mysql-connector-java</artifactId>
49+
<version>5.1.38</version>
50+
</dependency>
51+
52+
<!-- mybatisPlus代码生成模板引擎 -->
53+
<!-- <dependency>
54+
<groupId>org.apache.velocity</groupId>
55+
<artifactId>velocity</artifactId>
56+
</dependency> -->
57+
58+
<!-- druid阿里巴巴数据库连接池 -->
59+
<dependency>
60+
<groupId>com.alibaba</groupId>
61+
<artifactId>druid</artifactId>
62+
<version>1.0.26</version>
63+
</dependency>
64+
<!-- Hikari数据库连接池 -->
65+
<dependency>
66+
<groupId>com.zaxxer</groupId>
67+
<artifactId>HikariCP</artifactId>
68+
</dependency>
69+
70+
<!-- MP 核心库 -->
71+
<dependency>
72+
<groupId>com.baomidou</groupId>
73+
<artifactId>mybatis-plus</artifactId>
74+
<version>2.0.1</version>
75+
</dependency>
76+
77+
<!-- JUnit test dependency -->
78+
<dependency>
79+
<groupId>org.springframework.boot</groupId>
80+
<artifactId>spring-boot-starter-test</artifactId>
81+
</dependency>
82+
83+
<!-- fastjson阿里巴巴jSON处理器 -->
84+
<dependency>
85+
<groupId>com.alibaba</groupId>
86+
<artifactId>fastjson</artifactId>
87+
<version>1.2.13</version>
88+
</dependency>
89+
90+
<!-- java HTML解析器，获取document对象 -->
91+
<dependency>
92+
<groupId>org.jsoup</groupId>
93+
<artifactId>jsoup</artifactId>
94+
<version>1.10.2</version>
95+
</dependency>
96+
97+
<!-- shiro权限控制框架 -->
98+
<dependency>
99+
<groupId>org.apache.shiro</groupId>
100+
<artifactId>shiro-spring</artifactId>
101+
<version>1.3.2</version>
102+
</dependency>
103+
104+
</dependencies>
105+
<build>
106+
<plugins>
107+
<plugin>
108+
<groupId>org.springframework.boot</groupId>
109+
<artifactId>spring-boot-maven-plugin</artifactId>
110+
</plugin>
111+
</plugins>
112+
</build>
109113
</project>

‎src/main/java/io/z77z/CrawlerMain.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ public int crawler(String page) {
8989
// 入库
9090
beautifulPicturesService.insert(beautifulPictures);
9191
// 访问链接获取document，并保存里面的图片
92-
List<Picture> listPicture = getArticleInfo(homeUrl + beautifulPictures.getUrl(),
93-
beautifulPictures);
92+
List<Picture> listPicture = getArticleInfo(homeUrl + beautifulPictures.getUrl(), beautifulPictures);
9493
for (Picture picture : listPicture) {
9594
// 入库
9695
pictureService.insert(picture);
@@ -121,7 +120,7 @@ public List<Picture> getArticleInfo(String url, BeautifulPictures beautifulPictu
121120
for (Element e : a) {
122121
String url2 = e.attr("src");
123122
// 下载img标签里面的图片到本地
124-
CrawlerUtil.saveToFile(url2,local);
123+
//CrawlerUtil.saveToFile(url2,local);
125124
Picture picture = new Picture();
126125
picture.setPicturesId(beautifulPictures.getId());
127126
picture.setUrl(url2);

0 commit comments

Comments
 (0)