后台增加文案转链接口

admin

2020-01-04 ec5e0b3836c80da168de74e65235b607247fddb9

后台增加文案转链接口

 fanli/src/main/java/com/yeshi/fanli/aspect/AdminLoginAspect.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java
@@ -30,12 +30,12 @@


@Component

@Aspect

public class LoginAspect {

public class AdminLoginAspect {



    @Resource

    private AdminUserService adminUserService;



    @Around("execution(public * com.yeshi.fanli.controller.admin.*.*(..))")

    @Around("execution(public * com.yeshi.fanli.controller.admin..*.*(..))")

    public Object verifyLoginState(ProceedingJoinPoint joinPoint) throws IOException {



        Signature signature = joinPoint.getSignature();


 fanli/src/main/java/com/yeshi/fanli/aspect/WXMPSignValidateAspect.java

@@ -14,13 +14,11 @@
import org.aspectj.lang.annotation.Around;

import org.aspectj.lang.annotation.Aspect;

import org.springframework.core.annotation.Order;

import org.springframework.stereotype.Component;

import org.springframework.web.context.request.RequestContextHolder;

import org.springframework.web.context.request.ServletRequestAttributes;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.dto.WXMPAcceptData;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -34,11 +32,11 @@
 * @author Administrator

 *

 */

@Component

//@Component

@Aspect

@Order(2)

public class WXMPSignValidateAspect {

    public static final String EDP = "execution(* com.yeshi.fanli.controller.wxmp.*.*.*(..))";

    public static final String EDP = "execution(* com.yeshi.fanli.controller.wxmp..*.*(..))";



    public static String KEY = "";




 fanli/src/main/java/com/yeshi/fanli/controller/admin/goods/ConvertLinkController.java

New file
@@ -0,0 +1,51 @@
package com.yeshi.fanli.controller.admin.goods;



import java.io.PrintWriter;



import javax.annotation.Resource;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.StringUtil;



import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;



@Controller

@RequestMapping("admin/new/api/v1/convertLink")

public class ConvertLinkController {



    @Resource

    private ConvertLinkManager convertLinkManager;



    @RequestMapping(value = "convertLink")

    public void convertLink(String callback, String uid, String content, Boolean share, PrintWriter out) {

        if (StringUtil.isNullOrEmpty(uid)) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请上传用户ID"));

            return;

        }



        if (StringUtil.isNullOrEmpty(content)) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请上传文本内容"));

            return;

        }



        if (share == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请选择是分享还是自购"));

            return;

        }



        String result = null;

        try {

            result = convertLinkManager.convertLinkFromText(content, Long.parseLong(uid), share);

        } catch (NumberFormatException e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户ID转换出错"));

        } catch (Exception e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));

            return;

        }



        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(result));

    }



}


 fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetailV2.java

@@ -5,6 +5,7 @@
import java.util.Date;



import org.springframework.data.annotation.Id;

import org.springframework.data.mongodb.core.index.Indexed;

import org.springframework.data.mongodb.core.mapping.Document;

import org.springframework.data.mongodb.core.mapping.Field;



@@ -16,6 +17,7 @@
    private static final long serialVersionUID = 1L;

    @Id

    private Long id;// 商品ID

    @Indexed

    @Field

    private Long goodsId;// 淘宝商品ID

    @Field


 fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java

@@ -166,7 +166,7 @@
            return;

        

        int count = 0;

        int maxCount = 10;

        int maxCount = 15;

        for (int page = 1; page <= 10; page ++) {

            List<TaoBaoGoodsBrief> list = tljFreeBuyGoodsService.listPreGoods("", page);

            if (list == null || list.size() == 0)


 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java

@@ -159,8 +159,13 @@
        for (TaoBaoGoodsBrief goods : goodsList)

            goodsIdList.add(goods.getAuctionId());



        List<DaTaoKeDetailV2> dtList = listByGoodsIds(goodsIdList);

        List<DaTaoKeDetailV2> dtList = null;



        try {

            dtList = listByGoodsIds(goodsIdList);

        } catch (Exception e) {



        }

        Map<Long, DaTaoKeDetailV2> map = new HashMap<>();

        if (dtList != null)

            for (DaTaoKeDetailV2 goods : dtList)


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java

@@ -2137,7 +2137,7 @@
     * @throws

     */

    public static List<String> getTokenListFromText(String str) {

        String pattern = "(₳{1}[A-Za-z0-9]+₳{1})|(¥{1}[A-Za-z0-9]+¥{1})|(￥{1}[A-Za-z0-9]+￥{1})";

        String pattern = "(₳{1}[A-Za-z0-9]+₳{1})|(¥{1}[A-Za-z0-9]+¥{1})|(￥{1}[A-Za-z0-9]+￥{1})|(€{1}[A-Za-z0-9]+€{1})";

        Pattern r = Pattern.compile(pattern);

        Matcher m = r.matcher(str);

        List<String> urlList = new ArrayList<>();