Merge remote-tracking branch 'origin/master'

@@ -5,8 +5,8 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.manager.config.PropertiesConfig;
 import com.fedex.connect.manager.controller.log.ILogLoginService;
-import com.fedex.connect.manager.service.system.ISysAuthService;
-import com.fedex.connect.manager.service.system.ISysUserService;
+import com.fedex.connect.manager.service.sys.ISysAuthService;
+import com.fedex.connect.manager.service.sys.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

+package com.fedex.connect.manager.repository.base;
+
+import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper;
+import com.fedex.connect.common.dao.log.UserLoginInfoMapper;
+import com.fedex.connect.common.dao.sys.RedisSlabMapper;
+import com.fedex.connect.common.dao.sys.RoleMapper;
+import com.fedex.connect.common.dao.sys.UserMapper;
+import com.fedex.connect.common.dao.sys.UserRoleMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class BaseDao {
+    @Autowired
+    public UserLoginInfoMapper userLoginInfoMapper;
+    @Autowired
+    public RedisSlabMapper redisSlabMapper;
+    @Autowired
+    public RoleMapper roleMapper;
+    @Autowired
+    public UserRoleMapper userRoleMapper;
+    @Autowired
+    public UserMapper userMapper;
+    @Autowired
+    public DictionaryEntriesMapper dictionaryEntriesMapper;
+}

-package com.fedex.connect.manager.dao.repository.log;
+package com.fedex.connect.manager.repository.repo.log;
 
 import com.fedex.connect.common.model.log.UserLoginInfo;
 

-package com.fedex.connect.manager.dao.repository.log.impl;
+package com.fedex.connect.manager.repository.repo.log.impl;
 
 import com.fedex.connect.common.model.log.UserLoginInfo;
-import com.fedex.connect.manager.dao.base.BaseDao;
-import com.fedex.connect.manager.dao.repository.log.IUserLoginLogRepository;
+import com.fedex.connect.manager.repository.base.BaseDao;
+import com.fedex.connect.manager.repository.repo.log.IUserLoginLogRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository

-package com.fedex.connect.manager.dao.repository.sys;
+package com.fedex.connect.manager.repository.repo.sys;
 
 import com.fedex.connect.common.model.base.DictionaryEntries;
 import com.fedex.connect.common.model.base.DictionaryEntriesExample;

-package com.fedex.connect.manager.dao.repository.sys;
+package com.fedex.connect.manager.repository.repo.sys;
 
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlabExample;

-package com.fedex.connect.manager.dao.repository.sys;
+package com.fedex.connect.manager.repository.repo.sys;
 
 import com.fedex.connect.common.model.sys.Role;
 import com.fedex.connect.common.model.sys.RoleExample;

-package com.fedex.connect.manager.dao.repository.sys;
+package com.fedex.connect.manager.repository.repo.sys;
 
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.UserExample;

-package com.fedex.connect.manager.dao.repository.sys;
+package com.fedex.connect.manager.repository.repo.sys;
 
 import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.common.model.sys.UserRoleExample;

-package com.fedex.connect.manager.dao.repository.sys.impl;
+package com.fedex.connect.manager.repository.repo.sys.impl;
 
 import com.fedex.connect.common.model.base.DictionaryEntries;
 import com.fedex.connect.common.model.base.DictionaryEntriesExample;
-import com.fedex.connect.manager.dao.base.BaseDao;
-import com.fedex.connect.manager.dao.repository.sys.IDictionaryEntriesRepository;
+import com.fedex.connect.manager.repository.base.BaseDao;
+import com.fedex.connect.manager.repository.repo.sys.IDictionaryEntriesRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

-package com.fedex.connect.manager.dao.repository.sys.impl;
+package com.fedex.connect.manager.repository.repo.sys.impl;
 
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlabExample;
-import com.fedex.connect.manager.dao.base.BaseDao;
-import com.fedex.connect.manager.dao.repository.sys.IRedisSlabRepository;
+import com.fedex.connect.manager.repository.base.BaseDao;
+import com.fedex.connect.manager.repository.repo.sys.IRedisSlabRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

-package com.fedex.connect.manager.dao.repository.sys.impl;
+package com.fedex.connect.manager.repository.repo.sys.impl;
 
 import com.fedex.connect.common.model.sys.Role;
 import com.fedex.connect.common.model.sys.RoleExample;
-import com.fedex.connect.manager.dao.base.BaseDao;
-import com.fedex.connect.manager.dao.repository.sys.IRoleRepository;
+import com.fedex.connect.manager.repository.base.BaseDao;
+import com.fedex.connect.manager.repository.repo.sys.IRoleRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

-package com.fedex.connect.manager.dao.repository.sys.impl;
+package com.fedex.connect.manager.repository.repo.sys.impl;
 
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.UserExample;
-import com.fedex.connect.manager.dao.base.BaseDao;
-import com.fedex.connect.manager.dao.repository.sys.IUserRepository;
+import com.fedex.connect.manager.repository.base.BaseDao;
+import com.fedex.connect.manager.repository.repo.sys.IUserRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

