框架修改

admin

2019-02-18 525272051c74c82c44feca05a3552cf1bf8f43ba

框架修改

 .project

New file
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

    <name>flq</name>

    <comment></comment>

    <projects>

    </projects>

    <buildSpec>

        <buildCommand>

            <name>org.eclipse.jdt.core.javabuilder</name>

            <arguments>

            </arguments>

        </buildCommand>

        <buildCommand>

            <name>org.eclipse.wst.common.project.facet.core.builder</name>

            <arguments>

            </arguments>

        </buildCommand>

        <buildCommand>

            <name>org.eclipse.m2e.core.maven2Builder</name>

            <arguments>

            </arguments>

        </buildCommand>

    </buildSpec>

    <natures>

        <nature>org.eclipse.m2e.core.maven2Nature</nature>

        <nature>org.eclipse.wst.common.project.facet.core.nature</nature>

        <nature>org.eclipse.jdt.core.javanature</nature>

    </natures>

</projectDescription>


 fanli-facade-goods/.classpath

New file
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>

<classpath>

    <classpathentry kind="src" output="target/classes" path="src/main/java">

        <attributes>

            <attribute name="optional" value="true"/>

            <attribute name="maven.pomderived" value="true"/>

        </attributes>

    </classpathentry>

    <classpathentry kind="src" output="target/test-classes" path="src/test/java">

        <attributes>

            <attribute name="optional" value="true"/>

            <attribute name="maven.pomderived" value="true"/>

        </attributes>

    </classpathentry>

    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">

        <attributes>

            <attribute name="maven.pomderived" value="true"/>

        </attributes>

    </classpathentry>

    <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

        <attributes>

            <attribute name="maven.pomderived" value="true"/>

            <attribute name="org.eclipse.jst.component.nondependency" value=""/>

        </attributes>

    </classpathentry>

    <classpathentry kind="output" path="target/classes"/>

</classpath>


 fanli-facade-goods/.project

New file
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

    <name>fanli-facade-goods</name>

    <comment></comment>

    <projects>

    </projects>

    <buildSpec>

        <buildCommand>

            <name>org.eclipse.wst.common.project.facet.core.builder</name>

            <arguments>

            </arguments>

        </buildCommand>

        <buildCommand>

            <name>org.eclipse.jdt.core.javabuilder</name>

            <arguments>

            </arguments>

        </buildCommand>

        <buildCommand>

            <name>org.eclipse.m2e.core.maven2Builder</name>

            <arguments>

            </arguments>

        </buildCommand>

        <buildCommand>

            <name>org.eclipse.wst.validation.validationbuilder</name>

            <arguments>

            </arguments>

        </buildCommand>

    </buildSpec>

    <natures>

        <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

        <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>

        <nature>org.eclipse.jdt.core.javanature</nature>

        <nature>org.eclipse.m2e.core.maven2Nature</nature>

        <nature>org.eclipse.wst.common.project.facet.core.nature</nature>

    </natures>

</projectDescription>


 fanli-facade-goods/src/main/java/org/fanli/facade/goods/exception/taoke/TaoKeApiException.java

File was deleted

 fanli-facade-goods/src/main/java/org/fanli/facade/goods/utils/RedisManager.java

File was deleted

 fanli-facade-goods/src/main/java/org/fanli/facade/goods/utils/dataoke/TaoKeApiUtil.java

File was deleted

 fanli-facade-goods/src/main/java/org/fanli/facade/goods/utils/dataoke/TaoKeBaseUtil.java

File was deleted

 fanli-facade-goods/src/main/java/org/fanli/facade/goods/utils/taobao/TaoBaoShopUtil.java

@@ -4,14 +4,13 @@
import java.net.URLEncoder;

import java.util.List;



import net.sf.json.JSONObject;



import org.fanli.facade.goods.entity.taobao.TaoBaoShopInfo;

import org.fanli.facade.goods.utils.dataoke.TaoKeApiUtil;

import org.jsoup.Jsoup;

import org.jsoup.nodes.Document;

import org.jsoup.nodes.Element;

import org.yeshi.utils.HttpUtil;



import net.sf.json.JSONObject;



public class TaoBaoShopUtil {



@@ -19,7 +18,7 @@
        int page = 1;

        TaoBaoShopInfo shop = null;

