diff --git a/mhd-auth/src/main/resources/bootstrap.yml b/mhd-auth/src/main/resources/bootstrap.yml index 4ad3efaa9..0e2deba8b 100644 --- a/mhd-auth/src/main/resources/bootstrap.yml +++ b/mhd-auth/src/main/resources/bootstrap.yml @@ -12,13 +12,17 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-common/mhd-common-core/pom.xml b/mhd-common/mhd-common-core/pom.xml index bc525d13e..0ac4933ce 100644 --- a/mhd-common/mhd-common-core/pom.xml +++ b/mhd-common/mhd-common-core/pom.xml @@ -180,6 +180,12 @@ 3.3.2 compile + + io.minio + minio + 8.5.2 + compile + diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java index c8bcfc4e1..a9f7009b7 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java @@ -522,4 +522,22 @@ public class TmsOrder implements Serializable { @ApiModelProperty(value = "付款方名称") private String payer; + + @ApiModelProperty("客户编码nc") + private String customsCodeNc; + + @ApiModelProperty("制单人编码nc") + private String makerCodeNc; + + @ApiModelProperty("业务员编码nc") + private String salesmanCodeNc; + + @ApiModelProperty("税率") + private BigDecimal taxRate; + + @ApiModelProperty("结算币种") + private String settlementCurrency; + + @ApiModelProperty("合同编号") + private String contractNo; } diff --git a/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java b/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java new file mode 100644 index 000000000..02b44f326 --- /dev/null +++ b/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java @@ -0,0 +1,137 @@ +package minio; + +import com.aliyun.oss.ServiceException; +import io.minio.MinioClient; +import io.minio.PutObjectArgs; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.util.UriUtils; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.UUID; + +@Service +public class MinIoUploadService { + + private MinioClient minioClient; + + private static String bucket="ngwl"; + private static String host="http://10.102.192.5:6000"; + private static String accessKey="minioadmin"; + private static String secretKey="gmminioadmin"; + + + /** + * 上传到minio + * @param fileName + * @throws Exception + */ + + public String uploadFileToMinIo(MultipartFile multipartFile) { + try { + initMinio(); + InputStream inputStream = multipartFile.getInputStream(); + + // 上传文件的名称 + String filename = multipartFile.getOriginalFilename(); + + // PutObjectOptions，上传配置(文件大小，内存中文件分片大小) +// PutObjectOptions putObjectOptions = new PutObjectOptions(multipartFile.getSize(), PutObjectOptions.MIN_MULTIPART_SIZE); +// // 文件的ContentType +// putObjectOptions.setContentType(multipartFile.getContentType()); + + String prefix = filename.substring(filename.lastIndexOf(".") + 1);//后缀 + //根据当前时间生成文件夹 + Calendar calendar = Calendar.getInstance(); + Date time = calendar.getTime(); + // 2. 格式化系统时间--- 这里的时间格式可以根据自己的需要进行改变 + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + String buckfilename = format.format(time); + + String uuid= UUID.randomUUID().toString().replace("-","");//customer_YYYYMMDDHHMM + String fileName = buckfilename+"/"+uuid+"."+prefix; //文件全路径 + + PutObjectArgs objectArgs = PutObjectArgs.builder() + .object(fileName).bucket(bucket) + .stream(inputStream,inputStream.available(),-1).build(); + //文件名称相同会覆盖 + minioClient.putObject(objectArgs); + String url =host+ "/"+bucket + "/"+fileName; + +// + return url; + }catch (Exception e){ + //log.error(e.getMessage(),e); + } + return ""; + } + private MinioClient initMinio() { + try{ + MinioClient minioClient = MinioClient.builder() + .endpoint(host) + .credentials(accessKey, secretKey) + .build(); + return minioClient; + }catch (Exception e) { + e.printStackTrace(); + } + return minioClient; + } + + + /** + * 上传文件 + * 文件上传成功,返回文件完整访问路径 + * 文件上传失败,返回 null + * + * @param multipartFile 待上传文件 + * @param fileDir 文件保存目录 + * @return oss 中的相对文件路径 + */ + /* public static String upload(MultipartFile multipartFile, String fileDir) { + + + try (InputStream inputStream = multipartFile.getInputStream()) { + //初始化minio + initMinio(); + // bucket 不存在，创建 + if (!minioClient1.bucketExists(bucket)) { + minioClient1.makeBucket(bucket); + } + // 上传文件的名称 + String fileName = multipartFile.getOriginalFilename(); + long timestamp = Calendar.getInstance().getTimeInMillis(); + // PutObjectOptions，上传配置(文件大小，内存中文件分片大小) +// PutObjectOptions putObjectOptions = new PutObjectOptions(multipartFile.getSize(), PutObjectOptions.MIN_MULTIPART_SIZE); +// // 文件的ContentType +// putObjectOptions.setContentType(multipartFile.getContentType()); + + SimpleDateFormat sdYear = new SimpleDateFormat("yyyy"); + SimpleDateFormat sdMonth = new SimpleDateFormat("MM"); + SimpleDateFormat sdDay = new SimpleDateFormat("dd"); + String year = sdYear.format(new Date()); + String month = sdMonth.format(new Date()); + String day = sdDay.format(new Date()); + String filrDir = "wlhy/" + year + "/" + month + "/" + day + "/"; + +// minioClient.putObject(bucket, filrDir+timestamp+fileName, inputStream, putObjectOptions); + minioClient1.putObject(bucket, filrDir+timestamp+fileName, inputStream, multipartFile.getContentType()); + // 返回访问路径 + String fileurl = host+ "/"+bucket + "/"+filrDir+timestamp+ UriUtils.encode(fileName, StandardCharsets.UTF_8); + System.out.println("fileurl===="+fileurl); + FILE_URL = fileurl; + return fileurl; + } catch (ServiceException e){ + log.error(e.getErrorMessage()); + } catch (Exception e){ + log.error(e.getMessage()); + } + return FILE_URL; + }*/ +} diff --git a/mhd-gateway/src/main/resources/bootstrap.yml b/mhd-gateway/src/main/resources/bootstrap.yml index d1265f2c7..6fbcae731 100644 --- a/mhd-gateway/src/main/resources/bootstrap.yml +++ b/mhd-gateway/src/main/resources/bootstrap.yml @@ -13,15 +13,19 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.102.192.5:6848 - # server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.102.192.5:6848 - # server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml index 10198d980..b01b7d280 100644 --- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml +++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml @@ -13,13 +13,19 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - # server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - # server-addr: 10.33.0.129:6010 + + + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml index 9597fac7e..fbb15bbd9 100644 --- a/mhd-user-center/src/main/resources/bootstrap.yml +++ b/mhd-user-center/src/main/resources/bootstrap.yml @@ -18,15 +18,17 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - # server-addr: 10.33.0.129:6010 -# server-addr: 116.204.23.92:8848 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - # server-addr: 10.33.0.129:6010 -# server-addr: 116.204.23.92:8848 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-visual/mhd-monitor/src/main/java/com/mhd/modules/monitor/config/WebSecurityConfigurer.java b/mhd-visual/mhd-monitor/src/main/java/com/mhd/modules/monitor/config/WebSecurityConfigurer.java index 6c1a72247..27fbabc66 100644 --- a/mhd-visual/mhd-monitor/src/main/java/com/mhd/modules/monitor/config/WebSecurityConfigurer.java +++ b/mhd-visual/mhd-monitor/src/main/java/com/mhd/modules/monitor/config/WebSecurityConfigurer.java @@ -1,6 +1,7 @@ package com.mhd.modules.monitor.config; import de.codecentric.boot.admin.server.config.AdminServerProperties; +import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest; import org.springframework.context.annotation.Bean; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -9,7 +10,7 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti /** * 监控权限配置 - * + * * @author mhd */ @EnableWebSecurity @@ -32,11 +33,23 @@ public class WebSecurityConfigurer return httpSecurity .headers().frameOptions().disable() .and().authorizeRequests() + .antMatchers("/actuator/health", "/actuator/info").permitAll() //扫描漏洞添加 + .antMatchers("/actuator/**").authenticated() //扫描漏洞添加 .antMatchers(adminContextPath + "/assets/**" , adminContextPath + "/login" , adminContextPath + "/actuator/**" , adminContextPath + "/instances/**" ).permitAll() + // 管理端点需要认证 + .antMatchers("/actuator/**").hasRole("ADMIN")//扫描漏洞添加 + .antMatchers("/admin/**").hasRole("ADMIN")//扫描漏洞添加 + .antMatchers("/actuator/env").hasRole("plat_admin") // 仅允许ADMIN角色访问/env端点 //扫描漏洞添加 + // 允许公开访问的端点 + .requestMatchers(EndpointRequest.to("health", "info", "prometheus"))//扫描漏洞添加 + .permitAll() + // 敏感端点需要管理员权限 + .requestMatchers(EndpointRequest.to("env", "configprops", "beans", "mappings"))//扫描漏洞添加 + .hasRole("ADMIN") .anyRequest().authenticated() .and() .formLogin().loginPage(adminContextPath + "/login") diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/approvalDocument/ApprovalDocumentApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/approvalDocument/ApprovalDocumentApplicationService.java index 3845124ab..d3c528489 100644 --- a/mhd_finance/src/main/java/com/linke/finance/application/server/approvalDocument/ApprovalDocumentApplicationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/approvalDocument/ApprovalDocumentApplicationService.java @@ -7,11 +7,15 @@ import com.linke.finance.domain.approvalDocument.repository.todo.ApprovalDocumen import com.linke.finance.domain.approvalDocument.repository.todo.WorkflowProcessInstancesByIdDO; import com.linke.finance.domain.approvalDocument.service.ApprovalDocumentDomainService; import com.linke.finance.interfaces.vo.ApprovalStatsVO; +import com.mhd.common.core.domain.po.UserPo; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; +import org.apache.catalina.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.rmi.ServerException; import java.util.List; /** * 审批单据ApplicationService @@ -30,8 +34,12 @@ public class ApprovalDocumentApplicationService { * 分页查询审批单据列表 */ - public List queryList(ApprovalDocumentDO approvalDocumentDO) { + public List queryList(ApprovalDocumentDO approvalDocumentDO) throws Exception{ LoginUser loginUser = SecurityUtils.getLoginUser(); + UserPo userPo=loginUser.getUserPo(); + if(!userPo.getRoleCode().equals("plat_admin")){ + throw new ServerException("您没有权限访问"); + } if (loginUser != null){ Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); if (topOrganizationId != null && topOrganizationId != 1){ diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index 8884ae06a..ab85f2826 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -404,12 +404,6 @@ public class ReconciliationImpl extends ServiceImpl> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO); + String makerCodeNc=""; if(result.getCode()==200){ List list=result.getData(); if(ObjectUtil.isNotNull(list)){ @@ -448,36 +443,50 @@ public class ReconciliationImpl extends ServiceImpl ysitemList=new ArrayList(); ReconciliationDTO reconciliationDTO=new ReconciliationDTO(); reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber()); + if(null==reconciliation.getSettlementPartyId()){ + throw new ServiceException("没有结算方，请核对"); + } + String makerCodeNc=""; R> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO); if(result.getCode()==200){ List list=result.getData(); if(ObjectUtil.isNotNull(list)){ for(TmsOrder tmsOrder:list){ - if(null==reconciliation.getSettlementPartyId()){ - throw new ServiceException("没有结算方，请核对"); + if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getSalesmanCodeNc())) { + throw new ServiceException("请先维护业务员编码"); } - AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId())); + if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getMakerCodeNc())) { + throw new ServiceException("请先维护制单员编码"); + } + if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getCustomsCodeNc())) { + throw new ServiceException("请先维护制单员编码"); + } + + + SKitem item=new SKitem(); + item.setSo_deptid("NG040104"); + item.setPk_deptid("NG040104"); + item.setCheckdirection("ar"); + item.setPk_psndoc(tmsOrder.getSalesmanCodeNc()); + item.setCustomer(tmsOrder.getCustomsCodeNc()); + item.setPurchaseorder(tmsOrder.getGoodsNumber()); + item.setObjtype("0"); + item.setDirection("1"); + item.setScomment(tmsOrder.getAppointShipper()); + item.setPk_currtype(tmsOrder.getSettlementCurrency()); + item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight())); + item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight())); + ysitemList.add(item); + /* AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId())); if(ajaxResult.get("code").toString().equals("200")){ Object userShipperPo= ajaxResult.get("data"); JSONObject jsonObject = new JSONObject((Map) userShipperPo); if(org.apache.commons.lang.StringUtils.isBlank(jsonObject.get("customerNcCode").toString())){ throw new ServiceException("请先维护客户编码"); } - SKitem item=new SKitem(); - item.setSo_deptid("NG040104"); - item.setPk_deptid("NG040104"); - item.setCheckdirection("ar"); - item.setPk_psndoc(userPo.getSalespersonNcCode()); - item.setCustomer(jsonObject.get("customerNcCode").toString()); - item.setPurchaseorder(tmsOrder.getGoodsNumber()); - item.setObjtype("0"); - item.setDirection("1"); - item.setScomment(jsonObject.get("shipperEnterpriseName").toString()); - item.setPk_currtype("CNY"); - item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight())); - item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight())); - ysitemList.add(item); - } + + + }*/ } } @@ -668,7 +686,7 @@ public class ReconciliationImpl extends ServiceImpl list = approvalDocumentApplicationService.queryList(approvalDocumentDO); - return getDataTable(list); + List list = null; + try { + list = approvalDocumentApplicationService.queryList(approvalDocumentDO); + return getDataTable(list); + } catch (ServerException e) { + e.printStackTrace(); + return null; + } catch (Exception e) { + e.printStackTrace(); + return null; + } } /** diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml index f858ead66..3845ee8d6 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -18,25 +18,20 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - # server-addr: 10.33.0.129:6010 -# server-addr: 116.204.23.92:8848 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # server-addr: 116.204.23.92:8848 # 线上测试环境配置 容器名+端口号 - # server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -redisson: - config: - singleServerConfig: - address: redis://116.204.89.187:4399 - connectTimeout: 10000 # 连接超时时间 - timeout: 10000 # 命令执行超时时间 - retryAttempts: 3 # 重试次数 - retryInterval: 1500 # 重试间隔 diff --git a/mhd_product/pom.xml b/mhd_product/pom.xml index ef1ab104f..317ea4ab5 100644 --- a/mhd_product/pom.xml +++ b/mhd_product/pom.xml @@ -129,6 +129,17 @@ com.mhd mhd-common-log + + io.minio + minio + 8.4.3 + + + com.squareup.okhttp3 + okhttp + 4.8.1 + compile + diff --git a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java index 288b097e1..e48ecd148 100644 --- a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java +++ b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java @@ -43,9 +43,12 @@ import com.mhd.common.core.annotation.fieldsetvalue.NeedSetValueField; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; +import minio.MinIoUploadService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.File; @@ -95,6 +98,8 @@ public class MenuApplicationService { private SpecialServiceFeign logisticsServiceFeign; @Resource private MenuUtils menuUtils; + @Autowired(required = false) + private MinIoUploadService minIoUploadService; /** @@ -272,6 +277,19 @@ public class MenuApplicationService { return ossService.uploadOss(file); } + + /** + * 上传文件到oss + * + * @param file 文件 + * @return 文件路径 + */ + public String uploadMinio(MultipartFile file) + { + return minIoUploadService.uploadFileToMinIo(file); + } + + /** * 根据组织id查询菜单集合 * diff --git a/mhd_product/src/main/java/com/linke/product/interfaces/facade/menu/MenuApi.java b/mhd_product/src/main/java/com/linke/product/interfaces/facade/menu/MenuApi.java index 0164ed791..26b266a6d 100644 --- a/mhd_product/src/main/java/com/linke/product/interfaces/facade/menu/MenuApi.java +++ b/mhd_product/src/main/java/com/linke/product/interfaces/facade/menu/MenuApi.java @@ -162,7 +162,8 @@ public class MenuApi extends BaseController { } } - return AjaxResult.success(menuApplicationService.uploadOss(fileUpload)); + //return AjaxResult.success(menuApplicationService.uploadOss(fileUpload)); + return AjaxResult.success(menuApplicationService.uploadMinio(file)); } @PostMapping("/uploadFeign") diff --git a/mhd_product/src/main/resources/bootstrap.yml b/mhd_product/src/main/resources/bootstrap.yml index 71ba80796..10e613084 100644 --- a/mhd_product/src/main/resources/bootstrap.yml +++ b/mhd_product/src/main/resources/bootstrap.yml @@ -18,13 +18,17 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - # server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - # server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_thrid_party/src/main/resources/bootstrap.yml b/mhd_thrid_party/src/main/resources/bootstrap.yml index ea3251aeb..a0f470634 100644 --- a/mhd_thrid_party/src/main/resources/bootstrap.yml +++ b/mhd_thrid_party/src/main/resources/bootstrap.yml @@ -18,13 +18,17 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - # server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - # server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_transport/pom.xml b/mhd_transport/pom.xml index 1c550a5cc..6b22bb78e 100644 --- a/mhd_transport/pom.xml +++ b/mhd_transport/pom.xml @@ -102,6 +102,7 @@ spring-cloud-starter-sleuth + org.springframework.cloud spring-cloud-starter-zipkin diff --git a/mhd_transport/src/main/resources/bootstrap.yml b/mhd_transport/src/main/resources/bootstrap.yml index 45877b89b..5dfc4e3aa 100644 --- a/mhd_transport/src/main/resources/bootstrap.yml +++ b/mhd_transport/src/main/resources/bootstrap.yml @@ -18,15 +18,19 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 # server-addr: 10.33.0.129:6010r - # server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 + server-addr: 10.33.0.129:6010 # server-addr: 10.33.0.129:6010 - # server-addr: 10.33.0.129:6010 + #线上正式环境 +# server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置