Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 80c443cd4202b6cab12d9435231bd7a7636afce8
+  newTag: 41b7c2796a4725d6e4455fa4c9672fa411b3fb3c

release-service/src/main/java/com/mmc/csf/release/config/CorsConfig.java

+package com.mmc.csf.release.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.reactive.CorsWebFilter;
+import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
+
+/**
+ * @author 作者 geDuo
+ * @version 创建时间：2021年9月4日 上午9:33:40
+ * @explain 跨域
+ */
+@Configuration
+public class CorsConfig {
+
+	// 添加跨域过滤器
+	@Bean
+	public CorsWebFilter corsWebFilter() {
+		UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+		CorsConfiguration config = new CorsConfiguration();
+		config.addAllowedOrigin("*");
+		config.setAllowCredentials(true);
+		config.addAllowedHeader("*");
+		config.addAllowedMethod("*");
+		source.registerCorsConfiguration("/**", config);
+		return new CorsWebFilter(source);
+	}
+}
+

release-service/src/main/java/com/mmc/csf/release/controller/ModuleInfoController.java

@@ -31,7 +31,7 @@ public class ModuleInfoController {
     @Autowired
     private ModuleInfoService moduleInfoService;
 
-    @ApiOperation(value = "宣传模块-新增")
+    @ApiOperation(value = "V1.0.1-宣传模块-新增")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @PostMapping("insertModuleInfo")
     public ResultBody insertModuleInfo(@Validated(Create.class) @RequestBody ModuleInfoVO moduleInfoVO) {
@@ -45,7 +45,7 @@ public class ModuleInfoController {
         return moduleInfoService.updateModuleInfo(moduleInfoVO);
     }
 
-    @ApiOperation(value = "删除宣传模块")
+    @ApiOperation(value = "V1.0.1-删除宣传模块")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @GetMapping("removeModuleInfo")
     public ResultBody removeModuleInfo(@ApiParam(value = "id", required = true) @RequestParam Integer id) {
@@ -60,7 +60,7 @@ public class ModuleInfoController {
         return moduleInfoService.updateModuleInfoRemark(id, remark);
     }
 
-    @ApiOperation(value = "宣传模块管理-分页")
+    @ApiOperation(value = "V1.0.1-宣传模块管理-分页")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ModuleInfoDTO.class) })
     @PostMapping("listModuleInfoPage")
     public ResultBody<ModuleInfoDTO> listModuleInfoPage(
@@ -68,7 +68,7 @@ public class ModuleInfoController {
         return moduleInfoService.listModuleInfoPage(param);
     }
 
-    @ApiOperation(value = "banner管理-分页")
+    @ApiOperation(value = "V1.0.1-banner管理-分页")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = BannerInfoDTO.class) })
     @PostMapping("listBannerInfoPage")
     public ResultBody<BannerInfoDTO> listBannerInfoPage(
@@ -83,21 +83,21 @@ public class ModuleInfoController {
         return moduleInfoService.removeBannerInfo(id);
     }
 
-    @ApiOperation(value = "banner-新增")
+    @ApiOperation(value = "V1.0.1-banner-新增")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @PostMapping("insertBannerInfo")
     public ResultBody insertBannerInfo(@Validated(Create.class) @RequestBody BannerInfoVO bannerInfoVO) {
         return moduleInfoService.insertBannerInfo(bannerInfoVO);
     }
 
-    @ApiOperation(value = "banner-修改")
+    @ApiOperation(value = "V1.0.1-banner-修改")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @PostMapping("updateBannerInfo")
     public ResultBody updateBannerInfo(@Validated(Update.class) @RequestBody BannerInfoVO bannerInfoVO) {
         return moduleInfoService.updateBannerInfo(bannerInfoVO);
     }
 
-    @ApiOperation(value = "banner-排序交换")
+    @ApiOperation(value = "V1.0.1-banner-排序交换")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @PostMapping("exchangeBannerInfo")
     public ResultBody exchangeBannerInfo(@Validated(Others.class) @RequestBody List<BannerInfoVO> list) {
@@ -111,7 +111,7 @@ public class ModuleInfoController {
         return moduleInfoService.listBannerImg(moduleCode);
     }
 
-    @ApiOperation(value = "banner批量删除")
+    @ApiOperation(value = "V1.0.1-banner批量删除")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @PostMapping("batchRemoveBannerInfo")
     public ResultBody batchRemoveBannerInfo(

release-service/src/main/resources/application-local.yml

@@ -53,8 +53,8 @@ spring:
   #Redis
   redis:
     database: 0
-    host: 119.23.248.181
-    password: mmc@redis123
+    host: r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com
+    password: MMC@2022&REDIS
     port: 6379
     #连接池
     lettuce: