From 802e339ecf98e75ea4eff3eb4acc9849b68fa8bf Mon Sep 17 00:00:00 2001
From: mzr <mzr123456>
Date: Thu, 22 Aug 2024 11:35:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(crm-admin):=20=E8=A7=A3=E5=86=B3Excel?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=92=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 增加导出接口的produces属性，指定响应内容类型为application/octet-stream，以确保浏览器正确处理Excel文件。
- 更新应用配置，更改数据库和Redis连接信息。
---
 .../java/com/yb/lb/webapp/excel/archives/BankCardExcel.java | 2 +-
 .../yb/lb/webapp/excel/records/CollectionRecordsExcel.java  | 2 +-
 crm-admin/src/main/resources/application-dev.yml            | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/excel/archives/BankCardExcel.java b/crm-admin/src/main/java/com/yb/lb/webapp/excel/archives/BankCardExcel.java
index d8878f3..70e8694 100644
--- a/crm-admin/src/main/java/com/yb/lb/webapp/excel/archives/BankCardExcel.java
+++ b/crm-admin/src/main/java/com/yb/lb/webapp/excel/archives/BankCardExcel.java
@@ -163,7 +163,7 @@ public class BankCardExcel {
      **/
     @ResponseBody
     @RequestMapping(value = "/exportBankCard", method = RequestMethod.GET)
-    @ApiOperation(value = "导出银行卡档案")
+    @ApiOperation(value = "导出银行卡档案", produces = "application/octet-stream")
     public void exportBankCard(
             @ApiParam(required = true, value = "token") @RequestParam(required = true) String token,
             @ApiParam(required = false, value = "行政区域") @RequestParam(required = false) String region,
diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/excel/records/CollectionRecordsExcel.java b/crm-admin/src/main/java/com/yb/lb/webapp/excel/records/CollectionRecordsExcel.java
index 06743e5..c2dc4db 100644
--- a/crm-admin/src/main/java/com/yb/lb/webapp/excel/records/CollectionRecordsExcel.java
+++ b/crm-admin/src/main/java/com/yb/lb/webapp/excel/records/CollectionRecordsExcel.java
@@ -49,7 +49,7 @@ public class CollectionRecordsExcel {
      **/
     @ResponseBody
     @RequestMapping(value = "/exportCollectionRecords", method = RequestMethod.GET)
-    @ApiOperation(value = "导出收款记录")
+    @ApiOperation(value = "导出收款记录", produces = "application/octet-stream")
     public void exportCollectionRecords(
             @ApiParam(required = false, value = "客户编码") @RequestParam(required = false) String customerCode,
             @ApiParam(required = false, value = "客户名称") @RequestParam(required = false) String customerName,
diff --git a/crm-admin/src/main/resources/application-dev.yml b/crm-admin/src/main/resources/application-dev.yml
index 2ac3722..1ad5619 100644
--- a/crm-admin/src/main/resources/application-dev.yml
+++ b/crm-admin/src/main/resources/application-dev.yml
@@ -2,13 +2,13 @@ spring:
   #redis
   redis:
     # 地址
-    host: 192.168.0.124
+    host: 121.37.179.211
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 15
     # 密码
-    password: 123456
+    password: yunjiaokj123
     # 连接超时时间
     timeout: 1000
 
@@ -23,7 +23,7 @@ spring:
   datasource-oracle:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: oracle.jdbc.OracleDriver
-    url: jdbc:oracle:thin:@60.204.129.13:1521:ORCL
+    url: jdbc:oracle:thin:@121.37.179.211:1521:ORCL
     username: kesai
     password: kesai