        while (shop == null && page < 4) {

            List<TaoBaoShopInfo> list = TaoKeApiUtil.searchShop(title, page);

            List<TaoBaoShopInfo> list = TaoKeGoodsApiUtil.searchShop(title, page);

            shop = selectShop(sellerId, list);

            page++;

        }


 fanli-facade-goods/src/main/java/org/fanli/facade/goods/utils/taobao/TaoBaoUtil.java

@@ -18,9 +18,6 @@
import javax.xml.parsers.DocumentBuilder;

import javax.xml.parsers.DocumentBuilderFactory;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.apache.commons.httpclient.HttpClient;

import org.apache.commons.httpclient.methods.GetMethod;

import org.fanli.facade.goods.dto.taobao.TaoBaoGoodsBriefExtra;

@@ -36,7 +33,6 @@
import org.fanli.facade.goods.entity.usergoods.ScanHistory;

import org.fanli.facade.goods.exception.taobao.TaobaoGoodsDownException;

import org.fanli.facade.goods.service.taobao.TaoBaoLinkService;

import org.fanli.facade.goods.utils.dataoke.TaoKeApiUtil;

import org.fanli.facade.system.service.hongbao.HongBaoManageService;

import org.jsoup.Connection;

import org.jsoup.Jsoup;

@@ -63,6 +59,9 @@
import com.yeshi.fanli.base.entity.goods.CommonGoods;

import com.yeshi.fanli.base.entity.goods.TaoBaoGoodsBrief;

import com.yeshi.fanli.base.log.LogHelper;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Component

public class TaoBaoUtil {

@@ -172,7 +171,7 @@
                    String id = st.replace("id=", "").trim();

                    TaoBaoGoodsBrief tb = null;

                    try {

                        tb = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id));

                        tb = TaoKeGoodsApiUtil.searchGoodsDetail(Long.parseLong(id));

                    } catch (TaobaoGoodsDownException e) {

                        e.printStackTrace();

                    }

