From 54981e39ddbcb620728018ae5c49b81d13572c09 Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 23 Mar 2021 20:20:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1=E3=80=81=E6=9F=A5=E8=AF=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=8E=BB=E6=8E=89=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chinaunicom/mall/ebtp/project/feign/UsercenterApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/UsercenterApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/UsercenterApi.java index af0d73c..b81d2ae 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/UsercenterApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/UsercenterApi.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @author daixc * @date 2021/02/27 */ -@FeignClient(value = "${mconfig.service-price-usercenter}",url = "http://10.242.31.158:8100/core-service-usercenter-public/") +@FeignClient(value = "${mconfig.service-price-usercenter}") public interface UsercenterApi { /** From d16a7af3916ef854e9f878740d64c6ddd6dfe20a Mon Sep 17 00:00:00 2001 From: dxc Date: Wed, 24 Mar 2021 10:56:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1=E3=80=81=E6=B8=85=E9=99=A4=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-pro.yml | 2 +- src/main/resources/application-uat.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 6e0659c..d6d18f1 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -59,7 +59,7 @@ spring: connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 props: sql: - show: true + show: false jackson: date-format: yyyy-MM-dd HH:mm:ss diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index 23da1f9..8b7d1b2 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.yml @@ -55,7 +55,7 @@ spring: connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 props: sql: - show: true + show: false jackson: date-format: yyyy-MM-dd HH:mm:ss From 056da8ed61389187fbd3257a59736a1a6903c843 Mon Sep 17 00:00:00 2001 From: dxc Date: Wed, 24 Mar 2021 15:57:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?1=E3=80=81=E5=85=B3=E9=97=ADmybatis?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-pro.yml | 2 +- src/main/resources/application-uat.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index d6d18f1..5b20ecf 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -112,7 +112,7 @@ mybatis-plus: map-underscore-to-camel-case: true auto-mapping-behavior: full # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml global-config: # 逻辑删除配置 diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index 8b7d1b2..2a9e6d8 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.yml @@ -110,7 +110,7 @@ mybatis-plus: map-underscore-to-camel-case: true auto-mapping-behavior: full # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml global-config: # 逻辑删除配置 From fd5ec97e71e0ff8ae57ee29244d028a5e0a6b4f1 Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 25 Mar 2021 09:11:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=98=AF=E5=90=A6=E7=94=A8ipass=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=88=B6=E4=BD=9C=E5=BA=94=E7=AD=94=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectRecordServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 408f429..5f36fdb 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -663,17 +663,16 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionList = new ArrayList<>(); List materialList = new ArrayList<>(); List supplierList = new ArrayList<>(); From 26561979a0151254570e8ebbc5cf3b9401ce256d Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 25 Mar 2021 09:48:28 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-pro.yml | 2 +- src/main/resources/application-uat.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 5b20ecf..85a4479 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -59,7 +59,7 @@ spring: connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 props: sql: - show: false + show: true jackson: date-format: yyyy-MM-dd HH:mm:ss diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index 2a9e6d8..536139b 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.yml @@ -55,7 +55,7 @@ spring: connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 props: sql: - show: false + show: true jackson: date-format: yyyy-MM-dd HH:mm:ss