luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into release

Browse Source
release
yishiqihuasheng 2 years ago
parent 77421b8215 949bd6c18a
commit 34adecb9a5
9 changed files with 49 additions and 35 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      dxhy-admin/src/main/resources/bootstrap-test.yaml
  2. 4
      dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java
  3. 2
      dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
  4. 16
      dxhy-core/src/main/resources/bootstrap-std.yaml
  5. 14
      dxhy-core/src/main/resources/bootstrap-test.yaml
  6. 2
      dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java
  7. 4
      dxhy-erp/src/main/resources/bootstrap-test.yaml
  8. 14
      dxhy-gateway/src/main/resources/bootstrap-test.yaml
  9. 14
      dxhy-operation-flow/src/main/resources/bootstrap-test.yaml

14
dxhy-admin/src/main/resources/bootstrap-test.yaml
Unescape View File

@ -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

4
dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java
Unescape View File

@ -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);
@ -19,6 +21,8 @@ public interface GsClientMapper {
GsClient selectByPrimaryKey(Integer id);
List<GsClient> selectByGsdm(String gsdm);
int updateByPrimaryKeySelective(GsClient record);

2
dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
Unescape View File

@ -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("-");

16
dxhy-core/src/main/resources/bootstrap-std.yaml
Unescape View File

@ -4,24 +4,24 @@ 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: 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}
file-extension: yaml
# Nacos discovery 配置
discovery:
server-addr: nacos-1.itax.local:33000
server-addr: 172.31.36.143:33000
# Nacos config 登录用户名
username: nacos
username: admin
# Nacos config 登录密码
password: FaP!a0_NacOs
namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68
password: Invoice.nacos.!1
namespace: b271ba8e-84d9-4393-88b8-9271aff9465c

14
dxhy-core/src/main/resources/bootstrap-test.yaml
Unescape View File

@ -4,22 +4,24 @@ spring:
nacos:
config:
# Nacos config 地址
server-addr: 10.1.3.224:8848
server-addr: 172.31.36.143: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

2
dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java
Unescape View File

@ -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);

4
dxhy-erp/src/main/resources/bootstrap-test.yaml
Unescape View File

@ -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}

14
dxhy-gateway/src/main/resources/bootstrap-test.yaml
Unescape View File

@ -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

14
dxhy-operation-flow/src/main/resources/bootstrap-test.yaml
Unescape View File

@ -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
Write Preview
Loading…
Cancel
Save