Skip to content

Commit de42299

Browse files
MaCoredroidMaCoredroid
authored
Merge pull request #96 from sjtu-rr-homework/develop
Develop
2 parents 79e8f48 + 97c18e5 commit de42299

File tree

15 files changed

+58
-77
lines changed

15 files changed

+58
-77
lines changed

‎code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/controller/UserController.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,78 +23,78 @@ public class UserController {
2323
private ModifyUserInfo ModifyUserInfo;
2424

2525

26-
@GetMapping("/register/username/{username}/password/{password}/email/{email}")
26+
@GetMapping("/register/username/{username}/password/{password}/email/{email}")//register new user , check duplicate username
2727
public boolean register(@PathVariable("username") String username, @PathVariable("password") String password,@PathVariable("email") String email)
2828
{
2929
return RegisterService.Register(username,password,email,0);
3030
}
3131

32-
@GetMapping("/login/username/{username}/password/{password}")
32+
@GetMapping("/login/username/{username}/password/{password}")//use feign to communicate with zuul gateway
3333
public boolean login(@PathVariable("username") String username, @PathVariable("password") String password)
3434
{
3535
return LoginService.Login(username, password);
3636
}
3737

38-
@GetMapping("/addexp/username/{username}/exp/{exp}")
38+
@GetMapping("/addexp/username/{username}/exp/{exp}")//add exp in running
3939
public boolean addExp(@PathVariable("username") String username, @PathVariable("exp") String exp)
4040
{
4141
return ModifyUserInfo.ModifyExp(username, Integer.parseInt(exp));
4242
}
4343

44-
@GetMapping("/getinfo/username/{username}")
44+
@GetMapping("/getinfo/username/{username}")//user get user info
4545
public Userinfo getInfo(@PathVariable("username") String username)
4646
{
4747
return GetUserInfo.getUserInfo(username);
4848
}
4949

50-
@GetMapping("/admingetuserinfo/username/{username}")
50+
@GetMapping("/admingetuserinfo/username/{username}")//admin get userinfo
5151
public UserInfoForAdmin AdminGetUserInfo(@PathVariable("username") String username)
5252
{
5353
return GetUserInfo.AdminGetUserInfo(username);
5454
}
5555

56-
@GetMapping("/setpet/username/{username}/setpet/{pet}")
56+
@GetMapping("/setpet/username/{username}/setpet/{pet}")//set the pet to fight
5757
public boolean UserSetPet(@PathVariable("username") String username, @PathVariable("pet") String pet)
5858
{
5959
return ModifyUserInfo.SetPet(username,Integer.parseInt(pet));
6060
}
6161

62-
@GetMapping("/blockuser/username/{username}")
62+
@GetMapping("/blockuser/username/{username}")//block one user
6363
public boolean BlockUser(@PathVariable("username") String username)
6464
{
6565
return ModifyUserInfo.blockUser(username);
6666
}
67-
@GetMapping("/addDistance/username/{username}/distance/{distance}")
67+
@GetMapping("/addDistance/username/{username}/distance/{distance}")// the whole distance a user has run
6868
public boolean addDistance(@PathVariable("username") String username, @PathVariable("distance") String distance)
6969
{
7070
return ModifyUserInfo.AddDistance(username,Double.parseDouble(distance));
7171
}
72-
@GetMapping("/getpet/username/{username}")
72+
@GetMapping("/getpet/username/{username}")//get the pet to fight
7373
public int getPet(@PathVariable("username") String username)
7474
{
7575
return GetUserInfo.GetPet(username);
7676
}
77-
@GetMapping("/addfriend/username/{username}/friendname/{friendname}")
77+
@GetMapping("/addfriend/username/{username}/friendname/{friendname}")//add a user as user's friend
7878
public boolean addFriend(@PathVariable("username") String username,@PathVariable("friendname") String friendname)
7979
{
8080
return ModifyUserInfo.addFriend(username, friendname);
8181
}
82-
@GetMapping("/getallusername")
82+
@GetMapping("/getallusername")//admin to get all users
8383
public List<String> getAllUsername()
8484
{
8585
return GetUserInfo.GetAllUser();
8686
}
87-
@PostMapping("/add/cover")
87+
@PostMapping("/add/cover")//change avatar of one user
8888
public boolean addCover(@RequestBody Coverinfo Coverinfo)
8989
{
9090
return ModifyUserInfo.addCover(Coverinfo);
9191
}
92-
@GetMapping("/get/cover/username/{username}")
92+
@GetMapping("/get/cover/username/{username}")//get the avatar of one user
9393
public Coverinfo getCover(@PathVariable("username") String username)
9494
{
9595
return GetUserInfo.getCover(username);
9696
}
97-
@GetMapping("/getexp/username/{username}")
97+
@GetMapping("/getexp/username/{username}")//get exp of one user
9898
public int getExp(@PathVariable("username") String username)
9999
{
100100
return GetUserInfo.getExp(username);

‎code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/dao/CoverDao.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
import org.pokemonrun.entity.Cover;
44

55
public interface CoverDao {
6-
Cover getOneCover(String username);
7-
void save(Cover cover);
6+
Cover getOneCover(String username);//get avatar
7+
void save(Cover cover);//set avatar
88
}

‎code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/dao/UserDao.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66

77

88
public interface UserDao {
9-
User findOne(String username);
10-
User findById(int id);
11-
void save(String username, String password, String email, int star);
12-
void save(User user);
13-
List<User> findAll();
14-
void remove(Integer id);
15-
List<User> getAllUser();
9+
User findOne(String username);//find one user by username (no duplicate)
10+
User findById(int id);//find one user by ID, no duplicate
11+
void save(String username, String password, String email, int star);//save one user , no duplicate username
12+
void save(User user);//save one user , no duplicate username
13+
List<User> findAll();//find all user
14+
1615
}

‎code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/daoimpl/UserDaoimpl.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,4 @@ public List<User> findAll() {
4141
return UserRepository.findAll();
4242
}
4343

44-
@Override
45-
public void remove(Integer id) {
46-
UserRepository.deleteById(id);
47-
}
48-
49-
@Override
50-
public List<User> getAllUser() {
51-
return UserRepository.findAll();
52-
}
5344
}

‎code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/entity/Cover.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@Document(collection = "cover")
77
public class Cover {
88
@Id
9-
public String momentid;
9+
public String momentid;//generate automatically
1010

1111
public String username;
1212

‎code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/entity/User.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class User implements Serializable {
2525
private int exp;
2626
private int pet;
2727
private double distance;
28-
private Set<User> following = new HashSet<User>();
28+
private Set<User> following = new HashSet<User>();//self joint many to many
2929
private Set<User> followers = new HashSet<User>();
3030

3131
@Id
@@ -104,12 +104,12 @@ public void setEmail(String email) {
104104
public Set<User> getFollowing(){return following; }
105105
public void setFollowing(Set<User> following) {this.following= following; }
106106

107-
private User()
107+
private User()//used by system
108108
{
109109

110110
}
111111

112-
public User(String username,String password,String email,int star,int exp,int pet)
112+
public User(String username,String password,String email,int star,int exp,int pet)//used by programmer
113113
{
114114
this.username=username;
115115
this.password=password;

‎code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/info/UserInfoForAdmin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.pokemonrun.info;
22

3-
public class UserInfoForAdmin {
3+
public class UserInfoForAdmin {//user info which is visible to admin
44
public int userID;
55
public String username;
66
public int star;

‎code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/info/Userinfo.java

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

33
import java.util.List;
44

5-
public class Userinfo {
5+
public class Userinfo {//userinfo which is visible to user
66
public String username;
77
public int star;
88
public String email;

‎code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/service/GetUserInfo.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
public interface GetUserInfo {
1010
public Userinfo getUserInfo(String username);
1111
public UserInfoForAdmin AdminGetUserInfo(String username);
12-
public int GetPet(String username);
13-
public List<String> GetAllUser();
14-
public Coverinfo getCover(String username);
12+
public int GetPet(String username);//get the pet which is going to fight
13+
public List<String> GetAllUser();//used for admin to get all username
14+
public Coverinfo getCover(String username);//get avatar
1515
public int getExp(String username);
1616
}

‎code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/service/ModifyUserInfo.java

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

55
public interface ModifyUserInfo {
66
public boolean ModifyExp(String username,int num);
7-
public boolean blockUser(String username);
8-
public boolean SetPet(String username, int pet);
9-
public boolean AddDistance(String username, double distance);
10-
public boolean addFriend(String username,String friendname);
7+
public boolean blockUser(String username);//block user from login (set star)
8+
public boolean SetPet(String username, int pet);//user set the pet to fight
9+
public boolean AddDistance(String username, double distance);//add to the whole distance a user has run
10+
public boolean addFriend(String username,String friendname);//add a user as another user's friend, automatically back and forth
1111
public boolean addCover(Coverinfo Coverinfo);
1212
}

0 commit comments

Comments
 (0)