update theme and user top
This commit is contained in:
@@ -15,6 +15,7 @@ import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
@@ -50,6 +51,9 @@ public class UserSystemController extends BaseController {
|
||||
@Autowired
|
||||
private ITagsService tagsService;
|
||||
|
||||
@Autowired
|
||||
private BCryptPasswordEncoder passwordEncoder;
|
||||
|
||||
/**
|
||||
* 首页index
|
||||
* @param tag
|
||||
@@ -113,6 +117,7 @@ public class UserSystemController extends BaseController {
|
||||
map.put("pageNum", pageNum);
|
||||
map.put("pageTotalPages", allDiscussionsPage.getTotalPages());
|
||||
map.put("pageNumAll", allDiscussionsPage.getTotalPages());
|
||||
map.put("topUsers", usersService.getTopActiveUsers(10));
|
||||
UserInfo user = getUserInfo(request);
|
||||
if (user != null) {
|
||||
map.put("username", user.getUsername());
|
||||
@@ -251,7 +256,7 @@ public class UserSystemController extends BaseController {
|
||||
} else {
|
||||
User user = new User();
|
||||
user.setEmail(email);
|
||||
user.setPassword(password);
|
||||
user.setPassword(passwordEncoder.encode(password));
|
||||
user.setUsername(username);
|
||||
user.setRealname(username);
|
||||
user.setJoinTime(new Date());
|
||||
|
||||
Reference in New Issue
Block a user