Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
a1b62045 1 parent 92bc9ca7

manager|包名调整

Inline Side-by-side
Showing 25 changed files with 70 additions and 46 deletions
...@@ -5,8 +5,8 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo; ...@@ -5,8 +5,8 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
5 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil; 5 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
6 import com.fedex.connect.manager.config.PropertiesConfig; 6 import com.fedex.connect.manager.config.PropertiesConfig;
7 import com.fedex.connect.manager.controller.log.ILogLoginService; 7 import com.fedex.connect.manager.controller.log.ILogLoginService;
8 -import com.fedex.connect.manager.service.system.ISysAuthService; 8 +import com.fedex.connect.manager.service.sys.ISysAuthService;
9 -import com.fedex.connect.manager.service.system.ISysUserService; 9 +import com.fedex.connect.manager.service.sys.ISysUserService;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.http.HttpHeaders; 11 import org.springframework.http.HttpHeaders;
12 import org.springframework.http.HttpStatus; 12 import org.springframework.http.HttpStatus;
......
1 +package com.fedex.connect.manager.repository.base;
2 +
3 +import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper;
4 +import com.fedex.connect.common.dao.log.UserLoginInfoMapper;
5 +import com.fedex.connect.common.dao.sys.RedisSlabMapper;
6 +import com.fedex.connect.common.dao.sys.RoleMapper;
7 +import com.fedex.connect.common.dao.sys.UserMapper;
8 +import com.fedex.connect.common.dao.sys.UserRoleMapper;
9 +import org.springframework.beans.factory.annotation.Autowired;
10 +
11 +public class BaseDao {
12 + @Autowired
13 + public UserLoginInfoMapper userLoginInfoMapper;
14 + @Autowired
15 + public RedisSlabMapper redisSlabMapper;
16 + @Autowired
17 + public RoleMapper roleMapper;
18 + @Autowired
19 + public UserRoleMapper userRoleMapper;
20 + @Autowired
21 + public UserMapper userMapper;
22 + @Autowired
23 + public DictionaryEntriesMapper dictionaryEntriesMapper;
24 +}
1 -package com.fedex.connect.manager.dao.repository.log; 1 +package com.fedex.connect.manager.repository.repo.log;
2 2
3 import com.fedex.connect.common.model.log.UserLoginInfo; 3 import com.fedex.connect.common.model.log.UserLoginInfo;
4 4
......
1 -package com.fedex.connect.manager.dao.repository.log.impl; 1 +package com.fedex.connect.manager.repository.repo.log.impl;
2 2
3 import com.fedex.connect.common.model.log.UserLoginInfo; 3 import com.fedex.connect.common.model.log.UserLoginInfo;
4 -import com.fedex.connect.manager.dao.base.BaseDao; 4 +import com.fedex.connect.manager.repository.base.BaseDao;
5 -import com.fedex.connect.manager.dao.repository.log.IUserLoginLogRepository; 5 +import com.fedex.connect.manager.repository.repo.log.IUserLoginLogRepository;
6 import org.springframework.stereotype.Repository; 6 import org.springframework.stereotype.Repository;
7 7
8 @Repository 8 @Repository
......
1 -package com.fedex.connect.manager.dao.repository.sys; 1 +package com.fedex.connect.manager.repository.repo.sys;
2 2
3 import com.fedex.connect.common.model.base.DictionaryEntries; 3 import com.fedex.connect.common.model.base.DictionaryEntries;
4 import com.fedex.connect.common.model.base.DictionaryEntriesExample; 4 import com.fedex.connect.common.model.base.DictionaryEntriesExample;
......
1 -package com.fedex.connect.manager.dao.repository.sys; 1 +package com.fedex.connect.manager.repository.repo.sys;
2 2
3 import com.fedex.connect.common.model.sys.RedisSlab; 3 import com.fedex.connect.common.model.sys.RedisSlab;
4 import com.fedex.connect.common.model.sys.RedisSlabExample; 4 import com.fedex.connect.common.model.sys.RedisSlabExample;
......
1 -package com.fedex.connect.manager.dao.repository.sys; 1 +package com.fedex.connect.manager.repository.repo.sys;
2 2
3 import com.fedex.connect.common.model.sys.Role; 3 import com.fedex.connect.common.model.sys.Role;
4 import com.fedex.connect.common.model.sys.RoleExample; 4 import com.fedex.connect.common.model.sys.RoleExample;
......
1 -package com.fedex.connect.manager.dao.repository.sys; 1 +package com.fedex.connect.manager.repository.repo.sys;
2 2
3 import com.fedex.connect.common.model.sys.User; 3 import com.fedex.connect.common.model.sys.User;
4 import com.fedex.connect.common.model.sys.UserExample; 4 import com.fedex.connect.common.model.sys.UserExample;
......
1 -package com.fedex.connect.manager.dao.repository.sys; 1 +package com.fedex.connect.manager.repository.repo.sys;
2 2
3 import com.fedex.connect.common.model.sys.UserRole; 3 import com.fedex.connect.common.model.sys.UserRole;
4 import com.fedex.connect.common.model.sys.UserRoleExample; 4 import com.fedex.connect.common.model.sys.UserRoleExample;
......
1 -package com.fedex.connect.manager.dao.repository.sys.impl; 1 +package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.model.base.DictionaryEntries; 3 import com.fedex.connect.common.model.base.DictionaryEntries;
4 import com.fedex.connect.common.model.base.DictionaryEntriesExample; 4 import com.fedex.connect.common.model.base.DictionaryEntriesExample;
5 -import com.fedex.connect.manager.dao.base.BaseDao; 5 +import com.fedex.connect.manager.repository.base.BaseDao;
6 -import com.fedex.connect.manager.dao.repository.sys.IDictionaryEntriesRepository; 6 +import com.fedex.connect.manager.repository.repo.sys.IDictionaryEntriesRepository;
7 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
8 8
9 import java.util.List; 9 import java.util.List;
......
1 -package com.fedex.connect.manager.dao.repository.sys.impl; 1 +package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.model.sys.RedisSlab; 3 import com.fedex.connect.common.model.sys.RedisSlab;
4 import com.fedex.connect.common.model.sys.RedisSlabExample; 4 import com.fedex.connect.common.model.sys.RedisSlabExample;
5 -import com.fedex.connect.manager.dao.base.BaseDao; 5 +import com.fedex.connect.manager.repository.base.BaseDao;
6 -import com.fedex.connect.manager.dao.repository.sys.IRedisSlabRepository; 6 +import com.fedex.connect.manager.repository.repo.sys.IRedisSlabRepository;
7 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
8 8
9 import java.util.List; 9 import java.util.List;
......
1 -package com.fedex.connect.manager.dao.repository.sys.impl; 1 +package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.model.sys.Role; 3 import com.fedex.connect.common.model.sys.Role;
4 import com.fedex.connect.common.model.sys.RoleExample; 4 import com.fedex.connect.common.model.sys.RoleExample;
5 -import com.fedex.connect.manager.dao.base.BaseDao; 5 +import com.fedex.connect.manager.repository.base.BaseDao;
6 -import com.fedex.connect.manager.dao.repository.sys.IRoleRepository; 6 +import com.fedex.connect.manager.repository.repo.sys.IRoleRepository;
7 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
8 8
9 import java.util.List; 9 import java.util.List;
......
1 -package com.fedex.connect.manager.dao.repository.sys.impl; 1 +package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.model.sys.User; 3 import com.fedex.connect.common.model.sys.User;
4 import com.fedex.connect.common.model.sys.UserExample; 4 import com.fedex.connect.common.model.sys.UserExample;
5 -import com.fedex.connect.manager.dao.base.BaseDao; 5 +import com.fedex.connect.manager.repository.base.BaseDao;
6 -import com.fedex.connect.manager.dao.repository.sys.IUserRepository; 6 +import com.fedex.connect.manager.repository.repo.sys.IUserRepository;
7 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
8 8
9 import java.util.List; 9 import java.util.List;
......
1 -package com.fedex.connect.manager.dao.repository.sys.impl; 1 +package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.model.sys.UserRole; 3 import com.fedex.connect.common.model.sys.UserRole;
4 import com.fedex.connect.common.model.sys.UserRoleExample; 4 import com.fedex.connect.common.model.sys.UserRoleExample;
5 -import com.fedex.connect.manager.dao.base.BaseDao; 5 +import com.fedex.connect.manager.repository.base.BaseDao;
6 -import com.fedex.connect.manager.dao.repository.sys.IUserRoleRepository; 6 +import com.fedex.connect.manager.repository.repo.sys.IUserRoleRepository;
7 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
8 8
9 import java.util.List; 9 import java.util.List;
......
...@@ -6,8 +6,8 @@ import com.fedex.connect.common.dao.sys.RoleMapper; ...@@ -6,8 +6,8 @@ import com.fedex.connect.common.dao.sys.RoleMapper;
6 import com.fedex.connect.common.dao.sys.UserMapper; 6 import com.fedex.connect.common.dao.sys.UserMapper;
7 import com.fedex.connect.common.dao.sys.UserRoleMapper; 7 import com.fedex.connect.common.dao.sys.UserRoleMapper;
8 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil; 8 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
9 -import com.fedex.connect.manager.dao.repository.log.IUserLoginLogRepository; 9 +import com.fedex.connect.manager.repository.repo.log.IUserLoginLogRepository;
10 -import com.fedex.connect.manager.dao.repository.sys.*; 10 +import com.fedex.connect.manager.repository.repo.sys.*;
11 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
12 12
13 import javax.annotation.Resource; 13 import javax.annotation.Resource;
......
1 -package com.fedex.connect.manager.service.system; 1 +package com.fedex.connect.manager.service.sys;
2 2
3 import com.fedex.connect.common.model.sys.RedisSlab; 3 import com.fedex.connect.common.model.sys.RedisSlab;
4 4
......
1 -package com.fedex.connect.manager.service.system; 1 +package com.fedex.connect.manager.service.sys;
2 2
3 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo; 3 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
4 import com.fedex.connect.common.model.sys.User; 4 import com.fedex.connect.common.model.sys.User;
......
1 -package com.fedex.connect.manager.service.system; 1 +package com.fedex.connect.manager.service.sys;
2 2
3 import com.fedex.connect.common.model.sys.Role; 3 import com.fedex.connect.common.model.sys.Role;
4 4
......
1 -package com.fedex.connect.manager.service.system; 1 +package com.fedex.connect.manager.service.sys;
2 2
3 public interface ISysUserRoleService { 3 public interface ISysUserRoleService {
4 int save(Long userId,Long roleId); 4 int save(Long userId,Long roleId);
......
1 -package com.fedex.connect.manager.service.system; 1 +package com.fedex.connect.manager.service.sys;
2 2
3 import com.fedex.connect.common.model.sys.User; 3 import com.fedex.connect.common.model.sys.User;
4 import com.fedex.connect.manager.data.dto.SysUserDto; 4 import com.fedex.connect.manager.data.dto.SysUserDto;
......
1 -package com.fedex.connect.manager.service.system.impl; 1 +package com.fedex.connect.manager.service.sys.impl;
2 2
3 import com.fedex.connect.common.dependencies.util.GsonUtils; 3 import com.fedex.connect.common.dependencies.util.GsonUtils;
4 import com.fedex.connect.common.model.sys.RedisSlab; 4 import com.fedex.connect.common.model.sys.RedisSlab;
5 import com.fedex.connect.common.model.sys.RedisSlabExample; 5 import com.fedex.connect.common.model.sys.RedisSlabExample;
6 import com.fedex.connect.manager.data.bo.RedisSlabBo; 6 import com.fedex.connect.manager.data.bo.RedisSlabBo;
7 import com.fedex.connect.manager.service.AbstractEtService; 7 import com.fedex.connect.manager.service.AbstractEtService;
8 -import com.fedex.connect.manager.service.system.IRedisUtilService; 8 +import com.fedex.connect.manager.service.sys.IRedisUtilService;
9 import com.google.gson.Gson; 9 import com.google.gson.Gson;
10 import org.slf4j.Logger; 10 import org.slf4j.Logger;
11 import org.slf4j.LoggerFactory; 11 import org.slf4j.LoggerFactory;
......
1 -package com.fedex.connect.manager.service.system.impl; 1 +package com.fedex.connect.manager.service.sys.impl;
2 2
3 3
4 import com.fedex.connect.common.dependencies.contants.DatabaseConstants; 4 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
...@@ -12,8 +12,8 @@ import com.fedex.connect.common.model.sys.Role; ...@@ -12,8 +12,8 @@ import com.fedex.connect.common.model.sys.Role;
12 import com.fedex.connect.common.model.sys.User; 12 import com.fedex.connect.common.model.sys.User;
13 import com.fedex.connect.manager.data.dto.LoginRequest; 13 import com.fedex.connect.manager.data.dto.LoginRequest;
14 import com.fedex.connect.manager.service.AbstractEtService; 14 import com.fedex.connect.manager.service.AbstractEtService;
15 -import com.fedex.connect.manager.service.system.IRedisUtilService; 15 +import com.fedex.connect.manager.service.sys.IRedisUtilService;
16 -import com.fedex.connect.manager.service.system.ISysAuthService; 16 +import com.fedex.connect.manager.service.sys.ISysAuthService;
17 import com.google.gson.JsonObject; 17 import com.google.gson.JsonObject;
18 import org.slf4j.Logger; 18 import org.slf4j.Logger;
19 import org.slf4j.LoggerFactory; 19 import org.slf4j.LoggerFactory;
......
1 -package com.fedex.connect.manager.service.system.impl; 1 +package com.fedex.connect.manager.service.sys.impl;
2 2
3 import com.fedex.connect.common.dependencies.config.CacheSystem; 3 import com.fedex.connect.common.dependencies.config.CacheSystem;
4 import com.fedex.connect.common.dependencies.contants.DatabaseConstants; 4 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
...@@ -10,7 +10,7 @@ import com.fedex.connect.common.model.sys.UserRole; ...@@ -10,7 +10,7 @@ import com.fedex.connect.common.model.sys.UserRole;
10 import com.fedex.connect.common.model.sys.UserRoleExample; 10 import com.fedex.connect.common.model.sys.UserRoleExample;
11 import com.fedex.connect.manager.data.model.LogShowModel; 11 import com.fedex.connect.manager.data.model.LogShowModel;
12 import com.fedex.connect.manager.service.AbstractEtService; 12 import com.fedex.connect.manager.service.AbstractEtService;
13 -import com.fedex.connect.manager.service.system.ISysRoleService; 13 +import com.fedex.connect.manager.service.sys.ISysRoleService;
14 import org.slf4j.Logger; 14 import org.slf4j.Logger;
15 import org.slf4j.LoggerFactory; 15 import org.slf4j.LoggerFactory;
16 import org.springframework.stereotype.Service; 16 import org.springframework.stereotype.Service;
......
1 -package com.fedex.connect.manager.service.system.impl; 1 +package com.fedex.connect.manager.service.sys.impl;
2 2
3 import com.fedex.connect.common.dependencies.contants.DatabaseConstants; 3 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
4 import com.fedex.connect.common.model.sys.UserRole; 4 import com.fedex.connect.common.model.sys.UserRole;
5 import com.fedex.connect.manager.data.model.LogShowModel; 5 import com.fedex.connect.manager.data.model.LogShowModel;
6 import com.fedex.connect.manager.service.AbstractEtService; 6 import com.fedex.connect.manager.service.AbstractEtService;
7 -import com.fedex.connect.manager.service.system.ISysUserRoleService; 7 +import com.fedex.connect.manager.service.sys.ISysUserRoleService;
8 import org.slf4j.Logger; 8 import org.slf4j.Logger;
9 import org.slf4j.LoggerFactory; 9 import org.slf4j.LoggerFactory;
10 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
......
1 -package com.fedex.connect.manager.service.system.impl; 1 +package com.fedex.connect.manager.service.sys.impl;
2 2
3 import com.fedex.connect.common.dependencies.arithmetic.AESUtil; 3 import com.fedex.connect.common.dependencies.arithmetic.AESUtil;
4 import com.fedex.connect.common.dependencies.authentication.EncryptProvider; 4 import com.fedex.connect.common.dependencies.authentication.EncryptProvider;
...@@ -12,9 +12,9 @@ import com.fedex.connect.common.model.sys.UserExample; ...@@ -12,9 +12,9 @@ import com.fedex.connect.common.model.sys.UserExample;
12 import com.fedex.connect.manager.data.dto.SysUserDto; 12 import com.fedex.connect.manager.data.dto.SysUserDto;
13 import com.fedex.connect.manager.data.model.LogShowModel; 13 import com.fedex.connect.manager.data.model.LogShowModel;
14 import com.fedex.connect.manager.service.AbstractEtService; 14 import com.fedex.connect.manager.service.AbstractEtService;
15 -import com.fedex.connect.manager.service.system.ISysRoleService; 15 +import com.fedex.connect.manager.service.sys.ISysRoleService;
16 -import com.fedex.connect.manager.service.system.ISysUserRoleService; 16 +import com.fedex.connect.manager.service.sys.ISysUserRoleService;
17 -import com.fedex.connect.manager.service.system.ISysUserService; 17 +import com.fedex.connect.manager.service.sys.ISysUserService;
18 import org.apache.commons.lang3.StringUtils; 18 import org.apache.commons.lang3.StringUtils;
19 import org.slf4j.Logger; 19 import org.slf4j.Logger;
20 import org.slf4j.LoggerFactory; 20 import org.slf4j.LoggerFactory;
......