Merge remote-tracking branch 'origin/master'

src/main/java/com/ccl/tt/controller/UserController.java

@@ -9,6 +9,7 @@ import com.ccl.tt.repository.UserRepository;
 import com.ccl.tt.service.UserService;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -31,6 +32,8 @@ public class UserController {
     UserRepository userRepo;
     @Autowired
     private UserService userService;
+    @Value("${item.site}")
+    private String itemSite;
 
     @GetMapping("/")
     public String index(){
@@ -87,6 +90,7 @@ public class UserController {
             }
 
             user.setPassword(passwordEncoder.encode(user.getPassword()));
+            user.setSite(itemSite);
             userRepo.save(user);
 
             Authority authority = new Authority();
@@ -147,7 +151,7 @@ public class UserController {
             user.setEnabled(uptUser.getEnabled());
             user.setScanMachine(uptUser.getScanMachine());
             user.setAuthorities(uptUser.getAuthorities());
-
+            user.setSite(itemSite);
             userRepo.save(user);
             ret.put("success", true);
         }catch(DataIntegrityViolationException e){