build 合并冲突

easier-report-biz/src/main/java/com/yaoyicloud/controller/CsoReportController.java

@@ -43,7 +43,7 @@ public class CsoReportController {
      * @param resource 请求参数
      * @return {@link Boolean } 结果
      */
-    @PostMapping("/report/create-report-cso")
+    @PostMapping("/report/create-word")
     public Map<String, Object>
         createPlusVersionCheckReport(@Validated @RequestBody ReportDTO.CsoReport resource,
             HttpServletRequest request) throws Exception {
@@ -81,7 +81,7 @@ public class CsoReportController {
      * @return
      * @throws Exception
      */
-    @PostMapping(value = "/report/create-report", consumes = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+    @PostMapping(value = "/report/create-pdf", consumes = MediaType.APPLICATION_OCTET_STREAM_VALUE)
     public ResponseEntity<byte[]> handleReport(@RequestBody byte[] fileBytes)  {
         // 1. 直接获取PDF字节流
         ByteArrayOutputStream pdfStream = csoReportService.saveToTempFile(fileBytes);

easier-report-biz/src/main/resources/application.yml

@@ -13,9 +13,9 @@ spring:
   redis:
     host: 127.0.0.1
     port: 6379
-  #  password: 8F4tJuQEgAE7MZyX  # fxy测试密码
-    #  password: By2YR2hKhJdhVeEfMzdWDVrrmvpA  # cso生产本地redis密码
-    password: 123456
+    password: 8F4tJuQEgAE7MZyX  # fxy测试密码
+  #  password: By2YR2hKhJdhVeEfMzdWDVrrmvpA  # cso生产本地redis密码
+  #  password: 123456
     database: 10
   servlet:
     multipart:
@@ -103,8 +103,8 @@ logging:
     com.yaoyicloud.easier.filerepo.mapper: debug
 
 # 租户表维护
-easier:
-  office:
-    pdf:
-      rootPath: C:/Users/yyy/dev/yyc3/easier-be
+#easier:
+#  office:
+#    pdf:
+#      rootPath: C:/Users/yyy/dev/yyc3/easier-be