.idea/artifacts/fanli_war_exploded.xml
@@ -19,16 +19,6 @@ <element id="archive" name="common-0.0.1-SNAPSHOT.jar"> <element id="module-output" name="facede-common" /> </element> <element id="library" level="project" name="Maven: org.apache.dubbo:dubbo:2.7.5" /> <element id="library" level="project" name="Maven: com.alibaba.spring:spring-context-support:1.0.5" /> <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.25.Final" /> <element id="library" level="project" name="Maven: org.yaml:snakeyaml:1.20" /> <element id="library" level="project" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" /> <element id="library" level="project" name="Maven: jline:jline:0.9.94" /> <element id="library" level="project" name="Maven: org.apache.curator:curator-framework:2.8.0" /> <element id="library" level="project" name="Maven: org.apache.curator:curator-client:2.8.0" /> <element id="library" level="project" name="Maven: org.apache.curator:curator-recipes:2.8.0" /> <element id="library" level="project" name="Maven: com.101tec:zkclient:0.10" /> <element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" /> <element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" /> <element id="library" level="project" name="Maven: org.springframework:spring-context:4.3.0.RELEASE" /> @@ -140,6 +130,7 @@ <element id="library" level="project" name="Maven: com.aliyun.openservices:ons-client:1.8.0.Final" /> <element id="library" level="project" name="Maven: com.xuxueli:xxl-job-core:2.1.2" /> <element id="library" level="project" name="Maven: com.xuxueli:xxl-rpc-core:1.5.0" /> <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.43.Final" /> <element id="library" level="project" name="Maven: com.caucho:hessian:4.0.63" /> <element id="library" level="project" name="Maven: com.xuxueli:xxl-registry-client:1.1.0" /> <element id="library" level="project" name="Maven: org.codehaus.groovy:groovy:2.5.8" /> @@ -148,6 +139,7 @@ <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch-core:7.5.1" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch-secure-sm:7.5.1" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch-x-content:7.5.1" /> <element id="library" level="project" name="Maven: org.yaml:snakeyaml:1.17" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.11" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.11" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.11" /> .idea/artifacts/service_goods_war_exploded.xml
@@ -100,11 +100,9 @@ <element id="library" level="project" name="Maven: com.github.qcloudsms:qcloudsms:1.0.2" /> <element id="library" level="project" name="Maven: org.json:json:20170516" /> <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpmime:4.5.12" /> <element id="library" level="project" name="Maven: org.mongodb:mongo-java-driver:2.13.0-rc0" /> <element id="library" level="project" name="Maven: org.springframework.data:spring-data-mongodb:3.0.1.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.data:spring-data-commons:2.3.1.RELEASE" /> <element id="library" level="project" name="Maven: org.mongodb:mongodb-driver-core:4.0.4" /> <element id="library" level="project" name="Maven: org.mongodb:bson:4.0.4" /> <element id="library" level="project" name="Maven: org.springframework.data:spring-data-mongodb-cross-store:1.10.10.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-aspects:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: org.aspectj:aspectjrt:1.9.5" /> @@ -203,6 +201,10 @@ <element id="library" level="project" name="Maven: org.glassfish:jakarta.el:3.0.3" /> <element id="library" level="project" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.36" /> <element id="library" level="project" name="Maven: org.springframework:spring-web:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:2.3.1.RELEASE" /> <element id="library" level="project" name="Maven: org.mongodb:mongodb-driver-sync:4.0.4" /> <element id="library" level="project" name="Maven: org.mongodb:bson:4.0.4" /> <element id="library" level="project" name="Maven: org.mongodb:mongo-java-driver:3.12.0" /> <element id="library" level="project" name="Maven: org.hamcrest:hamcrest:2.2" /> <element id="library" level="project" name="Maven: org.springframework:spring-core:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-jcl:5.2.7.RELEASE" /> @@ -212,9 +214,9 @@ <element id="library" level="project" name="Maven: org.yaml:snakeyaml:1.26" /> <element id="library" level="project" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" /> <element id="library" level="project" name="Maven: jline:jline:0.9.94" /> <element id="library" level="project" name="Maven: org.apache.curator:curator-framework:2.8.0" /> <element id="library" level="project" name="Maven: org.apache.curator:curator-client:2.8.0" /> <element id="library" level="project" name="Maven: org.apache.curator:curator-recipes:2.8.0" /> <element id="library" level="project" name="Maven: org.apache.curator:curator-framework:2.13.0" /> <element id="library" level="project" name="Maven: org.apache.curator:curator-client:2.13.0" /> <element id="library" level="project" name="Maven: org.apache.curator:curator-recipes:2.13.0" /> <element id="library" level="project" name="Maven: com.101tec:zkclient:0.10" /> </element> </element> .idea/libraries/Maven__io_netty_netty_all_4_1_25_Final.xml
File was deleted .idea/libraries/Maven__org_apache_curator_curator_client_2_13_0.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.curator:curator-client:2.13.0"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/curator/curator-client/2.13.0/curator-client-2.13.0.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/curator/curator-client/2.13.0/curator-client-2.13.0-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/curator/curator-client/2.13.0/curator-client-2.13.0-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_curator_curator_client_2_8_0.xml
File was deleted .idea/libraries/Maven__org_apache_curator_curator_framework_2_13_0.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.curator:curator-framework:2.13.0"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/curator/curator-framework/2.13.0/curator-framework-2.13.0.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/curator/curator-framework/2.13.0/curator-framework-2.13.0-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/curator/curator-framework/2.13.0/curator-framework-2.13.0-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_curator_curator_framework_2_8_0.xml
File was deleted .idea/libraries/Maven__org_apache_curator_curator_recipes_2_13_0.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.curator:curator-recipes:2.13.0"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/curator/curator-recipes/2.13.0/curator-recipes-2.13.0.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/curator/curator-recipes/2.13.0/curator-recipes-2.13.0-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/curator/curator-recipes/2.13.0/curator-recipes-2.13.0-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_curator_curator_recipes_2_8_0.xml
File was deleted .idea/libraries/Maven__org_mongodb_mongo_java_driver_3_12_0.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.mongodb:mongo-java-driver:3.12.0"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongo-java-driver/3.12.0/mongo-java-driver-3.12.0.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongo-java-driver/3.12.0/mongo-java-driver-3.12.0-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongo-java-driver/3.12.0/mongo-java-driver-3.12.0-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_mongodb_mongodb_driver_sync_4_0_4.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.mongodb:mongodb-driver-sync:4.0.4"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-sync/4.0.4/mongodb-driver-sync-4.0.4.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-sync/4.0.4/mongodb-driver-sync-4.0.4-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-sync/4.0.4/mongodb-driver-sync-4.0.4-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_3_1_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:2.3.1.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-mongodb/2.3.1.RELEASE/spring-boot-starter-data-mongodb-2.3.1.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-mongodb/2.3.1.RELEASE/spring-boot-starter-data-mongodb-2.3.1.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-mongodb/2.3.1.RELEASE/spring-boot-starter-data-mongodb-2.3.1.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_yaml_snakeyaml_1_20.xml
File was deleted facade-goods/src/main/java/com/yeshi/goods/facade/entity/taobao/TaoBaoCouponCache.java
New file @@ -0,0 +1,115 @@ package com.yeshi.goods.facade.entity.taobao; import org.springframework.data.mongodb.core.mapping.Document; import org.yeshi.utils.StringUtil; import java.math.BigDecimal; import java.util.Date; @Document(collection = "taoBaoCouponCache") public class TaoBaoCouponCache { private String id;//主键 private Long auctionId;//商品Id private String activityId;//券ID private BigDecimal couponAmount;//券面额 private BigDecimal couponStartPrice;//使用券的最小价格 private Date startTime;//券开始时间 private Date endTime;//券结束时间 private String pid;//推广位ID private String couponLink;//券链接 private Date createTime;//创建时间 private Date updateTime;//更新时间 public String createId() { return StringUtil.Md5(this.auctionId + "-" + this.activityId + "-" + this.pid); } public String getId() { return id; } public void setId(String id) { this.id = id; } public Long getAuctionId() { return auctionId; } public void setAuctionId(Long auctionId) { this.auctionId = auctionId; } public String getActivityId() { return activityId; } public void setActivityId(String activityId) { this.activityId = activityId; } public BigDecimal getCouponAmount() { return couponAmount; } public void setCouponAmount(BigDecimal couponAmount) { this.couponAmount = couponAmount; } public BigDecimal getCouponStartPrice() { return couponStartPrice; } public void setCouponStartPrice(BigDecimal couponStartPrice) { this.couponStartPrice = couponStartPrice; } public Date getStartTime() { return startTime; } public void setStartTime(Date startTime) { this.startTime = startTime; } public Date getEndTime() { return endTime; } public void setEndTime(Date endTime) { this.endTime = endTime; } public String getPid() { return pid; } public void setPid(String pid) { this.pid = pid; } public String getCouponLink() { return couponLink; } public void setCouponLink(String couponLink) { this.couponLink = couponLink; } public Date getCreateTime() { return createTime; } public void setCreateTime(Date createTime) { this.createTime = createTime; } public Date getUpdateTime() { return updateTime; } public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } } facade-goods/src/main/java/com/yeshi/goods/facade/service/TaoBaoCouponCacheService.java
New file @@ -0,0 +1,10 @@ package com.yeshi.goods.facade.service; import com.yeshi.goods.facade.entity.taobao.TaoBaoCouponCache; public interface TaoBaoCouponCacheService { //保存 public void save(TaoBaoCouponCache cache); } facede-common/src/main/java/com/yeshi/common/MongodbBaseDao.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/dao/MongodbBaseDao.java @@ -1,4 +1,4 @@ package com.yeshi.fanli.dao; package com.yeshi.common; import java.lang.reflect.ParameterizedType; import java.util.List; fanli/fanli.iml
@@ -161,16 +161,6 @@ <SOURCES /> </library> </orderEntry> <orderEntry type="library" name="Maven: org.apache.dubbo:dubbo:2.7.5" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.5" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.25.Final" level="project" /> <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.20" level="project" /> <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.8.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.8.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.8.0" level="project" /> <orderEntry type="library" name="Maven: com.101tec:zkclient:0.10" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" /> <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" /> <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" level="project" /> @@ -286,6 +276,7 @@ <orderEntry type="library" name="Maven: com.aliyun.openservices:ons-client:1.8.0.Final" level="project" /> <orderEntry type="library" name="Maven: com.xuxueli:xxl-job-core:2.1.2" level="project" /> <orderEntry type="library" name="Maven: com.xuxueli:xxl-rpc-core:1.5.0" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.43.Final" level="project" /> <orderEntry type="library" name="Maven: com.caucho:hessian:4.0.63" level="project" /> <orderEntry type="library" name="Maven: com.xuxueli:xxl-registry-client:1.1.0" level="project" /> <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy:2.5.8" level="project" /> @@ -294,6 +285,7 @@ <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch-core:7.5.1" level="project" /> <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch-secure-sm:7.5.1" level="project" /> <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch-x-content:7.5.1" level="project" /> <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.11" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.11" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.11" level="project" /> fanli/pom.xml
@@ -16,7 +16,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <dubbo.version>2.7.5</dubbo.version> <curator.version>2.8.0</curator.version> <curator.version>2.13.0</curator.version> <zookeeper.version>3.4.6</zookeeper.version> </properties> <dependencies> @@ -146,58 +146,73 @@ </dependency> <dependency> <groupId>org.apache.dubbo</groupId> <artifactId>dubbo</artifactId> <version>${dubbo.version}</version> </dependency> <!--<dependency>--> <!--<groupId>org.apache.dubbo</groupId>--> <!--<artifactId>dubbo</artifactId>--> <!--<version>${dubbo.version}</version>--> <!--<exclusions>--> <!--<exclusion>--> <!--<groupId>org.springframework</groupId>--> <!--<artifactId>spring</artifactId>--> <!--</exclusion>--> <!--<!–去掉javassist依赖–>--> <!--<exclusion>--> <!--<groupId>org.javassist</groupId>--> <!--<artifactId>javassist</artifactId>--> <!--</exclusion>--> <!--</exclusions>--> <!--</dependency>--> <!-- zookeeper --> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <version>${zookeeper.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> <exclusion> <groupId>io.netty</groupId> <artifactId>netty</artifactId> </exclusion> </exclusions> </dependency> <!--<!– zookeeper –>--> <!--<dependency>--> <!--<groupId>org.apache.zookeeper</groupId>--> <!--<artifactId>zookeeper</artifactId>--> <!--<version>${zookeeper.version}</version>--> <!--<exclusions>--> <!--<exclusion>--> <!--<groupId>org.slf4j</groupId>--> <!--<artifactId>slf4j-log4j12</artifactId>--> <!--</exclusion>--> <!--<exclusion>--> <!--<groupId>log4j</groupId>--> <!--<artifactId>log4j</artifactId>--> <!--</exclusion>--> <!--</exclusions>--> <!--</dependency>--> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> <version>${curator.version}</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> <version>${curator.version}</version> </dependency> <!--<dependency>--> <!--<groupId>org.apache.curator</groupId>--> <!--<artifactId>curator-framework</artifactId>--> <!--<version>${curator.version}</version>--> <!--</dependency>--> <!--<dependency>--> <!--<groupId>org.apache.curator</groupId>--> <!--<artifactId>curator-recipes</artifactId>--> <!--<version>${curator.version}</version>--> <!--</dependency>--> <dependency> <groupId>com.101tec</groupId> <artifactId>zkclient</artifactId> <version>0.10</version> <exclusions> <exclusion> <artifactId>slf4j-log4j12</artifactId> <groupId>org.slf4j</groupId> </exclusion> </exclusions> </dependency> <!--<dependency>--> <!--<groupId>com.101tec</groupId>--> <!--<artifactId>zkclient</artifactId>--> <!--<version>0.10</version>--> <!--<exclusions>--> <!--<exclusion>--> <!--<artifactId>slf4j-log4j12</artifactId>--> <!--<groupId>org.slf4j</groupId>--> <!--</exclusion>--> <!--</exclusions>--> <!--</dependency>--> <!--<dependency>--> <!--<groupId>org.javassist</groupId>--> <!--<artifactId>javassist</artifactId>--> <!--<version>3.18.0-GA</version>--> <!--<scope>compile</scope>--> <!--</dependency>--> </dependencies> <build> <plugins> fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -19,6 +19,8 @@ import javax.servlet.http.HttpServletRequest; import com.yeshi.fanli.entity.SystemEnum; import com.yeshi.goods.facade.entity.taobao.TaoBaoCouponCache; import com.yeshi.goods.facade.service.TaoBaoCouponCacheService; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; @@ -109,11 +111,8 @@ @Resource private JedisPool jedisPool; @Resource private IntegralGetService integralGetService; @Resource private UserMoneyExtraService userMoneyExtraService; // @Reference(check = true, timeout = 1000) private TaoBaoCouponCacheService taoBaoCouponCacheService; @RequestMapping(value = "kefu") public void kefu(HttpServletRequest request, PrintWriter out) { @@ -421,4 +420,14 @@ LogManager.getLogger(LogType.taobaoAuth).info("123123123"); } @RequestMapping("dubbo") public void testDubbo() { TaoBaoCouponCache cache = new TaoBaoCouponCache(); cache.setActivityId("123123123"); cache.setPid("mm_12_12_12"); cache.setAuctionId(123123L); taoBaoCouponCacheService.save(cache); } } fanli/src/main/java/com/yeshi/fanli/dao/ad/DouYinClickEventDao.java
@@ -6,7 +6,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.ad.DouYinClickEvent; @Repository fanli/src/main/java/com/yeshi/fanli/dao/brand/BrandGoodsCaheDao.java
@@ -8,7 +8,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.brand.BrandGoodsCahe; @Repository fanli/src/main/java/com/yeshi/fanli/dao/brand/BrandShopCaheDao.java
@@ -7,7 +7,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.brand.BrandShopCahe; @Repository fanli/src/main/java/com/yeshi/fanli/dao/dynamic/WXMPDynamicInfoDao.java
@@ -14,7 +14,7 @@ import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.dynamic.WXMPDynamicInfo; @Repository fanli/src/main/java/com/yeshi/fanli/dao/goods/FreeGoodsCouponDao.java
@@ -1,17 +1,14 @@ package com.yeshi.fanli.dao.goods; import java.util.Date; import java.util.List; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.goods.FreeGoodsCoupon; import com.yeshi.fanli.vo.goods.GoodsDetailVO; @Repository public class FreeGoodsCouponDao extends MongodbBaseDao<FreeGoodsCoupon> { fanli/src/main/java/com/yeshi/fanli/dao/goods/PullNewGoodsDao.java
@@ -7,7 +7,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.goods.PullNewGoods; @Repository fanli/src/main/java/com/yeshi/fanli/dao/goods/jd/NYouHuiGoodsDao.java
@@ -10,7 +10,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.goods.jd.NYouHuiGoods; @Repository fanli/src/main/java/com/yeshi/fanli/dao/goods/taobao/dataoke/DaTaoKeGoodsDetailV2Dao.java
@@ -15,7 +15,7 @@ import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.goods.facade.entity.taobao.dataoke.DaTaoKeDetailV2; import org.yeshi.utils.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; fanli/src/main/java/com/yeshi/fanli/dao/goods/taobao/haodanku/HDKGoodsDetailDao.java
@@ -8,7 +8,7 @@ import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.goods.facade.entity.taobao.haodanku.HDKGoodsDetail; @Repository fanli/src/main/java/com/yeshi/fanli/dao/mongo/system/ConfigCategoryDao.java
@@ -7,7 +7,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.system.ConfigCategory; import com.yeshi.fanli.entity.system.ConfigCategory.ConfigCategoryEnum;
@@ -26,7 +26,7 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.mongodb.GroupCommand; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.order.OrderMoneyDailyCount; import com.yeshi.fanli.entity.order.SourceTypeEnum; import com.yeshi.fanli.vo.order.OrderRankingVO; fanli/src/main/java/com/yeshi/fanli/dao/push/DeviceTokenXMDao.java
@@ -16,7 +16,7 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBObject; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.push.DeviceTokenXM; @Repository fanli/src/main/java/com/yeshi/fanli/dao/taobao/ShareHotGoodsDao.java
@@ -7,7 +7,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.taobao.ShareHotGoods; @Repository fanli/src/main/java/com/yeshi/fanli/dao/taobao/SuperTaoBaoGoodsDao.java
@@ -8,7 +8,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.taobao.s618.SuperTaoBaoGoods; @Repository fanli/src/main/java/com/yeshi/fanli/dao/taobao/TLJBuyGoodsDao.java
@@ -7,7 +7,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.taobao.TLJBuyGoods; @Repository fanli/src/main/java/com/yeshi/fanli/dao/taobao/TLJFreeBuyGoodsDao.java
@@ -7,7 +7,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.taobao.TLJFreeBuyGoods; @Repository fanli/src/main/java/com/yeshi/fanli/dao/taobao/TaoBaoGoodsUpdateDao.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; import com.mongodb.BasicDBObject; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief; @Repository fanli/src/main/java/com/yeshi/fanli/dao/taobao/UserTLJBuyHistoryDao.java
@@ -6,7 +6,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.taobao.UserTLJBuyHistory;
@@ -5,7 +5,7 @@ import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.user.BindRemind; @Repository fanli/src/main/java/com/yeshi/fanli/dao/user/DeviceSexDao.java
@@ -2,7 +2,7 @@ import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.homemodule.DeviceSex; @Repository fanli/src/main/java/com/yeshi/fanli/dao/user/PreviewInfoDao.java
@@ -2,7 +2,7 @@ import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.user.PreviewInfo; @Repository fanli/src/main/java/com/yeshi/fanli/dao/user/UserConvertLinkTemplateDao.java
@@ -2,7 +2,7 @@ import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.user.UserConvertLinkTemplate; @Repository fanli/src/main/java/com/yeshi/fanli/dao/user/cloud/UserCloudSendContentDao.java
@@ -6,7 +6,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.user.cloud.UserCloudSendContent; @Repository fanli/src/main/java/com/yeshi/fanli/dao/user/cloud/UserCloudSendRecordDao.java
@@ -10,7 +10,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.user.cloud.UserCloudSendRecord; import com.yeshi.fanli.util.StringUtil;
@@ -8,7 +8,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.admin.count.CountOrderInfo; import com.yeshi.fanli.entity.admin.count.CountOrderInfo.CountOrderEnum; import com.yeshi.fanli.util.StringUtil; fanli/src/main/java/com/yeshi/fanli/dao/user/count/CountOrderTrackRateDao.java
@@ -8,7 +8,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.admin.count.CountOrderTrackRate; import com.yeshi.fanli.entity.admin.count.CountOrderTrackRate.OrderTrackRateEnum;
@@ -8,7 +8,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.admin.count.CountUserInfo; import com.yeshi.fanli.entity.admin.count.CountUserInfo.CountUserEnum; import com.yeshi.fanli.util.StringUtil; fanli/src/main/java/com/yeshi/fanli/dao/user/count/DailyCountCouponDao.java
@@ -8,7 +8,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.admin.count.DailyCountCoupon; import com.yeshi.fanli.entity.admin.count.DailyCountCoupon.DailyCountCouponEnum;
@@ -8,7 +8,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.admin.count.DailyCountMoments; import com.yeshi.fanli.entity.admin.count.DailyCountMoments.DailyCountMomentsEnum;
@@ -8,7 +8,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.admin.count.DailyCountOrder; import com.yeshi.fanli.entity.admin.count.DailyCountOrder.DailyCountOrderEnum; import com.yeshi.fanli.util.StringUtil; fanli/src/main/java/com/yeshi/fanli/dao/user/count/DailyCountUserDao.java
@@ -8,7 +8,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.admin.count.DailyCountUser; import com.yeshi.fanli.entity.admin.count.DailyCountUser.DailyCountUserEnum; import com.yeshi.fanli.util.StringUtil; fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java
@@ -25,7 +25,7 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.mongodb.GroupCommand; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.user.invite.TeamDailyRecord; import com.yeshi.fanli.vo.order.OrderRankingVO;
@@ -12,7 +12,7 @@ import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.dto.user.ThreeSaleFocusDTO; import com.yeshi.fanli.entity.bus.user.TeamFansInfo; import com.yeshi.fanli.util.StringUtil; fanli/src/main/java/com/yeshi/fanli/dao/user/invite/ThreeSaleDetailDao.java
@@ -6,7 +6,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.user.ThreeSaleDetail; @Repository fanli/src/main/java/com/yeshi/fanli/dao/user/notify/UserActivedRecordDao.java
@@ -2,7 +2,7 @@ import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.user.notify.UserActivedRecord; @Repository fanli/src/main/java/com/yeshi/fanli/dao/user/vip/GiveVIPApplyInfoDao.java
@@ -10,7 +10,7 @@ import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.user.vip.GiveVIPApplyInfo; @Repository fanli/src/main/java/com/yeshi/fanli/dao/user/vip/TearcherInfoDao.java
@@ -6,7 +6,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.user.vip.TearcherInfo; @Repository fanli/src/main/java/com/yeshi/fanli/dao/user/vip/UserLevelUpgradedNotifyDao.java
@@ -10,7 +10,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum; import com.yeshi.fanli.entity.bus.user.vip.UserLevelUpgradedNotify;
@@ -2,7 +2,7 @@ import org.springframework.stereotype.Repository; import com.yeshi.fanli.dao.MongodbBaseDao; import com.yeshi.common.MongodbBaseDao; import com.yeshi.fanli.entity.bus.user.vip.UserTearcherMap; @Repository fanli/src/main/resource/dubbo/consumer.xml
New file @@ -0,0 +1,8 @@ <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dubbo="http://dubbo.apache.org/schema/dubbo" xmlns="http://www.springframework.org/schema/beans" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd"> <dubbo:application name="demo-consumer"/> <dubbo:registry group="goods" address="zookeeper://134.175.68.214:2181"/> </beans> fanli/src/main/resource/spring.xml
@@ -11,15 +11,9 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-3.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd"> <!-- 必须采用java8 --> @@ -54,6 +48,7 @@ <import resource="classpath:test_consumer.xml" /> <import resource="classpath:xxl-job.xml" /> <import resource="classpath:elasticsearch.xml" /> <import resource="classpath:dubbo/consumer.xml" />
@@ -7,6 +7,7 @@ <artifactId>spring-boot-starter-parent</artifactId> <version>2.3.1.RELEASE</version> <relativePath/> <!-- lookup parent from repository --> </parent> <groupId>com.blks</groupId> <artifactId>goods</artifactId> @@ -18,8 +19,9 @@ <properties> <java.version>1.8</java.version> <dubbo.version>2.7.5</dubbo.version> <curator.version>2.8.0</curator.version> <curator.version>2.13.0</curator.version> <zookeeper.version>3.4.6</zookeeper.version> <spring.mongodb.version>1.10.10.RELEASE</spring.mongodb.version> </properties> <dependencies> @@ -53,6 +55,30 @@ </exclusions> </dependency> <!-- mongodb--> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-mongodb</artifactId> <exclusions> <exclusion> <artifactId>slf4j-log4j12</artifactId> <groupId>org.slf4j</groupId> </exclusion> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> </exclusions> </dependency> <!-- https://mvnrepository.com/artifact/org.mongodb/mongo-java-driver --> <dependency> <groupId>org.mongodb</groupId> <artifactId>mongo-java-driver</artifactId> <version>3.12.0</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> @@ -76,6 +102,7 @@ </dependency> <dependency> <groupId>org.apache.dubbo</groupId> <artifactId>dubbo</artifactId> service-goods/src/main/java/com/blks/goods/GoodsApplication.java
@@ -1,5 +1,6 @@ package com.blks.goods; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -8,6 +9,7 @@ @SpringBootApplication @EnableTransactionManagement @MapperScan(basePackages = "com.blks.goods.mapper") @EnableDubbo(scanBasePackages = "com.blks.goods.service.remote") public class GoodsApplication { public static void main(String[] args) { service-goods/src/main/java/com/blks/goods/dao/taobao/TaoBaoCouponCacheDao.java
New file @@ -0,0 +1,17 @@ package com.blks.goods.dao.taobao; import com.yeshi.goods.facade.entity.taobao.TaoBaoCouponCache; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.stereotype.Repository; import javax.annotation.Resource; @Repository public class TaoBaoCouponCacheDao { @Resource private MongoTemplate mongoTemplate; public void save(TaoBaoCouponCache cache) { mongoTemplate.save(cache); } } service-goods/src/main/java/com/blks/goods/service/remote/TaoBaoCouponCacheServiceRemote.java
New file @@ -0,0 +1,28 @@ package com.blks.goods.service.remote; import com.blks.goods.dao.taobao.TaoBaoCouponCacheDao; import com.yeshi.goods.facade.entity.taobao.TaoBaoCouponCache; import com.yeshi.goods.facade.service.TaoBaoCouponCacheService; import org.apache.dubbo.config.annotation.Service; import org.yeshi.utils.StringUtil; import javax.annotation.Resource; import java.util.Date; @Service(version = "1.0.0") public class TaoBaoCouponCacheServiceRemote implements TaoBaoCouponCacheService { @Resource private TaoBaoCouponCacheDao taoBaoCouponCacheDao; @Override public void save(TaoBaoCouponCache cache) { if (StringUtil.isNullOrEmpty(cache.getActivityId()) || cache.getAuctionId() == null || StringUtil.isNullOrEmpty(cache.getPid())) return; cache.setId(cache.createId()); cache.setCreateTime(new Date()); cache.setUpdateTime(new Date()); taoBaoCouponCacheDao.save(cache); } } service-goods/src/main/resources/application.yml
@@ -3,8 +3,9 @@ tomcat: uri-encoding: UTF-8 spring: main: allow-bean-definition-overriding: true http: encoding: force: true @@ -16,7 +17,7 @@ password: '123456' host: 192.168.1.253 port: 27017 database: tbtool database: flq authentication-database: admin redis: host: 192.168.1.253 @@ -53,7 +54,6 @@ filters: stat connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 use-global-data-source-stat: true dubbo: application: name: goods-provider @@ -68,3 +68,4 @@ base-packages: com.blks.goods.service.remote provider: timeout: 10000
