域名地址更改

3 years ago · b7af14d216
parent 7d90886ec8
commit b7af14d216
8 changed files with 44 additions and 8 deletions
--- a/manage/ad-platform-management/src/main/java/com/baiye/feign/SourceClueClient.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/feign/SourceClueClient.java
@ -2,6 +2,7 @@ package com.baiye.feign;

 import com.baiye.model.dto.ClueQueryCriteria;
 import com.baiye.model.dto.DistributeResponseDTO;
+import com.baiye.model.vo.ResSourceLabel;
 import com.baiye.modules.system.domain.Clue;
 import com.baiye.modules.system.service.dto.ClueMiddleTo;
 import io.swagger.annotations.ApiOperation;
@ -50,5 +51,9 @@ public interface SourceClueClient {
    @ApiOperation("查询资源详情")
    @GetMapping(API_PREFIX + "/queryDetails")
    ResponseEntity<Clue> queryDetails(@RequestParam("clueId") Long clueId);
+
+    @ApiOperation("查询资源标签")
+    @PostMapping(API_PREFIX+"/findSourceLabel")
+    ResponseEntity<List<ResSourceLabel>> findSourceLabel(@RequestBody List<Long> clueIds);
 }

--- a/manage/ad-platform-management/src/main/java/com/baiye/feign/SourceClueClientFallback.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/feign/SourceClueClientFallback.java
@ -3,6 +3,7 @@ package com.baiye.feign;
 import com.baiye.model.dto.ClueQueryCriteria;
 import com.baiye.model.dto.DistributeResponseDTO;
 import com.baiye.model.dto.OrganizeQueryCriteria;
+import com.baiye.model.vo.ResSourceLabel;
 import com.baiye.modules.system.domain.Clue;
 import com.baiye.modules.system.service.dto.ClueMiddleTo;
 import org.springframework.http.ResponseEntity;
@ -50,4 +51,9 @@ public class SourceClueClientFallback implements SourceClueClient {
        return null;
    }

+    @Override
+    public ResponseEntity<List<ResSourceLabel>> findSourceLabel(List<Long> clueIds) {
+        return null;
+    }
+
 }
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java
@ -18,12 +18,12 @@ import com.baiye.modules.system.service.dto.*;
 import com.baiye.modules.system.service.mapstruct.OrganizeMapper;
 import com.baiye.modules.system.service.mapstruct.OrganizeUserMapper;
 import com.baiye.modules.system.service.mapstruct.TaskOrganizeMapper;
