第二十一章

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/Constants.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/Constants.java

@@ -1,4 +1,4 @@
-package com.github.zhangkaitao.shiro.chapter20;
+package com.github.zhangkaitao.shiro.chapter21;
 
 /**
  * <p>User: Zhang Kaitao

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/credentials/RetryLimitHashedCredentialsMatcher.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/credentials/RetryLimitHashedCredentialsMatcher.java

@@ -1,4 +1,4 @@
-package com.github.zhangkaitao.shiro.chapter20.credentials;
+package com.github.zhangkaitao.shiro.chapter21.credentials;
 
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/dao/OrganizationDao.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/dao/OrganizationDao.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.dao;
+package com.github.zhangkaitao.shiro.chapter21.dao;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Organization;
+import com.github.zhangkaitao.shiro.chapter21.entity.Organization;
 
 import java.util.List;
 

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/dao/OrganizationDaoImpl.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/dao/OrganizationDaoImpl.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.dao;
+package com.github.zhangkaitao.shiro.chapter21.dao;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Organization;
+import com.github.zhangkaitao.shiro.chapter21.entity.Organization;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/dao/ResourceDao.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/dao/ResourceDao.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.dao;
+package com.github.zhangkaitao.shiro.chapter21.dao;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Resource;
+import com.github.zhangkaitao.shiro.chapter21.entity.Resource;
 
 import java.util.List;
 

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/dao/ResourceDaoImpl.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/dao/ResourceDaoImpl.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.dao;
+package com.github.zhangkaitao.shiro.chapter21.dao;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Resource;
+import com.github.zhangkaitao.shiro.chapter21.entity.Resource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/dao/RoleDao.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/dao/RoleDao.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.dao;
+package com.github.zhangkaitao.shiro.chapter21.dao;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Role;
+import com.github.zhangkaitao.shiro.chapter21.entity.Role;
 
 import java.util.List;
 

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/dao/RoleDaoImpl.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/dao/RoleDaoImpl.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.dao;
+package com.github.zhangkaitao.shiro.chapter21.dao;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Role;
+import com.github.zhangkaitao.shiro.chapter21.entity.Role;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/dao/UserDao.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/dao/UserDao.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.dao;
+package com.github.zhangkaitao.shiro.chapter21.dao;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.User;
+import com.github.zhangkaitao.shiro.chapter21.entity.User;
 
 import java.util.List;
 

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/dao/UserDaoImpl.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/dao/UserDaoImpl.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.dao;
+package com.github.zhangkaitao.shiro.chapter21.dao;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.User;
+import com.github.zhangkaitao.shiro.chapter21.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/dao/UserRunAsDao.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/dao/UserRunAsDao.java

@@ -1,4 +1,4 @@
-package com.github.zhangkaitao.shiro.chapter20.dao;
+package com.github.zhangkaitao.shiro.chapter21.dao;
 
 import java.util.List;
 

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/dao/UserRunAsDaoImpl.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/dao/UserRunAsDaoImpl.java

@@ -1,4 +1,4 @@
-package com.github.zhangkaitao.shiro.chapter20.dao;
+package com.github.zhangkaitao.shiro.chapter21.dao;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/entity/Organization.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/entity/Organization.java

@@ -1,4 +1,4 @@
-package com.github.zhangkaitao.shiro.chapter20.entity;
+package com.github.zhangkaitao.shiro.chapter21.entity;
 
 import java.io.Serializable;
 

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/entity/Resource.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/entity/Resource.java

@@ -1,4 +1,4 @@
-package com.github.zhangkaitao.shiro.chapter20.entity;
+package com.github.zhangkaitao.shiro.chapter21.entity;
 
 import java.io.Serializable;
 

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/entity/Role.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/entity/Role.java

@@ -1,4 +1,4 @@
-package com.github.zhangkaitao.shiro.chapter20.entity;
+package com.github.zhangkaitao.shiro.chapter21.entity;
 
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/entity/User.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/entity/User.java

@@ -1,4 +1,4 @@
-package com.github.zhangkaitao.shiro.chapter20.entity;
+package com.github.zhangkaitao.shiro.chapter21.entity;
 
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/entity/UserRunAs.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/entity/UserRunAs.java

@@ -1,4 +1,4 @@
-package com.github.zhangkaitao.shiro.chapter20.entity;
+package com.github.zhangkaitao.shiro.chapter21.entity;
 
 import java.io.Serializable;
 
@@ -8,8 +8,8 @@
  * <p>Version: 1.0
  */
 public class UserRunAs implements Serializable {
-    private Long fromUserId;
-    private Long toUserId;
+    private Long fromUserId;//授予身份帐号
+    private Long toUserId;//被授予身份帐号
 
     public Long getFromUserId() {
         return fromUserId;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/realm/UserRealm.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/realm/UserRealm.java

@@ -1,7 +1,7 @@
-package com.github.zhangkaitao.shiro.chapter20.realm;
+package com.github.zhangkaitao.shiro.chapter21.realm;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.User;
-import com.github.zhangkaitao.shiro.chapter20.service.UserService;
+import com.github.zhangkaitao.shiro.chapter21.entity.User;
+import com.github.zhangkaitao.shiro.chapter21.service.UserService;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/service/OrganizationService.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/service/OrganizationService.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.service;
+package com.github.zhangkaitao.shiro.chapter21.service;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Organization;
+import com.github.zhangkaitao.shiro.chapter21.entity.Organization;
 
 import java.util.List;
 

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/service/OrganizationServiceImpl.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/service/OrganizationServiceImpl.java

@@ -1,6 +1,7 @@
-package com.github.zhangkaitao.shiro.chapter20.service;
+package com.github.zhangkaitao.shiro.chapter21.service;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Organization;
+import com.github.zhangkaitao.shiro.chapter21.entity.Organization;
+import com.github.zhangkaitao.shiro.chapter21.dao.OrganizationDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -14,7 +15,7 @@
 @Service
 public class OrganizationServiceImpl implements OrganizationService {
     @Autowired
-    private com.github.zhangkaitao.shiro.chapter20.dao.OrganizationDao organizationDao;
+    private OrganizationDao organizationDao;
 
     @Override
     public Organization createOrganization(Organization organization) {

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/service/PasswordHelper.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/service/PasswordHelper.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.service;
+package com.github.zhangkaitao.shiro.chapter21.service;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.User;
+import com.github.zhangkaitao.shiro.chapter21.entity.User;
 import org.apache.shiro.crypto.RandomNumberGenerator;
 import org.apache.shiro.crypto.SecureRandomNumberGenerator;
 import org.apache.shiro.crypto.hash.SimpleHash;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/service/ResourceService.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/service/ResourceService.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.service;
+package com.github.zhangkaitao.shiro.chapter21.service;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Resource;
+import com.github.zhangkaitao.shiro.chapter21.entity.Resource;
 
 import java.util.List;
 import java.util.Set;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/service/ResourceServiceImpl.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/service/ResourceServiceImpl.java

@@ -1,6 +1,7 @@
-package com.github.zhangkaitao.shiro.chapter20.service;
+package com.github.zhangkaitao.shiro.chapter21.service;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Resource;
+import com.github.zhangkaitao.shiro.chapter21.dao.ResourceDao;
+import com.github.zhangkaitao.shiro.chapter21.entity.Resource;
 import org.apache.shiro.authz.permission.WildcardPermission;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,7 +22,7 @@
 public class ResourceServiceImpl implements ResourceService {
 
     @Autowired
-    private com.github.zhangkaitao.shiro.chapter20.dao.ResourceDao resourceDao;
+    private ResourceDao resourceDao;
 
     @Override
     public Resource createResource(Resource resource) {

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/service/RoleService.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/service/RoleService.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.service;
+package com.github.zhangkaitao.shiro.chapter21.service;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Role;
+import com.github.zhangkaitao.shiro.chapter21.entity.Role;
 
 import java.util.List;
 import java.util.Set;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/service/RoleServiceImpl.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/service/RoleServiceImpl.java

@@ -1,6 +1,7 @@
-package com.github.zhangkaitao.shiro.chapter20.service;
+package com.github.zhangkaitao.shiro.chapter21.service;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Role;
+import com.github.zhangkaitao.shiro.chapter21.entity.Role;
+import com.github.zhangkaitao.shiro.chapter21.dao.RoleDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +19,7 @@
 public class RoleServiceImpl implements RoleService {
 
     @Autowired
-    private com.github.zhangkaitao.shiro.chapter20.dao.RoleDao roleDao;
+    private RoleDao roleDao;
     @Autowired
     private ResourceService resourceService;
 

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/service/UserRunAsService.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/service/UserRunAsService.java

@@ -1,4 +1,4 @@
-package com.github.zhangkaitao.shiro.chapter20.service;
+package com.github.zhangkaitao.shiro.chapter21.service;
 
 import java.util.List;
 

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/service/UserRunAsServiceImpl.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/service/UserRunAsServiceImpl.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.service;
+package com.github.zhangkaitao.shiro.chapter21.service;
 
-import com.github.zhangkaitao.shiro.chapter20.dao.UserRunAsDao;
+import com.github.zhangkaitao.shiro.chapter21.dao.UserRunAsDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/service/UserService.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/service/UserService.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.service;
+package com.github.zhangkaitao.shiro.chapter21.service;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.User;
+import com.github.zhangkaitao.shiro.chapter21.entity.User;
 
 import java.util.List;
 import java.util.Set;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/service/UserServiceImpl.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/service/UserServiceImpl.java

@@ -1,6 +1,7 @@
-package com.github.zhangkaitao.shiro.chapter20.service;
+package com.github.zhangkaitao.shiro.chapter21.service;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.User;
+import com.github.zhangkaitao.shiro.chapter21.entity.User;
+import com.github.zhangkaitao.shiro.chapter21.dao.UserDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,7 +17,7 @@
 public class UserServiceImpl implements UserService {
 
     @Autowired
-    private com.github.zhangkaitao.shiro.chapter20.dao.UserDao userDao;
+    private UserDao userDao;
     @Autowired
     private PasswordHelper passwordHelper;
     @Autowired

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/web/bind/annotation/CurrentUser.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/web/bind/annotation/CurrentUser.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.github.zhangkaitao.shiro.chapter20.web.bind.annotation;
+package com.github.zhangkaitao.shiro.chapter21.web.bind.annotation;
 
-import com.github.zhangkaitao.shiro.chapter20.Constants;
+import com.github.zhangkaitao.shiro.chapter21.Constants;
 
 import java.lang.annotation.*;
 

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/web/bind/method/CurrentUserMethodArgumentResolver.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/web/bind/method/CurrentUserMethodArgumentResolver.java

@@ -1,6 +1,6 @@
-package com.github.zhangkaitao.shiro.chapter20.web.bind.method;
+package com.github.zhangkaitao.shiro.chapter21.web.bind.method;
 
-import com.github.zhangkaitao.shiro.chapter20.web.bind.annotation.CurrentUser;
+import com.github.zhangkaitao.shiro.chapter21.web.bind.annotation.CurrentUser;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/web/controller/IndexController.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/web/controller/IndexController.java

@@ -1,8 +1,10 @@
-package com.github.zhangkaitao.shiro.chapter20.web.controller;
+package com.github.zhangkaitao.shiro.chapter21.web.controller;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Resource;
-import com.github.zhangkaitao.shiro.chapter20.entity.User;
-import com.github.zhangkaitao.shiro.chapter20.web.bind.annotation.CurrentUser;
+import com.github.zhangkaitao.shiro.chapter21.entity.Resource;
+import com.github.zhangkaitao.shiro.chapter21.entity.User;
+import com.github.zhangkaitao.shiro.chapter21.web.bind.annotation.CurrentUser;
+import com.github.zhangkaitao.shiro.chapter21.service.ResourceService;
+import com.github.zhangkaitao.shiro.chapter21.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -20,9 +22,9 @@
 public class IndexController {
 
     @Autowired
-    private com.github.zhangkaitao.shiro.chapter20.service.ResourceService resourceService;
+    private ResourceService resourceService;
     @Autowired
-    private com.github.zhangkaitao.shiro.chapter20.service.UserService userService;
+    private UserService userService;
 
     @RequestMapping("/")
     public String index(@CurrentUser User loginUser, Model model) {

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/web/controller/LoginController.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/web/controller/LoginController.java

@@ -1,4 +1,4 @@
-package com.github.zhangkaitao.shiro.chapter20.web.controller;
+package com.github.zhangkaitao.shiro.chapter21.web.controller;
 
 import org.apache.shiro.authc.IncorrectCredentialsException;
 import org.apache.shiro.authc.UnknownAccountException;

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/web/controller/OrganizationController.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/web/controller/OrganizationController.java

@@ -1,6 +1,7 @@
-package com.github.zhangkaitao.shiro.chapter20.web.controller;
+package com.github.zhangkaitao.shiro.chapter21.web.controller;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Organization;
+import com.github.zhangkaitao.shiro.chapter21.entity.Organization;
+import com.github.zhangkaitao.shiro.chapter21.service.OrganizationService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -21,7 +22,7 @@
 public class OrganizationController {
 
     @Autowired
-    private com.github.zhangkaitao.shiro.chapter20.service.OrganizationService organizationService;
+    private OrganizationService organizationService;
 
     @RequiresPermissions("organization:view")
     @RequestMapping(method = RequestMethod.GET)

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/web/controller/ResourceController.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/web/controller/ResourceController.java

@@ -1,6 +1,7 @@
-package com.github.zhangkaitao.shiro.chapter20.web.controller;
+package com.github.zhangkaitao.shiro.chapter21.web.controller;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Resource;
+import com.github.zhangkaitao.shiro.chapter21.entity.Resource;
+import com.github.zhangkaitao.shiro.chapter21.service.ResourceService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -21,7 +22,7 @@
 public class ResourceController {
 
     @Autowired
-    private com.github.zhangkaitao.shiro.chapter20.service.ResourceService resourceService;
+    private ResourceService resourceService;
 
     @ModelAttribute("types")
     public Resource.ResourceType[] resourceTypes() {

shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter20/web/controller/RoleController.java → shiro-example-chapter21/src/main/java/com/github/zhangkaitao/shiro/chapter21/web/controller/RoleController.java

@@ -1,8 +1,8 @@
-package com.github.zhangkaitao.shiro.chapter20.web.controller;
+package com.github.zhangkaitao.shiro.chapter21.web.controller;
 
-import com.github.zhangkaitao.shiro.chapter20.entity.Role;
-import com.github.zhangkaitao.shiro.chapter20.service.ResourceService;
-import com.github.zhangkaitao.shiro.chapter20.service.RoleService;
+import com.github.zhangkaitao.shiro.chapter21.entity.Role;
+import com.github.zhangkaitao.shiro.chapter21.service.ResourceService;
+import com.github.zhangkaitao.shiro.chapter21.service.RoleService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;