Skip to content

Commit 6ea38dc

Browse files
sommer1991sommer1991
committed
Revert "delete target"
This reverts commit 5c5eec68d775d2e7d7b6ad578ab1daa74960f874.
1 parent 034d6d8 commit 6ea38dc

37 files changed

Lines changed: 5607 additions & 136 deletions

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.jar
88
*.war
99
*.ear
10-
10+
/target/*
11+
.gitignore
1112
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
1213
hs_err_pid*

‎pom.xml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.sommer.sample</groupId>
4+
<groupId>com.weibo</groupId>
55
<artifactId>webproject</artifactId>
66
<packaging>war</packaging>
77
<version>0.0.1-SNAPSHOT</version>
@@ -88,6 +88,14 @@
8888
<artifactId>javaee-api</artifactId>
8989
<version>7.0</version>
9090
</dependency>
91+
92+
<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
93+
<dependency>
94+
<groupId>javax.servlet</groupId>
95+
<artifactId>javax.servlet-api</artifactId>
96+
<version>3.1.0</version>
97+
</dependency>
98+
9199
<!-- dbcp用来在applicationContext.xml中配置数据库 -->
92100
<dependency>
93101
<groupId>commons-dbcp</groupId>
@@ -116,6 +124,12 @@
116124
<artifactId>jackson-annotations</artifactId>
117125
<version>2.5.4</version>
118126
</dependency>
127+
<!-- 用于将java对象封装成JSON格式或构造JSON数据 -->
128+
<dependency>
129+
<groupId>org.json</groupId>
130+
<artifactId>json</artifactId>
131+
<version>20160212</version>
132+
</dependency>
119133
</dependencies>
120134
<build>
121135
<finalName>webproject</finalName>

‎src/main/java/com/weibo/dashboard/controller/CommentController.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,27 @@
22

33
import javax.annotation.Resource;
44

5+
import org.springframework.web.bind.annotation.PathVariable;
6+
import org.springframework.web.bind.annotation.RequestBody;
57
import org.springframework.web.bind.annotation.RequestMapping;
8+
import org.springframework.web.bind.annotation.RequestMethod;
69
import org.springframework.web.bind.annotation.RestController;
710

11+
import com.weibo.dashboard.entity.Comment;
812
import com.weibo.dashboard.service.CommentService;
913

1014
@RestController
1115
@RequestMapping(value="/comment")
1216
public class CommentController {
1317
@Resource
1418
CommentService commentService;
19+
20+
@RequestMapping(value="/new",method=RequestMethod.POST)
21+
public void add(@RequestBody Comment comment){
22+
commentService.insert(comment);
23+
}
24+
@RequestMapping(value="/{id}",method=RequestMethod.DELETE)
25+
public void delete(@PathVariable("id") int id){
26+
commentService.delete(id);
27+
}
1528
}

‎src/main/java/com/weibo/dashboard/controller/PostController.java‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,53 @@
11
package com.weibo.dashboard.controller;
22

3+
import java.util.List;
4+
35
import javax.annotation.Resource;
46

7+
import org.springframework.web.bind.annotation.PathVariable;
8+
import org.springframework.web.bind.annotation.RequestBody;
59
import org.springframework.web.bind.annotation.RequestMapping;
10+
import org.springframework.web.bind.annotation.RequestMethod;
11+
import org.springframework.web.bind.annotation.ResponseBody;
612
import org.springframework.web.bind.annotation.RestController;
713

14+
import com.weibo.dashboard.entity.Post;
815
import com.weibo.dashboard.service.PostService;
16+
import com.weibo.util.ResponseData;
917

1018
@RestController
1119
@RequestMapping(value="/post")
1220
public class PostController {
1321
@Resource
1422
PostService postService;
23+
24+
@ResponseBody
25+
@RequestMapping(value="/show",method=RequestMethod.GET)
26+
public ResponseData findList(){
27+
List<Post> list = postService.findList();
28+
return new ResponseData(list);
29+
}
30+
@ResponseBody
31+
@RequestMapping(value="/show/{userName}",method=RequestMethod.GET)
32+
public ResponseData findList(@PathVariable("userName") String userName){
33+
List<Post> list = postService.postByUser(userName);
34+
return new ResponseData(list);
35+
}
36+
@RequestMapping(value="/{id}",method=RequestMethod.DELETE)
37+
public int delete(@PathVariable("id") int id){
38+
int res = postService.delete(id);
39+
return res;
40+
}
41+
@RequestMapping(value="/new",method=RequestMethod.POST)
42+
public void add(@RequestBody Post post){
43+
postService.insert(post);
44+
}
45+
@RequestMapping(value="/likes/{id}/{flag}",method=RequestMethod.GET)
46+
public void likeOrDislike(@PathVariable("id") int id,@PathVariable("flag") boolean flag){
47+
if(flag){
48+
postService.like(id);
49+
}else{
50+
postService.dislike(id);
51+
}
52+
}
1553
}

‎src/main/java/com/weibo/dashboard/controller/UserController.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import javax.annotation.Resource;
44

5+
import org.json.JSONObject;
56
import org.springframework.web.bind.annotation.PathVariable;
67
import org.springframework.web.bind.annotation.RequestBody;
78
import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,6 +12,7 @@
1112

1213
import com.weibo.dashboard.entity.User;
1314
import com.weibo.dashboard.service.UserService;
15+
import com.weibo.util.ResponseData;
1416

1517
@RestController
1618
@RequestMapping(value="/user")
@@ -21,11 +23,10 @@ public class UserController {
2123

2224
@ResponseBody
2325
@RequestMapping(value="/{name}",method=RequestMethod.GET)
24-
public User findUser(@PathVariable("name")String name){
26+
public ResponseData findUser(@PathVariable("name")String name){
2527
User user = userService.select(name);
26-
return user;
28+
return new ResponseData(user);
2729
}
28-
2930
// @ResponseBody
3031
// @RequestMapping(value="/{name}",method=RequestMethod.GET)
3132
// public int userNameExits(@PathVariable("name")String name){
@@ -34,17 +35,16 @@ public User findUser(@PathVariable("name")String name){
3435
// }
3536

3637
@ResponseBody
37-
@RequestMapping(value="",method=RequestMethod.POST)
38-
public int accountValid(@RequestBody User user){
39-
int res = userService.accountValid(user);
40-
return res;
38+
@RequestMapping(value="/login",method=RequestMethod.POST)
39+
public ResponseData accountValid(@RequestBody User user){
40+
User res = userService.accountValid(user);
41+
return new ResponseData(res);
4142
}
42-
4343
@ResponseBody
44-
@RequestMapping(value="",method=RequestMethod.POST)
45-
public int insert(@RequestBody User user){
46-
int res = userService.insert(user);
47-
return res;
44+
@RequestMapping(value="/new",method=RequestMethod.POST)
45+
public ResponseData insert(@RequestBody User user){
46+
userService.insert(user);
47+
return new ResponseData(user);
4848
}
4949

5050
}

‎src/main/java/com/weibo/dashboard/dao/PostMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
public interface PostMapper {
1010
List<Post> findList();
11-
List<Post> postByUser(@Param("userId") int userId);
11+
List<Post> postByUser(@Param("userName") String userName);
1212
int insert(Post post);
1313
int delete(@Param("id") int id);
1414
int like(@Param("id") int id);

‎src/main/java/com/weibo/dashboard/dao/UserMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
public interface UserMapper {
88
User select(@Param("name")String name);
99
int userNameExits(@Param("name")String name);
10-
int accountValid(User user);
10+
User accountValid(User user);
1111
int insert(User user);
1212
}

‎src/main/java/com/weibo/dashboard/entity/Comment.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@
44

55
public class Comment {
66
private int id;
7-
private Date date;
8-
private String content;
9-
private int authorId;
7+
private Date cDate;
8+
private String cContent;
9+
private String cAuthorName;
1010
private int postId;
1111
public int getId() {
1212
return id;
1313
}
1414
public void setId(int id) {
1515
this.id = id;
1616
}
17-
public Date getDate() {
18-
return date;
17+
public Date getcDate() {
18+
return cDate;
1919
}
20-
public void setDate(Date date) {
21-
this.date = date;
20+
public void setcDate(Date cDate) {
21+
this.cDate = cDate;
2222
}
23-
public String getContent() {
24-
return content;
23+
public String getcContent() {
24+
return cContent;
2525
}
26-
public void setContent(String content) {
27-
this.content = content;
26+
public void setcContent(String cContent) {
27+
this.cContent = cContent;
2828
}
29-
public int getAuthorId() {
30-
return authorId;
29+
public String getcAuthorName() {
30+
return cAuthorName;
3131
}
32-
public void setAuthorId(int authorId) {
33-
this.authorId = authorId;
32+
public void setcAuthorName(String cAuthorName) {
33+
this.cAuthorName = cAuthorName;
3434
}
3535
public int getPostId() {
3636
return postId;

‎src/main/java/com/weibo/dashboard/entity/Post.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
public class Post {
77
private int id;
88
private Date date;
9-
private int authorId;
9+
private String authorName;
1010
private String content;
1111
private int likes;
1212
private List<Comment> commentList;
@@ -22,11 +22,12 @@ public Date getDate() {
2222
public void setDate(Date date) {
2323
this.date = date;
2424
}
25-
public int getAuthorId() {
26-
return authorId;
25+
26+
public String getAuthorName() {
27+
return authorName;
2728
}
28-
public void setAuthorId(int authorId) {
29-
this.authorId = authorId;
29+
public void setAuthorName(String authorName) {
30+
this.authorName = authorName;
3031
}
3132
public String getContent() {
3233
return content;

‎src/main/java/com/weibo/dashboard/service/PostService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
public interface PostService {
88
List<Post> findList();
99

10-
List<Post> postByUser(int userId);
10+
List<Post> postByUser(String userName);
1111

1212
int insert(Post post);
1313

0 commit comments

Comments
 (0)