+import com.baiye.modules.telemarkting.service.ExtensionNumberService;
 import com.baiye.util.*;
 import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@ -55,6 +55,7 @@ public class OrganizeServiceImpl implements OrganizeService {
    private final RoleService roleService;
    private final RedisUtils redisUtils;
    private final UserMessageService userMessageService;
+    private final ExtensionNumberService ExtensionNumberService;

    /**
     * 新增小组
@ -66,6 +67,8 @@ public class OrganizeServiceImpl implements OrganizeService {
        for (Organize organize : organizeList) {
            organize.setCreateBy(SecurityUtils.getCurrentUserId());
            Organize saveOrganize = organizeRepository.save(organize);
+            //添加分机号
+            ExtensionNumberService.assignExtensionNum(saveOrganize.getId(),organize.getUserId());
            // 添加小组成员信息
            OrganizeUser organizeUser = new OrganizeUser();
            organizeUser.setOrganizeId(saveOrganize.getId());
@ -133,7 +136,9 @@ public class OrganizeServiceImpl implements OrganizeService {
            addOrganizeUser.setOrganizeId(organizeId);
            addOrganizeUser.setIsLeader(false);
            addOrganizeUser.setCreateBy(currentUserId);
-            organizeUserRepository.save(addOrganizeUser);
+            OrganizeUser saveOrganizeUser = organizeUserRepository.save(addOrganizeUser);
+            //添加分机号
+            ExtensionNumberService.assignExtensionNum(saveOrganizeUser.getOrganizeId(),saveOrganizeUser.getUserId());
        }
    }

@ -410,7 +415,9 @@ public class OrganizeServiceImpl implements OrganizeService {
                organizeUser.setOrganizeId(organizeId);
                organizeUser.setIsLeader(false);
                organizeUser.setCreateBy(SecurityUtils.getCurrentUserId());
-                organizeUserRepository.save(organizeUser);
+                OrganizeUser saveOrganizeUser = organizeUserRepository.save(organizeUser);
+                //添加分机号
+                ExtensionNumberService.assignExtensionNum(saveOrganizeUser.getOrganizeId(),saveOrganizeUser.getUserId());
            }
        }
        //分配组员资源
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/httpRequest/RollCallReq.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/httpRequest/RollCallReq.java
@ -46,10 +46,10 @@ public class RollCallReq {
    private String reqTask(TelephoneCallReqDTO doubleCallReq) {
        RollCallSystemDTO rollCallSystemDTO = new RollCallSystemDTO();
        String date = DateUtil.format(DateUtil.date(), "yyyyMMddHHssmm");
-        String sig = SecureUtil.md5(accountSid + token + date).toUpperCase();
+//        String sig = SecureUtil.md5(accountSid + token + date).toUpperCase();
        //设置header
        String authorization = Base64.encode(accountSid + ":" + date);
-        rollCallSystemDTO.setSig(sig);
+//        rollCallSystemDTO.setSig(sig);
        rollCallSystemDTO.setAppid(appId);
        rollCallSystemDTO.setReq_id(doubleCallReq.getRequestId());
        rollCallSystemDTO.setCaller(doubleCallReq.getTelA());
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ExtensionNumberServiceImpl.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ExtensionNumberServiceImpl.java
@ -2,6 +2,7 @@ package com.baiye.modules.telemarkting.service.impl;

 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.modules.system.domain.Organize;
+import com.baiye.modules.system.repository.OrganizeRepository;
 import com.baiye.modules.system.service.OrganizeService;
 import com.baiye.modules.telemarkting.dao.ExtensionNumberRepository;
 import com.baiye.modules.telemarkting.dao.ExtensionUserRepository;
@ -27,7 +28,7 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
    private ExtensionNumberRepository extensionNumberRepository;

    @Resource
-    private OrganizeService organizeService;
+    private OrganizeRepository organizeRepository;
    @Resource
    private ExtensionUserRepository extensionUserRepository;

@ -42,7 +43,7 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
    @Transactional(rollbackFor = Exception.class)
    public void assignExtensionNum(Long organizeId, Long memberId) {
        //查询组
-        Organize organize = organizeService.findByOrganizeId(organizeId);
+        Organize organize = organizeRepository.findById(organizeId).orElseGet(Organize::new);
        if (organize != null && organize.getCallMode() == DefaultNumberConstants.ONE_NUMBER) {
            Integer numberByMemberId = extensionUserRepository.findNumberByMemberId(memberId);

--- a/manage/ad-platform-management/src/main/resources/config/application-dev.yml
+++ b/manage/ad-platform-management/src/main/resources/config/application-dev.yml
@ -128,6 +128,15 @@ axb:
    bingUrl: http://ax.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Calls/AxbBinding
    unBingUrl: http://ax.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Calls/AxbUnBinding

+roll:
+  call:
+    reqUrl: http://api.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Calls/ClickCall
+    accountSid: dbby_hangzhoubaiyehl
+    appId: app1
+    cdrUrl: http://118.178.137.129:8866/api/roll/cdrUrl
+    #cdrUrl: https://baiyee.vip/api/roll/cdrUrl
+    #cdrUrl: http://localhost:8866/api/roll/cdrUrl
+    token: 44574ded6fdb6584dbc6963033988b5


 #ribbon:
--- a/manage/ad-platform-management/src/main/resources/config/application-prod.yml
+++ b/manage/ad-platform-management/src/main/resources/config/application-prod.yml
@ -135,3 +135,11 @@ axb:
    statusUrl: https://baiyee.vip/api/back/status
    bingUrl: http://ax.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Calls/AxbABinding
    unBingUrl: http://ax.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Calls/AxbUnBinding
+
+roll:
+  call:
+    reqUrl: http://api.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Calls/ClickCall
+    accountSid: dbby_hangzhoubaiyehl
+    appId: app1
+    cdrUrl: https://baiyee.vip/api/roll/cdrUrl
+    token: 44574ded6fdb6584dbc6963033988b5
--- a/services/ad-platform-source/src/main/resources/application-prod.yml
+++ b/services/ad-platform-source/src/main/resources/application-prod.yml
@ -63,7 +63,7 @@ spring:
 storage:
  url: /usr/local/webapp/source/files/
  de_symbol: /
-  download-template: https://mm.tuoz.net/source/download/custom.xlsx
+  download-template: https://baiyee.vip/source/download/custom.xlsx


 # 线程池配置