username to account

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java

@@ -37,7 +37,7 @@ public class DefaultData implements ApplicationRunner {
     public void run(ApplicationArguments args) {
 
 //        User user = User.builder()
-//                .username("test")
+//                .account("test")
 //                .password("test")
 //                .build();
 //        sensitiveUserService.add(user);

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/auth/User.java

@@ -20,7 +20,7 @@ public class User {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private long id;
 
-    private String username;
+    private String account;
 
     private String password;
 //    private BigInteger publicKey;

cloud/src/test/java/edu/prlab/tyler/iotgateway/cloud/CloudHttpApiTest.java

@@ -179,7 +179,7 @@ public class CloudHttpApiTest {
         PrivacyChoice privacyChoice = PrivacyChoice.builder()
                 .privacyContent(PrivacyContent.builder()
                         .user(User.builder()
-                                .username("test")
+                                .account("test")
                                 .password("test")
                                 .build())
                         .device(device)

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/config/DefaultData.java

@@ -16,7 +16,7 @@ public class DefaultData implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        SensitiveUser defaultUser = userService.registerNewUser(SensitiveUser.builder().username("testUser0").password("testUser0").build()).get();
+        SensitiveUser defaultUser = userService.registerNewUser(SensitiveUser.builder().account("testUser0").password("testUser0").build()).get();
         System.out.println(defaultUser.toString());
     }
 }

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/pojo/auth/SensitiveUser.java

@@ -22,7 +22,7 @@ public class SensitiveUser {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @JsonIgnore
     private long id;
-    private String username;
+    private String account;
     private String password;
 //    private BigInteger publicKey;
 //    private BigInteger privateKey;

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/repositories/UserRepository.java

@@ -5,6 +5,6 @@ import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 @Repository
 public interface UserRepository extends CrudRepository<SensitiveUser, Long> {
-    SensitiveUser findUserByUsername(String username);
-    boolean existsByUsername(String username);
+    SensitiveUser findUserByAccount(String account);
+    boolean existsByAccount(String account);
 }

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/UserService.java

@@ -20,16 +20,16 @@ public class UserService {
     //需要增加加密機制
     public Optional<SensitiveUser> registerNewUser(SensitiveUser user) {
         return Optional.ofNullable(user)
-                .map(SensitiveUser::getUsername)
-                .filter(username->!userRepository.existsByUsername(username))
-                .map(username -> userRepository.save(user));
+                .map(SensitiveUser::getAccount)
+                .filter(account->!userRepository.existsByAccount(account))
+                .map(account -> userRepository.save(user));
     }
 
     //TODO
     //需要增加解密確認
     public Optional<SensitiveUser> login(SensitiveUser user) {
-        return Optional.ofNullable(user.getUsername())
-                .map(username -> userRepository.findUserByUsername(username))
+        return Optional.ofNullable(user.getAccount())
+                .map(account -> userRepository.findUserByAccount(account))
                 .filter(sensitiveUser->sensitiveUser.getPassword().equals(user.getPassword()));
     }
 }

gateway/src/test/java/edu/prlab/tyler/iotgateway/gateway/GatewayHttpApiTest.java

@@ -51,7 +51,7 @@ public class GatewayHttpApiTest {
                 .post("/login")
                 .contentType(MediaType.APPLICATION_JSON_UTF8)
                 .accept(MediaType.APPLICATION_JSON_UTF8)
-                .content(mapper.writeValueAsString(SensitiveUser.builder().username("testUser0").password("testUser0").build())))
+                .content(mapper.writeValueAsString(SensitiveUser.builder().account("testUser0").password("testUser0").build())))
                 .andDo(print())
                 .andExpect(status().isOk())
                 .andReturn();
@@ -74,7 +74,7 @@ public class GatewayHttpApiTest {
                 .post("/device/" + "a1252c49-4188-4e6d-a32e-66604c664fb8")
                 .contentType(MediaType.APPLICATION_JSON_UTF8)
                 .accept(MediaType.APPLICATION_JSON_UTF8)
-                .content(mapper.writeValueAsString(SensitiveUser.builder().username("testUser0").password("testUser0").build())))
+                .content(mapper.writeValueAsString(SensitiveUser.builder().account("testUser0").password("testUser0").build())))
                 .andDo(print())
                 .andExpect(status().isOk())
                 .andReturn();
@@ -96,7 +96,7 @@ public class GatewayHttpApiTest {
         PrivacyChoice privacyChoice = PrivacyChoice.builder()
                 .privacyContent(PrivacyContent.builder()
                         .user(User.builder()
-                                .username("test")
+                                .account("test")
                                 .password("test")
                                 .build())
                         .device(device)