From 95c6df0aefeee9bcd6e2995306145ff1024c256a Mon Sep 17 00:00:00 2001 From: yefei Date: Sun, 23 Apr 2023 11:15:37 +0800 Subject: [PATCH 1/9] =?UTF-8?q?ariesy=20=E6=89=93=E5=8D=B0=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java index f874ae37..7cf29fef 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java @@ -578,7 +578,7 @@ public class ConfirmServiceImpl extends ServiceImpl impl // 加密串生成 String appSec = makeAppSecService.makeAppSec(org.getAceId(), appid, enterpriseCode, applyLtgalize, version, base64Data, dataExchangeId, org.getAceKey()); - log.info("org.getAceId()={},appid={},enterpriseCode={},applyLtgalize={},version={},base64Data={},dataExchangeId={},org.getAceKey={}", + log.info("org.getAceId={},appid={},enterpriseCode={},applyLtgalize={},version={},base64Data={},dataExchangeId={},org.getAceKey={}", org.getAceId(),appid,enterpriseCode,applyLtgalize,version,base64Data,dataExchangeId,org.getAceKey()); // 请求报文拼接 String requstData = From 9fb84cd5afff5a7873415178a3ba252bcfdc15be Mon Sep 17 00:00:00 2001 From: yefei Date: Sun, 23 Apr 2023 11:16:26 +0800 Subject: [PATCH 2/9] =?UTF-8?q?ariesy=20=E6=89=93=E5=8D=B0=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/job/service/impl/ConfirmServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java index 7cf29fef..fa85b773 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java @@ -575,11 +575,11 @@ public class ConfirmServiceImpl extends ServiceImpl impl applyInfo.setBatchNo(batchNo); String dataStr = JSONObject.toJSONString(applyInfo); String base64Data = Base64.encode(dataStr); + log.info("org.getAceId={},appid={},enterpriseCode={},applyLtgalize={},version={},base64Data={},dataExchangeId={},org.getAceKey={}", + org.getAceId(),appid,enterpriseCode,applyLtgalize,version,base64Data,dataExchangeId,org.getAceKey()); // 加密串生成 String appSec = makeAppSecService.makeAppSec(org.getAceId(), appid, enterpriseCode, applyLtgalize, version, base64Data, dataExchangeId, org.getAceKey()); - log.info("org.getAceId={},appid={},enterpriseCode={},applyLtgalize={},version={},base64Data={},dataExchangeId={},org.getAceKey={}", - org.getAceId(),appid,enterpriseCode,applyLtgalize,version,base64Data,dataExchangeId,org.getAceKey()); // 请求报文拼接 String requstData = requestData(appSec, dataExchangeId, base64Data, applyLtgalize, org.getAceId()); From b201fc97c39dc2551f69d61a8d5d3cb1d7276ab5 Mon Sep 17 00:00:00 2001 From: yefei Date: Sun, 23 Apr 2023 11:17:48 +0800 Subject: [PATCH 3/9] =?UTF-8?q?ariesy=20=E6=89=93=E5=8D=B0=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java index fa85b773..ae8a3603 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java @@ -575,7 +575,7 @@ public class ConfirmServiceImpl extends ServiceImpl impl applyInfo.setBatchNo(batchNo); String dataStr = JSONObject.toJSONString(applyInfo); String base64Data = Base64.encode(dataStr); - log.info("org.getAceId={},appid={},enterpriseCode={},applyLtgalize={},version={},base64Data={},dataExchangeId={},org.getAceKey={}", + log.info("org.getAceId()={},appid={},enterpriseCode={},applyLtgalize={},version={},base64Data={},dataExchangeId={},org.getAceKey={}", org.getAceId(),appid,enterpriseCode,applyLtgalize,version,base64Data,dataExchangeId,org.getAceKey()); // 加密串生成 String appSec = makeAppSecService.makeAppSec(org.getAceId(), appid, enterpriseCode, From 35bbb8056c74ed8266f9634c18338e153e297d91 Mon Sep 17 00:00:00 2001 From: yefei Date: Sun, 23 Apr 2023 11:33:40 +0800 Subject: [PATCH 4/9] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=20=E7=9B=B8=E5=85=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/config/WebConfiguration.java | 3 ++- .../mailGather/EmailMaintainController.java | 16 ++++++++++++---- .../core/dao/mailGather/EmailMaintainDao.java | 8 ++++++++ .../service/mailGather/EmailMaintainService.java | 2 ++ .../impl/EmailMaintainServiceImpl.java | 6 ++++++ dxhy-core/src/main/resources/bootstrap-std.yaml | 12 ++++++------ .../mapper/mailGather/EmailMaintainMapper.xml | 4 ++++ 7 files changed, 40 insertions(+), 11 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java b/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java index d6e1ef66..2edb5e0c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java +++ b/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java @@ -65,8 +65,9 @@ public class WebConfiguration implements WebMvcConfigurer { private ArrayList getIncludePathPatterns() { ArrayList list = new ArrayList<>(); String[] urls = - {"/mailGatherLog/**","/emailMaintain/**","/excel/apply","/excel/applyForSDNY", "/ftp/download", "/scan/get/scaninfo", "/setPwd", "/resetPwd", "/invoiceDetail/info", + {"/mailGatherLog/**","/excel/apply","/excel/applyForSDNY", "/ftp/download", "/scan/get/scaninfo", "/setPwd", "/resetPwd", "/invoiceDetail/info", "/invoiceDetail/saleInfo", "/smcy/info", "/invoiceDetail/companyPoolInvoiceDetail/**", "/pool/**"}; +// ,"/emailMaintain/**" Collections.addAll(list, urls); return list; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index 866fe548..35ddadd5 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -214,6 +214,13 @@ public class EmailMaintainController extends AbstractController { errorMsgList.add("第" + resultIndex + "行，用户邮箱地址重复，请核实！"); continue; } + + int i = emailMaintainService.selectByEmail(maintainExcel.getEmailAddress()); + if(i>0){ + errorMsgList.add("第" + resultIndex + "行，邮箱数据已存在，请核实！"); + continue; + } + mailTitleList.add(maintainExcel.getEmailAddress()); EmailMaintainVo maintainVo = new EmailMaintainVo(); @@ -227,7 +234,8 @@ public class EmailMaintainController extends AbstractController { String encode = Base64Encoding.encode(password); maintainVo.setEmailPassword(encode); maintainVo.setDelStatus("0"); - maintainVo.setCreateUser(getUserInfo().getLoginname()); + maintainVo.setCreateUser("yf"); +// maintainVo.setCreateUser(getUserInfo().getLoginname()); maintainVo.setCreateTime(new Date()); maintainVo.setModifyTime(new Date()); mailList.add(maintainVo); @@ -261,16 +269,16 @@ public class EmailMaintainController extends AbstractController { if(StringUtils.isEmpty(userCode)){ return ResponseEntity.ok(R.error("数据不能为空！")); } - DynamicContextHolder.push(DbConstant.BASICS_READ); String userName = emailMaintainService.getUserName(userCode); + JSONObject json = new JSONObject(); if(StringUtils.isNotEmpty(userName)){ - JSONObject json = new JSONObject(); json.put("datalist", userName); log.debug("返回结果：{}", json.toJSONString()); String jsonString = Base64.encode(json.toJSONString()); return ResponseEntity.ok(R.ok().put("data",jsonString)); + }else{ + return ResponseEntity.ok(R.ok().put("data","未查询到用户名为"+userName+"数据")); } - return ResponseEntity.ok(R.error("未查询到相应数据！")); } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java b/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java index 67042ce5..906245d7 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java +++ b/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java @@ -53,6 +53,14 @@ public interface EmailMaintainDao extends BaseMapper { */ int insertBatch(@Param("entities") List entities); + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int selectByEmail(@Param("email") String email); + /** * 批量新增或按主键更新数据（MyBatis原生foreach方法） * diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java index d855e687..39d12fe3 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java @@ -52,5 +52,7 @@ public interface EmailMaintainService { int insertBatch(List entities); + int selectByEmail(String email); + EmailMaintainVo getEmailMaintainVo(EmailMaintainVo emailMaintain); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java index cfca00b3..4d678356 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java @@ -117,6 +117,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { @Override public String getUserName(String userCode) { + DynamicContextHolder.push(DbConstant.BASICS_READ); return emailMaintainDao.getUserName(userCode); } @@ -125,6 +126,11 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { return emailMaintainDao.insertBatch(entities); } + @Override + public int selectByEmail(String email) { + return emailMaintainDao.selectByEmail(email); + } + @Override public EmailMaintainVo getEmailMaintainVo(EmailMaintainVo emailMaintain) { return emailMaintainDao.getEmailMaintainVo(emailMaintain); diff --git a/dxhy-core/src/main/resources/bootstrap-std.yaml b/dxhy-core/src/main/resources/bootstrap-std.yaml index c4522dab..466beb99 100644 --- a/dxhy-core/src/main/resources/bootstrap-std.yaml +++ b/dxhy-core/src/main/resources/bootstrap-std.yaml @@ -4,13 +4,13 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 172.31.36.143:33000 + server-addr: 172.31.36.147:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 # Nacos config 分组 group: dxhy-core-group # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 password: Invoice.nacos.!1 # Nacos config 配置文件前缀 @@ -19,9 +19,9 @@ spring: file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 172.31.36.143:33000 + server-addr: 172.31.36.147:33000 # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 password: Invoice.nacos.!1 - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 \ No newline at end of file diff --git a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml index c318f25e..0d695302 100644 --- a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml +++ b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml @@ -165,5 +165,9 @@ select username from sys_user where loginname = #{userCode} + + From 2b2925a205b996600b9bdc7a49d781ae5746ba09 Mon Sep 17 00:00:00 2001 From: yefei Date: Sun, 23 Apr 2023 16:09:22 +0800 Subject: [PATCH 5/9] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=20=E7=9B=B8=E5=85=B3bug=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/core/config/WebConfiguration.java | 4 ++-- .../core/controller/mailGather/EmailMaintainController.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java b/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java index 2edb5e0c..ddde892b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java +++ b/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java @@ -65,9 +65,9 @@ public class WebConfiguration implements WebMvcConfigurer { private ArrayList getIncludePathPatterns() { ArrayList list = new ArrayList<>(); String[] urls = - {"/mailGatherLog/**","/excel/apply","/excel/applyForSDNY", "/ftp/download", "/scan/get/scaninfo", "/setPwd", "/resetPwd", "/invoiceDetail/info", + {"/mailGatherLog/**","/excel/apply","/emailMaintain/**","/excel/applyForSDNY", "/ftp/download", "/scan/get/scaninfo", "/setPwd", "/resetPwd", "/invoiceDetail/info", "/invoiceDetail/saleInfo", "/smcy/info", "/invoiceDetail/companyPoolInvoiceDetail/**", "/pool/**"}; -// ,"/emailMaintain/**" + Collections.addAll(list, urls); return list; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index 35ddadd5..1f882266 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -234,8 +234,7 @@ public class EmailMaintainController extends AbstractController { String encode = Base64Encoding.encode(password); maintainVo.setEmailPassword(encode); maintainVo.setDelStatus("0"); - maintainVo.setCreateUser("yf"); -// maintainVo.setCreateUser(getUserInfo().getLoginname()); + maintainVo.setCreateUser(getUserInfo().getLoginname()); maintainVo.setCreateTime(new Date()); maintainVo.setModifyTime(new Date()); mailList.add(maintainVo); From ca1820f7156fd6224d51d8528b2f4dd8be228052 Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Sun, 23 Apr 2023 16:20:14 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=80=80=E7=A8=8E=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AE=A4=E8=AF=81--bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawback/impl/DomesticInvoiceDrawbackServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java index fc28a077..0af7189b 100644 --- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java +++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java @@ -253,7 +253,12 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba vo.setSelected("0"); return vo; } - String uuid = dto.getInvoiceCode() + dto.getInvoiceNo(); + String uuid =""; + if(dto.getInvoiceCode()!=null){ + uuid= dto.getInvoiceCode() + dto.getInvoiceNo(); + }else { + uuid = dto.getInvoiceNo(); + } List tdxRecordInvoices = domesticRecordInvoiceDao.selectByUuidList(Collections.singletonList(uuid)); // 底账信息查询 @@ -535,4 +540,5 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba return business.stream().filter(b -> deptId.equals(b.getBusinessCode())).findFirst() .map(Business::getBusinessName).orElse(null); } + } From df521bdb79bac898cf584bcd9d54563abdffaf29 Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Sun, 23 Apr 2023 16:39:29 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=8B=89=E5=8F=96=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/extend/controller/VouncherSyncController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java index 3989eede..f735d7c7 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java @@ -81,7 +81,7 @@ public class VouncherSyncController { if(ztype.equals("S")){ return ResponseEntity.ok(R.ok().put("data","数据拉取成功")); }else { - return ResponseEntity.ok(R.error(CommonConstants.MSG_ERR_DEFAULT)); + return ResponseEntity.ok(R.error((String)output.get("ZDATA"))); } }catch (Exception e ){ From 843607e3a9e64622f3d3373e4b02555f98dcb323 Mon Sep 17 00:00:00 2001 From: yefei Date: Sun, 23 Apr 2023 17:08:28 +0800 Subject: [PATCH 8/9] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=20=E7=9B=B8=E5=85=B3bug=20v3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mailGather/EmailMaintainController.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index 1f882266..a4e1480e 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -130,6 +130,16 @@ public class EmailMaintainController extends AbstractController { if(maintainVo != null && maintainVo.getId().equals(emailMaintain.getId())){ return ResponseEntity.ok(R.error("邮箱地址已存在！")); } + + String userId = emailMaintain.getUserId(); + + String userName = emailMaintainService.getUserName(userId); + if(StringUtils.isBlank(userName)){ + R data = new R(101, "用户编码在系统中查询不到，请核实！"); + data.put("data", ""); + return ResponseEntity.ok(data); + } + boolean b = emailMaintainService.update(emailMaintain); if(b){ return ResponseEntity.ok(R.ok()); @@ -242,7 +252,11 @@ public class EmailMaintainController extends AbstractController { if (ObjectUtil.isNotEmpty(errorMsgList)) { JSONObject json = new JSONObject(); json.put("datalist", errorMsgList); - return ResponseEntity.ok(R.ok().put("data",Base64.encode(json.toJSONString()))); + + R data = new R(101, "校验信息有误"); + data.put("data", json); + return ResponseEntity.ok(data); + } int i = emailMaintainService.insertBatch(mailList); if(i > 0){ From f22926ca44d286610145cf53f99cd1ccccd59733 Mon Sep 17 00:00:00 2001 From: yefei Date: Sun, 23 Apr 2023 17:33:30 +0800 Subject: [PATCH 9/9] =?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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dxhy-core/src/main/resources/bootstrap-std.yaml b/dxhy-core/src/main/resources/bootstrap-std.yaml index 466beb99..76a3f1d5 100644 --- a/dxhy-core/src/main/resources/bootstrap-std.yaml +++ b/dxhy-core/src/main/resources/bootstrap-std.yaml @@ -4,13 +4,13 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 172.31.36.147:33000 + server-addr: 172.31.36.143:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） - namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 + namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 group: dxhy-core-group # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 password: Invoice.nacos.!1 # Nacos config 配置文件前缀 @@ -21,7 +21,7 @@ spring: discovery: server-addr: 172.31.36.147:33000 # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 password: Invoice.nacos.!1 - namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 \ No newline at end of file + namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file