hjhc
This commit is contained in:
@ -14,7 +14,7 @@ import org.springframework.context.annotation.ComponentScan;
|
|||||||
@EnableFeignClients(basePackages = { "com.coscoshipping.ebtp.*", "com.chinaunicom.mall.ebtp.cloud.*",
|
@EnableFeignClients(basePackages = { "com.coscoshipping.ebtp.*", "com.chinaunicom.mall.ebtp.cloud.*",
|
||||||
"com.chinaunicom.mall.ebtp.*" })
|
"com.chinaunicom.mall.ebtp.*" })
|
||||||
@MapperScan({"com.coscoshipping.ebtp.system.**.dao", "com.chinaunicom.mall.ebtp.**.dao" })
|
@MapperScan({"com.coscoshipping.ebtp.system.**.dao", "com.chinaunicom.mall.ebtp.**.dao" })
|
||||||
@ComponentScan(basePackages = { "com.coscoshipping.ebtp.*", "com.chinaunicom.mall.ebtp.cloud.*",
|
@ComponentScan(basePackages = { "com.coscoshipping.ebtp.system.*", "com.chinaunicom.mall.ebtp.cloud.*",
|
||||||
"com.chinaunicom.mall.ebtp.*" })
|
"com.chinaunicom.mall.ebtp.*" })
|
||||||
public class SysManagerEbtpProjectApplication {
|
public class SysManagerEbtpProjectApplication {
|
||||||
|
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
package com.coscoshipping.ebtp.system.login.entity;
|
package com.coscoshipping.ebtp.system.login.entity;
|
||||||
|
|
||||||
|
|
||||||
import com.coscoshipping.ebtp.project.org.entity.SysOrg;
|
|
||||||
import com.coscoshipping.ebtp.project.user.entity.SysExpertUser;
|
import com.coscoshipping.ebtp.project.user.entity.SysExpertUser;
|
||||||
import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser;
|
import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser;
|
||||||
import com.coscoshipping.ebtp.project.user.entity.SysUser;
|
|
||||||
import com.coscoshipping.ebtp.system.org.entity.SysOrg;
|
import com.coscoshipping.ebtp.system.org.entity.SysOrg;
|
||||||
import com.coscoshipping.ebtp.system.user.entity.SysUser;
|
import com.coscoshipping.ebtp.system.user.entity.SysUser;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
@ -11,28 +11,21 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
|
|||||||
import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService;
|
import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService;
|
||||||
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
|
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
|
||||||
import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum;
|
import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum;
|
||||||
|
|
||||||
|
import com.coscoshipping.ebtp.project.user.entity.SysExpertUser;
|
||||||
|
import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser;
|
||||||
import com.coscoshipping.ebtp.system.login.common.Constants;
|
import com.coscoshipping.ebtp.system.login.common.Constants;
|
||||||
import com.coscoshipping.ebtp.system.login.common.RSA;
|
import com.coscoshipping.ebtp.system.login.common.RSA;
|
||||||
import com.coscoshipping.ebtp.system.login.dao.BaseUserMapper;
|
import com.coscoshipping.ebtp.system.login.dao.BaseUserMapper;
|
||||||
import com.coscoshipping.ebtp.system.login.entity.*;
|
import com.coscoshipping.ebtp.system.login.entity.BaseSelf;
|
||||||
|
import com.coscoshipping.ebtp.system.login.entity.BaseUserToken;
|
||||||
import com.coscoshipping.ebtp.system.login.service.BaseUserService;
|
import com.coscoshipping.ebtp.system.login.service.BaseUserService;
|
||||||
import com.coscoshipping.ebtp.system.login.service.BaseUserTokenService;
|
import com.coscoshipping.ebtp.system.login.service.BaseUserTokenService;
|
||||||
import com.coscoshipping.ebtp.system.org.entity.SysOrg;
|
import com.coscoshipping.ebtp.system.org.entity.SysOrg;
|
||||||
import com.coscoshipping.ebtp.system.org.service.SysOrgService;
|
import com.coscoshipping.ebtp.system.org.service.SysOrgService;
|
||||||
|
import com.coscoshipping.ebtp.system.user.dao.SysExpertUserMapper;
|
||||||
|
import com.coscoshipping.ebtp.system.user.dao.SysSupplierUserMapper;
|
||||||
import com.coscoshipping.ebtp.system.user.entity.SysUser;
|
import com.coscoshipping.ebtp.system.user.entity.SysUser;
|
||||||
import com.chinaunicom.mall.ebtp.login.common.Constants;;
|
|
||||||
import com.chinaunicom.mall.ebtp.login.common.RSA;
|
|
||||||
import com.chinaunicom.mall.ebtp.login.dao.BaseUserMapper;
|
|
||||||
import com.chinaunicom.mall.ebtp.login.entity.*;
|
|
||||||
import com.chinaunicom.mall.ebtp.login.service.BaseUserService;
|
|
||||||
import com.chinaunicom.mall.ebtp.login.service.BaseUserTokenService;
|
|
||||||
import com.coscoshipping.ebtp.project.org.entity.SysOrg;
|
|
||||||
import com.coscoshipping.ebtp.project.org.service.SysOrgService;
|
|
||||||
import com.coscoshipping.ebtp.project.user.dao.SysExpertUserMapper;
|
|
||||||
import com.coscoshipping.ebtp.project.user.dao.SysSupplierUserMapper;
|
|
||||||
import com.coscoshipping.ebtp.project.user.entity.SysExpertUser;
|
|
||||||
import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser;
|
|
||||||
import com.coscoshipping.ebtp.project.user.entity.SysUser;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@ -59,6 +52,8 @@ import java.util.concurrent.TimeUnit;
|
|||||||
|
|
||||||
import static com.chinaunicom.mall.ebtp.cloud.security.starter.common.Constants.REDIS_USER_KEY;
|
import static com.chinaunicom.mall.ebtp.cloud.security.starter.common.Constants.REDIS_USER_KEY;
|
||||||
|
|
||||||
|
;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 对数据表 base_user 操作的 serviceImpl
|
* 对数据表 base_user 操作的 serviceImpl
|
||||||
*
|
*
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package com.coscoshipping.ebtp.project.user.dao;
|
package com.coscoshipping.ebtp.system.user.dao;
|
||||||
|
|
||||||
import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity;
|
import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity;
|
||||||
import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper;
|
import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package com.coscoshipping.ebtp.project.user.dao;
|
package com.coscoshipping.ebtp.system.user.dao;
|
||||||
|
|
||||||
import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity;
|
import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity;
|
||||||
import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper;
|
import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
|
||||||
<mapper namespace="com.coscoshipping.ebtp.project.user.dao.SysExpertUserMapper">
|
<mapper namespace="com.coscoshipping.ebtp.system.user.dao.SysExpertUserMapper">
|
||||||
<select id="selectRoleByUserId" resultType="com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity">
|
<select id="selectRoleByUserId" resultType="com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity">
|
||||||
SELECT
|
SELECT
|
||||||
r.role_id AS roleId,
|
r.role_id AS roleId,
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
|
||||||
<mapper namespace="com.coscoshipping.ebtp.project.user.dao.SysSupplierUserMapper">
|
<mapper namespace="com.coscoshipping.ebtp.system.user.dao.SysSupplierUserMapper">
|
||||||
<select id="selectRoleByUserId" resultType="com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity">
|
<select id="selectRoleByUserId" resultType="com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity">
|
||||||
SELECT
|
SELECT
|
||||||
r.role_id AS roleId,
|
r.role_id AS roleId,
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package com.coscoshipping.ebtp.project.user.service.impl;
|
package com.coscoshipping.ebtp.system.user.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
@ -6,15 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
|
import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
|
||||||
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
|
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
|
||||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
|
||||||
import com.coscoshipping.ebtp.project.user.dao.SysExpertUserMapper;
|
|
||||||
import com.coscoshipping.ebtp.project.user.entity.SysExpertUser;
|
import com.coscoshipping.ebtp.project.user.entity.SysExpertUser;
|
||||||
import com.coscoshipping.ebtp.project.user.service.SysExpertUserService;
|
import com.coscoshipping.ebtp.project.user.service.SysExpertUserService;
|
||||||
|
import com.coscoshipping.ebtp.system.user.dao.SysExpertUserMapper;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 对数据表 sys_expert_user 操作的 serviceImpl
|
* 对数据表 sys_expert_user 操作的 serviceImpl
|
||||||
* @author yss
|
* @author yss
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package com.coscoshipping.ebtp.project.user.service.impl;
|
package com.coscoshipping.ebtp.system.user.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
@ -7,9 +7,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|||||||
import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
|
import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
|
||||||
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
|
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
|
||||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
||||||
import com.coscoshipping.ebtp.project.user.dao.SysSupplierUserMapper;
|
|
||||||
import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser;
|
import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser;
|
||||||
import com.coscoshipping.ebtp.project.user.service.SysSupplierUserService;
|
import com.coscoshipping.ebtp.project.user.service.SysSupplierUserService;
|
||||||
|
import com.coscoshipping.ebtp.system.user.dao.SysSupplierUserMapper;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user