From 1991657b6fe7a51e7ced7ef11372a8463b8937d4 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 24 Apr 2023 14:35:56 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-admin/src/main/resources/bootstrap-test.yaml | 14 ++++++++------ dxhy-core/src/main/resources/bootstrap-test.yaml | 14 ++++++++------ dxhy-erp/src/main/resources/bootstrap-test.yaml | 4 ++-- .../src/main/resources/bootstrap-test.yaml | 14 ++++++++------ .../src/main/resources/bootstrap-test.yaml | 14 ++++++++------ 5 files changed, 34 insertions(+), 26 deletions(-) diff --git a/dxhy-admin/src/main/resources/bootstrap-test.yaml b/dxhy-admin/src/main/resources/bootstrap-test.yaml index ad8a9954..54878275 100644 --- a/dxhy-admin/src/main/resources/bootstrap-test.yaml +++ b/dxhy-admin/src/main/resources/bootstrap-test.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.3.224:8848 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 group: dxhy-admin-group # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 - password: nacos + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-admin # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.3.224:8848 - username: nacos - password: nacos + server-addr: 172.31.36.143:33000 + # Nacos config 登录用户名 + username: admin + # Nacos config 登录密码 + password: Invoice.nacos.!1 namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file diff --git a/dxhy-core/src/main/resources/bootstrap-test.yaml b/dxhy-core/src/main/resources/bootstrap-test.yaml index 15638ac1..a9fd38b4 100644 --- a/dxhy-core/src/main/resources/bootstrap-test.yaml +++ b/dxhy-core/src/main/resources/bootstrap-test.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.3.224:8848 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 group: dxhy-core-group # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 - password: nacos + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-core # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.3.224:8848 - username: nacos - password: nacos + server-addr: 172.31.36.147:33000 + # Nacos config 登录用户名 + username: admin + # Nacos config 登录密码 + password: Invoice.nacos.!1 namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file diff --git a/dxhy-erp/src/main/resources/bootstrap-test.yaml b/dxhy-erp/src/main/resources/bootstrap-test.yaml index b9a78c6c..fdf23215 100644 --- a/dxhy-erp/src/main/resources/bootstrap-test.yaml +++ b/dxhy-erp/src/main/resources/bootstrap-test.yaml @@ -4,7 +4,7 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.3.224:8848 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 @@ -12,7 +12,7 @@ spring: # Nacos config 登录用户名 username: nacos # Nacos config 登录密码 - password: nacos + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-erp # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} diff --git a/dxhy-gateway/src/main/resources/bootstrap-test.yaml b/dxhy-gateway/src/main/resources/bootstrap-test.yaml index b25feb9d..ec92f982 100644 --- a/dxhy-gateway/src/main/resources/bootstrap-test.yaml +++ b/dxhy-gateway/src/main/resources/bootstrap-test.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.3.224:8848 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 group: dxhy-gateway-group # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 - password: nacos + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-gateway # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.3.224:8848 - username: nacos - password: nacos + server-addr: 172.31.36.143:33000 + # Nacos config 登录用户名 + username: admin + # Nacos config 登录密码 + password: Invoice.nacos.!1 namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file diff --git a/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml b/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml index 780b661c..9bb0a7aa 100644 --- a/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml +++ b/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.2.202:8848 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 group: dxhy-flow-group # Nacos config 登录用户名 - username: dxhy-jxpt + username: admin # Nacos config 登录密码 - password: dxhy-jxpt + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-flow # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.2.202:8848 - username: dxhy-jxpt - password: dxhy-jxpt + server-addr: 172.31.36.143:33000 + # Nacos config 登录用户名 + username: admin + # Nacos config 登录密码 + password: Invoice.nacos.!1 namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file From 28c0d44f7fd12babb6901b8e6d06157b79e3448c Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 24 Apr 2023 14:46:46 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/bootstrap-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-core/src/main/resources/bootstrap-test.yaml b/dxhy-core/src/main/resources/bootstrap-test.yaml index a9fd38b4..76a3f1d5 100644 --- a/dxhy-core/src/main/resources/bootstrap-test.yaml +++ b/dxhy-core/src/main/resources/bootstrap-test.yaml @@ -4,7 +4,7 @@ spring: nacos: config: # Nacos config 地址 - server-addr: nacos-1.itax.local:33000 + server-addr: 172.31.36.143:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 From b08c6b7f69b4b49afe3b15758d87e23a2d8e2792 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 14:59:38 +0800 Subject: [PATCH 3/7] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/bootstrap-std.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dxhy-core/src/main/resources/bootstrap-std.yaml b/dxhy-core/src/main/resources/bootstrap-std.yaml index 7b344d4c..02862826 100644 --- a/dxhy-core/src/main/resources/bootstrap-std.yaml +++ b/dxhy-core/src/main/resources/bootstrap-std.yaml @@ -6,13 +6,13 @@ spring: # Nacos config 地址 server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） - namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 + namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 group: dxhy-core-group # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 - password: FaP!a0_NacOs + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-core # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} @@ -21,7 +21,7 @@ spring: discovery: server-addr: nacos-1.itax.local:33000 # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 - password: FaP!a0_NacOs - namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 \ No newline at end of file + password: Invoice.nacos.!1 + namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file From b385d26a560fc39de8671f15e99c1b0cccb082c8 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 15:11:57 +0800 Subject: [PATCH 4/7] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java b/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java index aa4d5827..a710f830 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java +++ b/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java @@ -19,6 +19,8 @@ public interface GsClientMapper { GsClient selectByPrimaryKey(Integer id); + + List selectByGsdm(String gsdm); int updateByPrimaryKeySelective(GsClient record); From e2ba51b97505c72a3d69f3826fff770f08116681 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 15:15:18 +0800 Subject: [PATCH 5/7] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java b/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java index a710f830..599a4dce 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java +++ b/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java @@ -2,10 +2,12 @@ package com.dxhy.core.dao; import com.dxhy.core.entity.GsClient; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface GsClientMapper { int deleteByPrimaryKey(Integer id); From dd0a4490bad7ac79aec802e9f432241b78080298 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 15:45:02 +0800 Subject: [PATCH 6/7] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java | 2 +- dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java index f7bf54ff..07ce17d1 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java @@ -247,7 +247,7 @@ public class PoolAddTaxThread extends BaseThread { // 递归导出数据到excel 发票信息 this.cicleExport(pramsMap, default_curr, excelFile.toString(), out, writer); - this.detailCicleExport(pramsMap, default_curr, excelFile.toString(), out, writer); +// this.detailCicleExport(pramsMap, default_curr, excelFile.toString(), out, writer); // writer.finish(); // FTP文件存储路径 String[] toDay = DateUtil.today().split("-"); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java index 9782db98..dc2bf73a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java @@ -2,10 +2,12 @@ package com.dxhy.erp.dao; import com.dxhy.erp.entity.GsClient; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface GsClientMapper { int deleteByPrimaryKey(Integer id); From 949bd6c18ab9b9e1c9aa6ec7cfa5560e7668ae93 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 15:54:57 +0800 Subject: [PATCH 7/7] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/bootstrap-std.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-core/src/main/resources/bootstrap-std.yaml b/dxhy-core/src/main/resources/bootstrap-std.yaml index 02862826..c4522dab 100644 --- a/dxhy-core/src/main/resources/bootstrap-std.yaml +++ b/dxhy-core/src/main/resources/bootstrap-std.yaml @@ -4,7 +4,7 @@ spring: nacos: config: # Nacos config 地址 - server-addr: nacos-1.itax.local:33000 + server-addr: 172.31.36.143:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 @@ -19,7 +19,7 @@ spring: file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: nacos-1.itax.local:33000 + server-addr: 172.31.36.143:33000 # Nacos config 登录用户名 username: admin # Nacos config 登录密码