后台首页更 新，新增会员总数/作家总数/作品总数/交易总数统计，新增7日内会员新增/作家新增/作品新增/交易新增统计报表

novel-admin/src/main/java/com/java2nb/system/controller/SysUserController.java

@@ -10,7 +10,7 @@ import com.java2nb.system.domain.DeptDO;
 import com.java2nb.system.domain.RoleDO;
 import com.java2nb.system.domain.UserDO;
 import com.java2nb.system.service.RoleService;
-import com.java2nb.system.service.UserService;
+import com.java2nb.system.service.SysUserService;
 import com.java2nb.system.vo.UserVO;
 import javax.servlet.http.HttpServletRequest;
 
@@ -27,10 +27,10 @@ import java.util.Map;
 
 @RequestMapping("/sys/user")
 @Controller
-public class UserController extends BaseController {
+public class SysUserController extends BaseController {
 	private String prefix="system/user"  ;
 	@Autowired
-	UserService userService;
+	SysUserService userService;
 	@Autowired
 	RoleService roleService;
 	@Autowired

novel-admin/src/main/java/com/java2nb/system/dao/SysUserDao.java

@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Param;
  * @date 2019-10-03 09:45:11
  */
 @Mapper
-public interface UserDao {
+public interface SysUserDao {
 
 	UserDO get(Long userId);
 	

novel-admin/src/main/java/com/java2nb/system/service/SysUserService.java

@@ -13,7 +13,7 @@ import com.java2nb.system.domain.UserDO;
 import org.springframework.web.multipart.MultipartFile;
 
 @Service
-public interface UserService {
+public interface SysUserService {
 	UserDO get(Long id);
 
 	List<UserDO> list(Map<String, Object> map);

novel-admin/src/main/java/com/java2nb/system/service/impl/RoleServiceImpl.java

@@ -8,8 +8,6 @@ import java.util.Objects;
 import com.java2nb.system.dao.*;
 import com.java2nb.system.domain.RoleDataPermDO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -30,7 +28,7 @@ public class RoleServiceImpl implements RoleService {
     @Autowired
     RoleMenuDao roleMenuMapper;
     @Autowired
-    UserDao userMapper;
+    SysUserDao userMapper;
     @Autowired
     UserRoleDao userRoleMapper;
     @Autowired

novel-admin/src/main/java/com/java2nb/system/service/impl/SysUserServiceImpl.java

@@ -19,21 +19,21 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.java2nb.common.domain.Tree;
 import com.java2nb.system.dao.DeptDao;
-import com.java2nb.system.dao.UserDao;
+import com.java2nb.system.dao.SysUserDao;
 import com.java2nb.system.dao.UserRoleDao;
 import com.java2nb.system.domain.DeptDO;
 import com.java2nb.system.domain.UserDO;
 import com.java2nb.system.domain.UserRoleDO;
-import com.java2nb.system.service.UserService;
+import com.java2nb.system.service.SysUserService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.imageio.ImageIO;
 
 @Transactional
 @Service
-public class UserServiceImpl implements UserService {
+public class SysUserServiceImpl implements SysUserService {
     @Autowired
-    UserDao userMapper;
+    SysUserDao userMapper;
     @Autowired
     UserRoleDao userRoleMapper;
     @Autowired
@@ -44,7 +44,7 @@ public class UserServiceImpl implements UserService {
     private JnConfig jnConfig;
     @Autowired
     DeptService deptService;
-    private static final Logger logger = LoggerFactory.getLogger(UserService.class);
+    private static final Logger logger = LoggerFactory.getLogger(SysUserService.class);
 
     @Override
 //    @Cacheable(value = "user",key = "#id")

novel-admin/src/main/java/com/java2nb/system/shiro/UserRealm.java

@@ -6,7 +6,6 @@ import com.java2nb.common.config.ApplicationContextRegister;
 import com.java2nb.system.dao.DataPermDao;
 import com.java2nb.system.dao.DeptDao;
 import com.java2nb.system.domain.DataPermDO;
-import com.java2nb.system.domain.UserToken;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
@@ -18,10 +17,9 @@ import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.apache.shiro.realm.AuthorizingRealm;
 import org.apache.shiro.subject.PrincipalCollection;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import com.java2nb.common.utils.ShiroUtils;
-import com.java2nb.system.dao.UserDao;
+import com.java2nb.system.dao.SysUserDao;
 import com.java2nb.system.domain.UserDO;
 import com.java2nb.system.service.MenuService;
 
@@ -48,7 +46,7 @@ public class UserRealm extends AuthorizingRealm {
         map.put("username", username);
         String password = new String((char[]) token.getCredentials());
 
-        UserDao userMapper = ApplicationContextRegister.getBean(UserDao.class);
+        SysUserDao userMapper = ApplicationContextRegister.getBean(SysUserDao.class);
         // 查询用户信息
         UserDO user = userMapper.list(map).get(0);