diff --git a/mall-platform/mall-platform-core/src/main/java/com/zero2oneit/mall/system/power/service/impl/PowerServiceImpl.java b/mall-platform/mall-platform-core/src/main/java/com/zero2oneit/mall/system/power/service/impl/PowerServiceImpl.java index 6f4b7bc2495363fd0fd00885aa7c2a161251a5f1..aaffba435ac70bd4c360a714fc1b65c663f5aab2 100644 --- a/mall-platform/mall-platform-core/src/main/java/com/zero2oneit/mall/system/power/service/impl/PowerServiceImpl.java +++ b/mall-platform/mall-platform-core/src/main/java/com/zero2oneit/mall/system/power/service/impl/PowerServiceImpl.java @@ -11,6 +11,7 @@ import com.zero2oneit.mall.system.power.service.PowerService; import com.zero2oneit.mall.system.power.vo.PowerVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpSession; import java.util.Arrays; @@ -66,6 +67,7 @@ public class PowerServiceImpl implements PowerService { return TreeUtils.assembleTree(menuList); } + @Transactional(rollbackFor=Exception.class) @Override public void saveUserOrRoleData(PowerVO vo) { if(vo.getType() == 1){ diff --git a/mall-platform/mall-platform-core/src/main/java/com/zero2oneit/mall/system/user/service/impl/UserServiceImpl.java b/mall-platform/mall-platform-core/src/main/java/com/zero2oneit/mall/system/user/service/impl/UserServiceImpl.java index 7113de71ac1eb3acf181e0c643da24e7196edf87..31ee6797f0b1a7d0c3364bb18aa2d3c2d5337aff 100644 --- a/mall-platform/mall-platform-core/src/main/java/com/zero2oneit/mall/system/user/service/impl/UserServiceImpl.java +++ b/mall-platform/mall-platform-core/src/main/java/com/zero2oneit/mall/system/user/service/impl/UserServiceImpl.java @@ -68,7 +68,6 @@ public class UserServiceImpl implements UserService { //用户修改密码 @Override - @Transactional(rollbackFor=Exception.class) public void editPassword(String newPwd, String account, String password) { //1.先校验判断是否为空 Assert.notNull(newPwd, LoginStatusCode.NEWPASSWORD_NULL.getErrorMessage()); @@ -121,6 +120,7 @@ public class UserServiceImpl implements UserService { } @Override + @Transactional(rollbackFor=Exception.class) public void addUser(UserVO userVO) { //校验 Assert.notNull(userVO.getAccount().trim(), LoginStatusCode.ACCOUNT_NULL.getErrorMessage()); @@ -160,6 +160,7 @@ public class UserServiceImpl implements UserService { } @Override + @Transactional(rollbackFor=Exception.class) public void updateUser(UserVO userVO) { //校验 Assert.notNull(userVO.getAccount().trim(), LoginStatusCode.ACCOUNT_NULL.getErrorMessage()); diff --git a/mall-platform/mall-platform-web/src/main/java/com/zero2oneit/mall/system/common/shiro/realm/UserRealm.java b/mall-platform/mall-platform-web/src/main/java/com/zero2oneit/mall/system/common/shiro/realm/UserRealm.java index ea28e2d106f0dfbf37e9ffdb586409271fba0a49..0addf3e934d2127a4c26c01f51721ca17d77e765 100644 --- a/mall-platform/mall-platform-web/src/main/java/com/zero2oneit/mall/system/common/shiro/realm/UserRealm.java +++ b/mall-platform/mall-platform-web/src/main/java/com/zero2oneit/mall/system/common/shiro/realm/UserRealm.java @@ -15,8 +15,8 @@ import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.apache.shiro.crypto.hash.Md5Hash; import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; -import org.apache.shiro.util.ByteSource; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import java.util.HashSet; import java.util.Set; @@ -27,10 +27,13 @@ import java.util.Set; @Slf4j public class UserRealm extends AuthorizingRealm { + @Lazy @Autowired private UserService userService; + @Lazy @Autowired private RoleService roleService; + @Lazy @Autowired private PowerService powerService;