diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mq/AccMqSender.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mq/AccMqSender.java index 24ad2f5..d258862 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mq/AccMqSender.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mq/AccMqSender.java @@ -2,17 +2,16 @@ package com.bonus.canteen.core.account.mq; import com.bonus.canteen.core.account.constants.AccStatusEnum; import com.bonus.canteen.core.account.domain.bo.AccStatusChange; +import com.bonus.canteen.core.common.utils.MqUtil; import com.bonus.canteen.core.common.utils.TenantContextHolder; import com.bonus.common.core.constant.SecurityConstants; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.houqin.mq.constant.LeMqConstant; -import com.bonus.common.houqin.mq.util.MqUtil; import com.bonus.common.houqin.utils.JacksonUtil; import com.bonus.system.api.RemoteUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; - import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; diff --git a/bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/LogUtil.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/LogUtil.java similarity index 97% rename from bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/LogUtil.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/LogUtil.java index 67c8c1a..f2a9c4f 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/LogUtil.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/LogUtil.java @@ -1,4 +1,4 @@ -package com.bonus.common.houqin.utils; +package com.bonus.canteen.core.common.utils; import cn.hutool.core.bean.BeanDesc; import cn.hutool.core.bean.BeanUtil; @@ -9,6 +9,7 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.StrUtil; +import com.bonus.common.houqin.utils.JacksonUtil; import io.swagger.annotations.ApiModelProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +30,7 @@ public class LogUtil { private static final String ARG_SEPERATOR = " --> "; private static final ThreadLocal THREAD_LOCAL_FLAG = new InheritableThreadLocal(); @Lazy - private static final Environment environment = (Environment)SpringContextHolder.getBean(Environment.class); + private static final Environment environment = (Environment) SpringContextHolder.getBean(Environment.class); public static void generateNewLogTraceId() { MDC.put("X-Trace-Id", UUID.fastUUID().toString(true)); diff --git a/bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/MqPayload.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/MqPayload.java similarity index 93% rename from bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/MqPayload.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/MqPayload.java index 4db5e71..2fba90b 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/MqPayload.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/MqPayload.java @@ -1,7 +1,7 @@ -package com.bonus.common.houqin.mq.constant; +package com.bonus.canteen.core.common.utils; import com.bonus.common.houqin.constant.GlobalConstants; -import com.bonus.common.houqin.utils.LogUtil; +import com.bonus.common.houqin.mq.constant.LeMqConstant; public class MqPayload { private Long tenantId; diff --git a/bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/util/MqUtil.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/MqUtil.java similarity index 97% rename from bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/util/MqUtil.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/MqUtil.java index ac6bfcc..c622f0f 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/util/MqUtil.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/MqUtil.java @@ -1,18 +1,17 @@ -package com.bonus.common.houqin.mq.util; +package com.bonus.canteen.core.common.utils; import com.bonus.common.houqin.constant.GlobalConstants; import com.bonus.common.houqin.mq.MQTemplate; import com.bonus.common.houqin.mq.constant.LeMqConstant; -import com.bonus.common.houqin.mq.constant.MqPayload; import com.bonus.common.houqin.mq.domain.MqDataChangeMessageDto; import com.bonus.common.houqin.mq.tx.TxHolder; import com.bonus.common.houqin.utils.JacksonUtil; -import com.bonus.common.houqin.utils.SpringContextHolder; import com.bonus.common.security.utils.SecurityUtils; import lombok.SneakyThrows; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; + import java.time.LocalDateTime; public class MqUtil { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/RedisUtil.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/RedisUtil.java index 7e22763..62b396c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/RedisUtil.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/RedisUtil.java @@ -2,7 +2,6 @@ package com.bonus.canteen.core.common.utils; import cn.hutool.core.collection.CollUtil; import com.bonus.common.core.exception.ServiceException; -import com.bonus.common.houqin.utils.SpringContextHolder; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.slf4j.Logger; diff --git a/bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/SpringContextHolder.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/SpringContextHolder.java similarity index 97% rename from bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/SpringContextHolder.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/SpringContextHolder.java index 0fffece..e7d16d7 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/SpringContextHolder.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/SpringContextHolder.java @@ -1,4 +1,4 @@ -package com.bonus.common.houqin.utils; +package com.bonus.canteen.core.common.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/service/impl/UserFaceServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/service/impl/UserFaceServiceImpl.java index 1e9ff8c..a639f51 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/service/impl/UserFaceServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/service/impl/UserFaceServiceImpl.java @@ -5,9 +5,9 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Base64; import java.util.List; - import cn.hutool.core.util.ObjectUtil; import com.bonus.canteen.core.common.utils.FileUrlUtil; +import com.bonus.canteen.core.common.utils.MqUtil; import com.bonus.canteen.core.user.domain.DeviceMqPersonalUpdateMessageDTO; import com.bonus.canteen.core.user.utils.ArcFaceHelper; import com.bonus.canteen.core.user.utils.FaceResult; @@ -15,7 +15,6 @@ import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.houqin.mq.constant.LeMqConstant; -import com.bonus.common.houqin.mq.util.MqUtil; import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/utils/CommonConfiguration.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/utils/CommonConfiguration.java index 0ec3145..176f7bf 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/utils/CommonConfiguration.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/utils/CommonConfiguration.java @@ -1,7 +1,7 @@ package com.bonus.canteen.core.utils; import com.bonus.common.houqin.i18n.I18nConfiguration; -import com.bonus.common.houqin.utils.SpringContextHolder; +import com.bonus.canteen.core.common.utils.SpringContextHolder; import com.bonus.common.houqin.utils.id.IdWorkConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import;