Banner 的迁移

商品推荐的迁移
HeatBush · Aug 25, 2020 · 709b85e · 709b85e
1 parent f0999ea
commit 709b85e
Show file tree

Hide file tree

Showing 25 changed files with 239 additions and 2,121 deletions.
diff --git a/...ter-sentry/src/main/java/cn/iocoder/mall/sentry/config/CustomSentryAutoConfiguration.java b/...ter-sentry/src/main/java/cn/iocoder/mall/sentry/config/CustomSentryAutoConfiguration.java
@@ -35,4 +35,5 @@ public class CustomSentryAutoConfiguration {
     public SentryExceptionResolver doNothingExceptionResolver() {
         return new DoNothingExceptionResolver();
     }
+
 }
diff --git a/...boot-starter-web/src/main/java/cn/iocoder/mall/web/config/CommonWebAutoConfiguration.java b/...boot-starter-web/src/main/java/cn/iocoder/mall/web/config/CommonWebAutoConfiguration.java
@@ -84,7 +84,8 @@ public void configureMessageConverters(List<HttpMessageConverter<?>> converters)
         // 自定义 FastJson 配置
         FastJsonConfig fastJsonConfig = new FastJsonConfig();
         fastJsonConfig.setCharset(Charset.defaultCharset()); // 设置字符集
-        fastJsonConfig.setSerializerFeatures(SerializerFeature.DisableCircularReferenceDetect); // 剔除循环引用
+        fastJsonConfig.setSerializerFeatures(SerializerFeature.DisableCircularReferenceDetect, // 剔除循环引用
+                SerializerFeature.WriteNonStringKeyAsString); // 解决 Integer 作为 Key 时，转换为 String 类型，避免浏览器报错
         fastJsonHttpMessageConverter.setFastJsonConfig(fastJsonConfig);
         // 设置支持的 MediaType
         fastJsonHttpMessageConverter.setSupportedMediaTypes(Collections.singletonList(MediaType.APPLICATION_JSON));

diff --git a/docs/sql/old/mall_admin.sql b/docs/sql/old/mall_admin.sql
diff --git a/docs/sql/old/mall_product.sql b/docs/sql/old/mall_product.sql
diff --git a/docs/sql/old/mall_promotion.sql b/docs/sql/old/mall_promotion.sql
diff --git a/docs/sql/old/mall_user.sql b/docs/sql/old/mall_user.sql
diff --git a/management-web-app/pom.xml b/management-web-app/pom.xml
@@ -77,20 +77,13 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <artifactId>nacos-client</artifactId>-->
-<!--                    <groupId>com.alibaba.nacos</groupId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
         </dependency>
 
-        <!-- TODO 芋艿 解决 1.3.1 beta 的问题 -->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.nacos</groupId>-->
-<!--            <artifactId>nacos-client</artifactId>-->
-<!--            <version>1.3.1</version>-->
-<!--        </dependency>-->
+        <!-- 监控相关 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
 
         <!-- 工具类相关 -->
         <dependency>

diff --git a/management-web-app/src/main/resources/application.yml b/management-web-app/src/main/resources/application.yml
@@ -72,3 +72,8 @@ swagger:
   description: 提供管理员管理的所有功能
   version: 1.0.0
   base-package: cn.iocoder.mall.managementweb.controller
+
+# Actuator 监控配置项
+management:
+  server.port: 38087 # 独立端口，避免被暴露出去
+  endpoints.web.exposure.include: '*' # 暴露所有监控端点
diff --git a/...vice-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/banner/dto/BannerListReqDTO.java b/...vice-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/banner/dto/BannerListReqDTO.java
@@ -2,20 +2,17 @@
 
 import cn.iocoder.common.framework.enums.CommonStatusEnum;
 import cn.iocoder.common.framework.validator.InEnum;
-import cn.iocoder.common.framework.vo.PageParam;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 
 /**
  * Banner 列表 Request DTO
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-public class BannerListReqDTO extends PageParam {
+public class BannerListReqDTO implements Serializable {
 
     /**
      * 状态

diff --git a/promotion/pom.xml b/promotion/pom.xml
diff --git a/...ocoder/mall/promotion/application/controller/admins/AdminsProductRecommendController.java b/...ocoder/mall/promotion/application/controller/admins/AdminsProductRecommendController.java
diff --git a/...in/java/cn/iocoder/mall/promotion/application/controller/users/UsersBannerController.java b/...in/java/cn/iocoder/mall/promotion/application/controller/users/UsersBannerController.java
diff --git a/.../iocoder/mall/promotion/application/controller/users/UsersProductRecommendController.java b/.../iocoder/mall/promotion/application/controller/users/UsersProductRecommendController.java
diff --git a/...c/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsProductRecommendVO.java b/...c/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsProductRecommendVO.java
diff --git a/...src/main/java/cn/iocoder/mall/promotion/application/vo/users/UsersProductRecommendVO.java b/...src/main/java/cn/iocoder/mall/promotion/application/vo/users/UsersProductRecommendVO.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,4 +35,5 @@ public class CustomSentryAutoConfiguration { @@
         public SentryExceptionResolver doNothingExceptionResolver() {
             return new DoNothingExceptionResolver();
         }
     }