diff --git a/app.sh b/app.sh new file mode 100644 index 0000000..143a44e --- /dev/null +++ b/app.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +APP_NAME="sys_manager_ebtp_project-0.0.1.jar" +APP_PORT=18030 +LOG_FILE="app.log" +PID_FILE="app.pid" + +start() { + if [ -f "$PID_FILE" ]; then + echo "应用已经在运行中，PID: $(cat $PID_FILE)" + exit 1 + fi + + echo "正在启动应用..." + nohup java -jar $APP_NAME --spring.config.location=application-sim.yml > $LOG_FILE 2>&1 & + echo $! > $PID_FILE + echo "应用已启动，PID: $(cat $PID_FILE)" +} + +stop() { + if [ ! -f "$PID_FILE" ]; then + echo "应用未运行" + exit 1 + fi + + echo "正在停止应用，PID: $(cat $PID_FILE)..." + kill -9 $(cat $PID_FILE) + rm -f $PID_FILE + echo "应用已停止" +} + +status() { + if [ -f "$PID_FILE" ]; then + echo "应用正在运行，PID: $(cat $PID_FILE)" + else + echo "应用未运行" + fi +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + status) + status + ;; + *) + echo "使用方法: $0 {start|stop|restart|status}" + exit 1 +esac + +exit 0 diff --git a/src/main/java/com/coscoshipping/ebtp/project/SysManagerEbtpProjectApplication.java b/src/main/java/com/coscoshipping/ebtp/system/SysManagerEbtpProjectApplication.java similarity index 77% rename from src/main/java/com/coscoshipping/ebtp/project/SysManagerEbtpProjectApplication.java rename to src/main/java/com/coscoshipping/ebtp/system/SysManagerEbtpProjectApplication.java index 2e92b1f..7069035 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/SysManagerEbtpProjectApplication.java +++ b/src/main/java/com/coscoshipping/ebtp/system/SysManagerEbtpProjectApplication.java @@ -1,24 +1,19 @@ -package com.coscoshipping.ebtp.project; +package com.coscoshipping.ebtp.system; -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import io.micrometer.core.instrument.MeterRegistry; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; -@SpringBootApplication(exclude = { - // DataSourceAutoConfiguration.class, - // DruidDataSourceAutoConfigure.class -}) +@SpringBootApplication @EnableFeignClients(basePackages = { "com.coscoshipping.ebtp.*", "com.chinaunicom.mall.ebtp.cloud.*", "com.chinaunicom.mall.ebtp.*" }) -@MapperScan({ "com.coscoshipping.ebtp.project.**.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.*", "com.chinaunicom.mall.ebtp.*" }) public class SysManagerEbtpProjectApplication { diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/README.md b/src/main/java/com/coscoshipping/ebtp/system/dict/README.md similarity index 100% rename from src/main/java/com/coscoshipping/ebtp/project/dict/README.md rename to src/main/java/com/coscoshipping/ebtp/system/dict/README.md diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/controller/DictProjectController.java b/src/main/java/com/coscoshipping/ebtp/system/dict/controller/DictProjectController.java similarity index 94% rename from src/main/java/com/coscoshipping/ebtp/project/dict/controller/DictProjectController.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/controller/DictProjectController.java index 995e584..f11bb50 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/controller/DictProjectController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/controller/DictProjectController.java @@ -1,9 +1,9 @@ -package com.coscoshipping.ebtp.project.dict.controller; +package com.coscoshipping.ebtp.system.dict.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.coscoshipping.ebtp.project.dict.entity.DictProject; -import com.coscoshipping.ebtp.project.dict.service.IDictProjectService; +import com.coscoshipping.ebtp.system.dict.entity.DictProject; +import com.coscoshipping.ebtp.system.dict.service.IDictProjectService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/controller/DictRegionController.java b/src/main/java/com/coscoshipping/ebtp/system/dict/controller/DictRegionController.java similarity index 92% rename from src/main/java/com/coscoshipping/ebtp/project/dict/controller/DictRegionController.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/controller/DictRegionController.java index 3e76c9f..2602499 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/controller/DictRegionController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/controller/DictRegionController.java @@ -1,9 +1,9 @@ -package com.coscoshipping.ebtp.project.dict.controller; +package com.coscoshipping.ebtp.system.dict.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.coscoshipping.ebtp.project.dict.entity.DictRegion; -import com.coscoshipping.ebtp.project.dict.entity.DictRegionTreeVO; -import com.coscoshipping.ebtp.project.dict.service.IDictRegionService; +import com.coscoshipping.ebtp.system.dict.entity.DictRegion; +import com.coscoshipping.ebtp.system.dict.entity.DictRegionTreeVO; +import com.coscoshipping.ebtp.system.dict.service.IDictRegionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/controller/DictRegionInternationalController.java b/src/main/java/com/coscoshipping/ebtp/system/dict/controller/DictRegionInternationalController.java similarity index 91% rename from src/main/java/com/coscoshipping/ebtp/project/dict/controller/DictRegionInternationalController.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/controller/DictRegionInternationalController.java index 4a6d3d6..e857180 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/controller/DictRegionInternationalController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/controller/DictRegionInternationalController.java @@ -1,8 +1,7 @@ -package com.coscoshipping.ebtp.project.dict.controller; +package com.coscoshipping.ebtp.system.dict.controller; -import com.coscoshipping.ebtp.project.dict.entity.DictRegion; -import com.coscoshipping.ebtp.project.dict.entity.DictRegionInternational; -import com.coscoshipping.ebtp.project.dict.service.IDictRegionInternationalService; +import com.coscoshipping.ebtp.system.dict.entity.DictRegionInternational; +import com.coscoshipping.ebtp.system.dict.service.IDictRegionInternationalService; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictProjectMapper.java b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/DictProjectMapper.java similarity index 89% rename from src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictProjectMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/dao/DictProjectMapper.java index 1a78588..c3205a2 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictProjectMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/DictProjectMapper.java @@ -1,9 +1,9 @@ -package com.coscoshipping.ebtp.project.dict.dao; +package com.coscoshipping.ebtp.system.dict.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; -import com.coscoshipping.ebtp.project.dict.entity.DictProject; +import com.coscoshipping.ebtp.system.dict.entity.DictProject; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictRegionInternationalMapper.java b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/DictRegionInternationalMapper.java similarity index 55% rename from src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictRegionInternationalMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/dao/DictRegionInternationalMapper.java index 3978d4f..2dda19d 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictRegionInternationalMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/DictRegionInternationalMapper.java @@ -1,8 +1,8 @@ -package com.coscoshipping.ebtp.project.dict.dao; +package com.coscoshipping.ebtp.system.dict.dao; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; -import com.coscoshipping.ebtp.project.dict.entity.DictRegionInternational; +import com.coscoshipping.ebtp.system.dict.entity.DictRegionInternational; public interface DictRegionInternationalMapper extends IBaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictRegionMapper.java b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/DictRegionMapper.java similarity index 79% rename from src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictRegionMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/dao/DictRegionMapper.java index bf4c534..02b690c 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictRegionMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/DictRegionMapper.java @@ -1,8 +1,8 @@ -package com.coscoshipping.ebtp.project.dict.dao; +package com.coscoshipping.ebtp.system.dict.dao; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; -import com.coscoshipping.ebtp.project.dict.entity.DictRegion; +import com.coscoshipping.ebtp.system.dict.entity.DictRegion; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/mapper/DictProjectMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictProjectMapper.xml similarity index 89% rename from src/main/java/com/coscoshipping/ebtp/project/dict/dao/mapper/DictProjectMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictProjectMapper.xml index 850f6be..bdc4716 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/mapper/DictProjectMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictProjectMapper.xml @@ -1,9 +1,9 @@ - + + type="com.coscoshipping.ebtp.system.dict.entity.DictProject"> @@ -27,4 +27,4 @@ delete_flag="deleted" where ID=#{id} - \ No newline at end of file + diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/mapper/DictRegionInternationalMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictRegionInternationalMapper.xml similarity index 82% rename from src/main/java/com/coscoshipping/ebtp/project/dict/dao/mapper/DictRegionInternationalMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictRegionInternationalMapper.xml index ca995d6..c57ad92 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/mapper/DictRegionInternationalMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictRegionInternationalMapper.xml @@ -1,9 +1,9 @@ - + + type="com.coscoshipping.ebtp.system.dict.entity.DictRegionInternational"> @@ -19,4 +19,4 @@ delete_flag="deleted" where ID=#{id} - \ No newline at end of file + diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/mapper/DictRegionMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictRegionMapper.xml similarity index 89% rename from src/main/java/com/coscoshipping/ebtp/project/dict/dao/mapper/DictRegionMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictRegionMapper.xml index c8e0a8f..359fcfa 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/mapper/DictRegionMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/dao/mapper/DictRegionMapper.xml @@ -1,9 +1,9 @@ - + + type="com.coscoshipping.ebtp.system.dict.entity.DictRegion"> @@ -26,9 +26,9 @@ SELECT id, p_id, name, level, ab FROM dict_region WHERE id = #{id} - + UNION ALL - + -- 递归查询：查询所有子节点 SELECT dr.id, dr.p_id, dr.name, dr.level, dr.ab FROM dict_region dr diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictProject.java b/src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictProject.java similarity index 95% rename from src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictProject.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictProject.java index 021faa4..28f05d1 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictProject.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictProject.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.dict.entity; +package com.coscoshipping.ebtp.system.dict.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; -import org.springframework.data.annotation.Transient; import java.io.Serializable; import java.util.ArrayList; @@ -27,7 +26,7 @@ import java.util.List; public class DictProject implements Serializable { private static final long serialVersionUID = 1L; - + /** * 编号 */ diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictRegion.java b/src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegion.java similarity index 95% rename from src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictRegion.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegion.java index 1d1a2f1..ce733f8 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictRegion.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegion.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.dict.entity; +package com.coscoshipping.ebtp.system.dict.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictRegionInternational.java b/src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegionInternational.java similarity index 95% rename from src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictRegionInternational.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegionInternational.java index d637eeb..87babe1 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictRegionInternational.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegionInternational.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.dict.entity; +package com.coscoshipping.ebtp.system.dict.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -56,4 +56,4 @@ public class DictRegionInternational implements Serializable { */ @ApiModelProperty(value = "英文名称") private String enName; -} \ No newline at end of file +} diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictRegionTreeVO.java b/src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegionTreeVO.java similarity index 96% rename from src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictRegionTreeVO.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegionTreeVO.java index 8c3d348..71d49e1 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictRegionTreeVO.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/entity/DictRegionTreeVO.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.dict.entity; +package com.coscoshipping.ebtp.system.dict.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -68,4 +68,4 @@ public class DictRegionTreeVO implements Serializable { */ @ApiModelProperty(value = "层级深度") private Integer depth; -} \ No newline at end of file +} diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/service/IDictProjectService.java b/src/main/java/com/coscoshipping/ebtp/system/dict/service/IDictProjectService.java similarity index 90% rename from src/main/java/com/coscoshipping/ebtp/project/dict/service/IDictProjectService.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/service/IDictProjectService.java index 2d91e71..bb324e6 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/service/IDictProjectService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/service/IDictProjectService.java @@ -1,8 +1,8 @@ -package com.coscoshipping.ebtp.project.dict.service; +package com.coscoshipping.ebtp.system.dict.service; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.coscoshipping.ebtp.project.dict.entity.DictProject; +import com.coscoshipping.ebtp.system.dict.entity.DictProject; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/service/IDictRegionInternationalService.java b/src/main/java/com/coscoshipping/ebtp/system/dict/service/IDictRegionInternationalService.java similarity index 76% rename from src/main/java/com/coscoshipping/ebtp/project/dict/service/IDictRegionInternationalService.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/service/IDictRegionInternationalService.java index f7861d6..b4c7145 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/service/IDictRegionInternationalService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/service/IDictRegionInternationalService.java @@ -1,7 +1,7 @@ -package com.coscoshipping.ebtp.project.dict.service; +package com.coscoshipping.ebtp.system.dict.service; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.coscoshipping.ebtp.project.dict.entity.DictRegionInternational; +import com.coscoshipping.ebtp.system.dict.entity.DictRegionInternational; import java.util.List; @@ -16,4 +16,4 @@ public interface IDictRegionInternationalService extends IBaseService getChild(String pId); -} \ No newline at end of file +} diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/service/IDictRegionService.java b/src/main/java/com/coscoshipping/ebtp/system/dict/service/IDictRegionService.java similarity index 80% rename from src/main/java/com/coscoshipping/ebtp/project/dict/service/IDictRegionService.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/service/IDictRegionService.java index 61d30d0..027bfc7 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/service/IDictRegionService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/service/IDictRegionService.java @@ -1,9 +1,9 @@ -package com.coscoshipping.ebtp.project.dict.service; +package com.coscoshipping.ebtp.system.dict.service; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.coscoshipping.ebtp.project.dict.entity.DictRegion; -import com.coscoshipping.ebtp.project.dict.entity.DictRegionTreeVO; +import com.coscoshipping.ebtp.system.dict.entity.DictRegion; +import com.coscoshipping.ebtp.system.dict.entity.DictRegionTreeVO; import java.util.List; diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/service/impl/DictProjectServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/dict/service/impl/DictProjectServiceImpl.java similarity index 90% rename from src/main/java/com/coscoshipping/ebtp/project/dict/service/impl/DictProjectServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/service/impl/DictProjectServiceImpl.java index 8526973..f47f226 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/service/impl/DictProjectServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/service/impl/DictProjectServiceImpl.java @@ -1,12 +1,12 @@ -package com.coscoshipping.ebtp.project.dict.service.impl; +package com.coscoshipping.ebtp.system.dict.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.coscoshipping.ebtp.project.dict.dao.DictProjectMapper; -import com.coscoshipping.ebtp.project.dict.entity.DictProject; -import com.coscoshipping.ebtp.project.dict.service.IDictProjectService; +import com.coscoshipping.ebtp.system.dict.dao.DictProjectMapper; +import com.coscoshipping.ebtp.system.dict.entity.DictProject; +import com.coscoshipping.ebtp.system.dict.service.IDictProjectService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/service/impl/DictRegionInternationalServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/dict/service/impl/DictRegionInternationalServiceImpl.java similarity index 76% rename from src/main/java/com/coscoshipping/ebtp/project/dict/service/impl/DictRegionInternationalServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/dict/service/impl/DictRegionInternationalServiceImpl.java index f42e75f..9d2ba45 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/dict/service/impl/DictRegionInternationalServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/dict/service/impl/DictRegionInternationalServiceImpl.java @@ -1,10 +1,10 @@ -package com.coscoshipping.ebtp.project.dict.service.impl; +package com.coscoshipping.ebtp.system.dict.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.coscoshipping.ebtp.project.dict.dao.DictRegionInternationalMapper; -import com.coscoshipping.ebtp.project.dict.entity.DictRegionInternational; -import com.coscoshipping.ebtp.project.dict.service.IDictRegionInternationalService; +import com.coscoshipping.ebtp.system.dict.dao.DictRegionInternationalMapper; +import com.coscoshipping.ebtp.system.dict.entity.DictRegionInternational; +import com.coscoshipping.ebtp.system.dict.service.IDictRegionInternationalService; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; @@ -28,4 +28,4 @@ public class DictRegionInternationalServiceImpl extends BaseServiceImpl allChildren = getAllChildrenIncludingSelfByJava(id); if (allChildren == null || allChildren.isEmpty()) { return null; } - + // 构建父ID到子节点的映射，提高查找效率 Map> parentToChildrenMap = new HashMap<>(); for (DictRegion node : allChildren) { parentToChildrenMap.computeIfAbsent(node.getPId(), k -> new ArrayList<>()).add(node); } - + // 在内存中构建树形结构 return buildTreeFromMap(current, parentToChildrenMap, 0); } @@ -87,7 +87,7 @@ public class DictRegionServiceImpl extends BaseServiceImpl getAllChildrenIncludingSelfByJava(String id) { List result = new ArrayList<>(); - + // 查询当前节点 DictRegion current = this.getById(id); if (current != null) { @@ -95,7 +95,7 @@ public class DictRegionServiceImpl extends BaseServiceImpl getAllChildrenRecursive(String parentId) { List children = new ArrayList<>(); - + // 查询直接子节点 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("p_id", parentId); queryWrapper.orderByAsc("id"); List directChildren = this.list(queryWrapper); - + for (DictRegion child : directChildren) { children.add(child); // 递归查询子节点的子节点 children.addAll(getAllChildrenRecursive(child.getId())); } - + return children; } @@ -137,10 +137,10 @@ public class DictRegionServiceImpl extends BaseServiceImpl directChildren = parentToChildrenMap.get(rootNode.getId()); - + if (directChildren == null || directChildren.isEmpty()) { treeNode.setIsLeaf(true); treeNode.setChildren(null); @@ -152,7 +152,7 @@ public class DictRegionServiceImpl extends BaseServiceImpl - - + + @@ -21,7 +21,7 @@ - SELECT u.user_id, u.name, @@ -53,7 +53,7 @@ - SELECT DISTINCT u.user_id, @@ -86,7 +86,7 @@ - SELECT u.user_id, u.name, @@ -132,7 +132,7 @@ AND u.user_id = #{userId} - SELECT r.role_id AS roleId, r.role_name AS roleName, @@ -150,4 +150,4 @@ and ou.orgnid = o.id AND u.user_id = #{userId} - \ No newline at end of file + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/dao/mapper/BaseUserTokenMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/login/dao/mapper/BaseUserTokenMapper.xml similarity index 81% rename from src/main/java/com/chinaunicom/mall/ebtp/login/dao/mapper/BaseUserTokenMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/login/dao/mapper/BaseUserTokenMapper.xml index 1bb5ae4..8c2aa6e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/dao/mapper/BaseUserTokenMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/login/dao/mapper/BaseUserTokenMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -18,4 +18,4 @@ delete_flag="1" where ID=#{id } - \ No newline at end of file + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/dao/mapper/EshopMenuMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/login/dao/mapper/EshopMenuMapper.xml similarity index 89% rename from src/main/java/com/chinaunicom/mall/ebtp/login/dao/mapper/EshopMenuMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/login/dao/mapper/EshopMenuMapper.xml index 32e88d4..98e5fe2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/dao/mapper/EshopMenuMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/login/dao/mapper/EshopMenuMapper.xml @@ -1,7 +1,7 @@ - + sp.menu_id, @@ -24,7 +24,7 @@ - select sp.menu_id, sp.menu_url as path, diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseOrgn.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseOrgn.java similarity index 98% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseOrgn.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseOrgn.java index 035a2e1..41b62ab 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseOrgn.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseOrgn.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseOrgnR.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseOrgnR.java similarity index 93% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseOrgnR.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseOrgnR.java index 3b21ac7..1b71119 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseOrgnR.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseOrgnR.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/BaseRole.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseRole.java similarity index 94% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/BaseRole.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseRole.java index 0a6c79b..81caa51 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/BaseRole.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseRole.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.userinfo.entity; +package com.coscoshipping.ebtp.system.login.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseRoleOrgn.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseRoleOrgn.java similarity index 93% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseRoleOrgn.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseRoleOrgn.java index 7a0e5c7..7430b3d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseRoleOrgn.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseRoleOrgn.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseRoleOrgnVo.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseRoleOrgnVo.java similarity index 92% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseRoleOrgnVo.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseRoleOrgnVo.java index 6c7af10..f97b506 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseRoleOrgnVo.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseRoleOrgnVo.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; @@ -7,7 +7,6 @@ import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; -import java.util.List; /** * 实体类 BaseRole-角色表 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseSelf.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseSelf.java similarity index 69% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseSelf.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseSelf.java index 69ce3d5..f9259e4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseSelf.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseSelf.java @@ -1,8 +1,8 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; -import com.coscoshipping.ebtp.project.org.entity.SysOrg; -import com.coscoshipping.ebtp.project.user.entity.SysUser; +import com.coscoshipping.ebtp.system.org.entity.SysOrg; +import com.coscoshipping.ebtp.system.user.entity.SysUser; import lombok.Data; import java.util.List; @@ -13,7 +13,7 @@ import java.util.List; */ @Data public class BaseSelf { - + /** * token */ @@ -22,14 +22,14 @@ public class BaseSelf { * previoustoken */ private String previoustoken; - + /** * 登陆ip */ private String ip; - + /** - * + * */ private SysUser user; //user /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseTelIdcard.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseTelIdcard.java similarity index 96% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseTelIdcard.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseTelIdcard.java index 0f2853e..346b7ab 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseTelIdcard.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseTelIdcard.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseUser.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseUser.java similarity index 98% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseUser.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseUser.java index d37289a..a915edf 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseUser.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseUser.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseUserSelect.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseUserSelect.java similarity index 94% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseUserSelect.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseUserSelect.java index e90108b..ae9485d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseUserSelect.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseUserSelect.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseUserSelectVo.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseUserSelectVo.java similarity index 97% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseUserSelectVo.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseUserSelectVo.java index 82d9475..2769fa0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseUserSelectVo.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseUserSelectVo.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseUserToken.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseUserToken.java similarity index 96% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseUserToken.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseUserToken.java index 432835a..4cd3086 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseUserToken.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseUserToken.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BuffeedImageVo.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BuffeedImageVo.java similarity index 78% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/BuffeedImageVo.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/BuffeedImageVo.java index 34ef054..d7b76ff 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BuffeedImageVo.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BuffeedImageVo.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import lombok.Data; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/EshopMenuConverter.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/EshopMenuConverter.java similarity index 94% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/EshopMenuConverter.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/EshopMenuConverter.java index 0b82edf..36d6d9c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/EshopMenuConverter.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/EshopMenuConverter.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/EshopMenuConverterChildren.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/EshopMenuConverterChildren.java similarity index 87% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/EshopMenuConverterChildren.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/EshopMenuConverterChildren.java index 1cdc4f1..ed3405f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/EshopMenuConverterChildren.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/EshopMenuConverterChildren.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/EshopMenuPO.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/EshopMenuPO.java similarity index 97% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/EshopMenuPO.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/EshopMenuPO.java index 6d19806..e9e67f9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/EshopMenuPO.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/EshopMenuPO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/EshopMenuQuery.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/EshopMenuQuery.java similarity index 97% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/EshopMenuQuery.java rename to src/main/java/com/coscoshipping/ebtp/system/login/entity/EshopMenuQuery.java index 7f2cd26..0e9830f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/EshopMenuQuery.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/EshopMenuQuery.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.login.entity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/service/BaseUserService.java b/src/main/java/com/coscoshipping/ebtp/system/login/service/BaseUserService.java similarity index 57% rename from src/main/java/com/chinaunicom/mall/ebtp/login/service/BaseUserService.java rename to src/main/java/com/coscoshipping/ebtp/system/login/service/BaseUserService.java index a74af8b..c30c072 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/service/BaseUserService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/service/BaseUserService.java @@ -1,18 +1,12 @@ -package com.chinaunicom.mall.ebtp.login.service; +package com.coscoshipping.ebtp.system.login.service; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.SecurityEntity; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.chinaunicom.mall.ebtp.login.entity.BaseSelf; -import com.chinaunicom.mall.ebtp.login.entity.BaseUser; -import com.chinaunicom.mall.ebtp.login.entity.BaseUserSelect; -import com.chinaunicom.mall.ebtp.login.entity.BaseUserSelectVo; -import com.coscoshipping.ebtp.project.user.entity.SysUser; +import com.coscoshipping.ebtp.system.login.entity.BaseSelf; +import com.coscoshipping.ebtp.system.user.entity.SysUser; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.List; /** * 对数据表 base_user 操作的 service diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/service/BaseUserTokenService.java b/src/main/java/com/coscoshipping/ebtp/system/login/service/BaseUserTokenService.java similarity index 74% rename from src/main/java/com/chinaunicom/mall/ebtp/login/service/BaseUserTokenService.java rename to src/main/java/com/coscoshipping/ebtp/system/login/service/BaseUserTokenService.java index df1a0cb..8126108 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/service/BaseUserTokenService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/service/BaseUserTokenService.java @@ -1,8 +1,8 @@ -package com.chinaunicom.mall.ebtp.login.service; +package com.coscoshipping.ebtp.system.login.service; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.chinaunicom.mall.ebtp.login.entity.BaseUserToken; +import com.coscoshipping.ebtp.system.login.entity.BaseUserToken; /** * 对数据表 base_user_token 操作的 service diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/service/EshopMenuService.java b/src/main/java/com/coscoshipping/ebtp/system/login/service/EshopMenuService.java similarity index 70% rename from src/main/java/com/chinaunicom/mall/ebtp/login/service/EshopMenuService.java rename to src/main/java/com/coscoshipping/ebtp/system/login/service/EshopMenuService.java index 5a33d9e..51460be 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/service/EshopMenuService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/service/EshopMenuService.java @@ -1,8 +1,8 @@ -package com.chinaunicom.mall.ebtp.login.service; +package com.coscoshipping.ebtp.system.login.service; -import com.chinaunicom.mall.ebtp.login.entity.EshopMenuConverter; -import com.chinaunicom.mall.ebtp.login.entity.EshopMenuQuery; +import com.coscoshipping.ebtp.system.login.entity.EshopMenuConverter; +import com.coscoshipping.ebtp.system.login.entity.EshopMenuQuery; import java.util.List; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/BaseUserServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserServiceImpl.java similarity index 87% rename from src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/BaseUserServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserServiceImpl.java index c495c9a..1fefee4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/BaseUserServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.service.impl; +package com.coscoshipping.ebtp.system.login.service.impl; import com.alibaba.fastjson.JSON; @@ -11,18 +11,17 @@ 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.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; -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.entity.SysUser; +import com.coscoshipping.ebtp.system.login.common.Constants; +import com.coscoshipping.ebtp.system.login.common.RSA; +import com.coscoshipping.ebtp.system.login.dao.BaseUserMapper; +import com.coscoshipping.ebtp.system.login.entity.*; +import com.coscoshipping.ebtp.system.login.service.BaseUserService; +import com.coscoshipping.ebtp.system.login.service.BaseUserTokenService; +import com.coscoshipping.ebtp.system.org.entity.SysOrg; +import com.coscoshipping.ebtp.system.org.service.SysOrgService; +import com.coscoshipping.ebtp.system.user.entity.SysUser; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; @@ -41,11 +40,9 @@ import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.chinaunicom.mall.ebtp.cloud.security.starter.common.Constants.REDIS_USER_KEY; @@ -111,16 +108,43 @@ public class BaseUserServiceImpl extends BaseServiceImpl authorityList = baseUserMapper.selectRoleByUserId(user.getUserId()); + + // 2. 组装BaseCacheUser + BaseCacheUser baseCacheUser = new BaseCacheUser(); + baseCacheUser.setUserId(user.getUserId()); + baseCacheUser.setFullName(user.getName()); + baseCacheUser.setLoginName(user.getEmployeeNumber()); + baseCacheUser.setMobilePhone(user.getMobile()); + baseCacheUser.setOfficePhone(user.getOfficePhone()); + baseCacheUser.setSex(user.getSex() != null ? user.getSex().toString() : null); + baseCacheUser.setEmployeeNumber(user.getEmployeeNumber()); + baseCacheUser.setEmailAddress(user.getEmail()); + baseCacheUser.setOrganizationId(user.getOrgId()); + baseCacheUser.setOrganizationName(user.getOrgName()); + baseCacheUser.setUserType("0"); + baseCacheUser.setAuthorityList(authorityList); + // 角色ID字符串拼接 + if (authorityList != null && !authorityList.isEmpty()) { + StringBuilder roleIds = new StringBuilder(); + for (AuthorityEntity ae : authorityList) { + if (roleIds.length() > 0) roleIds.append(","); + roleIds.append(ae.getRoleId()); + } + baseCacheUser.setRoleIds(roleIds.toString()); + } + + // 3. 存入redis + String token = baseSelf.getToken(); + userinfoRedisTemplate.opsForValue().set( + REDIS_USER_KEY + token, + baseCacheUser, + Long.parseLong(valid_time_limit), + TimeUnit.HOURS + ); + return baseSelf; } catch (BadPaddingException e) { log.error("RSA解密异常", e); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/BaseUserTokenServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserTokenServiceImpl.java similarity index 80% rename from src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/BaseUserTokenServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserTokenServiceImpl.java index 9d51b32..924989c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/BaseUserTokenServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserTokenServiceImpl.java @@ -1,11 +1,11 @@ -package com.chinaunicom.mall.ebtp.login.service.impl; +package com.coscoshipping.ebtp.system.login.service.impl; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.chinaunicom.mall.ebtp.login.common.Constants; -import com.chinaunicom.mall.ebtp.login.dao.BaseUserTokenMapper; -import com.chinaunicom.mall.ebtp.login.entity.BaseUserToken; -import com.chinaunicom.mall.ebtp.login.service.BaseUserTokenService; +import com.coscoshipping.ebtp.system.login.common.Constants; +import com.coscoshipping.ebtp.system.login.dao.BaseUserTokenMapper; +import com.coscoshipping.ebtp.system.login.entity.BaseUserToken; +import com.coscoshipping.ebtp.system.login.service.BaseUserTokenService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/EshopMenuServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/EshopMenuServiceImpl.java similarity index 71% rename from src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/EshopMenuServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/login/service/impl/EshopMenuServiceImpl.java index 5675ee0..911a403 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/EshopMenuServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/EshopMenuServiceImpl.java @@ -1,9 +1,9 @@ -package com.chinaunicom.mall.ebtp.login.service.impl; +package com.coscoshipping.ebtp.system.login.service.impl; -import com.chinaunicom.mall.ebtp.login.dao.EshopMenuMapper; -import com.chinaunicom.mall.ebtp.login.entity.EshopMenuConverter; -import com.chinaunicom.mall.ebtp.login.entity.EshopMenuQuery; -import com.chinaunicom.mall.ebtp.login.service.EshopMenuService; +import com.coscoshipping.ebtp.system.login.dao.EshopMenuMapper; +import com.coscoshipping.ebtp.system.login.entity.EshopMenuConverter; +import com.coscoshipping.ebtp.system.login.entity.EshopMenuQuery; +import com.coscoshipping.ebtp.system.login.service.EshopMenuService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/utils/HttpsUtils.java b/src/main/java/com/coscoshipping/ebtp/system/login/utils/HttpsUtils.java similarity index 98% rename from src/main/java/com/chinaunicom/mall/ebtp/login/utils/HttpsUtils.java rename to src/main/java/com/coscoshipping/ebtp/system/login/utils/HttpsUtils.java index 694a39c..dfb7681 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/utils/HttpsUtils.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/utils/HttpsUtils.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.utils; +package com.coscoshipping.ebtp.system.login.utils; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/vo/LoginUserVo.java b/src/main/java/com/coscoshipping/ebtp/system/login/vo/LoginUserVo.java similarity index 84% rename from src/main/java/com/chinaunicom/mall/ebtp/login/vo/LoginUserVo.java rename to src/main/java/com/coscoshipping/ebtp/system/login/vo/LoginUserVo.java index 8a57a5f..7ef94e5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/vo/LoginUserVo.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/vo/LoginUserVo.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.vo; +package com.coscoshipping.ebtp.system.login.vo; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/src/main/java/com/coscoshipping/ebtp/project/menu/controller/SysMenuController.java b/src/main/java/com/coscoshipping/ebtp/system/menu/controller/SysMenuController.java similarity index 94% rename from src/main/java/com/coscoshipping/ebtp/project/menu/controller/SysMenuController.java rename to src/main/java/com/coscoshipping/ebtp/system/menu/controller/SysMenuController.java index 12df32d..04952c5 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/menu/controller/SysMenuController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/menu/controller/SysMenuController.java @@ -1,18 +1,17 @@ -package com.coscoshipping.ebtp.project.menu.controller; +package com.coscoshipping.ebtp.system.menu.controller; import com.chinaunicom.mall.ebtp.cloud.security.starter.common.Constants; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.coscoshipping.ebtp.project.menu.dto.BaseRoleTabulation; -import com.coscoshipping.ebtp.project.menu.entity.SysMenu; -import com.coscoshipping.ebtp.project.menu.service.ISysMenuService; +import com.coscoshipping.ebtp.system.menu.dto.BaseRoleTabulation; +import com.coscoshipping.ebtp.system.menu.entity.SysMenu; +import com.coscoshipping.ebtp.system.menu.service.ISysMenuService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/coscoshipping/ebtp/project/menu/dao/SysMenuMapper.java b/src/main/java/com/coscoshipping/ebtp/system/menu/dao/SysMenuMapper.java similarity index 94% rename from src/main/java/com/coscoshipping/ebtp/project/menu/dao/SysMenuMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/menu/dao/SysMenuMapper.java index 4e7a284..d4738b7 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/menu/dao/SysMenuMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/menu/dao/SysMenuMapper.java @@ -1,7 +1,7 @@ -package com.coscoshipping.ebtp.project.menu.dao; +package com.coscoshipping.ebtp.system.menu.dao; -import com.coscoshipping.ebtp.project.menu.entity.SysMenu; -import com.coscoshipping.ebtp.project.menu.vo.RoleTabulationVo; +import com.coscoshipping.ebtp.system.menu.entity.SysMenu; +import com.coscoshipping.ebtp.system.menu.vo.RoleTabulationVo; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/coscoshipping/ebtp/project/menu/dao/mapper/SysMenuMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/menu/dao/mapper/SysMenuMapper.xml similarity index 93% rename from src/main/java/com/coscoshipping/ebtp/project/menu/dao/mapper/SysMenuMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/menu/dao/mapper/SysMenuMapper.xml index f47ba68..2168b06 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/menu/dao/mapper/SysMenuMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/menu/dao/mapper/SysMenuMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -31,8 +31,8 @@ select id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time,create_by,del_flag from sys_menu - - @@ -47,14 +47,14 @@ order by parent_id, order_num - + - - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time from sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id @@ -72,7 +72,7 @@ order by m.parent_id, m.order_num - + - + - + - + - + - + - - where menu_name=#{menuName} and parent_id = #{parentId} limit 1 - SELECT r.role_id as id, r.`role_name` as name, @@ -155,7 +155,7 @@ - + update sys_menu menu_name = #{menuName}, @@ -178,7 +178,7 @@ where id = #{id} - + insert into sys_menu( id, parent_id, @@ -217,9 +217,9 @@ sysdate() ) - + delete from sys_menu where id = #{menuId} - \ No newline at end of file + diff --git a/src/main/java/com/coscoshipping/ebtp/project/menu/dto/BaseFuncTabulation.java b/src/main/java/com/coscoshipping/ebtp/system/menu/dto/BaseFuncTabulation.java similarity index 95% rename from src/main/java/com/coscoshipping/ebtp/project/menu/dto/BaseFuncTabulation.java rename to src/main/java/com/coscoshipping/ebtp/system/menu/dto/BaseFuncTabulation.java index 30a474d..8bc3502 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/menu/dto/BaseFuncTabulation.java +++ b/src/main/java/com/coscoshipping/ebtp/system/menu/dto/BaseFuncTabulation.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.menu.dto; +package com.coscoshipping.ebtp.system.menu.dto; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/coscoshipping/ebtp/project/menu/dto/BaseRoleTabulation.java b/src/main/java/com/coscoshipping/ebtp/system/menu/dto/BaseRoleTabulation.java similarity index 95% rename from src/main/java/com/coscoshipping/ebtp/project/menu/dto/BaseRoleTabulation.java rename to src/main/java/com/coscoshipping/ebtp/system/menu/dto/BaseRoleTabulation.java index 396a13f..a7c81d0 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/menu/dto/BaseRoleTabulation.java +++ b/src/main/java/com/coscoshipping/ebtp/system/menu/dto/BaseRoleTabulation.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.menu.dto; +package com.coscoshipping.ebtp.system.menu.dto; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/coscoshipping/ebtp/project/menu/entity/SysMenu.java b/src/main/java/com/coscoshipping/ebtp/system/menu/entity/SysMenu.java similarity index 99% rename from src/main/java/com/coscoshipping/ebtp/project/menu/entity/SysMenu.java rename to src/main/java/com/coscoshipping/ebtp/system/menu/entity/SysMenu.java index 0b6f5c6..ab87a31 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/menu/entity/SysMenu.java +++ b/src/main/java/com/coscoshipping/ebtp/system/menu/entity/SysMenu.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.menu.entity; +package com.coscoshipping.ebtp.system.menu.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/coscoshipping/ebtp/project/menu/entity/TreeEntity.java b/src/main/java/com/coscoshipping/ebtp/system/menu/entity/TreeEntity.java similarity index 96% rename from src/main/java/com/coscoshipping/ebtp/project/menu/entity/TreeEntity.java rename to src/main/java/com/coscoshipping/ebtp/system/menu/entity/TreeEntity.java index b261140..561e8ac 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/menu/entity/TreeEntity.java +++ b/src/main/java/com/coscoshipping/ebtp/system/menu/entity/TreeEntity.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.menu.entity; +package com.coscoshipping.ebtp.system.menu.entity; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/coscoshipping/ebtp/project/menu/entity/TreeSelect.java b/src/main/java/com/coscoshipping/ebtp/system/menu/entity/TreeSelect.java similarity index 96% rename from src/main/java/com/coscoshipping/ebtp/project/menu/entity/TreeSelect.java rename to src/main/java/com/coscoshipping/ebtp/system/menu/entity/TreeSelect.java index 36e7bc1..d2faaa1 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/menu/entity/TreeSelect.java +++ b/src/main/java/com/coscoshipping/ebtp/system/menu/entity/TreeSelect.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.menu.entity; +package com.coscoshipping.ebtp.system.menu.entity; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/src/main/java/com/coscoshipping/ebtp/project/menu/service/ISysMenuService.java b/src/main/java/com/coscoshipping/ebtp/system/menu/service/ISysMenuService.java similarity index 92% rename from src/main/java/com/coscoshipping/ebtp/project/menu/service/ISysMenuService.java rename to src/main/java/com/coscoshipping/ebtp/system/menu/service/ISysMenuService.java index 0ee433c..2da2bde 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/menu/service/ISysMenuService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/menu/service/ISysMenuService.java @@ -1,9 +1,9 @@ -package com.coscoshipping.ebtp.project.menu.service; +package com.coscoshipping.ebtp.system.menu.service; -import com.coscoshipping.ebtp.project.menu.dto.BaseRoleTabulation; -import com.coscoshipping.ebtp.project.menu.entity.SysMenu; -import com.coscoshipping.ebtp.project.menu.entity.TreeSelect; +import com.coscoshipping.ebtp.system.menu.dto.BaseRoleTabulation; +import com.coscoshipping.ebtp.system.menu.entity.SysMenu; +import com.coscoshipping.ebtp.system.menu.entity.TreeSelect; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/coscoshipping/ebtp/project/menu/service/impl/SysMenuServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/menu/service/impl/SysMenuServiceImpl.java similarity index 95% rename from src/main/java/com/coscoshipping/ebtp/project/menu/service/impl/SysMenuServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/menu/service/impl/SysMenuServiceImpl.java index 58a631b..c56fa9c 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/menu/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/menu/service/impl/SysMenuServiceImpl.java @@ -1,18 +1,16 @@ -package com.coscoshipping.ebtp.project.menu.service.impl; +package com.coscoshipping.ebtp.system.menu.service.impl; import cn.hutool.core.bean.BeanUtil; -import com.coscoshipping.ebtp.project.menu.dao.SysMenuMapper; -import com.coscoshipping.ebtp.project.menu.dto.BaseFuncTabulation; -import com.coscoshipping.ebtp.project.menu.dto.BaseRoleTabulation; -import com.coscoshipping.ebtp.project.menu.entity.SysMenu; -import com.coscoshipping.ebtp.project.menu.entity.TreeSelect; -import com.coscoshipping.ebtp.project.menu.service.ISysMenuService; -import com.coscoshipping.ebtp.project.menu.vo.RoleTabulationVo; -import com.coscoshipping.ebtp.project.role.dao.SysRoleMapper; -import com.coscoshipping.ebtp.project.role.dao.SysRoleMenuMapper; -import com.coscoshipping.ebtp.project.role.entity.SysRole; -import com.coscoshipping.ebtp.project.role.entity.SysRoleMenu; -import com.coscoshipping.ebtp.project.role.service.SysRoleService; +import com.coscoshipping.ebtp.system.menu.dao.SysMenuMapper; +import com.coscoshipping.ebtp.system.menu.dto.BaseFuncTabulation; +import com.coscoshipping.ebtp.system.menu.dto.BaseRoleTabulation; +import com.coscoshipping.ebtp.system.menu.entity.SysMenu; +import com.coscoshipping.ebtp.system.menu.entity.TreeSelect; +import com.coscoshipping.ebtp.system.menu.service.ISysMenuService; +import com.coscoshipping.ebtp.system.menu.vo.RoleTabulationVo; +import com.coscoshipping.ebtp.system.role.dao.SysRoleMapper; +import com.coscoshipping.ebtp.system.role.dao.SysRoleMenuMapper; +import com.coscoshipping.ebtp.system.role.service.SysRoleService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/coscoshipping/ebtp/project/menu/vo/RoleTabulationVo.java b/src/main/java/com/coscoshipping/ebtp/system/menu/vo/RoleTabulationVo.java similarity index 95% rename from src/main/java/com/coscoshipping/ebtp/project/menu/vo/RoleTabulationVo.java rename to src/main/java/com/coscoshipping/ebtp/system/menu/vo/RoleTabulationVo.java index 428f71f..b585c51 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/menu/vo/RoleTabulationVo.java +++ b/src/main/java/com/coscoshipping/ebtp/system/menu/vo/RoleTabulationVo.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.menu.vo; +package com.coscoshipping.ebtp.system.menu.vo; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/coscoshipping/ebtp/project/org/controller/SysOrgController.java b/src/main/java/com/coscoshipping/ebtp/system/org/controller/SysOrgController.java similarity index 92% rename from src/main/java/com/coscoshipping/ebtp/project/org/controller/SysOrgController.java rename to src/main/java/com/coscoshipping/ebtp/system/org/controller/SysOrgController.java index 312f443..332b267 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/org/controller/SysOrgController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/org/controller/SysOrgController.java @@ -1,9 +1,9 @@ -package com.coscoshipping.ebtp.project.org.controller; +package com.coscoshipping.ebtp.system.org.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.coscoshipping.ebtp.project.org.entity.vo.SysOrgVO; +import com.coscoshipping.ebtp.system.org.entity.vo.SysOrgVO; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -15,8 +15,8 @@ import io.swagger.annotations.ApiParam; import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import com.coscoshipping.ebtp.project.org.entity.SysOrg; -import com.coscoshipping.ebtp.project.org.service.SysOrgService; +import com.coscoshipping.ebtp.system.org.entity.SysOrg; +import com.coscoshipping.ebtp.system.org.service.SysOrgService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -27,12 +27,12 @@ public class SysOrgController{ @Resource private SysOrgService iSysOrgService; - + /** * 插入新数据 - * + * * @param sysOrg - * + * * @return */ @ApiOperation("插入新数据") @@ -40,15 +40,15 @@ public class SysOrgController{ public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid SysOrgVO sysOrg){ Boolean i = iSysOrgService.insertByVo(sysOrg); - + return BaseResponse.success(i); } - + /** * 修改数据 - * + * * @param sysOrg - * + * * @return */ @ApiOperation("修改数据") @@ -56,23 +56,23 @@ public class SysOrgController{ public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody SysOrgVO sysOrg){ Boolean i = iSysOrgService.updateByVo(sysOrg); - + return BaseResponse.success(i); } - + /** * 查询数据 - * + * * @param id - * + * * @return */ @ApiOperation("根据id查询数据") @GetMapping("/{id}") public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ - + SysOrg sysOrg = iSysOrgService.getById(id); - + return BaseResponse.success(sysOrg); } @@ -128,7 +128,7 @@ public class SysOrgController{ /** * 查询组织信息（当前组织及下级组织列表） - * + * * @param sysOrg 查询条件 * @return 返回当前组织信息以及下级组织列表 */ diff --git a/src/main/java/com/coscoshipping/ebtp/project/org/dao/SysOrgMapper.java b/src/main/java/com/coscoshipping/ebtp/system/org/dao/SysOrgMapper.java similarity index 80% rename from src/main/java/com/coscoshipping/ebtp/project/org/dao/SysOrgMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/org/dao/SysOrgMapper.java index 72ab86d..e018770 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/org/dao/SysOrgMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/org/dao/SysOrgMapper.java @@ -1,14 +1,14 @@ -package com.coscoshipping.ebtp.project.org.dao; +package com.coscoshipping.ebtp.system.org.dao; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; import java.util.List; import org.springframework.stereotype.Repository; -import com.coscoshipping.ebtp.project.org.entity.SysOrg; +import com.coscoshipping.ebtp.system.org.entity.SysOrg; @Repository public interface SysOrgMapper extends IBaseMapper { - + /** * 查询指定组织的所有下级组织（包括多级下级） * diff --git a/src/main/java/com/coscoshipping/ebtp/project/org/dao/mapper/SysOrgMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/org/dao/mapper/SysOrgMapper.xml similarity index 96% rename from src/main/java/com/coscoshipping/ebtp/project/org/dao/mapper/SysOrgMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/org/dao/mapper/SysOrgMapper.xml index f96e7f5..7e076c5 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/org/dao/mapper/SysOrgMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/org/dao/mapper/SysOrgMapper.xml @@ -1,8 +1,8 @@ - - + + diff --git a/src/main/java/com/coscoshipping/ebtp/project/org/entity/SysOrg.java b/src/main/java/com/coscoshipping/ebtp/system/org/entity/SysOrg.java similarity index 97% rename from src/main/java/com/coscoshipping/ebtp/project/org/entity/SysOrg.java rename to src/main/java/com/coscoshipping/ebtp/system/org/entity/SysOrg.java index 83c6a02..8bfcccf 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/org/entity/SysOrg.java +++ b/src/main/java/com/coscoshipping/ebtp/system/org/entity/SysOrg.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.org.entity; +package com.coscoshipping.ebtp.system.org.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/coscoshipping/ebtp/project/org/entity/vo/SysOrgVO.java b/src/main/java/com/coscoshipping/ebtp/system/org/entity/vo/SysOrgVO.java similarity index 89% rename from src/main/java/com/coscoshipping/ebtp/project/org/entity/vo/SysOrgVO.java rename to src/main/java/com/coscoshipping/ebtp/system/org/entity/vo/SysOrgVO.java index 5583925..db6d3c8 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/org/entity/vo/SysOrgVO.java +++ b/src/main/java/com/coscoshipping/ebtp/system/org/entity/vo/SysOrgVO.java @@ -1,8 +1,8 @@ -package com.coscoshipping.ebtp.project.org.entity.vo; +package com.coscoshipping.ebtp.system.org.entity.vo; import com.baomidou.mybatisplus.annotation.TableName; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; -import com.coscoshipping.ebtp.project.org.entity.SysOrg; +import com.coscoshipping.ebtp.system.org.entity.SysOrg; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/coscoshipping/ebtp/project/org/service/SysOrgService.java b/src/main/java/com/coscoshipping/ebtp/system/org/service/SysOrgService.java similarity index 79% rename from src/main/java/com/coscoshipping/ebtp/project/org/service/SysOrgService.java rename to src/main/java/com/coscoshipping/ebtp/system/org/service/SysOrgService.java index 033dc70..0f741b3 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/org/service/SysOrgService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/org/service/SysOrgService.java @@ -1,11 +1,10 @@ -package com.coscoshipping.ebtp.project.org.service; +package com.coscoshipping.ebtp.system.org.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.coscoshipping.ebtp.project.org.entity.SysOrg; -import com.coscoshipping.ebtp.project.org.entity.vo.SysOrgVO; -import com.coscoshipping.ebtp.project.role.entity.vo.SysRoleVO; +import com.coscoshipping.ebtp.system.org.entity.SysOrg; +import com.coscoshipping.ebtp.system.org.entity.vo.SysOrgVO; import java.util.List; diff --git a/src/main/java/com/coscoshipping/ebtp/project/org/service/impl/SysOrgServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/org/service/impl/SysOrgServiceImpl.java similarity index 97% rename from src/main/java/com/coscoshipping/ebtp/project/org/service/impl/SysOrgServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/org/service/impl/SysOrgServiceImpl.java index ba00d45..91848ea 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/org/service/impl/SysOrgServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/org/service/impl/SysOrgServiceImpl.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.org.service.impl; +package com.coscoshipping.ebtp.system.org.service.impl; import java.time.LocalDateTime; @@ -21,11 +21,11 @@ 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.exception.common.CommonExceptionEnum; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; -import com.coscoshipping.ebtp.project.org.dao.SysOrgMapper; -import com.coscoshipping.ebtp.project.org.entity.SysOrg; -import com.coscoshipping.ebtp.project.org.entity.vo.SysOrgVO; -import com.coscoshipping.ebtp.project.org.service.SysOrgService; -import com.coscoshipping.ebtp.project.org.util.CommonUtil; +import com.coscoshipping.ebtp.system.org.dao.SysOrgMapper; +import com.coscoshipping.ebtp.system.org.entity.SysOrg; +import com.coscoshipping.ebtp.system.org.entity.vo.SysOrgVO; +import com.coscoshipping.ebtp.system.org.service.SysOrgService; +import com.coscoshipping.ebtp.system.org.util.CommonUtil; import cn.hutool.core.bean.BeanUtil; diff --git a/src/main/java/com/coscoshipping/ebtp/project/org/util/CommonUtil.java b/src/main/java/com/coscoshipping/ebtp/system/org/util/CommonUtil.java similarity index 99% rename from src/main/java/com/coscoshipping/ebtp/project/org/util/CommonUtil.java rename to src/main/java/com/coscoshipping/ebtp/system/org/util/CommonUtil.java index 9615a98..51272e1 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/org/util/CommonUtil.java +++ b/src/main/java/com/coscoshipping/ebtp/system/org/util/CommonUtil.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.org.util; +package com.coscoshipping.ebtp.system.org.util; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/controller/SysRoleController.java b/src/main/java/com/coscoshipping/ebtp/system/role/controller/SysRoleController.java similarity index 88% rename from src/main/java/com/coscoshipping/ebtp/project/role/controller/SysRoleController.java rename to src/main/java/com/coscoshipping/ebtp/system/role/controller/SysRoleController.java index cdb0344..8887346 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/controller/SysRoleController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/role/controller/SysRoleController.java @@ -1,11 +1,11 @@ -package com.coscoshipping.ebtp.project.role.controller; +package com.coscoshipping.ebtp.system.role.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.coscoshipping.ebtp.project.role.entity.vo.AllRolesAndAssignRoleVO; -import com.coscoshipping.ebtp.project.role.entity.vo.SysRoleVO; -import com.coscoshipping.ebtp.project.userrole.service.SysUserRoleService; +import com.coscoshipping.ebtp.system.role.entity.vo.AllRolesAndAssignRoleVO; +import com.coscoshipping.ebtp.system.role.entity.vo.SysRoleVO; +import com.coscoshipping.ebtp.system.userrole.service.SysUserRoleService; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -17,8 +17,8 @@ import io.swagger.annotations.ApiParam; import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import com.coscoshipping.ebtp.project.role.entity.SysRole; -import com.coscoshipping.ebtp.project.role.service.SysRoleService; +import com.coscoshipping.ebtp.system.role.entity.SysRole; +import com.coscoshipping.ebtp.system.role.service.SysRoleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -31,27 +31,27 @@ public class SysRoleController{ private SysRoleService iSysRoleService; @Resource private SysUserRoleService userRoleService; - + /** * 插入新数据 - * + * * @param sysRole - * + * * @return */ @ApiOperation("插入新数据") @PostMapping("/insert") public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid SysRoleVO sysRole){ Boolean i = iSysRoleService.insertByVo(sysRole); - + return BaseResponse.success(i); } - + /** * 修改数据 - * + * * @param sysRole - * + * * @return */ @ApiOperation("修改数据") @@ -59,15 +59,15 @@ public class SysRoleController{ public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody SysRoleVO sysRole){ Boolean i = iSysRoleService.updateByVo(sysRole); - + return BaseResponse.success(i); } - + /** * 查询数据 - * + * * @param id - * + * * @return */ @ApiOperation("根据id查询数据") @@ -75,7 +75,7 @@ public class SysRoleController{ public BaseResponse getInfo(@ApiParam(value = "主键id", required = true) @PathVariable String id){ SysRoleVO sysRole = iSysRoleService.getInfoById(id); - + return BaseResponse.success(sysRole); } diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/dao/SysRoleMapper.java b/src/main/java/com/coscoshipping/ebtp/system/role/dao/SysRoleMapper.java similarity index 59% rename from src/main/java/com/coscoshipping/ebtp/project/role/dao/SysRoleMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/role/dao/SysRoleMapper.java index 2d4579e..641adcb 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/dao/SysRoleMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/role/dao/SysRoleMapper.java @@ -1,10 +1,9 @@ -package com.coscoshipping.ebtp.project.role.dao; +package com.coscoshipping.ebtp.system.role.dao; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; -import java.util.List; import org.springframework.stereotype.Repository; -import com.coscoshipping.ebtp.project.role.entity.SysRole; +import com.coscoshipping.ebtp.system.role.entity.SysRole; @Repository public interface SysRoleMapper extends IBaseMapper { diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/dao/SysRoleMenuMapper.java b/src/main/java/com/coscoshipping/ebtp/system/role/dao/SysRoleMenuMapper.java similarity index 59% rename from src/main/java/com/coscoshipping/ebtp/project/role/dao/SysRoleMenuMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/role/dao/SysRoleMenuMapper.java index 9ed5c40..b275e74 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/dao/SysRoleMenuMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/role/dao/SysRoleMenuMapper.java @@ -1,10 +1,9 @@ -package com.coscoshipping.ebtp.project.role.dao; +package com.coscoshipping.ebtp.system.role.dao; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; -import java.util.List; import org.springframework.stereotype.Repository; -import com.coscoshipping.ebtp.project.role.entity.SysRoleMenu; +import com.coscoshipping.ebtp.system.role.entity.SysRoleMenu; @Repository public interface SysRoleMenuMapper extends IBaseMapper { diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/dao/mapper/SysRoleMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/role/dao/mapper/SysRoleMapper.xml similarity index 92% rename from src/main/java/com/coscoshipping/ebtp/project/role/dao/mapper/SysRoleMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/role/dao/mapper/SysRoleMapper.xml index 8b2dc6f..d99f93a 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/dao/mapper/SysRoleMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/role/dao/mapper/SysRoleMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -37,4 +37,4 @@ delete_flag="1" where ID=#{id } - \ No newline at end of file + diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/dao/mapper/SysRoleMenuMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/role/dao/mapper/SysRoleMenuMapper.xml similarity index 62% rename from src/main/java/com/coscoshipping/ebtp/project/role/dao/mapper/SysRoleMenuMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/role/dao/mapper/SysRoleMenuMapper.xml index 7cdd157..dba5262 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/dao/mapper/SysRoleMenuMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/role/dao/mapper/SysRoleMenuMapper.xml @@ -1,9 +1,9 @@ - - + + - \ No newline at end of file + diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/entity/SysRole.java b/src/main/java/com/coscoshipping/ebtp/system/role/entity/SysRole.java similarity index 89% rename from src/main/java/com/coscoshipping/ebtp/project/role/entity/SysRole.java rename to src/main/java/com/coscoshipping/ebtp/system/role/entity/SysRole.java index b69dcb2..20b348f 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/entity/SysRole.java +++ b/src/main/java/com/coscoshipping/ebtp/system/role/entity/SysRole.java @@ -1,17 +1,13 @@ -package com.coscoshipping.ebtp.project.role.entity; +package com.coscoshipping.ebtp.system.role.entity; import com.baomidou.mybatisplus.annotation.*; import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; -import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.time.LocalDateTime; /** * 实体类 SysRole-角色表 diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/entity/SysRoleMenu.java b/src/main/java/com/coscoshipping/ebtp/system/role/entity/SysRoleMenu.java similarity index 93% rename from src/main/java/com/coscoshipping/ebtp/project/role/entity/SysRoleMenu.java rename to src/main/java/com/coscoshipping/ebtp/system/role/entity/SysRoleMenu.java index bd39ac0..fc57815 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/entity/SysRoleMenu.java +++ b/src/main/java/com/coscoshipping/ebtp/system/role/entity/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.role.entity; +package com.coscoshipping.ebtp.system.role.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/entity/vo/AllRolesAndAssignRoleVO.java b/src/main/java/com/coscoshipping/ebtp/system/role/entity/vo/AllRolesAndAssignRoleVO.java similarity index 83% rename from src/main/java/com/coscoshipping/ebtp/project/role/entity/vo/AllRolesAndAssignRoleVO.java rename to src/main/java/com/coscoshipping/ebtp/system/role/entity/vo/AllRolesAndAssignRoleVO.java index 8d5986d..0c9fbf6 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/entity/vo/AllRolesAndAssignRoleVO.java +++ b/src/main/java/com/coscoshipping/ebtp/system/role/entity/vo/AllRolesAndAssignRoleVO.java @@ -1,6 +1,6 @@ -package com.coscoshipping.ebtp.project.role.entity.vo; +package com.coscoshipping.ebtp.system.role.entity.vo; -import com.coscoshipping.ebtp.project.role.entity.SysRole; +import com.coscoshipping.ebtp.system.role.entity.SysRole; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/entity/vo/SysRoleVO.java b/src/main/java/com/coscoshipping/ebtp/system/role/entity/vo/SysRoleVO.java similarity index 73% rename from src/main/java/com/coscoshipping/ebtp/project/role/entity/vo/SysRoleVO.java rename to src/main/java/com/coscoshipping/ebtp/system/role/entity/vo/SysRoleVO.java index dccc8a0..69001dd 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/entity/vo/SysRoleVO.java +++ b/src/main/java/com/coscoshipping/ebtp/system/role/entity/vo/SysRoleVO.java @@ -1,17 +1,14 @@ -package com.coscoshipping.ebtp.project.role.entity.vo; +package com.coscoshipping.ebtp.system.role.entity.vo; import com.baomidou.mybatisplus.annotation.TableName; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; -import com.coscoshipping.ebtp.project.role.entity.SysRole; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.coscoshipping.ebtp.system.role.entity.SysRole; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; -import java.math.BigDecimal; import java.util.List; /** diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/service/SysRoleMenuService.java b/src/main/java/com/coscoshipping/ebtp/system/role/service/SysRoleMenuService.java similarity index 65% rename from src/main/java/com/coscoshipping/ebtp/project/role/service/SysRoleMenuService.java rename to src/main/java/com/coscoshipping/ebtp/system/role/service/SysRoleMenuService.java index 01d0413..3d307ff 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/service/SysRoleMenuService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/role/service/SysRoleMenuService.java @@ -1,8 +1,8 @@ -package com.coscoshipping.ebtp.project.role.service; +package com.coscoshipping.ebtp.system.role.service; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.coscoshipping.ebtp.project.role.entity.SysRoleMenu; +import com.coscoshipping.ebtp.system.role.entity.SysRoleMenu; /** * 对数据表 sys_role_menu 操作的 service diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/service/SysRoleService.java b/src/main/java/com/coscoshipping/ebtp/system/role/service/SysRoleService.java similarity index 81% rename from src/main/java/com/coscoshipping/ebtp/project/role/service/SysRoleService.java rename to src/main/java/com/coscoshipping/ebtp/system/role/service/SysRoleService.java index 5575f10..1c74df8 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/service/SysRoleService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/role/service/SysRoleService.java @@ -1,10 +1,10 @@ -package com.coscoshipping.ebtp.project.role.service; +package com.coscoshipping.ebtp.system.role.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.coscoshipping.ebtp.project.role.entity.SysRole; -import com.coscoshipping.ebtp.project.role.entity.vo.SysRoleVO; +import com.coscoshipping.ebtp.system.role.entity.SysRole; +import com.coscoshipping.ebtp.system.role.entity.vo.SysRoleVO; /** * 对数据表 sys_role 操作的 service diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/service/impl/SysRoleMenuServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/role/service/impl/SysRoleMenuServiceImpl.java similarity index 56% rename from src/main/java/com/coscoshipping/ebtp/project/role/service/impl/SysRoleMenuServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/role/service/impl/SysRoleMenuServiceImpl.java index 58eca4d..77ee732 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/service/impl/SysRoleMenuServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/role/service/impl/SysRoleMenuServiceImpl.java @@ -1,11 +1,11 @@ -package com.coscoshipping.ebtp.project.role.service.impl; +package com.coscoshipping.ebtp.system.role.service.impl; import org.springframework.stereotype.Service; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.coscoshipping.ebtp.project.role.dao.SysRoleMenuMapper; -import com.coscoshipping.ebtp.project.role.entity.SysRoleMenu; -import com.coscoshipping.ebtp.project.role.service.SysRoleMenuService; +import com.coscoshipping.ebtp.system.role.dao.SysRoleMenuMapper; +import com.coscoshipping.ebtp.system.role.entity.SysRoleMenu; +import com.coscoshipping.ebtp.system.role.service.SysRoleMenuService; /** * 对数据表 sys_role_menu 操作的 serviceImpl * @author yss diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/service/impl/SysRoleServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/role/service/impl/SysRoleServiceImpl.java similarity index 94% rename from src/main/java/com/coscoshipping/ebtp/project/role/service/impl/SysRoleServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/role/service/impl/SysRoleServiceImpl.java index 8cf3282..0f9a191 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/role/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.role.service.impl; +package com.coscoshipping.ebtp.system.role.service.impl; import cn.hutool.core.bean.BeanUtil; @@ -9,16 +9,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; import com.chinaunicom.mall.ebtp.common.exception.entity.BusinessException; -import com.coscoshipping.ebtp.project.role.entity.SysRoleMenu; -import com.coscoshipping.ebtp.project.role.entity.vo.SysRoleVO; -import com.coscoshipping.ebtp.project.role.service.SysRoleMenuService; +import com.coscoshipping.ebtp.system.role.entity.SysRoleMenu; +import com.coscoshipping.ebtp.system.role.entity.vo.SysRoleVO; +import com.coscoshipping.ebtp.system.role.service.SysRoleMenuService; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; -import com.coscoshipping.ebtp.project.role.dao.SysRoleMapper; -import com.coscoshipping.ebtp.project.role.entity.SysRole; -import com.coscoshipping.ebtp.project.role.service.SysRoleService; +import com.coscoshipping.ebtp.system.role.dao.SysRoleMapper; +import com.coscoshipping.ebtp.system.role.entity.SysRole; +import com.coscoshipping.ebtp.system.role.service.SysRoleService; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/common/RSA.java b/src/main/java/com/coscoshipping/ebtp/system/test/RSA.java similarity index 99% rename from src/main/java/com/chinaunicom/mall/ebtp/login/common/RSA.java rename to src/main/java/com/coscoshipping/ebtp/system/test/RSA.java index 75becf7..e58e6a4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/common/RSA.java +++ b/src/main/java/com/coscoshipping/ebtp/system/test/RSA.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.common; +package com.coscoshipping.ebtp.system.test; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/test/RsaUtil.java b/src/main/java/com/coscoshipping/ebtp/system/test/RsaUtil.java similarity index 99% rename from src/main/java/com/chinaunicom/mall/ebtp/test/RsaUtil.java rename to src/main/java/com/coscoshipping/ebtp/system/test/RsaUtil.java index 79995dd..d18cc3f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/test/RsaUtil.java +++ b/src/main/java/com/coscoshipping/ebtp/system/test/RsaUtil.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.test; +package com.coscoshipping.ebtp.system.test; import org.apache.commons.codec.binary.Base64; diff --git a/src/main/java/com/coscoshipping/ebtp/project/user/controller/SysUserController.java b/src/main/java/com/coscoshipping/ebtp/system/user/controller/SysUserController.java similarity index 90% rename from src/main/java/com/coscoshipping/ebtp/project/user/controller/SysUserController.java rename to src/main/java/com/coscoshipping/ebtp/system/user/controller/SysUserController.java index 4ac7d2e..0f569ca 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/user/controller/SysUserController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/controller/SysUserController.java @@ -1,9 +1,9 @@ -package com.coscoshipping.ebtp.project.user.controller; +package com.coscoshipping.ebtp.system.user.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.coscoshipping.ebtp.project.user.entity.vo.SysUserVO; +import com.coscoshipping.ebtp.system.user.entity.vo.SysUserVO; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -15,8 +15,8 @@ import io.swagger.annotations.ApiParam; import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import com.coscoshipping.ebtp.project.user.entity.SysUser; -import com.coscoshipping.ebtp.project.user.service.SysUserService; +import com.coscoshipping.ebtp.system.user.entity.SysUser; +import com.coscoshipping.ebtp.system.user.service.SysUserService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -27,12 +27,12 @@ public class SysUserController{ @Resource private SysUserService iSysUserService; - + /** * 插入新数据 - * + * * @param sysUser - * + * * @return */ @ApiOperation("插入新数据") @@ -40,15 +40,15 @@ public class SysUserController{ public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid SysUserVO sysUser){ Boolean i = iSysUserService.insertByVo(sysUser); - + return BaseResponse.success(i); } - + /** * 修改数据 - * + * * @param sysUser - * + * * @return */ @ApiOperation("修改数据") @@ -56,23 +56,23 @@ public class SysUserController{ public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody SysUser sysUser){ Boolean i = iSysUserService.updateById(sysUser); - + return BaseResponse.success(i); } - + /** * 查询数据 - * + * * @param id - * + * * @return */ @ApiOperation("根据id查询数据") @GetMapping("/{id}") public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ - + SysUser sysUser = iSysUserService.getById(id); - + return BaseResponse.success(sysUser); } diff --git a/src/main/java/com/coscoshipping/ebtp/project/user/dao/SysUserMapper.java b/src/main/java/com/coscoshipping/ebtp/system/user/dao/SysUserMapper.java similarity index 59% rename from src/main/java/com/coscoshipping/ebtp/project/user/dao/SysUserMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/user/dao/SysUserMapper.java index 4097d4d..a2547d8 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/user/dao/SysUserMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/dao/SysUserMapper.java @@ -1,10 +1,9 @@ -package com.coscoshipping.ebtp.project.user.dao; +package com.coscoshipping.ebtp.system.user.dao; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; -import java.util.List; import org.springframework.stereotype.Repository; -import com.coscoshipping.ebtp.project.user.entity.SysUser; +import com.coscoshipping.ebtp.system.user.entity.SysUser; @Repository public interface SysUserMapper extends IBaseMapper { diff --git a/src/main/java/com/coscoshipping/ebtp/project/user/dao/mapper/SysUserMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/user/dao/mapper/SysUserMapper.xml similarity index 91% rename from src/main/java/com/coscoshipping/ebtp/project/user/dao/mapper/SysUserMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/user/dao/mapper/SysUserMapper.xml index 3e8688e..22fecd6 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/user/dao/mapper/SysUserMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/user/dao/mapper/SysUserMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -34,4 +34,4 @@ delete_flag="1" where ID=#{id } - \ No newline at end of file + diff --git a/src/main/java/com/coscoshipping/ebtp/project/user/entity/SysUser.java b/src/main/java/com/coscoshipping/ebtp/system/user/entity/SysUser.java similarity index 97% rename from src/main/java/com/coscoshipping/ebtp/project/user/entity/SysUser.java rename to src/main/java/com/coscoshipping/ebtp/system/user/entity/SysUser.java index c81557b..adb8f1e 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/user/entity/SysUser.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.user.entity; +package com.coscoshipping.ebtp.system.user.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/coscoshipping/ebtp/project/user/entity/vo/SysUserVO.java b/src/main/java/com/coscoshipping/ebtp/system/user/entity/vo/SysUserVO.java similarity index 76% rename from src/main/java/com/coscoshipping/ebtp/project/user/entity/vo/SysUserVO.java rename to src/main/java/com/coscoshipping/ebtp/system/user/entity/vo/SysUserVO.java index 1c9615b..25a039b 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/user/entity/vo/SysUserVO.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/entity/vo/SysUserVO.java @@ -1,10 +1,8 @@ -package com.coscoshipping.ebtp.project.user.entity.vo; +package com.coscoshipping.ebtp.system.user.entity.vo; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; -import com.coscoshipping.ebtp.project.user.entity.SysUser; +import com.coscoshipping.ebtp.system.user.entity.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/coscoshipping/ebtp/project/user/service/SysUserService.java b/src/main/java/com/coscoshipping/ebtp/system/user/service/SysUserService.java similarity index 78% rename from src/main/java/com/coscoshipping/ebtp/project/user/service/SysUserService.java rename to src/main/java/com/coscoshipping/ebtp/system/user/service/SysUserService.java index b3dc991..d1fc57f 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/user/service/SysUserService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/service/SysUserService.java @@ -1,10 +1,10 @@ -package com.coscoshipping.ebtp.project.user.service; +package com.coscoshipping.ebtp.system.user.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.coscoshipping.ebtp.project.user.entity.SysUser; -import com.coscoshipping.ebtp.project.user.entity.vo.SysUserVO; +import com.coscoshipping.ebtp.system.user.entity.SysUser; +import com.coscoshipping.ebtp.system.user.entity.vo.SysUserVO; /** * 对数据表 sys_user 操作的 service diff --git a/src/main/java/com/coscoshipping/ebtp/project/user/service/impl/SysUserServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/user/service/impl/SysUserServiceImpl.java similarity index 92% rename from src/main/java/com/coscoshipping/ebtp/project/user/service/impl/SysUserServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/user/service/impl/SysUserServiceImpl.java index 263b550..0a71afa 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/user/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/service/impl/SysUserServiceImpl.java @@ -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; @@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; -import com.coscoshipping.ebtp.project.user.entity.vo.SysUserVO; +import com.coscoshipping.ebtp.system.user.entity.vo.SysUserVO; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; 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.SysUserMapper; -import com.coscoshipping.ebtp.project.user.entity.SysUser; -import com.coscoshipping.ebtp.project.user.service.SysUserService; +import com.coscoshipping.ebtp.system.user.dao.SysUserMapper; +import com.coscoshipping.ebtp.system.user.entity.SysUser; +import com.coscoshipping.ebtp.system.user.service.SysUserService; import java.time.LocalDateTime; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/AuthTokenController.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/AuthTokenController.java similarity index 81% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/AuthTokenController.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/AuthTokenController.java index c5856cc..e2d02d1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/AuthTokenController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/AuthTokenController.java @@ -1,25 +1,14 @@ -package com.chinaunicom.mall.ebtp.userinfo.controller; +package com.coscoshipping.ebtp.system.userinfo.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; -import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; -import com.chinaunicom.mall.ebtp.faceCompare.feign.SupplierbaseFeignClient; -import com.chinaunicom.mall.ebtp.userinfo.entity.AuthLogoutResponse; -import com.chinaunicom.mall.ebtp.userinfo.entity.BaseCert; -import com.chinaunicom.mall.ebtp.userinfo.entity.SupplierUserVo; -import com.chinaunicom.mall.ebtp.userinfo.service.AuthTokenService; -import com.chinaunicom.mall.ebtp.userinfo.service.EbtpUserInfoService; -import com.chinaunicom.mall.ebtp.userinfo.utils.BaseCertService; -import com.chinaunicom.mall.ebtp.userinfo.utils.HttpsUtils; +import com.coscoshipping.ebtp.system.userinfo.service.AuthTokenService; +import com.coscoshipping.ebtp.system.userinfo.utils.HttpsUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -28,8 +17,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; -import java.util.Optional; -import java.util.concurrent.TimeUnit; import static com.chinaunicom.mall.ebtp.cloud.security.starter.common.Constants.*; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/CheckTokenController.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/CheckTokenController.java similarity index 96% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/CheckTokenController.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/CheckTokenController.java index 4a6d5ee..4451649 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/CheckTokenController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/CheckTokenController.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.userinfo.controller; +package com.coscoshipping.ebtp.system.userinfo.controller; import com.chinaunicom.mall.ebtp.cloud.userinfo.starter.entity.CheckTokenVo; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/ProviderForSerController.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/ProviderForSerController.java similarity index 98% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/ProviderForSerController.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/ProviderForSerController.java index 8da943a..732df20 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/ProviderForSerController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/ProviderForSerController.java @@ -1,11 +1,11 @@ -package com.chinaunicom.mall.ebtp.userinfo.controller; +package com.coscoshipping.ebtp.system.userinfo.controller; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.faceCompare.util.Sm2Encryptor; +import com.coscoshipping.ebtp.system.faceCompare.util.Sm2Encryptor; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/UserInfoController.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/UserInfoController.java similarity index 91% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/UserInfoController.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/UserInfoController.java index fff3d59..b2ef576 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/UserInfoController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/UserInfoController.java @@ -1,21 +1,22 @@ -package com.chinaunicom.mall.ebtp.userinfo.controller; +package com.coscoshipping.ebtp.system.userinfo.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.SecurityEntity; +import com.chinaunicom.mall.ebtp.cloud.userinfo.starter.service.UserInfoService; import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; -import com.chinaunicom.mall.ebtp.faceCompare.feign.SupplierbaseFeignClient; -import com.chinaunicom.mall.ebtp.login.common.Constants; -import com.chinaunicom.mall.ebtp.login.entity.BaseUserToken; -import com.chinaunicom.mall.ebtp.login.service.BaseUserTokenService; -import com.chinaunicom.mall.ebtp.userinfo.entity.*; -import com.chinaunicom.mall.ebtp.userinfo.service.EbtpUserInfoService; -import com.chinaunicom.mall.ebtp.userinfo.utils.BaseCertService; -import com.chinaunicom.mall.ebtp.userinfo.utils.HttpUtils; -import com.chinaunicom.mall.ebtp.userinfo.utils.UserinfoConstants; +import com.coscoshipping.ebtp.system.faceCompare.feign.SupplierbaseFeignClient; +import com.coscoshipping.ebtp.system.login.common.Constants; +import com.coscoshipping.ebtp.system.login.entity.BaseUserToken; +import com.coscoshipping.ebtp.system.login.service.BaseUserTokenService; +import com.coscoshipping.ebtp.system.userinfo.entity.*; +import com.coscoshipping.ebtp.system.userinfo.service.EbtpUserInfoService; +import com.coscoshipping.ebtp.system.userinfo.utils.BaseCertService; +import com.coscoshipping.ebtp.system.userinfo.utils.HttpUtils; +import com.coscoshipping.ebtp.system.userinfo.utils.UserinfoConstants; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +33,6 @@ import javax.servlet.http.HttpServletResponse; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.time.LocalDateTime; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -53,6 +53,10 @@ public class UserInfoController { @Autowired private IBaseCacheUserService cacheUserService; + + @Autowired + private UserInfoService userInfoService; + @Autowired(required = false) @Qualifier("cacheRedisTemplate") private RedisTemplate redisTemplate; @@ -83,7 +87,8 @@ public class UserInfoController { log.error("access token is empty"); return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build(); } - return ResponseEntity.ok(cacheUserService.getCacheUser()); +// return ResponseEntity.ok(cacheUserService.getCacheUser()); + return ResponseEntity.ok(userInfoService.getUserInfo(token)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/UserPasswordController.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/UserPasswordController.java similarity index 77% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/UserPasswordController.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/UserPasswordController.java index 57ddbad..48d972c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/UserPasswordController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/controller/UserPasswordController.java @@ -1,9 +1,8 @@ -package com.chinaunicom.mall.ebtp.userinfo.controller; +package com.coscoshipping.ebtp.system.userinfo.controller; -import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.SecurityEntity; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.userinfo.service.IUserPasswordService; +import com.coscoshipping.ebtp.system.userinfo.service.IUserPasswordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/dao/BaseRoleMapper.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/dao/BaseRoleMapper.java similarity index 60% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/dao/BaseRoleMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/dao/BaseRoleMapper.java index e53910a..06f6fd1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/dao/BaseRoleMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/dao/BaseRoleMapper.java @@ -1,8 +1,8 @@ -package com.chinaunicom.mall.ebtp.userinfo.dao; +package com.coscoshipping.ebtp.system.userinfo.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chinaunicom.mall.ebtp.userinfo.entity.BaseRole; +import com.coscoshipping.ebtp.system.userinfo.entity.BaseRole; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/dao/UserPasswordMapper.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/dao/UserPasswordMapper.java similarity index 57% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/dao/UserPasswordMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/dao/UserPasswordMapper.java index f68e73f..82a7547 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/dao/UserPasswordMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/dao/UserPasswordMapper.java @@ -1,8 +1,8 @@ -package com.chinaunicom.mall.ebtp.userinfo.dao; +package com.coscoshipping.ebtp.system.userinfo.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chinaunicom.mall.ebtp.userinfo.entity.UserPassword; +import com.coscoshipping.ebtp.system.userinfo.entity.UserPassword; /** * @author daixc diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/dao/mapper/UserPasswordMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/userinfo/dao/mapper/UserPasswordMapper.xml similarity index 76% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/dao/mapper/UserPasswordMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/dao/mapper/UserPasswordMapper.xml index 8e4c11c..77afb44 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/dao/mapper/UserPasswordMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/dao/mapper/UserPasswordMapper.xml @@ -1,9 +1,9 @@ - + + type="com.coscoshipping.ebtp.system.userinfo.entity.UserPassword"> @@ -13,4 +13,4 @@ set delete_flag="deleted" where ID = #{id,jdbcType=BIGINT} - \ No newline at end of file + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/AuthCodeVo.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/AuthCodeVo.java similarity index 67% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/AuthCodeVo.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/AuthCodeVo.java index 299d154..e4c4c0d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/AuthCodeVo.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/AuthCodeVo.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.userinfo.entity; +package com.coscoshipping.ebtp.system.userinfo.entity; import lombok.Data; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/AuthLogoutResponse.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/AuthLogoutResponse.java similarity index 92% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/AuthLogoutResponse.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/AuthLogoutResponse.java index 84c59e4..7622855 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/AuthLogoutResponse.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/AuthLogoutResponse.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.userinfo.entity; +package com.coscoshipping.ebtp.system.userinfo.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/BaseCert.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/BaseCert.java similarity index 90% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/BaseCert.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/BaseCert.java index 5c5ae2b..7df3649 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/BaseCert.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/BaseCert.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.userinfo.entity; +package com.coscoshipping.ebtp.system.userinfo.entity; import java.io.Serializable; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseRole.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/BaseRole.java similarity index 94% rename from src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseRole.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/BaseRole.java index 46901a5..770ed24 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseRole.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/BaseRole.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.login.entity; +package com.coscoshipping.ebtp.system.userinfo.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/BaseUser.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/BaseUser.java similarity index 95% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/BaseUser.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/BaseUser.java index 641cc8d..f677527 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/BaseUser.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/BaseUser.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.userinfo.entity; +package com.coscoshipping.ebtp.system.userinfo.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/ExpertLoginUser.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/ExpertLoginUser.java similarity index 82% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/ExpertLoginUser.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/ExpertLoginUser.java index 50b0be3..dc6cf79 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/ExpertLoginUser.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/ExpertLoginUser.java @@ -1,12 +1,7 @@ -package com.chinaunicom.mall.ebtp.userinfo.entity; +package com.coscoshipping.ebtp.system.userinfo.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; /** * 功能模块bean diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/ExpertUpdateUser.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/ExpertUpdateUser.java similarity index 92% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/ExpertUpdateUser.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/ExpertUpdateUser.java index 8ac476e..3556100 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/ExpertUpdateUser.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/ExpertUpdateUser.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.userinfo.entity; +package com.coscoshipping.ebtp.system.userinfo.entity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/SupplierUserVo.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/SupplierUserVo.java similarity index 85% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/SupplierUserVo.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/SupplierUserVo.java index 3b2bb44..995ccaa 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/SupplierUserVo.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/SupplierUserVo.java @@ -1,6 +1,5 @@ -package com.chinaunicom.mall.ebtp.userinfo.entity; +package com.coscoshipping.ebtp.system.userinfo.entity; -import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,7 +7,6 @@ import lombok.experimental.Accessors; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; -import java.io.Serializable; /** * 功能模块bean diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/UserPassword.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/UserPassword.java similarity index 92% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/UserPassword.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/UserPassword.java index fbdddd6..b4cc59f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/UserPassword.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/UserPassword.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.userinfo.entity; +package com.coscoshipping.ebtp.system.userinfo.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/vo/SsoVO.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/vo/SsoVO.java similarity index 90% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/vo/SsoVO.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/vo/SsoVO.java index 49e8bd0..f1d65bd 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/entity/vo/SsoVO.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/entity/vo/SsoVO.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2022, CHINAUNICOM. All rights reserved. */ -package com.chinaunicom.mall.ebtp.userinfo.entity.vo; +package com.coscoshipping.ebtp.system.userinfo.entity.vo; import lombok.Data; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/fallback/UnicomOAuthClientFallback.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/fallback/UnicomOAuthClientFallback.java similarity index 51% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/fallback/UnicomOAuthClientFallback.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/fallback/UnicomOAuthClientFallback.java index ba8cb9e..1220fa7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/fallback/UnicomOAuthClientFallback.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/fallback/UnicomOAuthClientFallback.java @@ -1,7 +1,7 @@ -package com.chinaunicom.mall.ebtp.userinfo.fallback; +package com.coscoshipping.ebtp.system.userinfo.fallback; -import com.chinaunicom.mall.ebtp.userinfo.entity.AuthLogoutResponse; -import com.chinaunicom.mall.ebtp.userinfo.service.UnicomOAuthClient; +import com.coscoshipping.ebtp.system.userinfo.entity.AuthLogoutResponse; +import com.coscoshipping.ebtp.system.userinfo.service.UnicomOAuthClient; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/fallback/UnicomOAuthClientFallbackFactory.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/fallback/UnicomOAuthClientFallbackFactory.java similarity index 75% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/fallback/UnicomOAuthClientFallbackFactory.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/fallback/UnicomOAuthClientFallbackFactory.java index 1c78793..ad756c9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/fallback/UnicomOAuthClientFallbackFactory.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/fallback/UnicomOAuthClientFallbackFactory.java @@ -1,6 +1,6 @@ -package com.chinaunicom.mall.ebtp.userinfo.fallback; +package com.coscoshipping.ebtp.system.userinfo.fallback; -import com.chinaunicom.mall.ebtp.userinfo.service.UnicomOAuthClient; +import com.coscoshipping.ebtp.system.userinfo.service.UnicomOAuthClient; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/AuthTokenService.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/AuthTokenService.java similarity index 73% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/AuthTokenService.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/service/AuthTokenService.java index 44b3f83..c9f1df2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/AuthTokenService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/AuthTokenService.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.userinfo.service; +package com.coscoshipping.ebtp.system.userinfo.service; public interface AuthTokenService { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/EbtpUserInfoService.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/EbtpUserInfoService.java similarity index 68% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/EbtpUserInfoService.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/service/EbtpUserInfoService.java index 5527be7..321e37e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/EbtpUserInfoService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/EbtpUserInfoService.java @@ -1,8 +1,8 @@ -package com.chinaunicom.mall.ebtp.userinfo.service; +package com.coscoshipping.ebtp.system.userinfo.service; -import com.chinaunicom.mall.ebtp.userinfo.entity.AuthLogoutResponse; -import com.chinaunicom.mall.ebtp.userinfo.entity.ExpertLoginUser; -import com.chinaunicom.mall.ebtp.userinfo.entity.ExpertUpdateUser; +import com.coscoshipping.ebtp.system.userinfo.entity.AuthLogoutResponse; +import com.coscoshipping.ebtp.system.userinfo.entity.ExpertLoginUser; +import com.coscoshipping.ebtp.system.userinfo.entity.ExpertUpdateUser; import java.util.Map; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/IUserPasswordService.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/IUserPasswordService.java similarity index 68% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/IUserPasswordService.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/service/IUserPasswordService.java index c17943f..c6fdb17 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/IUserPasswordService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/IUserPasswordService.java @@ -1,7 +1,7 @@ -package com.chinaunicom.mall.ebtp.userinfo.service; +package com.coscoshipping.ebtp.system.userinfo.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.chinaunicom.mall.ebtp.userinfo.entity.UserPassword; +import com.coscoshipping.ebtp.system.userinfo.entity.UserPassword; /** * 对数据表 user_password 操作的 service diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/UnicomOAuthClient.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/UnicomOAuthClient.java similarity index 69% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/UnicomOAuthClient.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/service/UnicomOAuthClient.java index 5a61589..12ab81b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/UnicomOAuthClient.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/UnicomOAuthClient.java @@ -1,14 +1,14 @@ -package com.chinaunicom.mall.ebtp.userinfo.service; +package com.coscoshipping.ebtp.system.userinfo.service; -import com.chinaunicom.mall.ebtp.userinfo.entity.AuthLogoutResponse; -import com.chinaunicom.mall.ebtp.userinfo.fallback.UnicomOAuthClientFallbackFactory; +import com.coscoshipping.ebtp.system.userinfo.entity.AuthLogoutResponse; +import com.coscoshipping.ebtp.system.userinfo.fallback.UnicomOAuthClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; /** * 认证中心数据服务客户端 - * + * * @author Ajaxfan */ @FeignClient(value = "${user.auth.resource.serviceId:mall-auth}", diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/AuthTokenServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/impl/AuthTokenServiceImpl.java similarity index 88% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/AuthTokenServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/service/impl/AuthTokenServiceImpl.java index c962caf..dadd397 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/AuthTokenServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/impl/AuthTokenServiceImpl.java @@ -1,7 +1,7 @@ -package com.chinaunicom.mall.ebtp.userinfo.service.impl; +package com.coscoshipping.ebtp.system.userinfo.service.impl; -import com.chinaunicom.mall.ebtp.userinfo.service.AuthTokenService; +import com.coscoshipping.ebtp.system.userinfo.service.AuthTokenService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/EbtpUserInfoServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/impl/EbtpUserInfoServiceImpl.java similarity index 88% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/EbtpUserInfoServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/service/impl/EbtpUserInfoServiceImpl.java index ff4d0e8..45a7ec6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/EbtpUserInfoServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/impl/EbtpUserInfoServiceImpl.java @@ -1,25 +1,25 @@ -package com.chinaunicom.mall.ebtp.userinfo.service.impl; +package com.coscoshipping.ebtp.system.userinfo.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; import com.chinaunicom.mall.ebtp.common.util.JsonUtils; -import com.chinaunicom.mall.ebtp.faceCompare.entity.BizAssessRoom; -import com.chinaunicom.mall.ebtp.faceCompare.feign.AssessjFeignClient; -import com.chinaunicom.mall.ebtp.faceCompare.feign.ExtendFeignClient; -import com.chinaunicom.mall.ebtp.faceCompare.feign.RsmsFeignClient; -import com.chinaunicom.mall.ebtp.login.dao.BaseUserMapper; -import com.chinaunicom.mall.ebtp.test.RSA; -import com.chinaunicom.mall.ebtp.userinfo.dao.BaseRoleMapper; -import com.chinaunicom.mall.ebtp.userinfo.entity.*; -import com.chinaunicom.mall.ebtp.userinfo.service.EbtpUserInfoService; -import com.chinaunicom.mall.ebtp.userinfo.service.UnicomOAuthClient; -import com.chinaunicom.mall.ebtp.userinfo.utils.HttpsUtils; -import com.chinaunicom.mall.ebtp.userinfo.utils.UserinfoConstants; -import com.coscoshipping.ebtp.project.role.dao.SysRoleMapper; -import com.coscoshipping.ebtp.project.role.entity.SysRole; -import com.coscoshipping.ebtp.project.user.entity.SysUser; +import com.coscoshipping.ebtp.system.faceCompare.entity.BizAssessRoom; +import com.coscoshipping.ebtp.system.faceCompare.feign.AssessjFeignClient; +import com.coscoshipping.ebtp.system.faceCompare.feign.ExtendFeignClient; +import com.coscoshipping.ebtp.system.faceCompare.feign.RsmsFeignClient; +import com.coscoshipping.ebtp.system.login.dao.BaseUserMapper; +import com.coscoshipping.ebtp.system.test.RSA; +import com.coscoshipping.ebtp.system.userinfo.dao.BaseRoleMapper; +import com.coscoshipping.ebtp.system.userinfo.entity.*; +import com.coscoshipping.ebtp.system.userinfo.service.EbtpUserInfoService; +import com.coscoshipping.ebtp.system.userinfo.service.UnicomOAuthClient; +import com.coscoshipping.ebtp.system.userinfo.utils.HttpsUtils; +import com.coscoshipping.ebtp.system.userinfo.utils.UserinfoConstants; +import com.coscoshipping.ebtp.system.role.dao.SysRoleMapper; +import com.coscoshipping.ebtp.system.role.entity.SysRole; +import com.coscoshipping.ebtp.system.user.entity.SysUser; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/UserPasswordServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/impl/UserPasswordServiceImpl.java similarity index 70% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/UserPasswordServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/service/impl/UserPasswordServiceImpl.java index 6f90d59..6ef2a4a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/UserPasswordServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/service/impl/UserPasswordServiceImpl.java @@ -1,10 +1,10 @@ -package com.chinaunicom.mall.ebtp.userinfo.service.impl; +package com.coscoshipping.ebtp.system.userinfo.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chinaunicom.mall.ebtp.userinfo.dao.UserPasswordMapper; -import com.chinaunicom.mall.ebtp.userinfo.entity.UserPassword; -import com.chinaunicom.mall.ebtp.userinfo.service.IUserPasswordService; +import com.coscoshipping.ebtp.system.userinfo.dao.UserPasswordMapper; +import com.coscoshipping.ebtp.system.userinfo.entity.UserPassword; +import com.coscoshipping.ebtp.system.userinfo.service.IUserPasswordService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/utils/BaseCertService.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/utils/BaseCertService.java similarity index 97% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/utils/BaseCertService.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/utils/BaseCertService.java index b42a4cc..2eb806f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/utils/BaseCertService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/utils/BaseCertService.java @@ -1,6 +1,6 @@ -package com.chinaunicom.mall.ebtp.userinfo.utils; +package com.coscoshipping.ebtp.system.userinfo.utils; -import com.chinaunicom.mall.ebtp.userinfo.entity.BaseCert; +import com.coscoshipping.ebtp.system.userinfo.entity.BaseCert; import org.apache.commons.codec.binary.Base64; import org.springframework.stereotype.Service; @@ -29,7 +29,7 @@ public class BaseCertService { 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '2', '3', '4', '5', '6', '7', '8', '9' }; private final static Color[] color = new Color[] { Color.black, Color.blue, Color.green, Color.gray, Color.red, Color.darkGray }; - + public BaseCert choose() { String result = generateCertImage(); if (result.isEmpty() == false) { @@ -44,7 +44,7 @@ public class BaseCertService { } return null; } - + /** * 功能:生成彩色验证码图片 width为生成图片的宽度 height为生成图片的高度 os为页面的输出流 * diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/utils/HttpUtils.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/utils/HttpUtils.java similarity index 98% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/utils/HttpUtils.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/utils/HttpUtils.java index cb48ea4..8752c84 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/utils/HttpUtils.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/utils/HttpUtils.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.userinfo.utils; +package com.coscoshipping.ebtp.system.userinfo.utils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/utils/HttpsUtils.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/utils/HttpsUtils.java similarity index 92% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/utils/HttpsUtils.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/utils/HttpsUtils.java index 993b39b..8f5fcb2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/utils/HttpsUtils.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/utils/HttpsUtils.java @@ -1,17 +1,11 @@ -package com.chinaunicom.mall.ebtp.userinfo.utils; +package com.coscoshipping.ebtp.system.userinfo.utils; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.ResponseEntity; -import org.springframework.util.MultiValueMap; -import org.springframework.web.client.RestTemplate; import java.io.*; import java.net.HttpURLConnection; import java.net.URL; -import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/utils/UserinfoConstants.java b/src/main/java/com/coscoshipping/ebtp/system/userinfo/utils/UserinfoConstants.java similarity index 63% rename from src/main/java/com/chinaunicom/mall/ebtp/userinfo/utils/UserinfoConstants.java rename to src/main/java/com/coscoshipping/ebtp/system/userinfo/utils/UserinfoConstants.java index b2b6d62..e65855b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/utils/UserinfoConstants.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userinfo/utils/UserinfoConstants.java @@ -1,6 +1,4 @@ -package com.chinaunicom.mall.ebtp.userinfo.utils; - -import lombok.Data; +package com.coscoshipping.ebtp.system.userinfo.utils; public class UserinfoConstants { public static String okCode = "1"; diff --git a/src/main/java/com/coscoshipping/ebtp/project/userrole/controller/SysUserRoleController.java b/src/main/java/com/coscoshipping/ebtp/system/userrole/controller/SysUserRoleController.java similarity index 91% rename from src/main/java/com/coscoshipping/ebtp/project/userrole/controller/SysUserRoleController.java rename to src/main/java/com/coscoshipping/ebtp/system/userrole/controller/SysUserRoleController.java index 01cf87a..26cf35c 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/userrole/controller/SysUserRoleController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userrole/controller/SysUserRoleController.java @@ -1,8 +1,8 @@ -package com.coscoshipping.ebtp.project.userrole.controller; +package com.coscoshipping.ebtp.system.userrole.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.coscoshipping.ebtp.project.user.entity.vo.SysUserVO; +import com.coscoshipping.ebtp.system.user.entity.vo.SysUserVO; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PathVariable; @@ -15,8 +15,8 @@ import io.swagger.annotations.ApiParam; import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import com.coscoshipping.ebtp.project.userrole.entity.SysUserRole; -import com.coscoshipping.ebtp.project.userrole.service.SysUserRoleService; +import com.coscoshipping.ebtp.system.userrole.entity.SysUserRole; +import com.coscoshipping.ebtp.system.userrole.service.SysUserRoleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -41,12 +41,12 @@ public class SysUserRoleController{ return BaseResponse.success(iSysUserRoleService.assignsRoles(sysUserVO)); } - + /** * 插入新数据 - * + * * @param sysUserRole - * + * * @return */ @ApiOperation("插入新数据") @@ -54,15 +54,15 @@ public class SysUserRoleController{ public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid SysUserRole sysUserRole){ Boolean i = iSysUserRoleService.save(sysUserRole); - + return BaseResponse.success(i); } - + /** * 修改数据 - * + * * @param sysUserRole - * + * * @return */ @ApiOperation("修改数据") @@ -70,23 +70,23 @@ public class SysUserRoleController{ public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody SysUserRole sysUserRole){ Boolean i = iSysUserRoleService.updateById(sysUserRole); - + return BaseResponse.success(i); } - + /** * 查询数据 - * + * * @param id - * + * * @return */ @ApiOperation("根据id查询数据") @GetMapping("/{id}") public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ - + SysUserRole sysUserRole = iSysUserRoleService.getById(id); - + return BaseResponse.success(sysUserRole); } diff --git a/src/main/java/com/coscoshipping/ebtp/project/userrole/dao/SysUserRoleMapper.java b/src/main/java/com/coscoshipping/ebtp/system/userrole/dao/SysUserRoleMapper.java similarity index 58% rename from src/main/java/com/coscoshipping/ebtp/project/userrole/dao/SysUserRoleMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/userrole/dao/SysUserRoleMapper.java index a4a5fb2..9148149 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/userrole/dao/SysUserRoleMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userrole/dao/SysUserRoleMapper.java @@ -1,10 +1,9 @@ -package com.coscoshipping.ebtp.project.userrole.dao; +package com.coscoshipping.ebtp.system.userrole.dao; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; -import java.util.List; import org.springframework.stereotype.Repository; -import com.coscoshipping.ebtp.project.userrole.entity.SysUserRole; +import com.coscoshipping.ebtp.system.userrole.entity.SysUserRole; @Repository public interface SysUserRoleMapper extends IBaseMapper { diff --git a/src/main/java/com/coscoshipping/ebtp/project/userrole/dao/mapper/SysUserRoleMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/userrole/dao/mapper/SysUserRoleMapper.xml similarity index 85% rename from src/main/java/com/coscoshipping/ebtp/project/userrole/dao/mapper/SysUserRoleMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/userrole/dao/mapper/SysUserRoleMapper.xml index a4e4c9c..e6abac6 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/userrole/dao/mapper/SysUserRoleMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/userrole/dao/mapper/SysUserRoleMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -16,4 +16,4 @@ delete_flag="1" where ID=#{id } - \ No newline at end of file + diff --git a/src/main/java/com/coscoshipping/ebtp/project/userrole/entity/SysUserRole.java b/src/main/java/com/coscoshipping/ebtp/system/userrole/entity/SysUserRole.java similarity index 93% rename from src/main/java/com/coscoshipping/ebtp/project/userrole/entity/SysUserRole.java rename to src/main/java/com/coscoshipping/ebtp/system/userrole/entity/SysUserRole.java index f7eaf8c..337f10a 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/userrole/entity/SysUserRole.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userrole/entity/SysUserRole.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.userrole.entity; +package com.coscoshipping.ebtp.system.userrole.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/coscoshipping/ebtp/project/userrole/service/SysUserRoleService.java b/src/main/java/com/coscoshipping/ebtp/system/userrole/service/SysUserRoleService.java similarity index 64% rename from src/main/java/com/coscoshipping/ebtp/project/userrole/service/SysUserRoleService.java rename to src/main/java/com/coscoshipping/ebtp/system/userrole/service/SysUserRoleService.java index a41bda5..34edfc3 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/userrole/service/SysUserRoleService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userrole/service/SysUserRoleService.java @@ -1,10 +1,10 @@ -package com.coscoshipping.ebtp.project.userrole.service; +package com.coscoshipping.ebtp.system.userrole.service; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.coscoshipping.ebtp.project.role.entity.vo.AllRolesAndAssignRoleVO; -import com.coscoshipping.ebtp.project.user.entity.vo.SysUserVO; -import com.coscoshipping.ebtp.project.userrole.entity.SysUserRole; +import com.coscoshipping.ebtp.system.role.entity.vo.AllRolesAndAssignRoleVO; +import com.coscoshipping.ebtp.system.user.entity.vo.SysUserVO; +import com.coscoshipping.ebtp.system.userrole.entity.SysUserRole; /** * 对数据表 sys_user_role 操作的 service diff --git a/src/main/java/com/coscoshipping/ebtp/project/userrole/service/impl/SysUserRoleServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/userrole/service/impl/SysUserRoleServiceImpl.java similarity index 76% rename from src/main/java/com/coscoshipping/ebtp/project/userrole/service/impl/SysUserRoleServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/userrole/service/impl/SysUserRoleServiceImpl.java index 0650a4e..249680a 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/userrole/service/impl/SysUserRoleServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/userrole/service/impl/SysUserRoleServiceImpl.java @@ -1,20 +1,18 @@ -package com.coscoshipping.ebtp.project.userrole.service.impl; +package com.coscoshipping.ebtp.system.userrole.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; -import com.coscoshipping.ebtp.project.role.entity.SysRole; -import com.coscoshipping.ebtp.project.role.entity.vo.AllRolesAndAssignRoleVO; -import com.coscoshipping.ebtp.project.role.service.SysRoleService; -import com.coscoshipping.ebtp.project.user.entity.vo.SysUserVO; +import com.coscoshipping.ebtp.system.role.entity.SysRole; +import com.coscoshipping.ebtp.system.role.entity.vo.AllRolesAndAssignRoleVO; +import com.coscoshipping.ebtp.system.role.service.SysRoleService; +import com.coscoshipping.ebtp.system.user.entity.vo.SysUserVO; import org.springframework.stereotype.Service; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.coscoshipping.ebtp.project.userrole.dao.SysUserRoleMapper; -import com.coscoshipping.ebtp.project.userrole.entity.SysUserRole; -import com.coscoshipping.ebtp.project.userrole.service.SysUserRoleService; +import com.coscoshipping.ebtp.system.userrole.dao.SysUserRoleMapper; +import com.coscoshipping.ebtp.system.userrole.entity.SysUserRole; +import com.coscoshipping.ebtp.system.userrole.service.SysUserRoleService; import javax.annotation.Resource; import java.util.ArrayList; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/zglt/controller/ExpertController.java b/src/main/java/com/coscoshipping/ebtp/system/zglt/controller/ExpertController.java similarity index 90% rename from src/main/java/com/chinaunicom/mall/ebtp/zglt/controller/ExpertController.java rename to src/main/java/com/coscoshipping/ebtp/system/zglt/controller/ExpertController.java index 6fe7b00..b0038ea 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/zglt/controller/ExpertController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/zglt/controller/ExpertController.java @@ -1,10 +1,9 @@ -package com.chinaunicom.mall.ebtp.zglt.controller; +package com.coscoshipping.ebtp.system.zglt.controller; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; -import com.chinaunicom.mall.ebtp.test.RSA; -import com.chinaunicom.mall.ebtp.zglt.utils.MdConstants; +import com.coscoshipping.ebtp.system.test.RSA; +import com.coscoshipping.ebtp.system.zglt.utils.MdConstants; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -13,7 +12,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.view.RedirectView; -import java.net.URLDecoder; import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/zglt/controller/ZgltController.java b/src/main/java/com/coscoshipping/ebtp/system/zglt/controller/ZgltController.java similarity index 92% rename from src/main/java/com/chinaunicom/mall/ebtp/zglt/controller/ZgltController.java rename to src/main/java/com/coscoshipping/ebtp/system/zglt/controller/ZgltController.java index 86007d2..9484171 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/zglt/controller/ZgltController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/zglt/controller/ZgltController.java @@ -1,16 +1,15 @@ -package com.chinaunicom.mall.ebtp.zglt.controller; +package com.coscoshipping.ebtp.system.zglt.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; -import com.chinaunicom.mall.ebtp.test.RSA; +import com.coscoshipping.ebtp.system.test.RSA; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/zglt/utils/MdConstants.java b/src/main/java/com/coscoshipping/ebtp/system/zglt/utils/MdConstants.java similarity index 94% rename from src/main/java/com/chinaunicom/mall/ebtp/zglt/utils/MdConstants.java rename to src/main/java/com/coscoshipping/ebtp/system/zglt/utils/MdConstants.java index f6e74d1..638a3c9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/zglt/utils/MdConstants.java +++ b/src/main/java/com/coscoshipping/ebtp/system/zglt/utils/MdConstants.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.zglt.utils; +package com.coscoshipping.ebtp.system.zglt.utils; import java.math.BigInteger; import java.security.MessageDigest; diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 3125c2e..5ec27fa 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -48,7 +48,7 @@ - +