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

移除rabbit mq消费消息

This commit is contained in:
gaowdong 2025-02-14 14:58:47 +08:00
parent c8a7c14cf7
commit b5224726ce
9 changed files with 62 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-common-biz/src/main/java/com/bonus/mq/rabbit/RabbitListenerConfiguration.java
View File

@ -41,8 +41,9 @@ import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
import java.util.*;
@Configuration
public class RabbitListenerConfiguration implements RabbitListenerConfigurer {
//@Configuration
public class RabbitListenerConfiguration {
//implements RabbitListenerConfigurer
private static final Logger log = LoggerFactory.getLogger(RabbitListenerConfiguration.class);
public static final String REDELIVERED_TIMES_HEADER_NAME = "__redelivered_times";
public static final String ORG_DESTINATION = "__org_destination";

9
bonus-modules/bonus-smart-canteen/pom.xml
View File

@ -128,15 +128,6 @@
<version>4.34.0.ALL</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/advise/controller/BasicsCanteenEvaluateController.java
View File

@ -1,5 +1,6 @@
package com.bonus.core.allocation.advise.controller;
import com.bonus.common.core.domain.R;
import com.bonus.core.allocation.advise.dto.EvaluateAddDTO;
import com.bonus.core.allocation.advise.model.AllocPageDecorationModel;
import com.bonus.core.allocation.advise.service.AllocPageDecorationService;
@ -66,8 +67,9 @@ public class BasicsCanteenEvaluateController {
@ApiOperation("新增食堂评价")
@PostMapping({"/addEvaluate"})
// @RequiresGuest
public void addEvaluate(@RequestBody @Valid EvaluateAddDTO request) {
public R<Object> addEvaluate(@RequestBody @Valid EvaluateAddDTO request) {
this.basicsCanteenEvaluateService.addEvaluate(request);
return R.ok();
}
@ApiOperation("查询食堂评价页面装修")

9
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/autth/api/MgrAuthApi.java
View File

@ -13,8 +13,9 @@ import com.bonus.core.autth.role.mapper.MgrRoleOrgMapper;
import com.bonus.core.customer.dto.CustOrgTreeDTO;
import com.bonus.core.customer.model.PigxUser;
import com.bonus.core.customer.utils.SecureManager;
import com.bonus.core.customer.utils.SecurityUtils;
import com.bonus.i18n.I18n;
import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.system.api.model.LoginUser;
import org.springframework.stereotype.Service;
import java.util.List;
@ -40,7 +41,9 @@ public class MgrAuthApi {
public MgrUserAuthPO getUserAuthPO() {
MgrUserAuthPO userAuthPO = new MgrUserAuthPO();
PigxUser user = SecurityUtils.getUser();
LoginUser user = SecurityUtils.getLoginUser();
user.setUserid(SecurityUtils.getUserId());
user.setUsername(SecurityUtils.getUsername());
String roleCode = (String) SecureManager.getSubjectData().get("roleCode");
if (ObjectUtil.isEmpty(roleCode)) {
throw new ServiceException(I18n.getMessage("auth_user_no_role_code", new Object[0]));
@ -62,7 +65,7 @@ public class MgrAuthApi {
roleType = MgrRoleTypeV2Enum.ROLE_MERCHANT.getKey();
}
userAuthPO.setUserId(user.getId());
userAuthPO.setUserId(user.getUserid());
userAuthPO.setRoleType(roleType);
userAuthPO.setRoleCode(roleCode);
userAuthPO.setUserName(user.getUsername());

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/SecureProperties.java
View File

@ -4,11 +4,13 @@ import cn.hutool.core.codec.Base64Decoder;
import com.google.common.collect.Sets;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.Set;
@RefreshScope
@Component
@ConfigurationProperties(
prefix = "secure"
)

25
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/utils/SecurityUtils.java
View File

@ -1,25 +0,0 @@
package com.bonus.core.customer.utils;
import cn.hutool.core.collection.CollUtil;
import com.bonus.core.customer.model.PigxUser;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
public final class SecurityUtils {
public static PigxUser getUser() {
Map<String, String> subjectData = SecureManager.getSubjectData();
return new PigxUser((Long)SecureManager.getSubjectId().orElse((Long) null), StringUtils.isBlank((CharSequence)subjectData.get("merchantId")) ? null : Long.parseLong((String)subjectData.get("merchantId")), StringUtils.isBlank((CharSequence)subjectData.get("canteenEffId")) ? null : Long.parseLong((String)subjectData.get("canteenEffId")), StringUtils.isBlank((CharSequence)subjectData.get("custEffId")) ? null : Long.parseLong((String)subjectData.get("custEffId")), StringUtils.isBlank((CharSequence)subjectData.get("dishesEffId")) ? null : Long.parseLong((String)subjectData.get("dishesEffId")), CollUtil.isEmpty(SecureManager.getRole()) ? null : (String)SecureManager.getRole().stream().findFirst().get(), (String)subjectData.getOrDefault("username", ""));
}
public static List<Integer> getRoles() {
// return SecureManager.getRole().stream().map(Integer::parseInt).toList();
return SecureManager.getRole().stream().map(Integer::parseInt).collect(Collectors.toList());
}
private SecurityUtils() {
throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
}
}

41
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/starter/TableFillHandler.java Normal file
View File

@ -0,0 +1,41 @@
package com.bonus.core.starter;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.bonus.core.customer.model.PigxUser;
import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.system.api.model.LoginUser;
import org.apache.ibatis.reflection.MetaObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.util.Objects;
@Component
public class TableFillHandler implements MetaObjectHandler {
private static final Logger log = LoggerFactory.getLogger(TableFillHandler.class);
public void insertFill(MetaObject metaObject) {
this.strictInsertFill(metaObject, "crtime", LocalDateTime::now, LocalDateTime.class);
LoginUser loginUser = SecurityUtils.getLoginUser();
loginUser.setUsername(SecurityUtils.getUsername());
loginUser.setUserid(SecurityUtils.getUserId());
Objects.requireNonNull(loginUser);
this.strictInsertFill(metaObject, "crby", loginUser::getUsername, String.class);
this.strictUpdateFill(metaObject, "uptime", LocalDateTime::now, LocalDateTime.class);
loginUser = SecurityUtils.getLoginUser();
loginUser.setUsername(SecurityUtils.getUsername());
loginUser.setUserid(SecurityUtils.getUserId());
Objects.requireNonNull(loginUser);
this.strictUpdateFill(metaObject, "upby", loginUser::getUsername, String.class);
}
public void updateFill(MetaObject metaObject) {
this.strictUpdateFill(metaObject, "uptime", LocalDateTime::now, LocalDateTime.class);
LoginUser var10003 = SecurityUtils.getLoginUser();
var10003.setUsername(SecurityUtils.getUsername());
Objects.requireNonNull(var10003);
this.strictUpdateFill(metaObject, "upby", var10003::getUsername, String.class);
}
}

11
bonus-modules/pom.xml
View File

@ -13,22 +13,11 @@
<!-- <module>bonus-cateen</module>-->
<module>bonus-smart-canteen</module>
<module>bonus-shared-station</module>
<module>bonus-shared-station</module>
</modules>
<artifactId>bonus-modules</artifactId>
<packaging>pom</packaging>
<dependencies>
<!-- mybatis-plus -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
<description>
bonus-modules业务模块
</description>

14
pom.xml
View File

@ -242,13 +242,13 @@
<version>${bonus.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-boot-starter</artifactId>-->
<!-- <version>${mybatis-plus.version}</version>-->
<!-- <type>pom</type>-->
<!-- <scope>import</scope>-->
<!-- </dependency>-->
</dependencies>
</dependencyManagement>