diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/ProdApi.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/ProdApi.java index 919b0ae..6756d87 100644 --- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/ProdApi.java +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/ProdApi.java @@ -1,11 +1,13 @@ package com.tashow.cloud.productapi.api.product; +import com.tashow.cloud.common.pojo.CommonResult; import com.tashow.cloud.common.pojo.PageResult; import com.tashow.cloud.productapi.api.product.dto.ProdDO; import com.tashow.cloud.productapi.api.product.vo.prod.ProdListVO; import com.tashow.cloud.productapi.api.product.vo.prod.ProdPageReqVO; import com.tashow.cloud.productapi.api.product.vo.prod.ProdServiceVO; import com.tashow.cloud.productapi.enums.ApiConstants; +import jakarta.annotation.security.PermitAll; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -22,8 +24,9 @@ public interface ProdApi { * @return 编号 */ - @GetMapping(PREFIX + "/getProdInfo1") - ProdDO getProdInfo(@RequestParam(value = "id", required = false) Long id); + @GetMapping(PREFIX + "/getProdInfo") + @PermitAll + CommonResult getProdInfo(@RequestParam(value = "id", required = false) Long id); /** * 获取商品服务配置 diff --git a/tashow-framework/tashow-framework-env/src/main/java/com/tashow/cloud/env/config/EnvEnvironmentPostProcessor.java b/tashow-framework/tashow-framework-env/src/main/java/com/tashow/cloud/env/config/EnvEnvironmentPostProcessor.java index d9d1180..0a867ef 100644 --- a/tashow-framework/tashow-framework-env/src/main/java/com/tashow/cloud/env/config/EnvEnvironmentPostProcessor.java +++ b/tashow-framework/tashow-framework-env/src/main/java/com/tashow/cloud/env/config/EnvEnvironmentPostProcessor.java @@ -33,7 +33,7 @@ public class EnvEnvironmentPostProcessor implements EnvironmentPostProcessor { environment.getSystemProperties().put(hostNameKey, EnvUtils.getHostName()); } - // 1.1 如果没有 yudao.env.tag 配置项,则不进行配置项的修改 + // 1.1 如果没有 tashow.env.tag 配置项,则不进行配置项的修改 String tag = EnvUtils.getTag(environment); if (StrUtil.isEmpty(tag)) { return; diff --git a/tashow-framework/tashow-framework-security/src/main/java/com/tashow/cloud/security/security/config/WebSecurityConfigurerAdapter.java b/tashow-framework/tashow-framework-security/src/main/java/com/tashow/cloud/security/security/config/WebSecurityConfigurerAdapter.java index cc7a93d..507e28a 100644 --- a/tashow-framework/tashow-framework-security/src/main/java/com/tashow/cloud/security/security/config/WebSecurityConfigurerAdapter.java +++ b/tashow-framework/tashow-framework-security/src/main/java/com/tashow/cloud/security/security/config/WebSecurityConfigurerAdapter.java @@ -136,7 +136,7 @@ public class WebSecurityConfigurerAdapter { .requestMatchers(HttpMethod.DELETE, permitAllUrls.get(HttpMethod.DELETE).toArray(new String[0])).permitAll() .requestMatchers(HttpMethod.HEAD, permitAllUrls.get(HttpMethod.HEAD).toArray(new String[0])).permitAll() .requestMatchers(HttpMethod.PATCH, permitAllUrls.get(HttpMethod.PATCH).toArray(new String[0])).permitAll() - // 1.3 基于 yudao.security.permit-all-urls 无需认证 + // 1.3 基于 tashow.security.permit-all-urls 无需认证 .requestMatchers(securityProperties.getPermitAllUrls().toArray(new String[0])).permitAll() ) // ②:每个项目的自定义规则 diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java index 2bdf20a..990d7b0 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java @@ -1,10 +1,8 @@ package com.tashow.cloud.product; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * 应用服务启动类 diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/api/ProdImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/api/ProdImpl.java index e4abebc..9636a77 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/api/ProdImpl.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/api/ProdImpl.java @@ -1,17 +1,14 @@ package com.tashow.cloud.product.api; +import com.tashow.cloud.common.pojo.CommonResult; import com.tashow.cloud.common.pojo.PageResult; import com.tashow.cloud.product.service.ProdService; -import com.tashow.cloud.product.service.ShopDetailService; import com.tashow.cloud.productapi.api.product.ProdApi; -import com.tashow.cloud.productapi.api.product.ShopDetailApi; import com.tashow.cloud.productapi.api.product.dto.ProdDO; -import com.tashow.cloud.productapi.api.product.dto.ShopDetailDO; import com.tashow.cloud.productapi.api.product.vo.prod.ProdListVO; import com.tashow.cloud.productapi.api.product.vo.prod.ProdPageReqVO; import com.tashow.cloud.productapi.api.product.vo.prod.ProdServiceVO; import jakarta.annotation.Resource; -import jakarta.validation.Valid; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -23,8 +20,8 @@ public class ProdImpl implements ProdApi { private ProdService prodService; @Override - public ProdDO getProdInfo(Long id) { - return prodService.getProd(id); + public CommonResult getProdInfo(Long id) { + return CommonResult.success(prodService.getProd(id)); } @Override diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java index ce08b37..c2101ce 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java @@ -163,8 +163,8 @@ public class TradeOrderController { //获取交易订单详情 TradeOrderItemDO orderItem = tradeOrderQueryService.getOrderItem(reqVo.getItemId()); //获取产品详情 - ProdDO prodInfo = prodApi.getProdInfo(reqVo.getSpuId()); - return success(TradeOrderConvert.INSTANCE.convert(orderItem,prodInfo)); + CommonResult prodInfo = prodApi.getProdInfo(reqVo.getSpuId()); + return success(TradeOrderConvert.INSTANCE.convert(orderItem,prodInfo.getData())); } /**