-package com.fedex.connect.manager.dao.repository.sys.impl;
+package com.fedex.connect.manager.repository.repo.sys.impl;
 
 import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.common.model.sys.UserRoleExample;
-import com.fedex.connect.manager.dao.base.BaseDao;
-import com.fedex.connect.manager.dao.repository.sys.IUserRoleRepository;
+import com.fedex.connect.manager.repository.base.BaseDao;
+import com.fedex.connect.manager.repository.repo.sys.IUserRoleRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

@@ -6,8 +6,8 @@ import com.fedex.connect.common.dao.sys.RoleMapper;
 import com.fedex.connect.common.dao.sys.UserMapper;
 import com.fedex.connect.common.dao.sys.UserRoleMapper;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
-import com.fedex.connect.manager.dao.repository.log.IUserLoginLogRepository;
-import com.fedex.connect.manager.dao.repository.sys.*;
+import com.fedex.connect.manager.repository.repo.log.IUserLoginLogRepository;
+import com.fedex.connect.manager.repository.repo.sys.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.Resource;

-package com.fedex.connect.manager.service.system;
+package com.fedex.connect.manager.service.sys;
 
 import com.fedex.connect.common.model.sys.RedisSlab;
 

-package com.fedex.connect.manager.service.system;
+package com.fedex.connect.manager.service.sys;
 
 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
 import com.fedex.connect.common.model.sys.User;

-package com.fedex.connect.manager.service.system;
+package com.fedex.connect.manager.service.sys;
 
 import com.fedex.connect.common.model.sys.Role;
 

-package com.fedex.connect.manager.service.system;
+package com.fedex.connect.manager.service.sys;
 
 public interface ISysUserRoleService {
     int save(Long userId,Long roleId);

-package com.fedex.connect.manager.service.system;
+package com.fedex.connect.manager.service.sys;
 
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.manager.data.dto.SysUserDto;

-package com.fedex.connect.manager.service.system.impl;
+package com.fedex.connect.manager.service.sys.impl;
 
 import com.fedex.connect.common.dependencies.util.GsonUtils;
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlabExample;
 import com.fedex.connect.manager.data.bo.RedisSlabBo;
 import com.fedex.connect.manager.service.AbstractEtService;
-import com.fedex.connect.manager.service.system.IRedisUtilService;
+import com.fedex.connect.manager.service.sys.IRedisUtilService;
 import com.google.gson.Gson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-package com.fedex.connect.manager.service.system.impl;
+package com.fedex.connect.manager.service.sys.impl;
 
 
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
@@ -12,8 +12,8 @@ import com.fedex.connect.common.model.sys.Role;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.manager.data.dto.LoginRequest;
 import com.fedex.connect.manager.service.AbstractEtService;
-import com.fedex.connect.manager.service.system.IRedisUtilService;
-import com.fedex.connect.manager.service.system.ISysAuthService;
+import com.fedex.connect.manager.service.sys.IRedisUtilService;
+import com.fedex.connect.manager.service.sys.ISysAuthService;
 import com.google.gson.JsonObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-package com.fedex.connect.manager.service.system.impl;
+package com.fedex.connect.manager.service.sys.impl;
 
 import com.fedex.connect.common.dependencies.config.CacheSystem;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
@@ -10,7 +10,7 @@ import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.common.model.sys.UserRoleExample;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.service.AbstractEtService;
-import com.fedex.connect.manager.service.system.ISysRoleService;
+import com.fedex.connect.manager.service.sys.ISysRoleService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

-package com.fedex.connect.manager.service.system.impl;
+package com.fedex.connect.manager.service.sys.impl;
 
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.service.AbstractEtService;
-import com.fedex.connect.manager.service.system.ISysUserRoleService;
+import com.fedex.connect.manager.service.sys.ISysUserRoleService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

-package com.fedex.connect.manager.service.system.impl;
+package com.fedex.connect.manager.service.sys.impl;
 
 import com.fedex.connect.common.dependencies.arithmetic.AESUtil;
 import com.fedex.connect.common.dependencies.authentication.EncryptProvider;
@@ -12,9 +12,9 @@ import com.fedex.connect.common.model.sys.UserExample;
 import com.fedex.connect.manager.data.dto.SysUserDto;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.service.AbstractEtService;
-import com.fedex.connect.manager.service.system.ISysRoleService;
-import com.fedex.connect.manager.service.system.ISysUserRoleService;
-import com.fedex.connect.manager.service.system.ISysUserService;
+import com.fedex.connect.manager.service.sys.ISysRoleService;
+import com.fedex.connect.manager.service.sys.ISysUserRoleService;
+import com.fedex.connect.manager.service.sys.ISysUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;