diff --git a/jianshui-admin/src/main/resources/application-dev.yml b/jianshui-admin/src/main/resources/application-dev.yml
index ae34211..a9c9e3b 100644
--- a/jianshui-admin/src/main/resources/application-dev.yml
+++ b/jianshui-admin/src/main/resources/application-dev.yml
@@ -84,6 +84,3 @@ spring:
# #连接池最大阻塞等待时间(使用负值表示没有限制)
max-wait: -1ms
ele_auth_url: https://sandbox.ele-cloud.com/api/
-logstash:
- host: 43.138.58.64:14560
- indexname: jianshui-dev
\ No newline at end of file
diff --git a/jianshui-admin/src/main/resources/application-prod.yml b/jianshui-admin/src/main/resources/application-prod.yml
index 55cb5e8..9a099cd 100644
--- a/jianshui-admin/src/main/resources/application-prod.yml
+++ b/jianshui-admin/src/main/resources/application-prod.yml
@@ -81,6 +81,3 @@ spring:
# #连接池最大阻塞等待时间(使用负值表示没有限制)
max-wait: -1ms
ele_auth_url: https://openapi.ele-cloud.com/api/dxhy-open-income/v1/
-logstash:
- host: 43.138.58.64:14560
- indexname: jianshui-prod
\ No newline at end of file
diff --git a/jianshui-admin/src/main/resources/application.yml b/jianshui-admin/src/main/resources/application.yml
index 883d23c..32fde3b 100644
--- a/jianshui-admin/src/main/resources/application.yml
+++ b/jianshui-admin/src/main/resources/application.yml
@@ -46,7 +46,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
- active: dev
+ active: prod
# 文件上传
servlet:
multipart:
diff --git a/jianshui-admin/src/main/resources/logback-spring.xml b/jianshui-admin/src/main/resources/logback-spring.xml
index f2d5abe..95b2f1a 100644
--- a/jianshui-admin/src/main/resources/logback-spring.xml
+++ b/jianshui-admin/src/main/resources/logback-spring.xml
@@ -70,51 +70,6 @@
${log.pattern}
-
-
-
-
-
-
-
-
- ${logstash-host}
-
-
-
-
-
-
- {
-
- "indexname":"${logstash-indexname}",
-
- "appname":"${spring.application.name}",
-
-
-
-
-
- "timestamp": "%d{yyyy-MM-dd HH:mm:ss.SSS}",
-
- "thread": "%thread",
-
- "level": "%level",
-
- "logger_name": "%logger",
-
- "message": "%msg",
-
- "stack_trace": "%exception"
- }
-
-
-
-
-
-
-
-
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java
index 1e7b433..e0df2ff 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java
@@ -414,11 +414,12 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService {
} else if (StringUtils.equals(ddzt, "001999")) {
invoice.setState(22); // "开票状态"
} else if (StringUtils.equals(ddzt, "002000")) {
- if (StringUtils.equals(ztdm, "002000")) {
+ /*f (StringUtils.equals(ztdm, "002000")) {
invoice.setState(22); // "开票状态" 辣鸡大象,订单开票异常的外层报文也是002000,内层报文也是这个
} else {
invoice.setState(20); // "开票状态"
- }
+ }*/
+ invoice.setState(20);
} else if (StringUtils.equals(ddzt, "003000")) {
invoice.setState(3); // "开票状态"
} else if (StringUtils.equals(ddzt, "004000")) {