@@ -196,7 +195,7 @@
            for (String c : filter.getCateIds().split(","))

                cateList.add(Long.parseLong(c));

        }

        return TaoKeApiUtil.searchWuLiao(filter);

        return TaoKeGoodsApiUtil.searchWuLiao(filter);

    }



    /**

@@ -459,7 +458,7 @@
                    String id = st.replace("id=", "").trim();

                    TaoBaoGoodsBrief tb = null;

                    try {

                        tb = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id));

                        tb = TaoKeGoodsApiUtil.searchGoodsDetail(Long.parseLong(id));

                    } catch (TaobaoGoodsDownException e) {

                        e.printStackTrace();

                    }

@@ -486,7 +485,7 @@
        }



        if (1 > 0)

            return TaoKeApiUtil.searchWuLiao(filter);

            return TaoKeGoodsApiUtil.searchWuLiao(filter);



        Map<String, String> params = new HashMap<String, String>();

        String key = filter.getKey();

@@ -880,7 +879,7 @@
        activityId = StringUtil.isNullOrEmpty(activityId) ? "da75a5880d4c41ab88a82256b069a38c" : activityId;

        String url = String.format("https://uland.taobao.com/coupon/edetail?activityId=%s&pid=%s&itemId=%s", activityId,

                pid, auctionId + "");

        String tbk = TaoKeApiUtil.getTKToken(picture, title, url);

        String tbk = TaoKeGoodsApiUtil.getTKToken(picture, title, url);

        if (StringUtil.isNullOrEmpty(tbk))

            LogHelper.error("生成淘口令失败（优惠券链接）:" + auctionId);

        TaoBaoLink taoBaoLink = new TaoBaoLink();

@@ -1092,7 +1091,7 @@
            return new ArrayList<>();

        TaoBaoGoodsBrief taoBaoGoodsBrief = null;

        try {

            taoBaoGoodsBrief = TaoKeApiUtil.getSimpleGoodsInfo(Long.parseLong(auctionId));

            taoBaoGoodsBrief = TaoKeGoodsApiUtil.getSimpleGoodsInfo(Long.parseLong(auctionId));

        } catch (TaobaoGoodsDownException e) {

            e.printStackTrace();

        }

@@ -1113,7 +1112,7 @@
            return null;

        TaoBaoGoodsBrief tb = null;

        try {

            tb = TaoKeApiUtil.getSimpleGoodsInfo(Long.parseLong(auctionId));

            tb = TaoKeGoodsApiUtil.getSimpleGoodsInfo(Long.parseLong(auctionId));

        } catch (TaobaoGoodsDownException e) {

            e.printStackTrace();

        }


 fanli-facade-order/src/main/java/org/fanli/facade/order/entity/order/TaoBaoOrder.java

@@ -77,6 +77,26 @@
    private Date latestUpdateTime;// 最近一次的更新时间

    @Column(name = "to_orderby")

    private Integer orderBy;// 排序值

    @Column(name = "to_special_id")

    private String specialId;

    @Column(name = "to_relation_id")

    private String relationId;



    public String getSpecialId() {

        return specialId;

    }



    public void setSpecialId(String specialId) {

        this.specialId = specialId;

    }



    public String getRelationId() {

        return relationId;

    }



    public void setRelationId(String relationId) {

        this.relationId = relationId;

    }



    public Integer getOrderBy() {

        return orderBy;


 fanli-facade-system/src/main/java/org/fanli/facade/system/App.java

File was deleted

 fanli-service-goods/src/main/java/com/yeshi/fanli/goods/service/impl/label/LabelGoodsServiceImpl.java

@@ -15,7 +15,7 @@
import org.fanli.facade.goods.service.label.LabelGoodsService;

import org.fanli.facade.goods.service.label.LabelService;

import org.fanli.facade.goods.service.taobao.TaoBaoGoodsBriefService;

import org.fanli.facade.goods.utils.RedisManager;

import org.fanli.facade.goods.utils.RedisGoodsManager;



import com.alibaba.dubbo.config.annotation.Service;

import com.yeshi.fanli.base.entity.admin.AdminUser;

@@ -27,7 +27,7 @@
public class LabelGoodsServiceImpl implements LabelGoodsService {



    @Resource

    private RedisManager redisManager;

    private RedisGoodsManager redisManager;

    

    @Resource

    private LabelGoodsMapper labelGoodsMapper;


 fanli-service-goods/src/main/java/com/yeshi/fanli/goods/service/impl/quality/QualityFactoryServiceImpl.java

@@ -25,7 +25,7 @@
import org.fanli.facade.goods.service.taobao.TaoBaoGoodsBriefService;

import org.fanli.facade.goods.service.taobao.TaoBaoGoodsUpdateService;

import org.fanli.facade.goods.service.taobao.TaoBaoUnionConfigService;

import org.fanli.facade.goods.utils.RedisManager;

import org.fanli.facade.goods.utils.RedisGoodsManager;

import org.fanli.facade.goods.utils.dataoke.TaoKeApiUtil;

import org.fanli.facade.goods.utils.taobao.TaoBaoUtil;

import org.fanli.facade.goods.vo.quality.QualityFactoryVO;

@@ -47,7 +47,7 @@
public class QualityFactoryServiceImpl implements QualityFactoryService {



    @Resource

    private RedisManager redisManager;

    private RedisGoodsManager redisManager;

    @Resource

    private QualityFactoryMapper qualityFactoryMapper;

    @Resource


 fanli-service-goods/src/main/java/com/yeshi/fanli/goods/service/impl/quality/QualityGoodsServiceImpl.java

@@ -12,7 +12,7 @@
import org.fanli.facade.goods.service.quality.QualityGoodsService;

import org.fanli.facade.goods.service.taobao.TaoBaoGoodsBriefService;

import org.fanli.facade.goods.service.taobao.TaoBaoUnionConfigService;

import org.fanli.facade.goods.utils.RedisManager;

import org.fanli.facade.goods.utils.RedisGoodsManager;

import org.fanli.facade.goods.utils.taobao.TaoBaoUtil;

import org.springframework.cache.annotation.Cacheable;

import org.yeshi.utils.JsonUtil;

@@ -35,7 +35,7 @@
public class QualityGoodsServiceImpl implements QualityGoodsService {



    @Resource

    private RedisManager redisManager;

    private RedisGoodsManager redisManager;

    @Resource

    private QualityFactoryMapper qualityFactoryMapper;

    @Resource


 fanli-service-goods/src/main/java/com/yeshi/fanli/goods/service/impl/taobao/TaoBaoCouponServiceImpl.java

@@ -11,7 +11,7 @@
import org.fanli.facade.goods.entity.taobao.TaoBaoCoupon;

import org.fanli.facade.goods.service.taobao.TaoBaoCouponService;

import org.fanli.facade.goods.service.taobao.TaoBaoUnionConfigService;

import org.fanli.facade.goods.utils.RedisManager;

import org.fanli.facade.goods.utils.RedisGoodsManager;

import org.fanli.facade.goods.utils.dataoke.TaoKeApiUtil;

import org.springframework.cache.annotation.Cacheable;

import org.springframework.transaction.annotation.Transactional;

@@ -34,7 +34,7 @@
    private TaoBaoUnionConfigService taoBaoUnionConfigService;



    @Resource

    private RedisManager redisManager;

    private RedisGoodsManager redisManager;





    public List<TaoBaoCoupon> getTaoBaoCouponList(String key, int page) {


 fanli-service-goods/src/main/java/com/yeshi/fanli/goods/service/impl/usergoods/ShareGoodsServiceImpl.java

@@ -24,7 +24,7 @@
import org.fanli.facade.goods.service.usergoods.ShareGoodsService;

import org.fanli.facade.goods.service.usergoods.UserShareGoodsRecordService;

import org.fanli.facade.goods.utils.ImageUtil;

import org.fanli.facade.goods.utils.RedisManager;

import org.fanli.facade.goods.utils.RedisGoodsManager;

import org.fanli.facade.goods.utils.dataoke.TaoKeApiUtil;

import org.fanli.facade.goods.utils.taobao.TaoBaoUtil;

import org.fanli.facade.order.service.hongbao.HongBaoManageService;

@@ -70,7 +70,7 @@
    private UserInfoService userInfoService;



    @Resource

    private RedisManager redisManager;

    private RedisGoodsManager redisManager;



    @Resource

    private ConfigService configService;


 fanli-service-goods/src/main/java/com/yeshi/fanli/goods/service/impl/usergoods/UserGoodsStorageServiceImpl.java

@@ -22,7 +22,7 @@
import org.fanli.facade.goods.service.taobao.CommonGoodsService;

import org.fanli.facade.goods.service.usergoods.UserGoodsStorageService;

import org.fanli.facade.goods.service.usergoods.UserShareGoodsRecordService;

import org.fanli.facade.goods.utils.RedisManager;

import org.fanli.facade.goods.utils.RedisGoodsManager;

import org.fanli.facade.goods.utils.dataoke.TaoKeApiUtil;

import org.fanli.facade.goods.utils.factory.CommonGoodsFactory;

import org.fanli.facade.goods.utils.taobao.TaoBaoUtil;

@@ -46,7 +46,7 @@
    private TaskExecutor executor;

    

    @Resource

    private RedisManager redisManager;

    private RedisGoodsManager redisManager;

    

    @Resource

    private ConfigService configService;


 fanli-service-goods/src/main/java/com/yeshi/fanli/goods/service/impl/usergoods/UserShareGoodsRecordServiceImpl.java

@@ -24,7 +24,7 @@
import org.fanli.facade.goods.service.usergoods.UserShareGoodsGroupService;

import org.fanli.facade.goods.service.usergoods.UserShareGoodsRecordService;

import org.fanli.facade.goods.utils.ImageUtil;

import org.fanli.facade.goods.utils.RedisManager;

import org.fanli.facade.goods.utils.RedisGoodsManager;

import org.fanli.facade.goods.utils.dataoke.TaoKeApiUtil;

import org.fanli.facade.goods.utils.factory.CommonGoodsFactory;

import org.fanli.facade.goods.utils.taobao.TaoBaoUtil;

@@ -66,7 +66,7 @@
    private ConfigService configService;



    @Resource

    private RedisManager redisManager;

    private RedisGoodsManager redisManager;



    @Resource

    private UserInfoService userInfoService;


 fanli-service-system/src/main/java/com/yeshi/fanli/system/mapping/SystemClientParamsMapper.xml

File was deleted

 fanli-service-system/src/main/java/com/yeshi/fanli/system/mapping/SystemManageMapper.xml

File was deleted

 pom.xml

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>

    <groupId>com.yeshi.fanli</groupId>
@@ -22,7 +21,11 @@
        <module>fanli-service-system</module>
        <module>fanli-service-goods</module>
        <module>fanli-service-order</module>
    </modules>
    <module>test</module>
    <module>tets</module>
    <module>fanli-service-user</module>
    <module>test12</module>
  </modules>


    <properties>