merge
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.xwbing.repository;
|
||||
package com.xwbing.repository.sys;
|
||||
|
||||
import com.xwbing.entity.SysAuthority;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.xwbing.repository;
|
||||
package com.xwbing.repository.sys;
|
||||
|
||||
import com.xwbing.entity.SysConfig;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.xwbing.repository;
|
||||
package com.xwbing.repository.sys;
|
||||
|
||||
import com.xwbing.entity.SysRoleAuthority;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.xwbing.repository;
|
||||
package com.xwbing.repository.sys;
|
||||
|
||||
import com.xwbing.entity.SysRole;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.xwbing.repository;
|
||||
package com.xwbing.repository.sys;
|
||||
|
||||
import com.xwbing.entity.SysUserLoginInOut;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.xwbing.repository;
|
||||
package com.xwbing.repository.sys;
|
||||
|
||||
import com.xwbing.entity.SysUser;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.xwbing.repository;
|
||||
package com.xwbing.repository.sys;
|
||||
|
||||
import com.xwbing.entity.SysUserRole;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
+2
-2
@@ -1,11 +1,11 @@
|
||||
package com.xwbing.service;
|
||||
package com.xwbing.service.sys;
|
||||
|
||||
import com.xwbing.constant.CommonConstant;
|
||||
import com.xwbing.entity.SysAuthority;
|
||||
import com.xwbing.entity.SysRoleAuthority;
|
||||
import com.xwbing.entity.vo.SysAuthVo;
|
||||
import com.xwbing.exception.BusinessException;
|
||||
import com.xwbing.repository.SysAuthorityRepository;
|
||||
import com.xwbing.repository.sys.SysAuthorityRepository;
|
||||
import com.xwbing.util.PassWordUtil;
|
||||
import com.xwbing.util.RestMessage;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package com.xwbing.service;
|
||||
package com.xwbing.service.sys;
|
||||
|
||||
import com.xwbing.entity.SysConfig;
|
||||
import com.xwbing.exception.BusinessException;
|
||||
import com.xwbing.repository.SysConfigRepository;
|
||||
import com.xwbing.repository.sys.SysConfigRepository;
|
||||
import com.xwbing.util.PassWordUtil;
|
||||
import com.xwbing.util.RestMessage;
|
||||
import org.slf4j.Logger;
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package com.xwbing.service;
|
||||
package com.xwbing.service.sys;
|
||||
|
||||
import com.xwbing.entity.SysRoleAuthority;
|
||||
import com.xwbing.repository.SysRoleAuthorityRepository;
|
||||
import com.xwbing.repository.sys.SysRoleAuthorityRepository;
|
||||
import com.xwbing.util.PassWordUtil;
|
||||
import com.xwbing.util.RestMessage;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
package com.xwbing.service;
|
||||
package com.xwbing.service.sys;
|
||||
|
||||
import com.xwbing.entity.SysRole;
|
||||
import com.xwbing.entity.SysRoleAuthority;
|
||||
import com.xwbing.entity.SysUserRole;
|
||||
import com.xwbing.exception.BusinessException;
|
||||
import com.xwbing.repository.SysRoleRepository;
|
||||
import com.xwbing.repository.sys.SysRoleRepository;
|
||||
import com.xwbing.util.PassWordUtil;
|
||||
import com.xwbing.util.RestMessage;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
package com.xwbing.service;
|
||||
package com.xwbing.service.sys;
|
||||
|
||||
import com.xwbing.constant.CommonEnum;
|
||||
import com.xwbing.entity.SysUser;
|
||||
import com.xwbing.entity.SysUserLoginInOut;
|
||||
import com.xwbing.repository.SysUserLoginInOutRepository;
|
||||
import com.xwbing.repository.sys.SysUserLoginInOutRepository;
|
||||
import com.xwbing.util.DateUtil2;
|
||||
import com.xwbing.util.PassWordUtil;
|
||||
import com.xwbing.util.RestMessage;
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package com.xwbing.service;
|
||||
package com.xwbing.service.sys;
|
||||
|
||||
import com.xwbing.entity.SysUserRole;
|
||||
import com.xwbing.repository.SysUserRoleRepository;
|
||||
import com.xwbing.repository.sys.SysUserRoleRepository;
|
||||
import com.xwbing.util.PassWordUtil;
|
||||
import com.xwbing.util.RestMessage;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package com.xwbing.service;
|
||||
package com.xwbing.service.sys;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.xwbing.constant.CommonConstant;
|
||||
@@ -6,7 +6,7 @@ import com.xwbing.constant.CommonEnum;
|
||||
import com.xwbing.entity.*;
|
||||
import com.xwbing.entity.model.EmailModel;
|
||||
import com.xwbing.exception.BusinessException;
|
||||
import com.xwbing.repository.SysUserRepository;
|
||||
import com.xwbing.repository.sys.SysUserRepository;
|
||||
import com.xwbing.util.*;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
Reference in New Issue
Block a user