bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

biz-util move to core-util

This commit is contained in:
sxu 2025-04-10 13:47:45 +08:00
parent 240c49a5b7
commit 82766f76c5
8 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mq/AccMqSender.java
View File

@ -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.constants.AccStatusEnum;
import com.bonus.canteen.core.account.domain.bo.AccStatusChange; 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.canteen.core.common.utils.TenantContextHolder;
import com.bonus.common.core.constant.SecurityConstants; import com.bonus.common.core.constant.SecurityConstants;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.houqin.mq.constant.LeMqConstant; 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.common.houqin.utils.JacksonUtil;
import com.bonus.system.api.RemoteUserService; import com.bonus.system.api.RemoteUserService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;

5
bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/LogUtil.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/LogUtil.java
View File

@ -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.BeanDesc;
import cn.hutool.core.bean.BeanUtil; 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.ArrayUtil;
import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.bonus.common.houqin.utils.JacksonUtil;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -29,7 +30,7 @@ public class LogUtil {
private static final String ARG_SEPERATOR = " --> "; private static final String ARG_SEPERATOR = " --> ";
private static final ThreadLocal<Boolean> THREAD_LOCAL_FLAG = new InheritableThreadLocal(); private static final ThreadLocal<Boolean> THREAD_LOCAL_FLAG = new InheritableThreadLocal();
@Lazy @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() { public static void generateNewLogTraceId() {
MDC.put("X-Trace-Id", UUID.fastUUID().toString(true)); MDC.put("X-Trace-Id", UUID.fastUUID().toString(true));

4
bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/MqPayload.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/MqPayload.java
View File

@ -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.constant.GlobalConstants;
import com.bonus.common.houqin.utils.LogUtil; import com.bonus.common.houqin.mq.constant.LeMqConstant;
public class MqPayload<T> { public class MqPayload<T> {
private Long tenantId; private Long tenantId;

5
bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/util/MqUtil.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/MqUtil.java
View File

@ -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.constant.GlobalConstants;
import com.bonus.common.houqin.mq.MQTemplate; import com.bonus.common.houqin.mq.MQTemplate;
import com.bonus.common.houqin.mq.constant.LeMqConstant; 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.domain.MqDataChangeMessageDto;
import com.bonus.common.houqin.mq.tx.TxHolder; import com.bonus.common.houqin.mq.tx.TxHolder;
import com.bonus.common.houqin.utils.JacksonUtil; import com.bonus.common.houqin.utils.JacksonUtil;
import com.bonus.common.houqin.utils.SpringContextHolder;
import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.security.utils.SecurityUtils;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import java.time.LocalDateTime; import java.time.LocalDateTime;
public class MqUtil { public class MqUtil {

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/RedisUtil.java
View File

@ -2,7 +2,6 @@ package com.bonus.canteen.core.common.utils;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.houqin.utils.SpringContextHolder;
import org.redisson.api.RLock; import org.redisson.api.RLock;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.slf4j.Logger; import org.slf4j.Logger;

2
bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/SpringContextHolder.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/SpringContextHolder.java
View File

@ -1,4 +1,4 @@
package com.bonus.common.houqin.utils; package com.bonus.canteen.core.common.utils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/service/impl/UserFaceServiceImpl.java
View File

@ -5,9 +5,9 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Base64; import java.util.Base64;
import java.util.List; import java.util.List;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.bonus.canteen.core.common.utils.FileUrlUtil; 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.domain.DeviceMqPersonalUpdateMessageDTO;
import com.bonus.canteen.core.user.utils.ArcFaceHelper; import com.bonus.canteen.core.user.utils.ArcFaceHelper;
import com.bonus.canteen.core.user.utils.FaceResult; 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.utils.DateUtils;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.houqin.mq.constant.LeMqConstant; import com.bonus.common.houqin.mq.constant.LeMqConstant;
import com.bonus.common.houqin.mq.util.MqUtil;
import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.security.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/utils/CommonConfiguration.java
View File

@ -1,7 +1,7 @@
package com.bonus.canteen.core.utils; package com.bonus.canteen.core.utils;
import com.bonus.common.houqin.i18n.I18nConfiguration; 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 com.bonus.common.houqin.utils.id.IdWorkConfiguration;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;