diff --git a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/FileUtil.java b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/FileUtil.java index a3967fd2..78f8fcd1 100644 --- a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/FileUtil.java +++ b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/FileUtil.java @@ -218,7 +218,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { // 一次性写出内容，使用默认样式，强制输出标题 writer.write(list, true); //response为HttpServletResponse对象 - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码 response.setHeader("Content-Disposition", "attachment;filename=file.xlsx"); ServletOutputStream out = response.getOutputStream(); diff --git a/ad-platform-gateway/src/main/resources/config/application.yml b/ad-platform-gateway/src/main/resources/config/application.yml index fe87013c..9f098d5d 100644 --- a/ad-platform-gateway/src/main/resources/config/application.yml +++ b/ad-platform-gateway/src/main/resources/config/application.yml @@ -33,6 +33,14 @@ spring: - Path=/api-task/** filters: - StripPrefix=1 + redis: + #数据库索引 + database: 0 + host: localhost + port: 6379 + password: + #连接超时时间 + timeout: 5000 hystrix: command: default: diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/controller/ChannelManageController.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/controller/ChannelManageController.java index e84ba9b2..2b78bd85 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/controller/ChannelManageController.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/controller/ChannelManageController.java @@ -6,7 +6,6 @@ import com.baiye.http.CommonResponse; import com.baiye.modules.agent.entity.ChannelCustom; import com.baiye.modules.agent.entity.query.ChannelQuery; import com.baiye.modules.agent.service.ChannelManageService; -import com.baiye.util.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java index cb1a5847..f4002bdf 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java @@ -3,8 +3,8 @@ package com.baiye.modules.agent.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.StrPool; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import com.baiye.constant.DefaultNumberConstants; @@ -23,6 +23,12 @@ import com.baiye.modules.agent.repository.ChannelCustomRepository; import com.baiye.modules.agent.repository.ChannelCustomTagRepository; import com.baiye.modules.agent.repository.ChannelResourceAssignRepository; import com.baiye.modules.agent.service.CustomManageService; +import com.baiye.modules.platform.domain.Task; +import com.baiye.modules.platform.repository.TaskRepository; +import com.baiye.modules.platform.service.CompanyService; +import com.baiye.modules.platform.service.PayFatherTemplateService; +import com.baiye.modules.platform.service.QualityScoreService; +import com.baiye.modules.platform.service.dto.CompanyDto; import com.baiye.modules.platform.service.dto.CreateUserDTO; import com.baiye.modules.system.domain.Role; import com.baiye.modules.system.domain.User; @@ -51,6 +57,8 @@ import java.util.stream.Collectors; @RequiredArgsConstructor @Slf4j public class CustomManageServiceImpl implements CustomManageService { + + private final ChannelCustomRepository channelCustomRepository; private final ChannelCustomTagRepository channelCustomTagRepository; @@ -58,6 +66,11 @@ public class CustomManageServiceImpl implements CustomManageService { private final ChannelResourceAssignRepository channelResourceAssignRepository; private final UserRepository userRepository; + + private final CompanyService companyService; + private final TaskRepository taskRepository; + private final QualityScoreService qualityScoreService; + private final PayFatherTemplateService payFatherTemplateService; @Value("${generate.url}") private String configurationUrl; @@ -122,15 +135,21 @@ public class CustomManageServiceImpl implements CustomManageService { String activeCode = "by" + NumUtil.getFourNum(parent.getId().intValue()) + DateUtil.format(DateUtil.date(), "MMdd") + RandomUtil.randomString(4); channelCustom.setActivationCode(activeCode); channelCustom.setParentId(parent.getId()); - - //这里如果是代理商 直接同步 - if (channelCustom.getType() == DefaultNumberConstants.ONE_NUMBER) { - addChannelCustom(channelCustom); - } channelCustom.setCreateTime(DateUtil.date()); channelCustom.setCustomLimitNum(100); channelCustom.setChannelLimitNum(1); + //这里如果是代理商 直接同步 + if (channelCustom.getType() == DefaultNumberConstants.ONE_NUMBER) { + syncChannelCustom(channelCustom); + } + //todo 自动激活账号 如果不需要自动激活 去掉这个else就可以 + else { + syncCustom(channelCustom); + channelCustom.setStatus(DefaultNumberConstants.ONE_NUMBER); + } channelCustomRepository.save(channelCustom); + + ChannelResourceAssign channelResourceAssign = new ChannelResourceAssign().addChannelResourceAssign(parent.getId(), channelCustom.getId(), channelCustom.getChannelName()); boolean flag = false; if (channelCustom.getSurplusNum() != null && channelCustom.getSurplusNum() > 0) { @@ -148,7 +167,12 @@ public class CustomManageServiceImpl implements CustomManageService { return CommonResponse.createBySuccess(); } - private void addChannelCustom(ChannelCustom channelCustom) { + /** + * 同步创建代理商账号 + * + * @param channelCustom + */ + private void syncChannelCustom(ChannelCustom channelCustom) { CreateUserDTO createUserDTO = new CreateUserDTO().addCreateUserDTO(channelCustom.getChannelName(), channelCustom.getPhone()); createUserDTO.setPassword(passwordEncoder.encode (StringUtils.isNotBlank(createUserDTO.getPassword()) @@ -156,7 +180,7 @@ public class CustomManageServiceImpl implements CustomManageService { User user = new User(); BeanUtil.copyProperties(createUserDTO, user); user.setUsername(user.getUsername().trim()); - //这个地方注意,代理商的创建人为admin。这whichUserId属性会在之前的逻辑里面用到，这里写死了 + //todo 这个地方注意,代理商的创建人为admin。这whichUserId属性会在之前的逻辑里面用到，这里写死了 user.setWhichUserId(1L); user.setIsReview(Boolean.FALSE); Set roles = new HashSet<>(); @@ -169,6 +193,73 @@ public class CustomManageServiceImpl implements CustomManageService { channelCustom.setStatus(1); } + /** + * 同步创建直客账号（公司用户） + * + * @param channelCustom + */ + private void syncCustom(ChannelCustom channelCustom) { + CreateUserDTO createUserDTO = new CreateUserDTO().addCreateUserDTO(channelCustom.getChannelName(), channelCustom.getPhone()); + createUserDTO.setPassword(passwordEncoder.encode + (StringUtils.isNotBlank(createUserDTO.getPassword()) + ? createUserDTO.getPassword() : "123456")); + User user = new User(); + BeanUtil.copyProperties(createUserDTO, user); + user.setUsername(user.getUsername().trim()); + user.setWhichUserId(1L); + user.setIsReview(Boolean.FALSE); + + //创建公司 + CompanyDto companyDto = new CompanyDto(); + companyDto.setCompanyName(user.getUsername().trim()); +// companyDto.setTemplateId(userDTO.getTemplateId()); + companyDto.setCompanyType(createUserDTO.getCompanyType()); + companyDto.setStatus(DefaultNumberConstants.ZERO_NUMBER); + Long companyId = companyService.createCompany(companyDto).getId(); + user.setCompanyId(companyId); + + user.setTurnCrmNum(50); + //创建账号 + Long userId = create(user).getId(); + + //公司名称做的对应,所以将公司名设为表单任务名 + createTask(userId, user.getUsername(), DefaultNumberConstants.ONE_NUMBER); + createTask(userId, "员工上传任务", DefaultNumberConstants.TWO_NUMBER); + createTask(userId, "拓客模块-投流回流池", DefaultNumberConstants.SEVEN_NUMBER); + createTask(userId, "拓客模块-拓客回流池", DefaultNumberConstants.SIX_NUMBER); + + //添加质量图 + qualityScoreService.addDefault(userId); + //todo 创建默认的支付模板 (因为这快业务已经不需要了，为了避免多余业务操作，默认创建一个) + payFatherTemplateService.addDefaultTemplate(user.getUsername(), userId, user.getExpirationTime(), companyId); + + channelCustom.setUserId(userId); + channelCustom.setStatus(1); + channelCustom.setUserId(userId); + } + + /** + * 在创建用户时 创建一个表单任动态务 + * + * @param username + */ + private void createTask(Long id, String username, Integer isForm) { + Long taskId = IdUtil.getSnowflake(9, 9).nextId(); + Task task = new Task(); + task.setId(taskId); + task.setTaskName(username); + task.setEncryptionType(DefaultNumberConstants.ZERO_NUMBER); + //设置默认值 + if (isForm == DefaultNumberConstants.SIX_NUMBER || isForm == DefaultNumberConstants.SEVEN_NUMBER) { + task.setIsDistribution(DefaultNumberConstants.ONE_NUMBER); + } else { + task.setIsDistribution(DefaultNumberConstants.ZERO_NUMBER); + } + task.setTaskType(DefaultNumberConstants.ONE_NUMBER); + task.setIsForm(isForm); + task.setCreateBy(id); + taskRepository.save(task); + } @Override @Transactional(rollbackFor = Exception.class) @@ -513,4 +604,5 @@ public class CustomManageServiceImpl implements CustomManageService { } } } + } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/dto/CreateUserDTO.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/dto/CreateUserDTO.java index 07739da0..16c15fd5 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/dto/CreateUserDTO.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/dto/CreateUserDTO.java @@ -103,11 +103,11 @@ public class CreateUserDTO { this.setPhone(phone); Set roles = new HashSet<>(); Role role = new Role(); - role.setId(8L); - Role role1 = new Role(); - role1.setId(10L); + role.setId(16L); +// Role role1 = new Role(); +// role1.setId(10L); roles.add(role); - roles.add(role1); +// roles.add(role1); this.setRoles(roles); this.setTurnCrmNum(50); return this; diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml index 94fb4dfd..68b5ce28 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml +++ b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml @@ -10,6 +10,8 @@ spring: host: 39.100.77.21 timeout: 5000 password: sC33HXphkHBRj4Jb + port: 6379 + elasticsearch: rest: uris: 39.100.77.21:9200 @@ -129,16 +131,16 @@ double: call: reqUrl: http://ax.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Hw/CallBack appid: app1 - cdrUrl: http://8.130.96.163:8866/api/back/cdrUrl - statusUrl: http://8.130.96.163:8866/api/back/status + cdrUrl: http://39.100.77.21:8866/api/back/cdrUrl + statusUrl: http:///39.100.77.21:8866/api/back/status stopUrl: http://ax.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Hw/CallBackStop #axb地址 axb: call: appid: app1 - cdrUrl: http://8.130.96.163:8866/api/back/cdrUrl - statusUrl: http://8.130.96.163:8866/api/back/status + cdrUrl: http:///39.100.77.21:8866/api/back/cdrUrl + statusUrl: http:///39.100.77.21:8866/api/back/status bingUrl: http://ax.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Calls/AxbBinding unBingUrl: http://ax.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Calls/AxbUnBinding @@ -147,7 +149,7 @@ roll: reqUrl: http://api.hzdaba.cn/v3/Accounts/dbby_hangzhoubaiyehl/Calls/ClickCall accountSid: dbby_hangzhoubaiyehl appId: app1 - cdrUrl: http://8.130.96.163:8866/api/roll/cdrUrl + cdrUrl: http:///39.100.77.21:8866/api/roll/cdrUrl #cdrUrl: https://baiyee.vip/api/roll/cdrUrl #cdrUrl: http://localhost:8866/api/roll/cdrUrl stopUrl: http://api.hzdaba.cn/v3/Accounts/default/Esl/Process @@ -169,9 +171,9 @@ alipay: # 填支付宝公钥，注意不是生成的应用公钥 aliPayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyvegkGCrz1i5/K7VzQxvoZm4G73pSPNu9R5ET8YonIuDVoHkHaYvQQizLdRkTyBsYIik8FXsSDmVsw5MLMQ7OAlZ97nQBkz5TxOX6Px766nUpSVoWXoAz6cpIlWnwgir4t1ph88Ph56l+qmqW3gUj/U6MIuzjxBJlijTMHl96its95Nd4cEFx4j+sFuRYob6D0kcemC7xEFuty7bdupda51Z56GYI1YjuUTryTlFOHZbOSThc2ZMzNC1gPG25bn2Lx6sDuPByk4KW4rQ2v7mSfeUuZZRdjtVSC0WV2M2Cv5L8eLFvZRgNYnXrUJYhnRpT+OBAvJZXaWU2nv/bNe/UQIDAQAB # 回调地址 - notifyUrl: http://8.130.96.163:8866/pay/aliPay/pay-notify + notifyUrl: http:///39.100.77.21:8866/pay/aliPay/pay-notify # 支付宝成功支付跳转页面 - returnUrl: http://8.130.96.163:8001/dashboard + returnUrl: http:///39.100.77.21:8001/dashboard # 可设置AES密钥，调用AES加解密相关接口时需要（可选） encryptKey: @@ -185,7 +187,7 @@ template: #债务表单二维码扫描地址及二维码存放路径 debt: - visitUrl: http://8.130.96.163:8800/pages/login#/pages/statisticsForm/index?userId= + visitUrl: http:///39.100.77.21:8800/pages/login#/pages/statisticsForm/index?userId= qrcodeUrl: /home/eladmin/qrcode/ qrcodeLogo: /home/eladmin/qrcode/qrcode.jpg reqUrl: /qrcode/ @@ -201,7 +203,7 @@ platform: customerId: QISX0xz4l6fR3YL2sUNSpzM2 toEmailAddress: lambda0821@outlook.com toGenderEmailAddress: lambda0821@outlook.com - dmpDownPath: http://8.130.96.163:8001/dmp/down/ + dmpDownPath: http:///39.100.77.21:8001/dmp/down/ privateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJi+nz0zudS+4Sh+SmTnRfzgJOBIEwlLlJhcRgUbInvFx03zUgdzOUrGsvD2OTPPssnY8dv+Zgz2kUSEDYaWWKUs+VAklVOo0sOxzRMaUfwHRBN3Eq9OkqibDerYf6WUdv1k1BJsXSIdTlz8m6rtVbPF2hz8x/kYyJFzhM2IKTITAgMBAAECgYAgTZAXvWy7lXLAwZSyKkce57hkxllgSd+vKTSVt9tfGcDAt4jNkoy3R7ZoR2ppjq9dCMh9ohuq+ipWtya1I+6zC5sflk9HI/rf+5bq3JRJvxq3EJYe5DlSjQitLUMRP6PQorHnZZj/bdqKgRvrulI8XtK5Fv9Cd4jhkbSZtzgpYQJBAOJu0nu4qJCqIYLCmFWDpRzi9cu8/TFCBLVDH0xhNi28JL6G8xOfdzxsQa8ZlLOxPwn56VbS3+Korq34WCOAG5cCQQCssI4I7dshlA7kXeurVSFvui1YV/7ofFOxRs019+V88tfwNby5TAS9YjX7AuvGkobjpBBNEkE0JExf69m6VBzlAkB5te4HuLNKx1gp7CVr2c43n7tVHynNf1n+gKzjJmGz5ayuiOVBx/aUkPAhiZOHnx9uYlnNZJ4ZPGhgdNwTgPnTAkB61pQSMe/AMOtu8ogjNck1CoAa6W0/vsBhx/VNQGsTuEJ2ciMuw65TcLrpNKi2daBR6XBXAnczOebCDKix7AcpAkEArrU+bx6GwR+UbgoNAl1KwFLrV50pasK7Mlp0BkHM0cz4BGB53O5ng+TJHzen03OgC9I1W1WFAYHj03lb84qM/w== publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYvp89M7nUvuEofkpk50X84CTgSBMJS5SYXEYFGyJ7xcdN81IHczlKxrLw9jkzz7LJ2PHb/mYM9pFEhA2GllilLPlQJJVTqNLDsc0TGlH8B0QTdxKvTpKomw3q2H+llHb9ZNQSbF0iHU5c/Juq7VWzxdoc/Mf5GMiRc4TNiCkyEwIDAQAB @@ -211,7 +213,7 @@ ocean: engine: appId: 1744002574259247 appSecret: f1bef553cd635b7cd8057052654ebaaa30fa92a5 - redirectUrl: http://8.130.96.163:8866/api/oceanEngine/callback + redirectUrl: http:///39.100.77.21:8866/api/oceanEngine/callback welcomeUrl: https://baiyee.vip/ ad-back: @@ -230,4 +232,4 @@ channel: id: 14 logstash: - url: 8.130.96.163:9601 + url: localhost:9601 diff --git a/ad-platform-pojo/src/main/java/com/baiye/model/entity/BaseClue.java b/ad-platform-pojo/src/main/java/com/baiye/model/entity/BaseClue.java index 2e046361..140a869a 100644 --- a/ad-platform-pojo/src/main/java/com/baiye/model/entity/BaseClue.java +++ b/ad-platform-pojo/src/main/java/com/baiye/model/entity/BaseClue.java @@ -36,6 +36,11 @@ public class BaseClue implements Serializable { @Convert(converter = JpaConverterAes.class) private String nid; + @ApiModelProperty(value = "nidBack") + @Column(name = "nid_back") + @Convert(converter = JpaConverterAes.class) + private String nidBack; + @ApiModelProperty(value = "微信") @Column(name = "wx") private String wx; diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/entity/ClueMiddle.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/entity/ClueMiddle.java index deac329b..68308353 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/entity/ClueMiddle.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/entity/ClueMiddle.java @@ -37,6 +37,9 @@ public class ClueMiddle extends BaseClueMiddle { @Transient private String address; + @Transient + private String newNid; + public ClueMiddle(Long clueId, Long taskId, Integer memberStatus, Integer optimisticVersion, Integer clueStage, Integer clueCallStatus, Integer clueType) { super(taskId, memberStatus, optimisticVersion, clueStage, clueCallStatus, clueType); this.clueId = clueId; diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/entity/ClueTalk.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/entity/ClueTalk.java index b8357533..5b6ea855 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/entity/ClueTalk.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/entity/ClueTalk.java @@ -29,6 +29,9 @@ public class ClueTalk extends BaseClueMiddle { @Column(name = "is_freeze") private Boolean isFreeze = false; + @Transient + private String newNid; + @Transient private String clueName; @Transient diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java index ed66727c..c48cec35 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.baiye.common.CommonLog; import com.baiye.constant.*; import com.baiye.enums.ClueStageEnum; @@ -334,6 +335,10 @@ public class ClueServiceImpl implements ClueService { if (StringUtils.isNotEmpty(clueMiddle.getAddress())) { clue.setAddress(clueMiddle.getAddress()); } + if (StringUtils.isNotEmpty(clueMiddle.getNewNid())) { + clue.setNidBack(clue.getNid()); + clue.setNid(clueMiddle.getNewNid()); + } if (clueMiddle.getClueCallStatus() != null) { clueMiddleOne.setClueCallStatus(clueMiddle.getClueCallStatus()); } @@ -369,7 +374,18 @@ public class ClueServiceImpl implements ClueService { List sourceLabel = new ArrayList<>(new TreeSet<>(sourceLabelList)); clueTalk.setSourceLabel(sourceLabel); clueTalk.setLabelTime(new Date()); +// if (SourceLabelConstants.INTENTION.equals(sourceLabel.get(0))) { +// //如果转有意向 转crm +// clueBackFlow(clueTalk); +// } if (SourceLabelConstants.INTENTION.equals(sourceLabel.get(0))) { + if (StrUtil.isBlank(clueMiddle.getNewNid())) { + throw new BadRequestException("联系方式不能为空"); + } + if (!MobileUtil.checkPhone(clueMiddle.getNewNid())) { + throw new BadRequestException("联系方式格式错误"); + } + clueTalk.setNewNid(clueMiddle.getNewNid()); //如果转有意向 转crm clueBackFlow(clueTalk); } @@ -814,6 +830,9 @@ public class ClueServiceImpl implements ClueService { // 初始化线索加密字段 Clue clue = clueRepository.findById(clueTalk.getClueId()).orElseGet(Clue::new); clue.setIsEncryption(DefaultNumberConstants.ZERO_NUMBER); + String nidBack = clue.getNid(); + clue.setNid(clueTalk.getNewNid()); + clue.setNidBack(nidBack); clueRepository.save(clue); //查看crm的回流任务 diff --git a/ad-platform-services/ad-platform-source/src/main/resources/application-dev.yml b/ad-platform-services/ad-platform-source/src/main/resources/application-dev.yml index fe46c70c..4281b293 100644 --- a/ad-platform-services/ad-platform-source/src/main/resources/application-dev.yml +++ b/ad-platform-services/ad-platform-source/src/main/resources/application-dev.yml @@ -3,19 +3,21 @@ spring: cloud: nacos: discovery: -# server-addr: ${NACOS_HOST:8.130.96.163}:${NACOS_PORT:8848} + # server-addr: ${NACOS_HOST:8.130.96.163}:${NACOS_PORT:8848} server-addr: ${NACOS_HOST:localhost}:${NACOS_PORT:8848} redis: database: 2 - host: 8.130.96.163 + host: 39.100.77.21 timeout: 5000 - password: + password: sC33HXphkHBRj4Jb + port: 6379 + datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://8.130.96.163:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://39.100.77.21:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull username: root password: y7z7noq2 # 初始连接数 @@ -63,15 +65,15 @@ spring: # 文件存储 storage: -# url: /usr/local/webapp/services/source/ -# symbol:/ + # url: /usr/local/webapp/services/source/ + # symbol:/ url: C:\Users\Admin\Desktop\ de_symbol: \\ auditingUrl: C:\Users\Admin\Desktop\ download-template: /usr/local/webapp/ad-platform/ad-platform-source/custom.xlsx download-template-move: /usr/local/webapp/ad-platform/ad-platform-source/dynamictemplate.xlsx download-template-toker: /usr/local/webapp/ad-platform/ad-platform-source/toker.xlsx - download-auditing-file: http://8.130.96.163:8001/source/auditingFiles/ + download-auditing-file: http:///39.100.77.21:8001/source/auditingFiles/ private-key: C:\Users\Admin\Desktop\ # 线程池配置 @@ -84,6 +86,6 @@ save: ThreadNamePrefix: SaveFileTaskExecutor- logstash: - url: 8.130.96.163:9601 + url: 39.100.77.21:9601 diff --git a/ad-platform-services/ad-platform-source/src/main/resources/application-test.yml b/ad-platform-services/ad-platform-source/src/main/resources/application-test.yml index 2e44a0f7..5c24bc3c 100644 --- a/ad-platform-services/ad-platform-source/src/main/resources/application-test.yml +++ b/ad-platform-services/ad-platform-source/src/main/resources/application-test.yml @@ -7,14 +7,16 @@ spring: redis: database: 2 - host: 8.130.96.163 + host: 39.100.77.21 timeout: 5000 + password: sC33HXphkHBRj4Jb + port: 6379 datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://8.130.96.163:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://39.100.77.21:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull username: root password: y7z7noq2 # 初始连接数 @@ -64,10 +66,10 @@ storage: url: /usr/local/webapp/platform/source/files/ auditingUrl: /usr/local/webapp/platform/source/auditingFiles/ de_symbol: / - download-template: http://8.130.96.163:8001/source/download/1/custom.xlsx - download-template-move: http://8.130.96.163:8001/source/download/1/dynamictemplate.xlsx - download-template-toker: http://8.130.96.163:8001/source/download/1/toker.xlsx - download-auditing-file: http://8.130.96.163:8001/source/auditingFiles/ + download-template: http://39.100.77.21:8001/source/download/1/custom.xlsx + download-template-move: http://39.100.77.21:8001/source/download/1/dynamictemplate.xlsx + download-template-toker: http://39.100.77.21:8001/source/download/1/toker.xlsx + download-auditing-file: http://39.100.77.21:8001/source/auditingFiles/ private-key: /usr/local/webapp/platform/source/template/privatekey # 线程池配置 @@ -89,10 +91,10 @@ platform: customerId: QISX0xz4l6fR3YL2sUNSpzM2 toEmailAddress: lambda0821@outlook.com toGenderEmailAddress: lambda0821@outlook.com - dmpDownPath: http://8.130.96.163:8001/dmp/down/ + dmpDownPath: http://39.100.77.21:8001/dmp/down/ privateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJi+nz0zudS+4Sh+SmTnRfzgJOBIEwlLlJhcRgUbInvFx03zUgdzOUrGsvD2OTPPssnY8dv+Zgz2kUSEDYaWWKUs+VAklVOo0sOxzRMaUfwHRBN3Eq9OkqibDerYf6WUdv1k1BJsXSIdTlz8m6rtVbPF2hz8x/kYyJFzhM2IKTITAgMBAAECgYAgTZAXvWy7lXLAwZSyKkce57hkxllgSd+vKTSVt9tfGcDAt4jNkoy3R7ZoR2ppjq9dCMh9ohuq+ipWtya1I+6zC5sflk9HI/rf+5bq3JRJvxq3EJYe5DlSjQitLUMRP6PQorHnZZj/bdqKgRvrulI8XtK5Fv9Cd4jhkbSZtzgpYQJBAOJu0nu4qJCqIYLCmFWDpRzi9cu8/TFCBLVDH0xhNi28JL6G8xOfdzxsQa8ZlLOxPwn56VbS3+Korq34WCOAG5cCQQCssI4I7dshlA7kXeurVSFvui1YV/7ofFOxRs019+V88tfwNby5TAS9YjX7AuvGkobjpBBNEkE0JExf69m6VBzlAkB5te4HuLNKx1gp7CVr2c43n7tVHynNf1n+gKzjJmGz5ayuiOVBx/aUkPAhiZOHnx9uYlnNZJ4ZPGhgdNwTgPnTAkB61pQSMe/AMOtu8ogjNck1CoAa6W0/vsBhx/VNQGsTuEJ2ciMuw65TcLrpNKi2daBR6XBXAnczOebCDKix7AcpAkEArrU+bx6GwR+UbgoNAl1KwFLrV50pasK7Mlp0BkHM0cz4BGB53O5ng+TJHzen03OgC9I1W1WFAYHj03lb84qM/w== publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYvp89M7nUvuEofkpk50X84CTgSBMJS5SYXEYFGyJ7xcdN81IHczlKxrLw9jkzz7LJ2PHb/mYM9pFEhA2GllilLPlQJJVTqNLDsc0TGlH8B0QTdxKvTpKomw3q2H+llHb9ZNQSbF0iHU5c/Juq7VWzxdoc/Mf5GMiRc4TNiCkyEwIDAQAB logstash: - url: 8.130.96.163:9601 + url: 39.100.77.21:9601