.idea/artifacts/fanli_war_exploded.xml
@@ -19,6 +19,18 @@ <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: io.netty:netty:3.7.0.Final" /> <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 id="library" level="project" name="Maven: org.javassist:javassist:3.21.0-GA" /> <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" /> @@ -41,16 +53,9 @@ <element id="library" level="project" name="Maven: cglib:cglib:2.2.2" /> <element id="library" level="project" name="Maven: asm:asm:3.3.1" /> <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.21" /> <element id="library" level="project" name="Maven: org.javassist:javassist:3.18.1-GA" /> <element id="library" level="project" name="Maven: jstl:jstl:1.2" /> <element id="library" level="project" name="Maven: org.apache.commons:commons-dbcp2:2.0" /> <element id="library" level="project" name="Maven: org.apache.commons:commons-pool2:2.2" /> <element id="library" level="project" name="Maven: org.apache.struts:struts2-core:2.3.14" /> <element id="library" level="project" name="Maven: org.apache.struts.xwork:xwork-core:2.3.14" /> <element id="library" level="project" name="Maven: asm:asm-commons:3.3" /> <element id="library" level="project" name="Maven: asm:asm-tree:3.3" /> <element id="library" level="project" name="Maven: ognl:ognl:3.0.6" /> <element id="library" level="project" name="Maven: javassist:javassist:3.11.0.GA" /> <element id="library" level="project" name="Maven: antlr:antlr:2.7.7" /> <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" /> <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.0.b2" /> @@ -130,7 +135,6 @@ <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" /> @@ -139,7 +143,6 @@ <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.xml
@@ -1,7 +1,7 @@ <component name="ArtifactManager"> <artifact type="war" name="service-goods:war"> <output-path>$PROJECT_DIR$/service-goods/target</output-path> <root id="archive" name="goods-0.0.1-SNAPSHOT.war"> <root id="archive" name="service-goods.war"> <element id="artifact" artifact-name="service-goods:war exploded" /> </root> </artifact> .idea/artifacts/service_goods_war_exploded.xml
@@ -1,6 +1,6 @@ <component name="ArtifactManager"> <artifact type="exploded-war" name="service-goods:war exploded"> <output-path>$PROJECT_DIR$/service-goods/target/goods-0.0.1-SNAPSHOT</output-path> <output-path>$PROJECT_DIR$/service-goods/target/service-goods</output-path> <root id="root"> <element id="directory" name="WEB-INF"> <element id="directory" name="classes"> @@ -21,34 +21,27 @@ <element id="library" level="project" name="Maven: org.apache.commons:commons-collections4:4.2" /> <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:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-aop:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-beans:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-expression:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-orm:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-tx:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-context:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-aop:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-beans:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-expression:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-orm:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-tx:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: org.quartz-scheduler:quartz:2.3.2" /> <element id="library" level="project" name="Maven: com.mchange:mchange-commons-java:0.2.15" /> <element id="library" level="project" name="Maven: org.springframework:spring-context-support:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-context-support:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: aspectj:aspectjrt:1.5.3" /> <element id="library" level="project" name="Maven: org.aspectj:aspectjweaver:1.9.5" /> <element id="library" level="project" name="Maven: cglib:cglib-nodep:3.2.4" /> <element id="library" level="project" name="Maven: org.freemarker:freemarker:2.3.30" /> <element id="library" level="project" name="Maven: org.freemarker:freemarker:2.3.29" /> <element id="library" level="project" name="Maven: cglib:cglib:2.2.2" /> <element id="library" level="project" name="Maven: asm:asm:3.3.1" /> <element id="library" level="project" name="Maven: mysql:mysql-connector-java:8.0.20" /> <element id="library" level="project" name="Maven: org.javassist:javassist:3.18.1-GA" /> <element id="library" level="project" name="Maven: mysql:mysql-connector-java:8.0.19" /> <element id="library" level="project" name="Maven: jstl:jstl:1.2" /> <element id="library" level="project" name="Maven: org.apache.commons:commons-dbcp2:2.7.0" /> <element id="library" level="project" name="Maven: org.apache.commons:commons-pool2:2.8.0" /> <element id="library" level="project" name="Maven: org.apache.struts:struts2-core:2.3.14" /> <element id="library" level="project" name="Maven: org.apache.struts.xwork:xwork-core:2.3.14" /> <element id="library" level="project" name="Maven: asm:asm-commons:3.3" /> <element id="library" level="project" name="Maven: asm:asm-tree:3.3" /> <element id="library" level="project" name="Maven: ognl:ognl:3.0.6" /> <element id="library" level="project" name="Maven: javassist:javassist:3.11.0.GA" /> <element id="library" level="project" name="Maven: org.apache.commons:commons-pool2:2.7.0" /> <element id="library" level="project" name="Maven: antlr:antlr:2.7.7" /> <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" /> <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.0.b2" /> @@ -67,7 +60,7 @@ <element id="library" level="project" name="Maven: org.jsoup:jsoup:1.9.2" /> <element id="library" level="project" name="Maven: com.google.code.gson:gson:2.8.6" /> <element id="library" level="project" name="Maven: commons-httpclient:commons-httpclient:3.1" /> <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" /> <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" /> <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" /> <element id="library" level="project" name="Maven: javax.mail:mail:1.4.7" /> <element id="library" level="project" name="Maven: javax.activation:activation:1.1" /> @@ -85,32 +78,31 @@ <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:1.3.0" /> <element id="library" level="project" name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.0" /> <element id="library" level="project" name="Maven: com.qcloud:cos_api:5.2.4" /> <element id="library" level="project" name="Maven: joda-time:joda-time:2.9.6" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.0" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.0" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.0" /> <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.14" /> <element id="library" level="project" name="Maven: joda-time:joda-time:2.10.5" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.2" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" /> <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.13" /> <element id="library" level="project" name="Maven: commons-fileupload:commons-fileupload:1.3.1" /> <element id="library" level="project" name="Maven: commons-io:commons-io:2.4" /> <element id="library" level="project" name="Maven: redis.clients:jedis:3.3.0" /> <element id="library" level="project" name="Maven: org.springframework.data:spring-data-redis:2.3.1.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.1.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-oxm:5.2.7.RELEASE" /> <element id="library" level="project" name="Maven: redis.clients:jedis:3.1.0" /> <element id="library" level="project" name="Maven: org.springframework.data:spring-data-redis:2.2.4.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.data:spring-data-keyvalue:2.2.4.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-oxm:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.47" /> <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.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.apache.httpcomponents:httpmime:4.5.10" /> <element id="library" level="project" name="Maven: org.springframework.data:spring-data-mongodb:2.2.4.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.data:spring-data-commons:2.2.4.RELEASE" /> <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.springframework:spring-aspects:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: org.aspectj:aspectjrt:1.9.5" /> <element id="library" level="project" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" /> <element id="library" level="project" name="Maven: org.springframework.data:spring-data-mongodb-log4j:1.10.17.RELEASE" /> <element id="library" level="project" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" /> <element id="library" level="project" name="Maven: junit:junit:4.13" /> <element id="library" level="project" name="Maven: org.hamcrest:hamcrest-core:2.2" /> <element id="library" level="project" name="Maven: junit:junit:4.12" /> <element id="library" level="project" name="Maven: org.hamcrest:hamcrest-core:2.1" /> <element id="library" level="project" name="Maven: org.jdom:jdom:1.1" /> <element id="library" level="project" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.6" /> <element id="library" level="project" name="Maven: javax.xml.bind:jaxb-api:2.3.1" /> @@ -132,96 +124,100 @@ <element id="library" level="project" name="Maven: com.xuxueli:xxl-rpc-core:1.5.0" /> <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.12" /> <element id="library" level="project" name="Maven: org.elasticsearch.client:elasticsearch-rest-high-level-client:7.6.2" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch:7.6.2" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch-core:7.6.2" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch-secure-sm:7.6.2" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch-x-content:7.6.2" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.11.0" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.0" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.0" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch-geo:7.6.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-core:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-analyzers-common:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-backward-codecs:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-grouping:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-highlighter:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-join:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-memory:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-misc:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-queries:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-queryparser:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-sandbox:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-spatial:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-spatial-extras:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-spatial3d:8.4.0" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-suggest:8.4.0" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch-cli:7.6.2" /> <element id="library" level="project" name="Maven: org.codehaus.groovy:groovy:2.5.9" /> <element id="library" level="project" name="Maven: org.elasticsearch.client:elasticsearch-rest-high-level-client:6.8.6" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch:6.8.6" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch-core:6.8.6" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch-secure-sm:6.8.6" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch-x-content:6.8.6" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.10.2" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.2" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-core:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-analyzers-common:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-backward-codecs:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-grouping:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-highlighter:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-join:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-memory:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-misc:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-queries:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-queryparser:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-sandbox:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-spatial:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-spatial-extras:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-spatial3d:7.7.2" /> <element id="library" level="project" name="Maven: org.apache.lucene:lucene-suggest:7.7.2" /> <element id="library" level="project" name="Maven: org.elasticsearch:elasticsearch-cli:6.8.6" /> <element id="library" level="project" name="Maven: net.sf.jopt-simple:jopt-simple:5.0.2" /> <element id="library" level="project" name="Maven: com.carrotsearch:hppc:0.8.1" /> <element id="library" level="project" name="Maven: com.carrotsearch:hppc:0.7.1" /> <element id="library" level="project" name="Maven: com.tdunning:t-digest:3.2" /> <element id="library" level="project" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" /> <element id="library" level="project" name="Maven: org.elasticsearch:jna:4.5.1" /> <element id="library" level="project" name="Maven: org.elasticsearch.client:elasticsearch-rest-client:7.6.2" /> <element id="library" level="project" name="Maven: org.elasticsearch.client:elasticsearch-rest-client:6.8.6" /> <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" /> <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" /> <element id="library" level="project" name="Maven: org.elasticsearch.plugin:mapper-extras-client:7.6.2" /> <element id="library" level="project" name="Maven: org.elasticsearch.plugin:parent-join-client:7.6.2" /> <element id="library" level="project" name="Maven: org.elasticsearch.plugin:aggs-matrix-stats-client:7.6.2" /> <element id="library" level="project" name="Maven: org.elasticsearch.plugin:rank-eval-client:7.6.2" /> <element id="library" level="project" name="Maven: org.elasticsearch.plugin:lang-mustache-client:7.6.2" /> <element id="library" level="project" name="Maven: com.github.spullara.mustache.java:compiler:0.9.6" /> <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" /> <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-core:2.13.3" /> <element id="library" level="project" name="Maven: org.elasticsearch.plugin:parent-join-client:6.8.6" /> <element id="library" level="project" name="Maven: org.elasticsearch.plugin:aggs-matrix-stats-client:6.8.6" /> <element id="library" level="project" name="Maven: org.elasticsearch.plugin:rank-eval-client:6.8.6" /> <element id="library" level="project" name="Maven: org.elasticsearch.plugin:lang-mustache-client:6.8.6" /> <element id="library" level="project" name="Maven: com.github.spullara.mustache.java:compiler:0.9.3" /> <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-api:2.12.1" /> <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-core:2.12.1" /> <element id="library" level="project" name="Maven: com.alipay.sdk:alipay-sdk-java:4.9.71.ALL" /> <element id="library" level="project" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" /> <element id="library" level="project" name="Maven: org.apache.rocketmq:rocketmq-client:4.3.0" /> <element id="library" level="project" name="Maven: org.apache.rocketmq:rocketmq-common:4.3.0" /> <element id="library" level="project" name="Maven: org.apache.rocketmq:rocketmq-remoting:4.3.0" /> <element id="library" level="project" name="Maven: org.apache.rocketmq:rocketmq-logging:4.3.0" /> <element id="library" level="project" name="Maven: io.netty:netty-tcnative-boringssl-static:2.0.31.Final" /> <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.10" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.1.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter:2.3.1.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot:2.3.1.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.1.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.1.RELEASE" /> <element id="library" level="project" name="Maven: io.netty:netty-tcnative-boringssl-static:2.0.28.Final" /> <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.9" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" /> <element id="library" level="project" name="Maven: ch.qos.logback:logback-classic:1.2.3" /> <element id="library" level="project" name="Maven: ch.qos.logback:logback-core:1.2.3" /> <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" /> <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" /> <element id="library" level="project" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" /> <element id="library" level="project" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.1.RELEASE" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.0" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.0" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.1.RELEASE" /> <element id="library" level="project" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.36" /> <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.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.2" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.2" /> <element id="library" level="project" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.2" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" /> <element id="library" level="project" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" /> <element id="library" level="project" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" /> <element id="library" level="project" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" /> <element id="library" level="project" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" /> <element id="library" level="project" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" /> <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.5.1" /> <element id="library" level="project" name="Maven: org.springframework:spring-web:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:2.2.4.RELEASE" /> <element id="library" level="project" name="Maven: org.mongodb:mongodb-driver:3.11.2" /> <element id="library" level="project" name="Maven: org.mongodb:bson:3.11.2" /> <element id="library" level="project" name="Maven: org.mongodb:mongodb-driver-core:3.11.2" /> <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" /> <element id="library" level="project" name="Maven: org.hamcrest:hamcrest:2.1" /> <element id="library" level="project" name="Maven: org.springframework:spring-core:5.2.3.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-jcl:5.2.3.RELEASE" /> <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.50.Final" /> <element id="library" level="project" name="Maven: org.yaml:snakeyaml:1.26" /> <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.45.Final" /> <element id="library" level="project" name="Maven: org.yaml:snakeyaml:1.25" /> <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.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 id="library" level="project" name="Maven: org.javassist:javassist:3.18.1-GA" /> </element> </element> <element id="directory" name="META-INF"> <element id="file-copy" path="$PROJECT_DIR$/service-goods/target/goods-0.0.1-SNAPSHOT/META-INF/MANIFEST.MF" /> <element id="file-copy" path="$PROJECT_DIR$/service-goods/target/service-goods/META-INF/MANIFEST.MF" /> </element> <element id="javaee-facet-resources" facet="service-goods/web/Web" /> </root> .idea/libraries/Maven__asm_asm_commons_3_3.xml
File was deleted .idea/libraries/Maven__asm_asm_tree_3_3.xml
File was deleted .idea/libraries/Maven__com_carrotsearch_hppc_0_7_1.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: com.carrotsearch:hppc:0.7.1"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/com/carrotsearch/hppc/0.7.1/hppc-0.7.1.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/com/carrotsearch/hppc/0.7.1/hppc-0.7.1-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/com/carrotsearch/hppc/0.7.1/hppc-0.7.1-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: com.fasterxml:classmate:1.5.1"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_2.xml
File was renamed from .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.0"> <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.0/jackson-annotations-2.11.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.10.2/jackson-annotations-2.10.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.0/jackson-annotations-2.11.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.10.2/jackson-annotations-2.10.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.0/jackson-annotations-2.11.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.10.2/jackson-annotations-2.10.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_2.xml
File was renamed from .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.0"> <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.0/jackson-core-2.11.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.10.2/jackson-core-2.10.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.0/jackson-core-2.11.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.10.2/jackson-core-2.10.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.0/jackson-core-2.11.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.10.2/jackson-core-2.10.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_2.xml
File was renamed from .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.0"> <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.0/jackson-databind-2.11.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.10.2/jackson-databind-2.10.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.0/jackson-databind-2.11.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.10.2/jackson-databind-2.10.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.0/jackson-databind-2.11.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.10.2/jackson-databind-2.10.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_cbor_2_10_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.10.2/jackson-dataformat-cbor-2.10.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.10.2/jackson-dataformat-cbor-2.10.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.10.2/jackson-dataformat-cbor-2.10.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_cbor_2_11_0.xml
File was deleted .idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_smile_2_10_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.10.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.10.2/jackson-dataformat-smile-2.10.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.10.2/jackson-dataformat-smile-2.10.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.10.2/jackson-dataformat-smile-2.10.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_smile_2_11_0.xml
File was deleted .idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_10_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.10.2/jackson-dataformat-yaml-2.10.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.10.2/jackson-dataformat-yaml-2.10.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.10.2/jackson-dataformat-yaml-2.10.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_11_0.xml
File was deleted .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.10.2/jackson-datatype-jdk8-2.10.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.10.2/jackson-datatype-jdk8-2.10.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.10.2/jackson-datatype-jdk8-2.10.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_0.xml
File was deleted .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.10.2/jackson-datatype-jsr310-2.10.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.10.2/jackson-datatype-jsr310-2.10.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.10.2/jackson-datatype-jsr310-2.10.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_0.xml
File was deleted .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.10.2/jackson-module-parameter-names-2.10.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.10.2/jackson-module-parameter-names-2.10.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.10.2/jackson-module-parameter-names-2.10.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_0.xml
File was deleted .idea/libraries/Maven__com_github_spullara_mustache_java_compiler_0_9_3.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: com.github.spullara.mustache.java:compiler:0.9.3"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/com/github/spullara/mustache/java/compiler/0.9.3/compiler-0.9.3.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/com/github/spullara/mustache/java/compiler/0.9.3/compiler-0.9.3-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/com/github/spullara/mustache/java/compiler/0.9.3/compiler-0.9.3-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__commons_codec_commons_codec_1_13.xml
File was renamed from .idea/libraries/Maven__commons_codec_commons_codec_1_14.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: commons-codec:commons-codec:1.14"> <library name="Maven: commons-codec:commons-codec:1.13"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.14/commons-codec-1.14.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.13/commons-codec-1.13.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.14/commons-codec-1.14-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.13/commons-codec-1.13-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.14/commons-codec-1.14-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.13/commons-codec-1.13-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__io_netty_netty_3_7_0_Final.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: io.netty:netty:3.7.0.Final"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty/3.7.0.Final/netty-3.7.0.Final.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty/3.7.0.Final/netty-3.7.0.Final-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty/3.7.0.Final/netty-3.7.0.Final-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__io_netty_netty_all_4_1_25_Final.xmlcopy from .idea/libraries/Maven__io_netty_netty_all_4_1_50_Final.xml copy to .idea/libraries/Maven__io_netty_netty_all_4_1_25_Final.xml
File was copied from .idea/libraries/Maven__io_netty_netty_all_4_1_50_Final.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: io.netty:netty-all:4.1.50.Final"> <library name="Maven: io.netty:netty-all:4.1.25.Final"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.50.Final/netty-all-4.1.50.Final.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.25.Final/netty-all-4.1.25.Final.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.50.Final/netty-all-4.1.50.Final-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.25.Final/netty-all-4.1.25.Final-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.50.Final/netty-all-4.1.50.Final-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.25.Final/netty-all-4.1.25.Final-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__io_netty_netty_all_4_1_45_Final.xml
File was renamed from .idea/libraries/Maven__io_netty_netty_all_4_1_50_Final.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: io.netty:netty-all:4.1.50.Final"> <library name="Maven: io.netty:netty-all:4.1.45.Final"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.50.Final/netty-all-4.1.50.Final.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.45.Final/netty-all-4.1.45.Final.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.50.Final/netty-all-4.1.50.Final-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.45.Final/netty-all-4.1.45.Final-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.50.Final/netty-all-4.1.50.Final-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.45.Final/netty-all-4.1.45.Final-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__io_netty_netty_tcnative_boringssl_static_2_0_28_Final.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: io.netty:netty-tcnative-boringssl-static:2.0.28.Final"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-tcnative-boringssl-static/2.0.28.Final/netty-tcnative-boringssl-static-2.0.28.Final.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-tcnative-boringssl-static/2.0.28.Final/netty-tcnative-boringssl-static-2.0.28.Final-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-tcnative-boringssl-static/2.0.28.Final/netty-tcnative-boringssl-static-2.0.28.Final-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__io_netty_netty_tcnative_boringssl_static_2_0_31_Final.xml
File was deleted .idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_1.xml
File was renamed from .idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: jakarta.activation:jakarta.activation-api:1.2.2"> <library name="Maven: jakarta.activation:jakarta.activation-api:1.2.1"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: jakarta.validation:jakarta.validation-api:2.0.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_2.xml
File was renamed from .idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3"> <library name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__javassist_javassist_3_11_0_GA.xml
File was deleted .idea/libraries/Maven__joda_time_joda_time_2_10_5.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: joda-time:joda-time:2.10.5"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.10.5/joda-time-2.10.5.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.10.5/joda-time-2.10.5-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.10.5/joda-time-2.10.5-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__junit_junit_4_12.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: junit:junit:4.12"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__junit_junit_4_13.xml
File was deleted .idea/libraries/Maven__mysql_mysql_connector_java_8_0_19.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: mysql:mysql-connector-java:8.0.19"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__mysql_mysql_connector_java_8_0_20.xml
File was deleted .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_6.xml
File was renamed from .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_11.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: net.bytebuddy:byte-buddy:1.10.11"> <library name="Maven: net.bytebuddy:byte-buddy:1.10.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.11/byte-buddy-1.10.11.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.6/byte-buddy-1.10.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.11/byte-buddy-1.10.11-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.6/byte-buddy-1.10.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.11/byte-buddy-1.10.11-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.6/byte-buddy-1.10.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_11.xml
File was deleted .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_6.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.6/byte-buddy-agent-1.10.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.6/byte-buddy-agent-1.10.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.6/byte-buddy-agent-1.10.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__ognl_ognl_3_0_6.xml
File was deleted .idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xmlcopy from .idea/libraries/Maven__org_apache_commons_commons_lang3_3_10.xml copy to .idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml
File was copied from .idea/libraries/Maven__org_apache_commons_commons_lang3_3_10.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.commons:commons-lang3:3.10"> <library name="Maven: org.apache.commons:commons-lang3:3.9"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.9/commons-lang3-3.9.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.9/commons-lang3-3.9-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.9/commons-lang3-3.9-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml
File was renamed from .idea/libraries/Maven__org_apache_commons_commons_lang3_3_10.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.commons:commons-lang3:3.10"> <library name="Maven: org.apache.commons:commons-pool2:2.7.0"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-pool2/2.7.0/commons-pool2-2.7.0.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-pool2/2.7.0/commons-pool2-2.7.0-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-pool2/2.7.0/commons-pool2-2.7.0-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_commons_commons_pool2_2_8_0.xml
File was deleted .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_10.xml
File was renamed from .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.httpcomponents:httpclient:4.5.12"> <library name="Maven: org.apache.httpcomponents:httpclient:4.5.10"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.12/httpclient-4.5.12.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.12/httpclient-4.5.12-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.12/httpclient-4.5.12-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_10.xml
File was renamed from .idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_12.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.httpcomponents:httpmime:4.5.12"> <library name="Maven: org.apache.httpcomponents:httpmime:4.5.10"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.12/httpmime-4.5.12.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.10/httpmime-4.5.10.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.12/httpmime-4.5.12-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.10/httpmime-4.5.10-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.12/httpmime-4.5.12-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.10/httpmime-4.5.10-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.logging.log4j:log4j-api:2.12.1"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.12.1/log4j-api-2.12.1.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.12.1/log4j-api-2.12.1-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.12.1/log4j-api-2.12.1-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml
File was deleted .idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_12_1.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.logging.log4j:log4j-core:2.12.1"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-core/2.12.1/log4j-core-2.12.1.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-core/2.12.1/log4j-core-2.12.1-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-core/2.12.1/log4j-core-2.12.1-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_13_3.xml
File was deleted .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml
File was renamed from .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3"> <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.12.1/log4j-to-slf4j-2.12.1.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.12.1/log4j-to-slf4j-2.12.1-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.12.1/log4j-to-slf4j-2.12.1-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_analyzers_common_7_7_2.xml
File was renamed from .idea/libraries/Maven__org_apache_lucene_lucene_analyzers_common_8_4_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-analyzers-common:8.4.0"> <library name="Maven: org.apache.lucene:lucene-analyzers-common:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-analyzers-common/8.4.0/lucene-analyzers-common-8.4.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-analyzers-common/7.7.2/lucene-analyzers-common-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-analyzers-common/8.4.0/lucene-analyzers-common-8.4.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-analyzers-common/7.7.2/lucene-analyzers-common-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-analyzers-common/8.4.0/lucene-analyzers-common-8.4.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-analyzers-common/7.7.2/lucene-analyzers-common-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_backward_codecs_7_7_2.xml
File was renamed from .idea/libraries/Maven__org_apache_lucene_lucene_backward_codecs_8_4_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-backward-codecs:8.4.0"> <library name="Maven: org.apache.lucene:lucene-backward-codecs:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-backward-codecs/8.4.0/lucene-backward-codecs-8.4.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-backward-codecs/7.7.2/lucene-backward-codecs-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-backward-codecs/8.4.0/lucene-backward-codecs-8.4.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-backward-codecs/7.7.2/lucene-backward-codecs-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-backward-codecs/8.4.0/lucene-backward-codecs-8.4.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-backward-codecs/7.7.2/lucene-backward-codecs-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_core_7_7_2.xmlcopy from .idea/libraries/Maven__org_apache_lucene_lucene_misc_8_4_0.xml copy to .idea/libraries/Maven__org_apache_lucene_lucene_core_7_7_2.xml
File was copied from .idea/libraries/Maven__org_apache_lucene_lucene_misc_8_4_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-misc:8.4.0"> <library name="Maven: org.apache.lucene:lucene-core:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-core/7.7.2/lucene-core-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-core/7.7.2/lucene-core-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-core/7.7.2/lucene-core-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_core_8_4_0.xml
File was deleted .idea/libraries/Maven__org_apache_lucene_lucene_grouping_7_7_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-grouping:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-grouping/7.7.2/lucene-grouping-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-grouping/7.7.2/lucene-grouping-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-grouping/7.7.2/lucene-grouping-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_grouping_8_4_0.xml
File was deleted .idea/libraries/Maven__org_apache_lucene_lucene_highlighter_7_7_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-highlighter:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-highlighter/7.7.2/lucene-highlighter-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-highlighter/7.7.2/lucene-highlighter-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-highlighter/7.7.2/lucene-highlighter-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_highlighter_8_4_0.xml
File was deleted .idea/libraries/Maven__org_apache_lucene_lucene_join_7_7_2.xml
File was renamed from .idea/libraries/Maven__org_apache_lucene_lucene_misc_8_4_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-misc:8.4.0"> <library name="Maven: org.apache.lucene:lucene-join:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-join/7.7.2/lucene-join-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-join/7.7.2/lucene-join-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-join/7.7.2/lucene-join-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_join_8_4_0.xml
File was deleted .idea/libraries/Maven__org_apache_lucene_lucene_memory_7_7_2.xmlcopy from .idea/libraries/Maven__org_apache_lucene_lucene_misc_8_4_0.xml copy to .idea/libraries/Maven__org_apache_lucene_lucene_memory_7_7_2.xml
File was copied from .idea/libraries/Maven__org_apache_lucene_lucene_misc_8_4_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-misc:8.4.0"> <library name="Maven: org.apache.lucene:lucene-memory:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-memory/7.7.2/lucene-memory-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-memory/7.7.2/lucene-memory-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-memory/7.7.2/lucene-memory-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_memory_8_4_0.xml
File was deleted .idea/libraries/Maven__org_apache_lucene_lucene_misc_7_7_2.xmlcopy from .idea/libraries/Maven__org_apache_lucene_lucene_misc_8_4_0.xml copy to .idea/libraries/Maven__org_apache_lucene_lucene_misc_7_7_2.xml
File was copied from .idea/libraries/Maven__org_apache_lucene_lucene_misc_8_4_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-misc:8.4.0"> <library name="Maven: org.apache.lucene:lucene-misc:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/7.7.2/lucene-misc-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/7.7.2/lucene-misc-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-misc/7.7.2/lucene-misc-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_queries_7_7_2.xmlcopy from .idea/libraries/Maven__org_apache_lucene_lucene_queries_8_4_0.xml copy to .idea/libraries/Maven__org_apache_lucene_lucene_queries_7_7_2.xml
File was copied from .idea/libraries/Maven__org_apache_lucene_lucene_queries_8_4_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-queries:8.4.0"> <library name="Maven: org.apache.lucene:lucene-queries:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/7.7.2/lucene-queries-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/7.7.2/lucene-queries-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/7.7.2/lucene-queries-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_queryparser_7_7_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-queryparser:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queryparser/7.7.2/lucene-queryparser-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queryparser/7.7.2/lucene-queryparser-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queryparser/7.7.2/lucene-queryparser-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_queryparser_8_4_0.xml
File was deleted .idea/libraries/Maven__org_apache_lucene_lucene_sandbox_7_7_2.xmlcopy from .idea/libraries/Maven__org_apache_lucene_lucene_queries_8_4_0.xml copy to .idea/libraries/Maven__org_apache_lucene_lucene_sandbox_7_7_2.xml
File was copied from .idea/libraries/Maven__org_apache_lucene_lucene_queries_8_4_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-queries:8.4.0"> <library name="Maven: org.apache.lucene:lucene-sandbox:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-sandbox/7.7.2/lucene-sandbox-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-sandbox/7.7.2/lucene-sandbox-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-sandbox/7.7.2/lucene-sandbox-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_sandbox_8_4_0.xml
File was deleted .idea/libraries/Maven__org_apache_lucene_lucene_spatial3d_7_7_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-spatial3d:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial3d/7.7.2/lucene-spatial3d-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial3d/7.7.2/lucene-spatial3d-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial3d/7.7.2/lucene-spatial3d-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_spatial3d_8_4_0.xml
File was deleted .idea/libraries/Maven__org_apache_lucene_lucene_spatial_7_7_2.xml
File was renamed from .idea/libraries/Maven__org_apache_lucene_lucene_queries_8_4_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-queries:8.4.0"> <library name="Maven: org.apache.lucene:lucene-spatial:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial/7.7.2/lucene-spatial-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial/7.7.2/lucene-spatial-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial/7.7.2/lucene-spatial-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_spatial_8_4_0.xml
File was deleted .idea/libraries/Maven__org_apache_lucene_lucene_spatial_extras_7_7_2.xml
File was renamed from .idea/libraries/Maven__org_apache_lucene_lucene_spatial_extras_8_4_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-spatial-extras:8.4.0"> <library name="Maven: org.apache.lucene:lucene-spatial-extras:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial-extras/8.4.0/lucene-spatial-extras-8.4.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial-extras/7.7.2/lucene-spatial-extras-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial-extras/8.4.0/lucene-spatial-extras-8.4.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial-extras/7.7.2/lucene-spatial-extras-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial-extras/8.4.0/lucene-spatial-extras-8.4.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-spatial-extras/7.7.2/lucene-spatial-extras-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_suggest_7_7_2.xmlcopy from .idea/libraries/Maven__org_apache_lucene_lucene_queries_8_4_0.xml copy to .idea/libraries/Maven__org_apache_lucene_lucene_suggest_7_7_2.xml
File was copied from .idea/libraries/Maven__org_apache_lucene_lucene_queries_8_4_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.lucene:lucene-queries:8.4.0"> <library name="Maven: org.apache.lucene:lucene-suggest:7.7.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-suggest/7.7.2/lucene-suggest-7.7.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-suggest/7.7.2/lucene-suggest-7.7.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/lucene/lucene-suggest/7.7.2/lucene-suggest-7.7.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_lucene_lucene_suggest_8_4_0.xml
File was deleted .idea/libraries/Maven__org_apache_struts_struts2_core_2_3_14.xml
File was deleted .idea/libraries/Maven__org_apache_struts_xwork_xwork_core_2_3_14.xml
File was deleted .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_30.xml
File was renamed from .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_36.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.36"> <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.36/tomcat-embed-core-9.0.36.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.30/tomcat-embed-core-9.0.30.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.36/tomcat-embed-core-9.0.36-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.30/tomcat-embed-core-9.0.30-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.36/tomcat-embed-core-9.0.36-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.30/tomcat-embed-core-9.0.30-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_30.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.30/tomcat-embed-el-9.0.30.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.30/tomcat-embed-el-9.0.30-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.30/tomcat-embed-el-9.0.30-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_30.xml
File was renamed from .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_36.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.36"> <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.36/tomcat-embed-websocket-9.0.36.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.30/tomcat-embed-websocket-9.0.30.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.36/tomcat-embed-websocket-9.0.36-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.30/tomcat-embed-websocket-9.0.30-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.36/tomcat-embed-websocket-9.0.36-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.30/tomcat-embed-websocket-9.0.30-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml
File was renamed from .idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.assertj:assertj-core:3.16.1"> <library name="Maven: org.assertj:assertj-core:3.13.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.13.2/assertj-core-3.13.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.13.2/assertj-core-3.13.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.13.2/assertj-core-3.13.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_9.xml
File was renamed from .idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_12.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.codehaus.groovy:groovy:2.5.12"> <library name="Maven: org.codehaus.groovy:groovy:2.5.9"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.5.12/groovy-2.5.12.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.5.9/groovy-2.5.9.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.5.12/groovy-2.5.12-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.5.9/groovy-2.5.9-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.5.12/groovy-2.5.12-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.5.9/groovy-2.5.9-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_elasticsearch_client_elasticsearch_rest_client_6_8_6.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.elasticsearch.client:elasticsearch-rest-client:6.8.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/client/elasticsearch-rest-client/6.8.6/elasticsearch-rest-client-6.8.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/client/elasticsearch-rest-client/6.8.6/elasticsearch-rest-client-6.8.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/client/elasticsearch-rest-client/6.8.6/elasticsearch-rest-client-6.8.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_elasticsearch_client_elasticsearch_rest_client_7_6_2.xml
File was deleted .idea/libraries/Maven__org_elasticsearch_client_elasticsearch_rest_high_level_client_6_8_6.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.elasticsearch.client:elasticsearch-rest-high-level-client:6.8.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/client/elasticsearch-rest-high-level-client/6.8.6/elasticsearch-rest-high-level-client-6.8.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/client/elasticsearch-rest-high-level-client/6.8.6/elasticsearch-rest-high-level-client-6.8.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/client/elasticsearch-rest-high-level-client/6.8.6/elasticsearch-rest-high-level-client-6.8.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_elasticsearch_client_elasticsearch_rest_high_level_client_7_6_2.xml
File was deleted .idea/libraries/Maven__org_elasticsearch_elasticsearch_6_8_6.xml
File was renamed from .idea/libraries/Maven__org_elasticsearch_elasticsearch_7_6_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.elasticsearch:elasticsearch:7.6.2"> <library name="Maven: org.elasticsearch:elasticsearch:6.8.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch/7.6.2/elasticsearch-7.6.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch/6.8.6/elasticsearch-6.8.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch/7.6.2/elasticsearch-7.6.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch/6.8.6/elasticsearch-6.8.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch/7.6.2/elasticsearch-7.6.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch/6.8.6/elasticsearch-6.8.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_elasticsearch_elasticsearch_cli_6_8_6.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.elasticsearch:elasticsearch-cli:6.8.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-cli/6.8.6/elasticsearch-cli-6.8.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-cli/6.8.6/elasticsearch-cli-6.8.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-cli/6.8.6/elasticsearch-cli-6.8.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_elasticsearch_elasticsearch_cli_7_6_2.xml
File was deleted .idea/libraries/Maven__org_elasticsearch_elasticsearch_core_6_8_6.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.elasticsearch:elasticsearch-core:6.8.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-core/6.8.6/elasticsearch-core-6.8.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-core/6.8.6/elasticsearch-core-6.8.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-core/6.8.6/elasticsearch-core-6.8.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_elasticsearch_elasticsearch_core_7_6_2.xml
File was deleted .idea/libraries/Maven__org_elasticsearch_elasticsearch_geo_7_6_2.xml
File was deleted .idea/libraries/Maven__org_elasticsearch_elasticsearch_secure_sm_6_8_6.xml
File was renamed from .idea/libraries/Maven__org_elasticsearch_elasticsearch_secure_sm_7_6_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.elasticsearch:elasticsearch-secure-sm:7.6.2"> <library name="Maven: org.elasticsearch:elasticsearch-secure-sm:6.8.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-secure-sm/7.6.2/elasticsearch-secure-sm-7.6.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-secure-sm/6.8.6/elasticsearch-secure-sm-6.8.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-secure-sm/7.6.2/elasticsearch-secure-sm-7.6.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-secure-sm/6.8.6/elasticsearch-secure-sm-6.8.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-secure-sm/7.6.2/elasticsearch-secure-sm-7.6.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-secure-sm/6.8.6/elasticsearch-secure-sm-6.8.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_elasticsearch_elasticsearch_x_content_6_8_6.xml
File was renamed from .idea/libraries/Maven__org_elasticsearch_elasticsearch_x_content_7_6_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.elasticsearch:elasticsearch-x-content:7.6.2"> <library name="Maven: org.elasticsearch:elasticsearch-x-content:6.8.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-x-content/7.6.2/elasticsearch-x-content-7.6.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-x-content/6.8.6/elasticsearch-x-content-6.8.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-x-content/7.6.2/elasticsearch-x-content-7.6.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-x-content/6.8.6/elasticsearch-x-content-6.8.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-x-content/7.6.2/elasticsearch-x-content-7.6.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/elasticsearch-x-content/6.8.6/elasticsearch-x-content-6.8.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_elasticsearch_plugin_aggs_matrix_stats_client_6_8_6.xml
File was renamed from .idea/libraries/Maven__org_elasticsearch_plugin_aggs_matrix_stats_client_7_6_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.elasticsearch.plugin:aggs-matrix-stats-client:7.6.2"> <library name="Maven: org.elasticsearch.plugin:aggs-matrix-stats-client:6.8.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/aggs-matrix-stats-client/7.6.2/aggs-matrix-stats-client-7.6.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/aggs-matrix-stats-client/6.8.6/aggs-matrix-stats-client-6.8.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/aggs-matrix-stats-client/7.6.2/aggs-matrix-stats-client-7.6.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/aggs-matrix-stats-client/6.8.6/aggs-matrix-stats-client-6.8.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/aggs-matrix-stats-client/7.6.2/aggs-matrix-stats-client-7.6.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/aggs-matrix-stats-client/6.8.6/aggs-matrix-stats-client-6.8.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_elasticsearch_plugin_lang_mustache_client_6_8_6.xml
File was renamed from .idea/libraries/Maven__org_elasticsearch_plugin_lang_mustache_client_7_6_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.elasticsearch.plugin:lang-mustache-client:7.6.2"> <library name="Maven: org.elasticsearch.plugin:lang-mustache-client:6.8.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/lang-mustache-client/7.6.2/lang-mustache-client-7.6.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/lang-mustache-client/6.8.6/lang-mustache-client-6.8.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/lang-mustache-client/7.6.2/lang-mustache-client-7.6.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/lang-mustache-client/6.8.6/lang-mustache-client-6.8.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/lang-mustache-client/7.6.2/lang-mustache-client-7.6.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/lang-mustache-client/6.8.6/lang-mustache-client-6.8.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_elasticsearch_plugin_mapper_extras_client_7_6_2.xml
File was deleted .idea/libraries/Maven__org_elasticsearch_plugin_parent_join_client_6_8_6.xml
File was renamed from .idea/libraries/Maven__org_elasticsearch_plugin_parent_join_client_7_6_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.elasticsearch.plugin:parent-join-client:7.6.2"> <library name="Maven: org.elasticsearch.plugin:parent-join-client:6.8.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/parent-join-client/7.6.2/parent-join-client-7.6.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/parent-join-client/6.8.6/parent-join-client-6.8.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/parent-join-client/7.6.2/parent-join-client-7.6.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/parent-join-client/6.8.6/parent-join-client-6.8.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/parent-join-client/7.6.2/parent-join-client-7.6.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/parent-join-client/6.8.6/parent-join-client-6.8.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_elasticsearch_plugin_rank_eval_client_6_8_6.xml
File was renamed from .idea/libraries/Maven__org_elasticsearch_plugin_rank_eval_client_7_6_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.elasticsearch.plugin:rank-eval-client:7.6.2"> <library name="Maven: org.elasticsearch.plugin:rank-eval-client:6.8.6"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/rank-eval-client/7.6.2/rank-eval-client-7.6.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/rank-eval-client/6.8.6/rank-eval-client-6.8.6.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/rank-eval-client/7.6.2/rank-eval-client-7.6.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/rank-eval-client/6.8.6/rank-eval-client-6.8.6-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/rank-eval-client/7.6.2/rank-eval-client-7.6.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/elasticsearch/plugin/rank-eval-client/6.8.6/rank-eval-client-6.8.6-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_freemarker_freemarker_2_3_29.xml
File was renamed from .idea/libraries/Maven__org_freemarker_freemarker_2_3_30.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.freemarker:freemarker:2.3.30"> <library name="Maven: org.freemarker:freemarker:2.3.29"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.29/freemarker-2.3.29.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.29/freemarker-2.3.29-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.29/freemarker-2.3.29-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml
File was deleted .idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml
File was renamed from .idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.hamcrest:hamcrest:2.2"> <library name="Maven: org.hamcrest:hamcrest:2.1"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.1/hamcrest-2.1.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.2/hamcrest-2.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.1/hamcrest-2.1-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.1/hamcrest-2.1-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_hamcrest_hamcrest_core_2_1.xml
File was renamed from .idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.hamcrest:hamcrest-core:2.2"> <library name="Maven: org.hamcrest:hamcrest-core:2.1"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/2.1/hamcrest-core-2.1.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/2.1/hamcrest-core-2.1-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/2.1/hamcrest-core-2.1-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_18_Final.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.18.Final/hibernate-validator-6.0.18.Final.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.18.Final/hibernate-validator-6.0.18.Final-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.18.Final/hibernate-validator-6.0.18.Final-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.javassist:javassist:3.21.0-GA"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml
File was renamed from .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.junit.jupiter:junit-jupiter:5.6.2"> <library name="Maven: org.junit.jupiter:junit-jupiter:5.5.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.5.2/junit-jupiter-5.5.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.5.2/junit-jupiter-5.5.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.5.2/junit-jupiter-5.5.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.junit.jupiter:junit-jupiter-api:5.5.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.5.2/junit-jupiter-api-5.5.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.5.2/junit-jupiter-api-5.5.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.5.2/junit-jupiter-api-5.5.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
File was deleted .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml
File was renamed from .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2"> <library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.5.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.5.2/junit-jupiter-engine-5.5.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.5.2/junit-jupiter-engine-5.5.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.5.2/junit-jupiter-engine-5.5.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml
File was renamed from .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2"> <library name="Maven: org.junit.jupiter:junit-jupiter-params:5.5.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.5.2/junit-jupiter-params-5.5.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.5.2/junit-jupiter-params-5.5.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.5.2/junit-jupiter-params-5.5.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml
File was renamed from .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.junit.platform:junit-platform-commons:1.6.2"> <library name="Maven: org.junit.platform:junit-platform-commons:1.5.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.5.2/junit-platform-commons-1.5.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.5.2/junit-platform-commons-1.5.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.5.2/junit-platform-commons-1.5.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml
File was renamed from .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.junit.platform:junit-platform-engine:1.6.2"> <library name="Maven: org.junit.platform:junit-platform-engine:1.5.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.5.2/junit-platform-engine-1.5.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.5.2/junit-platform-engine-1.5.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.5.2/junit-platform-engine-1.5.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml
File was renamed from .idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.mockito:mockito-core:3.3.3"> <library name="Maven: org.mockito:mockito-core:3.1.0"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.1.0/mockito-core-3.1.0.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.1.0/mockito-core-3.1.0-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.1.0/mockito-core-3.1.0-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.mockito:mockito-junit-jupiter:3.1.0"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.1.0/mockito-junit-jupiter-3.1.0.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.1.0/mockito-junit-jupiter-3.1.0-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.1.0/mockito-junit-jupiter-3.1.0-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml
File was deleted .idea/libraries/Maven__org_mongodb_bson_3_11_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.mongodb:bson:3.11.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/bson/3.11.2/bson-3.11.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/bson/3.11.2/bson-3.11.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/bson/3.11.2/bson-3.11.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_mongodb_bson_4_0_4.xml
File was deleted .idea/libraries/Maven__org_mongodb_mongodb_driver_3_11_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.mongodb:mongodb-driver:3.11.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver/3.11.2/mongodb-driver-3.11.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver/3.11.2/mongodb-driver-3.11.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver/3.11.2/mongodb-driver-3.11.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_11_2.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.mongodb:mongodb-driver-core:3.11.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/3.11.2/mongodb-driver-core-3.11.2.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/3.11.2/mongodb-driver-core-3.11.2-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/3.11.2/mongodb-driver-core-3.11.2-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_mongodb_mongodb_driver_core_4_0_4.xml
File was deleted .idea/libraries/Maven__org_mongodb_mongodb_driver_sync_4_0_4.xml
File was deleted .idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_4_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.2.4.RELEASE/spring-boot-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.2.4.RELEASE/spring-boot-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.2.4.RELEASE/spring-boot-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_1_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_4_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.2.4.RELEASE/spring-boot-autoconfigure-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.2.4.RELEASE/spring-boot-autoconfigure-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.2.4.RELEASE/spring-boot-autoconfigure-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_1_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_4_RELEASE.xml
File was renamed from .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_1_RELEASE.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot-starter:2.3.1.RELEASE"> <library name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.1.RELEASE/spring-boot-starter-2.3.1.RELEASE.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.2.4.RELEASE/spring-boot-starter-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.1.RELEASE/spring-boot-starter-2.3.1.RELEASE-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.2.4.RELEASE/spring-boot-starter-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.1.RELEASE/spring-boot-starter-2.3.1.RELEASE-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.2.4.RELEASE/spring-boot-starter-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_2_4_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-mongodb/2.2.4.RELEASE/spring-boot-starter-data-mongodb-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-mongodb/2.2.4.RELEASE/spring-boot-starter-data-mongodb-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-mongodb/2.2.4.RELEASE/spring-boot-starter-data-mongodb-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_3_1_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_4_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.2.4.RELEASE/spring-boot-starter-json-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.2.4.RELEASE/spring-boot-starter-json-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.2.4.RELEASE/spring-boot-starter-json-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_1_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_4_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.2.4.RELEASE/spring-boot-starter-logging-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.2.4.RELEASE/spring-boot-starter-logging-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.2.4.RELEASE/spring-boot-starter-logging-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_1_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_4_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.2.4.RELEASE/spring-boot-starter-test-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.2.4.RELEASE/spring-boot-starter-test-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.2.4.RELEASE/spring-boot-starter-test-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_1_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_4_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.2.4.RELEASE/spring-boot-starter-tomcat-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.2.4.RELEASE/spring-boot-starter-tomcat-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.2.4.RELEASE/spring-boot-starter-tomcat-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_1_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_4_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.2.4.RELEASE/spring-boot-starter-validation-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.2.4.RELEASE/spring-boot-starter-validation-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.2.4.RELEASE/spring-boot-starter-validation-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_4_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.2.4.RELEASE/spring-boot-starter-web-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.2.4.RELEASE/spring-boot-starter-web-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.2.4.RELEASE/spring-boot-starter-web-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_1_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_4_RELEASE.xml
File was renamed from .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_1_RELEASE.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot-test:2.3.1.RELEASE"> <library name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.3.1.RELEASE/spring-boot-test-2.3.1.RELEASE.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.2.4.RELEASE/spring-boot-test-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.3.1.RELEASE/spring-boot-test-2.3.1.RELEASE-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.2.4.RELEASE/spring-boot-test-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.3.1.RELEASE/spring-boot-test-2.3.1.RELEASE-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.2.4.RELEASE/spring-boot-test-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_4_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.2.4.RELEASE/spring-boot-test-autoconfigure-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.2.4.RELEASE/spring-boot-test-autoconfigure-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.2.4.RELEASE/spring-boot-test-autoconfigure-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_1_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_4_RELEASE.xml
File was renamed from .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_1_RELEASE.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.data:spring-data-commons:2.3.1.RELEASE"> <library name="Maven: org.springframework.data:spring-data-commons:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.3.1.RELEASE/spring-data-commons-2.3.1.RELEASE.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.2.4.RELEASE/spring-data-commons-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.3.1.RELEASE/spring-data-commons-2.3.1.RELEASE-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.2.4.RELEASE/spring-data-commons-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.3.1.RELEASE/spring-data-commons-2.3.1.RELEASE-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.2.4.RELEASE/spring-data-commons-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_4_RELEASE.xml
File was renamed from .idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_1_RELEASE.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.data:spring-data-keyvalue:2.3.1.RELEASE"> <library name="Maven: org.springframework.data:spring-data-keyvalue:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.3.1.RELEASE/spring-data-keyvalue-2.3.1.RELEASE.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.2.4.RELEASE/spring-data-keyvalue-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.3.1.RELEASE/spring-data-keyvalue-2.3.1.RELEASE-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.2.4.RELEASE/spring-data-keyvalue-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.3.1.RELEASE/spring-data-keyvalue-2.3.1.RELEASE-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.2.4.RELEASE/spring-data-keyvalue-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_2_4_RELEASE.xml
File was renamed from .idea/libraries/Maven__org_springframework_data_spring_data_mongodb_3_0_1_RELEASE.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.data:spring-data-mongodb:3.0.1.RELEASE"> <library name="Maven: org.springframework.data:spring-data-mongodb:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/3.0.1.RELEASE/spring-data-mongodb-3.0.1.RELEASE.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.2.4.RELEASE/spring-data-mongodb-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/3.0.1.RELEASE/spring-data-mongodb-3.0.1.RELEASE-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.2.4.RELEASE/spring-data-mongodb-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/3.0.1.RELEASE/spring-data-mongodb-3.0.1.RELEASE-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.2.4.RELEASE/spring-data-mongodb-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_4_RELEASE.xml
File was renamed from .idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_1_RELEASE.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework.data:spring-data-redis:2.3.1.RELEASE"> <library name="Maven: org.springframework.data:spring-data-redis:2.2.4.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.3.1.RELEASE/spring-data-redis-2.3.1.RELEASE.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.2.4.RELEASE/spring-data-redis-2.2.4.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.3.1.RELEASE/spring-data-redis-2.3.1.RELEASE-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.2.4.RELEASE/spring-data-redis-2.2.4.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.3.1.RELEASE/spring-data-redis-2.3.1.RELEASE-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.2.4.RELEASE/spring-data-redis-2.2.4.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_aop_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-aop:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.3.RELEASE/spring-aop-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.3.RELEASE/spring-aop-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.3.RELEASE/spring-aop-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_aop_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_spring_aspects_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-aspects:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.2.3.RELEASE/spring-aspects-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.2.3.RELEASE/spring-aspects-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.2.3.RELEASE/spring-aspects-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_aspects_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_spring_beans_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-beans:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.3.RELEASE/spring-beans-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.3.RELEASE/spring-beans-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.3.RELEASE/spring-beans-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_beans_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_spring_context_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-context:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.3.RELEASE/spring-context-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.3.RELEASE/spring-context-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.3.RELEASE/spring-context-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_context_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_spring_context_support_5_2_3_RELEASE.xml
File was renamed from .idea/libraries/Maven__org_springframework_spring_context_support_5_2_7_RELEASE.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-context-support:5.2.7.RELEASE"> <library name="Maven: org.springframework:spring-context-support:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.7.RELEASE/spring-context-support-5.2.7.RELEASE.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.3.RELEASE/spring-context-support-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.7.RELEASE/spring-context-support-5.2.7.RELEASE-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.3.RELEASE/spring-context-support-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.7.RELEASE/spring-context-support-5.2.7.RELEASE-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.3.RELEASE/spring-context-support-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_core_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-core:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.3.RELEASE/spring-core-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.3.RELEASE/spring-core-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.3.RELEASE/spring-core-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_core_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_spring_expression_5_2_3_RELEASE.xml
File was renamed from .idea/libraries/Maven__org_springframework_spring_expression_5_2_7_RELEASE.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-expression:5.2.7.RELEASE"> <library name="Maven: org.springframework:spring-expression:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.7.RELEASE/spring-expression-5.2.7.RELEASE.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.3.RELEASE/spring-expression-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.7.RELEASE/spring-expression-5.2.7.RELEASE-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.3.RELEASE/spring-expression-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.7.RELEASE/spring-expression-5.2.7.RELEASE-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.3.RELEASE/spring-expression-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_jcl_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-jcl:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.3.RELEASE/spring-jcl-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.3.RELEASE/spring-jcl-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.3.RELEASE/spring-jcl-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_jcl_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_spring_jdbc_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-jdbc:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.3.RELEASE/spring-jdbc-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.3.RELEASE/spring-jdbc-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.3.RELEASE/spring-jdbc-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_jdbc_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_spring_orm_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-orm:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.2.3.RELEASE/spring-orm-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.2.3.RELEASE/spring-orm-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.2.3.RELEASE/spring-orm-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_orm_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_spring_oxm_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-oxm:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.2.3.RELEASE/spring-oxm-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.2.3.RELEASE/spring-oxm-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.2.3.RELEASE/spring-oxm-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_oxm_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_spring_test_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-test:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.3.RELEASE/spring-test-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.3.RELEASE/spring-test-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.3.RELEASE/spring-test-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_test_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_spring_tx_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-tx:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.3.RELEASE/spring-tx-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.3.RELEASE/spring-tx-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.3.RELEASE/spring-tx-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_tx_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_spring_web_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-web:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.3.RELEASE/spring-web-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.3.RELEASE/spring-web-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.3.RELEASE/spring-web-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_web_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_springframework_spring_webmvc_5_2_3_RELEASE.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.springframework:spring-webmvc:5.2.3.RELEASE"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.3.RELEASE/spring-webmvc-5.2.3.RELEASE.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.3.RELEASE/spring-webmvc-5.2.3.RELEASE-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.3.RELEASE/spring-webmvc-5.2.3.RELEASE-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_springframework_spring_webmvc_5_2_7_RELEASE.xml
File was deleted .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml
File was renamed from .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.xmlunit:xmlunit-core:2.7.0"> <library name="Maven: org.xmlunit:xmlunit-core:2.6.3"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.3/xmlunit-core-2.6.3.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.3/xmlunit-core-2.6.3-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.3/xmlunit-core-2.6.3-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_yaml_snakeyaml_1_20.xmlcopy from .idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml copy to .idea/libraries/Maven__org_yaml_snakeyaml_1_20.xml
File was copied from .idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.yaml:snakeyaml:1.26"> <library name="Maven: org.yaml:snakeyaml:1.20"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.20/snakeyaml-1.20.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.20/snakeyaml-1.20-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.20/snakeyaml-1.20-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml
File was renamed from .idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml @@ -1,13 +1,13 @@ <component name="libraryTable"> <library name="Maven: org.yaml:snakeyaml:1.26"> <library name="Maven: org.yaml:snakeyaml:1.25"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.25/snakeyaml-1.25.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.25/snakeyaml-1.25-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.25/snakeyaml-1.25-sources.jar!/" /> </SOURCES> </library> </component> .idea/libraries/Maven__redis_clients_jedis_3_3_0.xml
File was deleted .idea/libraries/javas.xml
New file @@ -0,0 +1,13 @@ <component name="libraryTable"> <library name="javas"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7.jar!/" /> </CLASSES> <JAVADOC> <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-javadoc.jar!/" /> </JAVADOC> <SOURCES> <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-sources.jar!/" /> </SOURCES> </library> </component> FanLiMain.iml
@@ -17,6 +17,7 @@ </content> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="inheritedJdk" /> <orderEntry type="library" name="javas" 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" /> @@ -42,16 +43,9 @@ <orderEntry type="library" name="Maven: cglib:cglib:2.2.2" level="project" /> <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" /> <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.21" level="project" /> <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" /> <orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.struts:struts2-core:2.3.14" level="project" /> <orderEntry type="library" name="Maven: org.apache.struts.xwork:xwork-core:2.3.14" level="project" /> <orderEntry type="library" name="Maven: asm:asm-commons:3.3" level="project" /> <orderEntry type="library" name="Maven: asm:asm-tree:3.3" level="project" /> <orderEntry type="library" name="Maven: ognl:ognl:3.0.6" level="project" /> <orderEntry type="library" name="Maven: javassist:javassist:3.11.0.GA" level="project" /> <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" /> <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> facade-goods/facade-goods.iml
@@ -16,6 +16,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="javas" level="project" /> <orderEntry type="module" module-name="facede-common" /> <orderEntry type="module" module-name="utils" /> <orderEntry type="library" name="Maven: com.opencsv:opencsv:4.3.2" level="project" /> @@ -46,16 +47,9 @@ <orderEntry type="library" name="Maven: cglib:cglib:2.2.2" level="project" /> <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" /> <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.21" level="project" /> <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" /> <orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.struts:struts2-core:2.3.14" level="project" /> <orderEntry type="library" name="Maven: org.apache.struts.xwork:xwork-core:2.3.14" level="project" /> <orderEntry type="library" name="Maven: asm:asm-commons:3.3" level="project" /> <orderEntry type="library" name="Maven: asm:asm-tree:3.3" level="project" /> <orderEntry type="library" name="Maven: ognl:ognl:3.0.6" level="project" /> <orderEntry type="library" name="Maven: javassist:javassist:3.11.0.GA" level="project" /> <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" /> <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> facade-goods/src/main/java/com/yeshi/goods/facade/entity/taobao/TaoBaoCouponCache.java
@@ -3,11 +3,12 @@ import org.springframework.data.mongodb.core.mapping.Document; import org.yeshi.utils.StringUtil; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @Document(collection = "taoBaoCouponCache") public class TaoBaoCouponCache { public class TaoBaoCouponCache implements Serializable { private String id;//主键 private Long auctionId;//商品Id private String activityId;//券ID facade-goods/src/main/java/com/yeshi/goods/facade/utils/factory/TaoBaoCouponCacheFactory.java
New file @@ -0,0 +1,24 @@ package com.yeshi.goods.facade.utils.factory; import com.yeshi.goods.facade.entity.taobao.TaoBaoCouponCache; import java.math.BigDecimal; import java.util.Date; public class TaoBaoCouponCacheFactory { public static TaoBaoCouponCache create(Long auctionId, String activityId, BigDecimal couponAmount, BigDecimal couponStartPrice, Date startTime, Date endTime, String pid, String couponLink) { TaoBaoCouponCache cache = new TaoBaoCouponCache(); cache.setAuctionId(auctionId); cache.setPid(pid); cache.setActivityId(activityId); cache.setCouponAmount(couponAmount); cache.setCouponLink(couponLink); cache.setCouponStartPrice(couponStartPrice); cache.setEndTime(endTime); cache.setStartTime(startTime); cache.setCreateTime(new Date()); return cache; } } facede-common/facede-common.iml
@@ -16,6 +16,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="javas" level="project" /> <orderEntry type="module" module-name="utils" /> <orderEntry type="library" name="Maven: com.opencsv:opencsv:4.3.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.3" level="project" /> @@ -45,16 +46,9 @@ <orderEntry type="library" name="Maven: cglib:cglib:2.2.2" level="project" /> <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" /> <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.21" level="project" /> <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" /> <orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.struts:struts2-core:2.3.14" level="project" /> <orderEntry type="library" name="Maven: org.apache.struts.xwork:xwork-core:2.3.14" level="project" /> <orderEntry type="library" name="Maven: asm:asm-commons:3.3" level="project" /> <orderEntry type="library" name="Maven: asm:asm-tree:3.3" level="project" /> <orderEntry type="library" name="Maven: ognl:ognl:3.0.6" level="project" /> <orderEntry type="library" name="Maven: javassist:javassist:3.11.0.GA" level="project" /> <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" /> <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> fanli/error.log.2020-07-10
New file @@ -0,0 +1,6 @@ 2020-07-10 18:07:24 [ main:77 ] - [ ERROR ] 参数:{"app_key":"24980167","method":"taobao.tbk.coupon.convert","item_id":"41359311431","special_id":"510437437","v":"2.0","adzone_id":"89555600043","sign_method":"md5","format":"json","sign":"FA22648CDD731C6E463041BF98E2B6CA","relation_id":"510437437","timestamp":"2020-07-10 18:07:22"} 内容:{"error_response":{"code":15,"msg":"Remote service error","sub_code":"isp.rebate_id_not_match","sub_msg":"relationId、specialId、externalId不匹配","request_id":"4wntbg9ulk7v"}} 2020-07-10 18:07:24 [ main:331 ] - [ ERROR ] 参数:{"app_key":"24980167","method":"taobao.tbk.coupon.convert","item_id":"41359311431","special_id":"510437437","v":"2.0","adzone_id":"89555600043","sign_method":"md5","format":"json","sign":"21BDC9661F454C6D195C2A90D6FEA5C6","relation_id":"510437437","timestamp":"2020-07-10 18:07:24"} 内容:{"error_response":{"code":15,"msg":"Remote service error","sub_code":"isp.rebate_id_not_match","sub_msg":"relationId、specialId、externalId不匹配","request_id":"saelyxoucp3t"}} 2020-07-10 18:07:24 [ main:678 ] - [ ERROR ] 参数:{"app_key":"24980167","method":"taobao.tbk.coupon.convert","item_id":"41359311431","special_id":"510437437","v":"2.0","adzone_id":"89555600043","sign_method":"md5","format":"json","sign":"21BDC9661F454C6D195C2A90D6FEA5C6","relation_id":"510437437","timestamp":"2020-07-10 18:07:24"} 内容:{"error_response":{"code":15,"msg":"Remote service error","sub_code":"isp.rebate_id_not_match","sub_msg":"relationId、specialId、externalId不匹配","request_id":"vo670i2v4o3d"}} fanli/fanli.iml
@@ -38,6 +38,7 @@ </content> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="inheritedJdk" /> <orderEntry type="library" name="javas" level="project" /> <orderEntry type="module" module-name="utils" /> <orderEntry type="library" name="Maven: com.opencsv:opencsv:4.3.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.3" level="project" /> @@ -161,6 +162,18 @@ <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: io.netty:netty:3.7.0.Final" level="project" /> <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.13.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.13.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.13.0" level="project" /> <orderEntry type="library" name="Maven: com.101tec:zkclient:0.10" level="project" /> <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" 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" /> @@ -186,16 +199,9 @@ <orderEntry type="library" name="Maven: cglib:cglib:2.2.2" level="project" /> <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" /> <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.21" level="project" /> <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" /> <orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.struts:struts2-core:2.3.14" level="project" /> <orderEntry type="library" name="Maven: org.apache.struts.xwork:xwork-core:2.3.14" level="project" /> <orderEntry type="library" name="Maven: asm:asm-commons:3.3" level="project" /> <orderEntry type="library" name="Maven: asm:asm-tree:3.3" level="project" /> <orderEntry type="library" name="Maven: ognl:ognl:3.0.6" level="project" /> <orderEntry type="library" name="Maven: javassist:javassist:3.11.0.GA" level="project" /> <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" /> <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> @@ -276,7 +282,6 @@ <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" /> @@ -285,7 +290,6 @@ <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
@@ -146,72 +146,65 @@ </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>--> <dependency> <groupId>org.apache.dubbo</groupId> <artifactId>dubbo</artifactId> <version>${dubbo.version}</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> <artifactId>spring</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.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>--> <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <version>3.21.0-GA</version> </dependency> </dependencies> <build> fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -1,46 +1,13 @@ package com.yeshi.fanli.controller; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.PrintWriter; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.UUID; import javax.annotation.Resource; import javax.script.Invocable; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; 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; import org.quartz.JobExecutionContext; import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.springframework.cache.ehcache.EhCacheCacheManager; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.yeshi.utils.JsonUtil; import org.yeshi.utils.wx.WXUtil; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.yeshi.fanli.dao.dynamic.DynamicInfoDao; import com.yeshi.fanli.dao.mybatis.help.HelpCenterMapper; import com.yeshi.fanli.entity.SystemEnum; import com.yeshi.fanli.entity.bus.activity.ActivityShareResult; import com.yeshi.fanli.entity.bus.activity.RecommendActivity; import com.yeshi.fanli.entity.dynamic.InviteMaterial; import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.exception.ActivityException; import com.yeshi.fanli.exception.push.PushException; import com.yeshi.fanli.exception.share.UserShareGoodsRecordException; @@ -53,21 +20,42 @@ import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService; import com.yeshi.fanli.service.inter.dynamic.InviteMaterialService; import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService; import com.yeshi.fanli.service.inter.money.UserMoneyExtraService; import com.yeshi.fanli.service.inter.order.config.HongBaoManageService; import com.yeshi.fanli.service.inter.user.integral.IntegralGetService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import org.yeshi.utils.TimeUtil; import com.yeshi.fanli.util.db.MongoDBManager; import com.yeshi.fanli.util.push.OPPOPushUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; import com.yeshi.goods.facade.entity.taobao.TaoBaoCouponCache; import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.goods.facade.service.TaoBaoCouponCacheService; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.dubbo.config.annotation.Reference; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; import org.quartz.JobExecutionContext; import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.springframework.cache.ehcache.EhCacheCacheManager; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.yeshi.utils.JsonUtil; import org.yeshi.utils.TimeUtil; import org.yeshi.utils.wx.WXUtil; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import javax.annotation.Resource; import javax.script.Invocable; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; import javax.servlet.http.HttpServletRequest; import java.io.*; import java.math.BigDecimal; import java.util.*; @Controller @RequestMapping("test") @@ -111,7 +99,7 @@ @Resource private JedisPool jedisPool; // @Reference(check = true, timeout = 1000) @Resource private TaoBaoCouponCacheService taoBaoCouponCacheService; @RequestMapping(value = "kefu") fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -17,7 +17,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.yeshi.fanli.entity.SystemEnum; import com.yeshi.fanli.entity.accept.AdminAcceptData; import com.yeshi.fanli.service.inter.user.UserInfoService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -85,6 +87,9 @@ @Resource private CommonOrderCountService commonOrderCountService; @Resource private UserInfoService userInfoService; /** * 方法说明: 通过提现请求 可jsonP方式 * @@ -94,7 +99,7 @@ * @param request */ @RequestMapping(value = "passExtractJP") public void passExtractJP(AdminAcceptData acceptData,String callback, Long id, String code, PrintWriter out, HttpServletRequest request) { public void passExtractJP(AdminAcceptData acceptData, String callback, Long id, String code, PrintWriter out, HttpServletRequest request) { /* 检验是否登陆 */ AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN); @@ -140,7 +145,7 @@ * @author mawurui createTime 2018年3月14日 下午3:15:55 */ @RequestMapping(value = "rejectExtractJP") public void rejectExtractJP(AdminAcceptData acceptData,String callback, Long id, String code, String reason, PrintWriter out, public void rejectExtractJP(AdminAcceptData acceptData, String callback, Long id, String code, String reason, PrintWriter out, HttpServletRequest request) { /* 检验是否登陆 */ AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN); @@ -237,7 +242,7 @@ * @param out */ @RequestMapping(value = "getFinishRecordList") public void getFinishRecordList(AdminAcceptData acceptData,String callback, Integer pageIndex, String key, String startTime, String endTime, public void getFinishRecordList(AdminAcceptData acceptData, String callback, Integer pageIndex, String key, String startTime, String endTime, PrintWriter out) { try { @@ -320,7 +325,7 @@ * @param request */ @RequestMapping(value = "getMyAuditedList") public void getMyAuditedList(AdminAcceptData acceptData,String callback, Integer pageIndex, String key, String timeSlot, Integer state, public void getMyAuditedList(AdminAcceptData acceptData, String callback, Integer pageIndex, String key, String timeSlot, Integer state, PrintWriter out, HttpServletRequest request) { try { @@ -470,6 +475,10 @@ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请登录")); return; } SystemEnum system = userInfoService.getUserSystem(uid); acceptData.setSystem(system); // 查询同店铺商品，同商品订单超过一定数量的 List<Integer> typeList = new ArrayList<>(); typeList.add(HongBaoV2.TYPE_ZIGOU); @@ -491,7 +500,7 @@ * @param out */ @RequestMapping(value = "getMyAuditedCount") public void getMyAuditedCount(AdminAcceptData acceptData,String callback, HttpServletRequest request, PrintWriter out) { public void getMyAuditedCount(AdminAcceptData acceptData, String callback, HttpServletRequest request, PrintWriter out) { AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN); @@ -531,7 +540,7 @@ * @param out */ @RequestMapping(value = "getIaskInfo") public void getIaskInfo(AdminAcceptData acceptData,String callback, Long extractId, HttpServletRequest request, PrintWriter out) { public void getIaskInfo(AdminAcceptData acceptData, String callback, Long extractId, HttpServletRequest request, PrintWriter out) { try { String surplusTime = ""; @@ -704,7 +713,7 @@ * @param out */ @RequestMapping(value = "getByUidList") public void getByUidList(AdminAcceptData acceptData,String callback, Integer pageIndex, Long uid, HttpServletRequest request, public void getByUidList(AdminAcceptData acceptData, String callback, Integer pageIndex, Long uid, HttpServletRequest request, PrintWriter out) { try { if (uid == null) { @@ -765,7 +774,7 @@ * @param out */ @RequestMapping(value = "countByUid") public void countByUid(AdminAcceptData acceptData,String callback, Long uid, HttpServletRequest request, PrintWriter out) { public void countByUid(AdminAcceptData acceptData, String callback, Long uid, HttpServletRequest request, PrintWriter out) { try { @@ -805,7 +814,7 @@ * @param out */ @RequestMapping(value = "checkMoney") public void checkMoney(AdminAcceptData acceptData,String callback, String uid, PrintWriter out) { public void checkMoney(AdminAcceptData acceptData, String callback, String uid, PrintWriter out) { if (StringUtil.isNullOrEmpty(uid)) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("UID不能为空")); @@ -829,7 +838,7 @@ * @param out */ @RequestMapping(value = "downAutoExtractTxt") public void downAutoExtractTxt(AdminAcceptData acceptData,String callback, HttpServletResponse response, PrintWriter out) { public void downAutoExtractTxt(AdminAcceptData acceptData, String callback, HttpServletResponse response, PrintWriter out) { try { List<String> list = extractService.getAutoExtractOpenIds(); if (list == null || list.size() <= 1) { @@ -872,7 +881,7 @@ * @param out */ @RequestMapping(value = "uploadExcel", method = RequestMethod.POST) public void uploadExcel(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) { public void uploadExcel(AdminAcceptData acceptData, @RequestParam("file") CommonsMultipartFile file, PrintWriter out) { if (file == null) { out.print(JsonUtil.loadFalseResult("上传文件不能为空！")); return; @@ -907,7 +916,7 @@ * @param out */ @RequestMapping(value = "preAutoUser") public void preAutoUser(AdminAcceptData acceptData,String callback, Integer pageIndex, PrintWriter out) { public void preAutoUser(AdminAcceptData acceptData, String callback, Integer pageIndex, PrintWriter out) { try { List<UserInfo> list = extractService.preAutoUser(); if (list == null || list.isEmpty()) { fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java
@@ -214,13 +214,8 @@ /** * 新后台端 上传订单文件 * * @param acceptData * @param file * excel文件 * @param uid * 当前用户id * @param request * @param response * @param out */ @RequestMapping(value = "uploadOrderFile") fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java
@@ -1,193 +1,238 @@ package com.yeshi.fanli.controller.admin.order; import java.io.PrintWriter; import java.lang.reflect.Type; import java.util.Date; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; import javax.annotation.Resource; import com.google.gson.*; import com.yeshi.common.entity.PageEntity; import com.yeshi.fanli.entity.accept.AdminAcceptData; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.yeshi.utils.JsonUtil; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder; import com.yeshi.fanli.job.order.taobao.UpdateOrderJob; import com.yeshi.fanli.job.order.taobao.UpdateTBRelationAndSpecialOrderJob; import com.yeshi.fanli.service.inter.order.OrderProcessService; import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService; import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService; import com.yeshi.common.entity.PageEntity; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.ThreadUtil; import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil; import net.sf.json.JSONObject; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.commons.CommonsMultipartFile; import org.yeshi.utils.JsonUtil; import org.yeshi.utils.TimeUtil; import net.sf.json.JSONObject; import javax.annotation.Resource; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.PrintWriter; import java.lang.reflect.Type; import java.util.*; @Controller @RequestMapping("admin/new/api/v1/taobaoOrder") public class TaoBaoOrderController { @Resource private TaoBaoOrderService taoBaoOrderService; @Resource private TaoBaoOrderService taoBaoOrderService; @Resource private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService; @Resource private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService; @Resource private UpdateTBRelationAndSpecialOrderJob updateRelationAndSpecialOrderJob; @Resource private UpdateTBRelationAndSpecialOrderJob updateRelationAndSpecialOrderJob; @Resource private UpdateOrderJob updateOrderJob; @Resource private UpdateOrderJob updateOrderJob; /** * 查询列表 - 新后台 * * @param callback * @param key * 查询词 名称 * @param pageIndex * @param out */ @RequestMapping(value = "listTaoBaoOrder") public void listTaoBaoOrder(AdminAcceptData acceptData, String callback, String key, Integer pageIndex, PrintWriter out) { @Resource private OrderProcessService orderProcessService; try { /** * 查询列表 - 新后台 * * @param callback * @param key 查询词 名称 * @param pageIndex * @param out */ @RequestMapping(value = "listTaoBaoOrder") public void listTaoBaoOrder(AdminAcceptData acceptData, String callback, String key, Integer pageIndex, PrintWriter out) { if (pageIndex == null || pageIndex < 0) { pageIndex = 1; } try { List<TaoBaoOrder> orderList = null; Long count = null; if (pageIndex == null || pageIndex < 0) { pageIndex = 1; } if (!StringUtil.isNullOrEmpty(key)) { orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(key); count = (long) orderList.size(); } else { orderList = taoBaoOrderService.listAllOrder(pageIndex, Constant.PAGE_SIZE); count = taoBaoOrderService.countAllOrder(); } List<TaoBaoOrder> orderList = null; Long count = null; int pageSize = Constant.PAGE_SIZE; if (!StringUtil.isNullOrEmpty(key)) { orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(key); count = (long) orderList.size(); } else { orderList = taoBaoOrderService.listAllOrder(pageIndex, Constant.PAGE_SIZE); count = taoBaoOrderService.countAllOrder(); } int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1); PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage); int pageSize = Constant.PAGE_SIZE; Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() { @Override public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) { if (value == null) { return new JsonPrimitive(""); } else { return new JsonPrimitive(TimeUtil.getGernalTime(value.getTime(), "yyyy-MM-dd HH:mm:ss")); } } }).create(); int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1); PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage); JSONObject data = new JSONObject(); data.put("pe", pe); data.put("result_list", gson.toJson(orderList)); Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() { @Override public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) { if (value == null) { return new JsonPrimitive(""); } else { return new JsonPrimitive(TimeUtil.getGernalTime(value.getTime(), "yyyy-MM-dd HH:mm:ss")); } } }).create(); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); JSONObject data = new JSONObject(); data.put("pe", pe); data.put("result_list", gson.toJson(orderList)); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询失败")); e.printStackTrace(); } } JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); @RequestMapping(value = "updateTaoBaoOrder") public void updateTaoBaoOrder(AdminAcceptData acceptData,String callback, String ids, PrintWriter out) { try { if (StringUtil.isNullOrEmpty(ids)) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请上传订单ID")); return; } net.sf.json.JSONArray idsArray = net.sf.json.JSONArray.fromObject(ids); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询失败")); e.printStackTrace(); } } Set<String> orderIds = new HashSet<>(); @RequestMapping(value = "updateTaoBaoOrder") public void updateTaoBaoOrder(AdminAcceptData acceptData, String callback, String ids, PrintWriter out) { try { if (StringUtil.isNullOrEmpty(ids)) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请上传订单ID")); return; } net.sf.json.JSONArray idsArray = net.sf.json.JSONArray.fromObject(ids); for (int i = 0; i < idsArray.size(); i++) { TaoBaoOrder taoBaoOrder = taoBaoOrderService.selectByPrimaryKey(idsArray.optLong(i)); orderIds.add(taoBaoOrder.getOrderId()); } Set<String> orderIds = new HashSet<>(); Long[] startTimes = new Long[orderIds.size()]; Long[] endTimes = new Long[orderIds.size()]; for (int i = 0; i < idsArray.size(); i++) { TaoBaoOrder taoBaoOrder = taoBaoOrderService.selectByPrimaryKey(idsArray.optLong(i)); orderIds.add(taoBaoOrder.getOrderId()); } int p = 0; for (Iterator<String> its = orderIds.iterator(); its.hasNext();) { String orderId = its.next(); List<TaoBaoOrder> list = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId); startTimes[p] = TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") - 1000L; endTimes[p] = TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") + 1000L; p++; } Long[] startTimes = new Long[orderIds.size()]; Long[] endTimes = new Long[orderIds.size()]; for (int i = 0; i < idsArray.size(); i++) { updateRelationAndSpecialOrderJob.updateRelationAndSpecialOrder(startTimes[i], endTimes[i]); updateOrderJob.updateOrder(startTimes[i], endTimes[i]); } JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("更新成功")); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("更新失败")); e.printStackTrace(); } } int p = 0; for (Iterator<String> its = orderIds.iterator(); its.hasNext(); ) { String orderId = its.next(); List<TaoBaoOrder> list = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId); startTimes[p] = TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") - 1000L; endTimes[p] = TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") + 1000L; p++; } @RequestMapping(value = "listTaoBaoWQOrder") public void listTaoBaoWeiQuanOrder(AdminAcceptData acceptData,String callback, String key, Integer pageIndex, PrintWriter out) { try { if (pageIndex == null || pageIndex < 0) { pageIndex = 1; } List<TaoBaoWeiQuanOrder> orderList = null; Long count = null; if (!StringUtil.isNullOrEmpty(key)) { orderList = taoBaoWeiQuanOrderService.listByOrderId(key); count = (long) orderList.size(); } else { orderList = taoBaoWeiQuanOrderService.listByState(null, pageIndex, Constant.PAGE_SIZE); count = taoBaoWeiQuanOrderService.countByState(null); } for (int i = 0; i < idsArray.size(); i++) { updateRelationAndSpecialOrderJob.updateRelationAndSpecialOrder(startTimes[i], endTimes[i]); updateOrderJob.updateOrder(startTimes[i], endTimes[i]); } JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("更新成功")); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("更新失败")); e.printStackTrace(); } } int pageSize = Constant.PAGE_SIZE; @RequestMapping(value = "listTaoBaoWQOrder") public void listTaoBaoWeiQuanOrder(AdminAcceptData acceptData, String callback, String key, Integer pageIndex, PrintWriter out) { try { if (pageIndex == null || pageIndex < 0) { pageIndex = 1; } List<TaoBaoWeiQuanOrder> orderList = null; Long count = null; if (!StringUtil.isNullOrEmpty(key)) { orderList = taoBaoWeiQuanOrderService.listByOrderId(key); count = (long) orderList.size(); } else { orderList = taoBaoWeiQuanOrderService.listByState(null, pageIndex, Constant.PAGE_SIZE); count = taoBaoWeiQuanOrderService.countByState(null); } int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1); PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage); int pageSize = Constant.PAGE_SIZE; Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() { @Override public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) { if (value == null) { return new JsonPrimitive(""); } else { return new JsonPrimitive(TimeUtil.getGernalTime(value.getTime(), "yyyy-MM-dd HH:mm:ss")); } } }).create(); int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1); PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage); JSONObject data = new JSONObject(); data.put("pe", pe); data.put("result_list", gson.toJson(orderList)); Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() { @Override public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) { if (value == null) { return new JsonPrimitive(""); } else { return new JsonPrimitive(TimeUtil.getGernalTime(value.getTime(), "yyyy-MM-dd HH:mm:ss")); } } }).create(); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); JSONObject data = new JSONObject(); data.put("pe", pe); data.put("result_list", gson.toJson(orderList)); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询失败")); e.printStackTrace(); } } JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询失败")); e.printStackTrace(); } } /** * 新后台端 上传订单文件 * * @param acceptData * @param file * @param out */ @RequestMapping(value = "uploadWQOrderFile") public void uploadWQOrderFile(AdminAcceptData acceptData, @RequestParam("file") CommonsMultipartFile file, PrintWriter out) { if (file == null) { out.print(JsonUtil.loadFalseResult("上传文件不能为空")); return; } List<TaoBaoWeiQuanOrder> orderList = null; try { orderList = TaoBaoOrderUtil.parseWeiQuanOrder( file.getInputStream()); int pos = 0; for (TaoBaoWeiQuanOrder order : orderList) try { pos++; // if (pos == 19||pos == 26) taoBaoWeiQuanOrderService.addWeiQuanOrder(order);// 添加维权订单到数据库 } catch (Exception e) { System.out.println("位置:" + pos); e.printStackTrace(); } // 处理维权订单 out.print(JsonUtil.loadTrueResult("上传成功,系统正在处理中...")); } catch (IOException e) { out.print(JsonUtil.loadFalseResult("上传文件失败")); e.printStackTrace(); } final List<TaoBaoWeiQuanOrder> finalOrderList = orderList; ThreadUtil.run(new Runnable() { @Override public void run() { orderProcessService.weiQuanOrder(finalOrderList); } }); } } fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
@@ -158,6 +158,7 @@ */ @RequestMapping(value = "getClass") public void getClass(String callback, AcceptData acceptData, PrintWriter out) { acceptData.setSystem(SystemEnum.blks); try { List<HelpClass> resultList = new ArrayList<>();
@@ -179,7 +179,7 @@ sf.setKey(text); JSONObject root = new JSONObject(); TaoBaoSearchResult result = TaoBaoUtil.search(sf); TaoBaoSearchResult result = TaoBaoUtil.search(sf,null,null); if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) { // 是属于淘宝联盟商品 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -1096,7 +1096,7 @@ // 按名字搜索商品 SearchFilter sf = new SearchFilter(); sf.setKey(cgoods.getTitle().substring(0, cgoods.getTitle().length() / 2)); TaoBaoSearchResult result = TaoBaoUtil.search(sf); TaoBaoSearchResult result = TaoBaoUtil.search(sf,null,null); if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) for (TaoBaoGoodsBrief gds : result.getTaoBaoGoodsBriefs()) { fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
@@ -306,7 +306,7 @@ } sf.setParams(params); } TaoBaoSearchResult result = TaoBaoUtil.search(sf); TaoBaoSearchResult result = TaoBaoUtil.search(sf,null,null); if (result == null) { return null; } @@ -621,7 +621,7 @@ if (page == 1) daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(kw); TaoBaoSearchResult result = TaoBaoUtil.search(sf); TaoBaoSearchResult result = TaoBaoUtil.search(sf,null,null); if (result == null) { return null; } fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -9,6 +9,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpSession; import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService; import org.springframework.core.task.TaskExecutor; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -94,1100 +95,1086 @@ @RequestMapping("api/v2/search") public class SearchControllerV2 { @Resource private BusinessSystemService businessSystemService; @Resource private ConfigService configService; @Resource private ConfigService configService; @Resource private HistorySearchService historySearchService; @Resource private SuperHotSearchService superHotSearchSerivce; @Resource private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil; @Resource private HistorySearchService historySearchService; @Resource private TaoBaoShopService taoBaoShopService; @Resource private HongBaoManageService hongBaoManageService; @Resource private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service; @Resource private TaoBaoUnionConfigService taoBaoUnionConfigService; @Resource(name = "taskExecutor") private TaskExecutor executor; @Resource private TaoKeGoodsService taoKeGoodsService; @Resource private TokenRecordService tokenRecordService; @Resource private QualityGoodsService qualityGoodsService; @Resource private IntegralGetService integralGetService; @Resource private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil; @Resource private IntegralGetCacheManager integralGetCacheManager; @Resource private TaoBaoShopService taoBaoShopService; @Resource private BrandInfoService brandInfoService; @Resource private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service; @Resource private ClipboardAnalysisManager clipboardAnalysisManager; @Resource(name = "taskExecutor") private TaskExecutor executor; @Resource private JumpDetailV2Service jumpDetailV2Service; @Resource private TokenRecordService tokenRecordService; @Resource private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService; @Resource private IntegralGetService integralGetService; @Resource private AppPageNotificationService appPageNotificationService; @Resource private IntegralGetCacheManager integralGetCacheManager; @Resource private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService; @Resource private BrandInfoService brandInfoService; /** * 粘贴板信息推荐 * * @param acceptData * @param text * @param uid * @param out */ @RequestMapping(value = "getRecommendInfo", method = RequestMethod.POST) public void getRecommendInfo(AcceptData acceptData, String text, Long uid, PrintWriter out) { if (StringUtil.isNullOrEmpty(text)) { out.print(JsonUtil.loadFalseResult("值为空")); return; } // 去除前后空格 text = text.trim(); String originalText = text; @Resource private JDGoodsLinkParseManager jdGoodsLinkParseManager; JSONObject data = new JSONObject(); @Resource private ClipboardAnalysisManager clipboardAnalysisManager; clipboardAnalysisManager.parse(acceptData.getPlatform(), acceptData.getVersion(), originalText, uid, new IClipboardAnalysisResult() { @Resource private JumpDetailV2Service jumpDetailV2Service; @Override public void onResult(GoodsDocParseResultVO result) { if (uid == null) { out.print(JsonUtil.loadFalseResult("无推荐")); return; } @Resource private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService; JSONObject root = new JSONObject(); root.put("type", 20); JSONObject data = new JSONObject(); data.put("text", originalText); // int platformCode = Constant.getPlatformCode(acceptData.getPlatform()); int version = Integer.parseInt(acceptData.getVersion()); JumpDetailContentVO convert = new JumpDetailContentVO(); convert.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version)); JSONObject convertParams = new JSONObject(); convertParams.put("url", configService.getValue(ConfigKeyEnum.convertDocWebLink.getKey(), acceptData.getSystem())); convertParams.put("clipboard", false); convert.setParams(convertParams); @Resource private AppPageNotificationService appPageNotificationService; JumpDetailContentVO view = null; JumpDetailContentVO guessLike = null; /** * 粘贴板信息推荐 * * @param acceptData * @param url * 商品链接 * @param out */ @RequestMapping(value = "getRecommendInfo", method = RequestMethod.POST) public void getRecommendInfo(AcceptData acceptData, String text, Long uid, PrintWriter out) { if (StringUtil.isNullOrEmpty(text)) { out.print(JsonUtil.loadFalseResult("值为空")); return; } // 去除前后空格 text = text.trim(); String originalText = text; Gson gson = JsonUtil.getApiCommonGson(); data.put("title", "智能搜索"); JSONObject data = new JSONObject(); int state = 0; if (result.getFirstGoods() != null && result.getFirstGoods().getGoodsId() != null) { state = 2; data.put("stateDesc", "选择搜券或转链"); JSONObject params = new JSONObject(); params.put("id", result.getFirstGoods().getGoodsId() + ""); params.put("from", "转链"); if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) { view = new JumpDetailContentVO(); view.setJumpDetail( jumpDetailV2Service.getByTypeCache("goodsdetail", platformCode, version)); view.setParams(params); } else if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_JD) { view = new JumpDetailContentVO(); view.setJumpDetail( jumpDetailV2Service.getByTypeCache("goodsdetail_jd", platformCode, version)); view.setParams(params); } else if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_PDD) { view = new JumpDetailContentVO(); view.setJumpDetail( jumpDetailV2Service.getByTypeCache("goodsdetail_pdd", platformCode, version)); view.setParams(params); } clipboardAnalysisManager.parse(acceptData.getPlatform(), acceptData.getVersion(), originalText, uid, new IClipboardAnalysisResult() { } else if (!StringUtil.isNullOrEmpty(result.getFirstLink())) { state = 2; data.put("stateDesc", "选择搜券或转链"); view = new JumpDetailContentVO(); view.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version)); JSONObject params = new JSONObject(); params.put("url", result.getFirstLink()); view.setParams(params); } else { data.put("stateDesc", "去试试转链"); state = 1; } data.put("state", state); if (convert != null) data.put("convert", gson.toJson(convert)); if (view != null) data.put("view", gson.toJson(view)); @Override public void onResult(GoodsDocParseResultVO result) { if (uid == null) { out.print(JsonUtil.loadFalseResult("无推荐")); return; } if (guessLike != null) data.put("guessLike", gson.toJson(guessLike)); JSONObject root = new JSONObject(); root.put("type", 20); JSONObject data = new JSONObject(); data.put("text", originalText); // int platformCode = Constant.getPlatformCode(acceptData.getPlatform()); int version = Integer.parseInt(acceptData.getVersion()); JumpDetailContentVO convert = new JumpDetailContentVO(); convert.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version)); JSONObject convertParams = new JSONObject(); convertParams.put("url", configService.getValue(ConfigKeyEnum.convertDocWebLink.getKey(),acceptData.getSystem())); convertParams.put("clipboard", false); convert.setParams(convertParams); root.put("data", data); out.print(JsonUtil.loadTrueResult(root)); return; } JumpDetailContentVO view = null; JumpDetailContentVO guessLike = null; @Override public void onResult(String result) { JSONObject root = new JSONObject(); root.put("type", 2); JSONObject data = new JSONObject(); data.put("title", result); root.put("data", data); out.print(JsonUtil.loadTrueResult(root)); return; } Gson gson = JsonUtil.getApiCommonGson(); data.put("title", "智能搜索"); @Override public void onResult(CommonGoods goods) { if (goods.getGoodsId() != null) { if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {// 1.6.5版本后返回商品详情 if (goods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) { TaoBaoGoodsBrief goodsBrief = null; String specialId = userExtraTaoBaoInfoService.getSpecialIdByUid(uid); try { goodsBrief = TaoKeApiUtil.searchGoodsDetail(goods.getGoodsId(),specialId,null); } catch (TaobaoGoodsDownException e) { e.printStackTrace(); } int state = 0; if (result.getFirstGoods() != null && result.getFirstGoods().getGoodsId() != null) { state = 2; data.put("stateDesc", "选择搜券或转链"); JSONObject params = new JSONObject(); params.put("id", result.getFirstGoods().getGoodsId() + ""); params.put("from", "转链"); if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) { view = new JumpDetailContentVO(); view.setJumpDetail( jumpDetailV2Service.getByTypeCache("goodsdetail", platformCode, version)); view.setParams(params); } else if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_JD) { view = new JumpDetailContentVO(); view.setJumpDetail( jumpDetailV2Service.getByTypeCache("goodsdetail_jd", platformCode, version)); view.setParams(params); } else if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_PDD) { view = new JumpDetailContentVO(); view.setJumpDetail( jumpDetailV2Service.getByTypeCache("goodsdetail_pdd", platformCode, version)); view.setParams(params); } if (goodsBrief != null) { goods = CommonGoodsFactory.create(goodsBrief); Gson gson = JsonUtil .getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd") .create(); data.put("type", 3); data.put("goods", gson.toJson( GoodsDetailVOFactory.convertCommonGoods(goods, orderHongBaoMoneyComputeService.getShowComputeRate( acceptData.getPlatform(), acceptData.getVersion(), acceptData.getSystem())))); // 跳转详情 if (VersionUtil.greaterThan_2_1_3(acceptData.getPlatform(), acceptData.getVersion())) { buildGoodsClick(data, goods, acceptData, gson); } } else if (!StringUtil.isNullOrEmpty(result.getFirstLink())) { state = 2; data.put("stateDesc", "选择搜券或转链"); view = new JumpDetailContentVO(); view.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version)); JSONObject params = new JSONObject(); params.put("url", result.getFirstLink()); view.setParams(params); } else { data.put("stateDesc", "去试试转链"); state = 1; } data.put("state", state); if (convert != null) data.put("convert", gson.toJson(convert)); if (view != null) data.put("view", gson.toJson(view)); out.print(JsonUtil.loadTrueResult(data)); return; } } else { Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd") .create(); data.put("type", 3); data.put("goods", gson.toJson( GoodsDetailVOFactory.convertCommonGoods(goods, orderHongBaoMoneyComputeService.getShowComputeRate( acceptData.getPlatform(), acceptData.getVersion(), acceptData.getSystem())))); // if // (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), // acceptData.getVersion())) { // buildGoodsClick(data, goods, acceptData, // gson); // } out.print(JsonUtil.loadTrueResult(data)); return; } } else { // 低于1.6.5版本 JSONObject taoBaoGoodsJSON = new JSONObject(); taoBaoGoodsJSON.put("title", goods.getTitle()); taoBaoGoodsJSON.put("zkPrice", goods.getPrice() + ""); taoBaoGoodsJSON.put("id", goods.getGoodsId()); taoBaoGoodsJSON.put("goodsType", goods.getGoodsType()); if (goods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) { taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + goods.getGoodsId()); } else if (goods.getGoodsType() == Constant.SOURCE_TYPE_JD) { taoBaoGoodsJSON.put("url", String.format("https://item.jd.com/%s.html", goods.getGoodsId() + "")); } else if (goods.getGoodsType() == Constant.SOURCE_TYPE_PDD) { taoBaoGoodsJSON.put("url", "http://yangkeduo.com/goods.html?goods_id=" + goods.getGoodsId()); } data.put("goods", taoBaoGoodsJSON); List<String> picList = new ArrayList<>(); picList.add(goods.getPicture()); data.put("imgs", picList); JSONObject root = new JSONObject(); root.put("type", 1); root.put("data", data); out.print(JsonUtil.loadTrueResult(root)); return; } } if (guessLike != null) data.put("guessLike", gson.toJson(guessLike)); JSONObject goodsJSON = new JSONObject(); goodsJSON.put("title", goods.getTitle()); goodsJSON.put("pictUrl", goods.getPicture()); root.put("data", data); out.print(JsonUtil.loadTrueResult(root)); return; } data.put("type", 4); data.put("desc", "该商品无推广信息"); data.put("goods", goodsJSON); out.print(JsonUtil.loadTrueResult(data)); return; } @Override public void onResult(String result) { JSONObject root = new JSONObject(); root.put("type", 2); JSONObject data = new JSONObject(); data.put("title", result); root.put("data", data); out.print(JsonUtil.loadTrueResult(root)); return; } @Override public void onResult(TokenVO tokenVO) { out.print(JsonUtil.loadTrueResult(tokenVO)); return; } @Override public void onResult(CommonGoods goods) { if (goods.getGoodsId() != null) { if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {// 1.6.5版本后返回商品详情 if (goods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) { TaoBaoGoodsBrief goodsBrief = null; try { goodsBrief = TaoKeApiUtil.searchGoodsDetail(goods.getGoodsId()); } catch (TaobaoGoodsDownException e) { e.printStackTrace(); } @Override public void none() { out.print(JsonUtil.loadFalseResult("无推荐")); } if (goodsBrief != null) { goods = CommonGoodsFactory.create(goodsBrief); Gson gson = JsonUtil .getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd") .create(); data.put("type", 3); data.put("goods", gson.toJson( GoodsDetailVOFactory.convertCommonGoods(goods, orderHongBaoMoneyComputeService.getShowComputeRate( acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem())))); // 跳转详情 if (VersionUtil.greaterThan_2_1_3(acceptData.getPlatform(), acceptData.getVersion())) { buildGoodsClick(data, goods, acceptData, gson); } @Override public void needLogin(String msg) { out.print(JsonUtil.loadFalseResult(1001, msg)); } }); } out.print(JsonUtil.loadTrueResult(data)); return; } } else { Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd") .create(); data.put("type", 3); data.put("goods", gson.toJson( GoodsDetailVOFactory.convertCommonGoods(goods, orderHongBaoMoneyComputeService.getShowComputeRate( acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem())))); // if // (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), // acceptData.getVersion())) { // buildGoodsClick(data, goods, acceptData, // gson); // } out.print(JsonUtil.loadTrueResult(data)); return; } } else { // 低于1.6.5版本 JSONObject taoBaoGoodsJSON = new JSONObject(); taoBaoGoodsJSON.put("title", goods.getTitle()); taoBaoGoodsJSON.put("zkPrice", goods.getPrice() + ""); taoBaoGoodsJSON.put("id", goods.getGoodsId()); taoBaoGoodsJSON.put("goodsType", goods.getGoodsType()); if (goods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) { taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + goods.getGoodsId()); } else if (goods.getGoodsType() == Constant.SOURCE_TYPE_JD) { taoBaoGoodsJSON.put("url", String.format("https://item.jd.com/%s.html", goods.getGoodsId() + "")); } else if (goods.getGoodsType() == Constant.SOURCE_TYPE_PDD) { taoBaoGoodsJSON.put("url", "http://yangkeduo.com/goods.html?goods_id=" + goods.getGoodsId()); } data.put("goods", taoBaoGoodsJSON); List<String> picList = new ArrayList<>(); picList.add(goods.getPicture()); data.put("imgs", picList); JSONObject root = new JSONObject(); root.put("type", 1); root.put("data", data); out.print(JsonUtil.loadTrueResult(root)); return; } } private void buildGoodsClick(JSONObject data, CommonGoods goods, AcceptData acceptData, Gson gson) { JSONObject goodsJSON = new JSONObject(); goodsJSON.put("title", goods.getTitle()); goodsJSON.put("pictUrl", goods.getPicture()); JSONObject params = new JSONObject(); params.put("id", goods.getGoodsId() + ""); params.put("from", "猜你喜欢"); data.put("type", 4); data.put("desc", "该商品无推广信息"); data.put("goods", goodsJSON); out.print(JsonUtil.loadTrueResult(data)); return; } String type = ""; switch (goods.getGoodsType()) { case Constant.SOURCE_TYPE_TAOBAO: type = "goodsdetail"; break; case Constant.SOURCE_TYPE_JD: type = "goodsdetail_jd"; break; case Constant.SOURCE_TYPE_PDD: type = "goodsdetail_pdd"; break; case Constant.SOURCE_TYPE_VIP: type = "goodsdetail_vip"; break; case Constant.SOURCE_TYPE_SUNING: type = "goodsdetail_suning"; break; @Override public void onResult(TokenVO tokenVO) { out.print(JsonUtil.loadTrueResult(tokenVO)); return; } } @Override public void none() { out.print(JsonUtil.loadFalseResult("无推荐")); } RecommendJumpInfoVO left = new RecommendJumpInfoVO("去看看", jumpDetailV2Service.getByTypeCache(type, Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())), params); data.put("left", gson.toJson(left)); @Override public void needLogin(String msg) { out.print(JsonUtil.loadFalseResult(1001, msg)); } }); } // 去网页 String rightValue = configService.getByVersion(ConfigKeyEnum.clipboardRecommendGoodsMakeMore.getKey(), acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()), acceptData.getSystem()); private void buildGoodsClick(JSONObject data, CommonGoods goods, AcceptData acceptData, Gson gson) { if (StringUtil.isNullOrEmpty(rightValue)) { data.remove("left"); } else { params = new JSONObject(); params.put("url", rightValue); JSONObject params = new JSONObject(); params.put("id", goods.getGoodsId() + ""); params.put("from", "猜你喜欢"); RecommendJumpInfoVO right = new RecommendJumpInfoVO("有更高返利？", jumpDetailV2Service.getByTypeCache("web", Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())), params); data.put("right", gson.toJson(right)); } } String type = ""; switch (goods.getGoodsType()) { case Constant.SOURCE_TYPE_TAOBAO: type = "goodsdetail"; break; case Constant.SOURCE_TYPE_JD: type = "goodsdetail_jd"; break; case Constant.SOURCE_TYPE_PDD: type = "goodsdetail_pdd"; break; case Constant.SOURCE_TYPE_VIP: type = "goodsdetail_vip"; break; case Constant.SOURCE_TYPE_SUNING: type = "goodsdetail_suning"; break; /** * 口令领取 * * @param acceptData * @param uid * @param token * @param out */ @RequestSerializableByKey(key = "'tokenReceive-'+#uid") @RequestMapping(value = "tokenReceive", method = RequestMethod.POST) public void tokenReceive(AcceptData acceptData, Long uid, String token, PrintWriter out) { try { String msg = tokenRecordService.receiveToken(token, uid, acceptData); out.print(JsonUtil.loadTrueResult(msg)); } catch (TokenRecordException e) { out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg())); } } } /** * 搜索候选词 * * @param acceptData * @param kw * @param out */ @RequestMapping(value = "suggestSearch", method = RequestMethod.POST) public void getSugguestSearch(AcceptData acceptData, String kw, Integer goodsType, PrintWriter out) { if (goodsType == null) { out.print(JsonUtil.loadFalseResult("平台类型不能为空")); return; } RecommendJumpInfoVO left = new RecommendJumpInfoVO("去看看", jumpDetailV2Service.getByTypeCache(type, Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())), params); data.put("left", gson.toJson(left)); List<String> list = null; if (goodsType == Constant.SOURCE_TYPE_TAOBAO) { list = TaoBaoUtil.getSuguestSearch(kw); } else if (goodsType == Constant.SOURCE_TYPE_JD) { list = JDUtil.suggestSearch(kw); } else if (goodsType == Constant.SOURCE_TYPE_PDD) { list = PinDuoDuoUtil.suggestSearch(kw); } // 去网页 String rightValue = configService.getByVersion(ConfigKeyEnum.clipboardRecommendGoodsMakeMore.getKey(), acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()); if (list == null || list.size() == 0) { out.print(JsonUtil.loadFalseResult("暂无建议内容")); return; } if (StringUtil.isNullOrEmpty(rightValue)) { data.remove("left"); } else { params = new JSONObject(); params.put("url", rightValue); JSONArray array = new JSONArray(); for (String words : list) { array.add(words); } out.print(JsonUtil.loadTrueResult(array)); } RecommendJumpInfoVO right = new RecommendJumpInfoVO("有更高返利？", jumpDetailV2Service.getByTypeCache("web", Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())), params); data.put("right", gson.toJson(right)); } } /** * @param acceptData * @param goodsType * @param key * @param page * @param filter * @param order 销量由高到低:1 、 价格从高到低:2 、 价格从低到高:3 、 推广量高到低:4（综合默认）、返利比高到低:5 * * 、返利比低到高:6 、推荐20 * @param uid * @param notifyType * @param session * @param out */ @RequestMapping(value = "searchGoods") public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter, Integer order, Long uid, String notifyType, HttpSession session, PrintWriter out) { /** * 口令领取 * * @param acceptData * @param kw * @param goodsType * @param out */ @RequestSerializableByKey(key = "'tokenReceive-'+#uid") @RequestMapping(value = "tokenReceive", method = RequestMethod.POST) public void tokenReceive(AcceptData acceptData, Long uid, String token, PrintWriter out) { try { String msg = tokenRecordService.receiveToken(token, uid, acceptData); out.print(JsonUtil.loadTrueResult(msg)); } catch (TokenRecordException e) { out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg())); } } if (goodsType == null || goodsType < 1 || goodsType > 5) { out.print(JsonUtil.loadFalseResult(1, "请传递正确平台参数")); return; } /** * 搜索候选词 * * @param acceptData * @param kw * @param out */ @RequestMapping(value = "suggestSearch", method = RequestMethod.POST) public void getSugguestSearch(AcceptData acceptData, String kw, Integer goodsType, PrintWriter out) { if (goodsType == null) { out.print(JsonUtil.loadFalseResult("平台类型不能为空")); return; } if (page == null || page < 1) { out.print(JsonUtil.loadFalseResult(1, "页码不能小于1")); return; } List<String> list = null; if (goodsType == Constant.SOURCE_TYPE_TAOBAO) { list = TaoBaoUtil.getSuguestSearch(kw); } else if (goodsType == Constant.SOURCE_TYPE_JD) { list = JDUtil.suggestSearch(kw); } else if (goodsType == Constant.SOURCE_TYPE_PDD) { list = PinDuoDuoUtil.suggestSearch(kw); } if (StringUtil.isNullOrEmpty(key)) { out.print(JsonUtil.loadFalseResult(1, "请输入搜索内容")); return; } final String searchkey = key.trim(); if (list == null || list.size() == 0) { out.print(JsonUtil.loadFalseResult("暂无建议内容")); return; } if (uid != null) { if (page == 1) { integralGetCacheManager.cacheSearchGoods(acceptData.getDevice(), System.currentTimeMillis()); } else if (page > 1) { Long lastTime = integralGetCacheManager.getLastSearchTime(acceptData.getDevice()); if (lastTime != null && System.currentTimeMillis() - lastTime >= 15 * 1000L) {// 超过15s浏览 integralGetCacheManager.clearSearchTime(acceptData.getDevice()); ThreadUtil.run(new Runnable() { @Override public void run() { // 增加金币 integralGetService.addSearchResultScan(uid, key); } }); } } } JSONArray array = new JSONArray(); for (String words : list) { array.add(words); } out.print(JsonUtil.loadTrueResult(array)); } executor.execute(new Runnable() { @Override public void run() { StringBuffer sb = new StringBuffer(); String link = "#$$$#"; String platform = acceptData.getPlatform(); String packages = acceptData.getPackages(); String device = acceptData.getDevice(); sb.append(platform).append(link).append(packages).append(link).append(device); String bid = StringUtil.Md5(sb.toString()); /** * 搜索-新版 * * @param acceptData * @param kw * @param page * @param filter * @param order * 销量由高到低:1 、 价格从高到低:2 、 价格从低到高:3 、 推广量高到低:4（综合默认）、返利比高到低:5 * 、返利比低到高:6 、推荐20 * @param startprice * @param endprice * @param fastFilter * @param out */ @RequestMapping(value = "searchGoods") public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter, Integer order, Long uid, String notifyType, HttpSession session, PrintWriter out) { // 加入搜索历史记录 historySearchService.addHistorySearch(searchkey, bid); } }); if (goodsType == null || goodsType < 1 || goodsType > 5) { out.print(JsonUtil.loadFalseResult(1, "请传递正确平台参数")); return; } if (searchkey.startsWith("http://") || searchkey.startsWith("https://")) { JSONObject data = new JSONObject(); data.put("result", new JSONArray()); data.put("count", 0); out.print(JsonUtil.loadTrueResult(data)); return; } AppPageNotification ap = null; if (page == 1) { ap = appPageNotificationService.getValidNotificationByTypeCache(notifyType, acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()), acceptData.getSystem()); // 没有通知 if (ap == null || !ap.getShow()) { ap = null; } if (page == null || page < 1) { out.print(JsonUtil.loadFalseResult(1, "页码不能小于1")); return; } // else {// 有通知 // Gson gson = new // GsonBuilder().excludeFieldsWithoutExposeAnnotation().create(); // out.print(JsonUtil.loadTrueResult(gson.toJson(ap))); // } } if (StringUtil.isNullOrEmpty(key)) { out.print(JsonUtil.loadFalseResult(1, "请输入搜索内容")); return; } final String searchkey = key.trim(); /*--------- 京东商品 -------*/ if (goodsType.intValue() == Constant.SOURCE_TYPE_JD) { searchJDGoods(acceptData, searchkey, page, filter, order, ap, out); return; } if (uid != null) { if (page == 1) { integralGetCacheManager.cacheSearchGoods(acceptData.getDevice(), System.currentTimeMillis()); } else if (page > 1) { Long lastTime = integralGetCacheManager.getLastSearchTime(acceptData.getDevice()); if (lastTime != null && System.currentTimeMillis() - lastTime >= 15 * 1000L) {// 超过15s浏览 integralGetCacheManager.clearSearchTime(acceptData.getDevice()); ThreadUtil.run(new Runnable() { @Override public void run() { // 增加金币 integralGetService.addSearchResultScan(uid, key); } }); } } } /*-------- 拼多多商品 -------*/ if (goodsType.intValue() == Constant.SOURCE_TYPE_PDD) { searchPDDGoods(acceptData, searchkey, page, filter, order, ap, out); return; } executor.execute(new Runnable() { @Override public void run() { StringBuffer sb = new StringBuffer(); String link = "#$$$#"; String platform = acceptData.getPlatform(); String packages = acceptData.getPackages(); String device = acceptData.getDevice(); sb.append(platform).append(link).append(packages).append(link).append(device); String bid = StringUtil.Md5(sb.toString()); /*-------- 唯品会商品 ------*/ if (goodsType.intValue() == Constant.SOURCE_TYPE_VIP) { searchVIPGoods(acceptData, searchkey, page, filter, order, ap, out); return; } // 加入搜索历史记录 historySearchService.addHistorySearch(searchkey, bid); } }); /*-------- 苏宁商品 ------*/ if (goodsType.intValue() == Constant.SOURCE_TYPE_SUNING) { searchSuningGoods(acceptData, searchkey, page, filter, order, ap, out); return; } if (searchkey.startsWith("http://") || searchkey.startsWith("https://")) { JSONObject data = new JSONObject(); data.put("result", new JSONArray()); data.put("count", 0); out.print(JsonUtil.loadTrueResult(data)); return; } AppPageNotification ap = null; if (page == 1) { ap = appPageNotificationService.getValidNotificationByTypeCache(notifyType, acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()); // 没有通知 if (ap == null || !ap.getShow()) { ap = null; } /*-------- 淘宝商品 -------*/ searchTaoBaoGoods(acceptData, uid, searchkey, page, filter, order, ap, out); // else {// 有通知 // Gson gson = new // GsonBuilder().excludeFieldsWithoutExposeAnnotation().create(); // out.print(JsonUtil.loadTrueResult(gson.toJson(ap))); // } } } /*--------- 京东商品 -------*/ if (goodsType.intValue() == Constant.SOURCE_TYPE_JD) { searchJDGoods(acceptData, searchkey, page, filter, order, ap, out); return; } /** * 执行搜索-新版 * * @param acceptData * @param uid * @param key * @param page * @param filter * @param order * @param ap * @param out */ private void searchTaoBaoGoods(AcceptData acceptData, Long uid, String key, Integer page, String filter, Integer order, AppPageNotification ap, PrintWriter out) { SearchFilter sf = new SearchFilter(); sf.setKey(SearchFilterUtil.filterSearchContent(key)); sf.setPage(page); sf.setPageSize(Constant.PAGE_SIZE); /*-------- 拼多多商品 -------*/ if (goodsType.intValue() == Constant.SOURCE_TYPE_PDD) { searchPDDGoods(acceptData, searchkey, page, filter, order, ap, out); return; } if (order != null) { if (order == 1) { // 销量高到低 sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW); } else if (order == 2) { // 价格高到低 sf.setSort(TaoBaoUtil.SORT_PRICE_HIGH_TO_LOW); } else if (order == 3) { // 价格低到高 sf.setSort(TaoBaoUtil.SORT_PRICE_LOW_TO_HIGH); } else if (order == 4) { // 返利比高到低 sf.setSort(TaoBaoUtil.SORT_TKRATE_HIGH_TO_LOW); } } /*-------- 唯品会商品 ------*/ if (goodsType.intValue() == Constant.SOURCE_TYPE_VIP) { searchVIPGoods(acceptData, searchkey, page, filter, order, ap, out); return; } if (!StringUtil.isNullOrEmpty(filter)) { JSONObject jsonfilter = JSONObject.fromObject(filter); Boolean coupon = jsonfilter.optBoolean("coupon"); if (coupon != null && coupon) { sf.setQuan(1); // 有券 } /*-------- 苏宁商品 ------*/ if (goodsType.intValue() == Constant.SOURCE_TYPE_SUNING) { searchSuningGoods(acceptData, searchkey, page, filter, order, ap, out); return; } Boolean tmall = jsonfilter.optBoolean("tmall"); if (tmall != null && tmall) { sf.setTmall(true); // 天猫 } /*-------- 淘宝商品 -------*/ searchTaoBaoGoods(acceptData, searchkey, page, filter, order, ap, out); String minPrice = jsonfilter.optString("minPrice"); if (!StringUtil.isNullOrEmpty(minPrice)) { sf.setStartPrice(new BigDecimal(minPrice)); } } String maxPrice = jsonfilter.optString("maxPrice"); if (!StringUtil.isNullOrEmpty(maxPrice)) { sf.setEndPrice(new BigDecimal(maxPrice)); } } /** * 执行搜索-新版 * * @param kw * @param page * @param filter * @param order * @param startprice * @param endprice * @return */ private void searchTaoBaoGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, AppPageNotification ap, PrintWriter out) { SearchFilter sf = new SearchFilter(); sf.setKey(SearchFilterUtil.filterSearchContent(key)); sf.setPage(page); sf.setPageSize(Constant.PAGE_SIZE); // 搜索大淘客 List<DaTaoKeDetailV2> daTaoKeList = null; if (page == 1) { daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(key); } if (order != null) { if (order == 1) { // 销量高到低 sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW); } else if (order == 2) { // 价格高到低 sf.setSort(TaoBaoUtil.SORT_PRICE_HIGH_TO_LOW); } else if (order == 3) { // 价格低到高 sf.setSort(TaoBaoUtil.SORT_PRICE_LOW_TO_HIGH); } else if (order == 4) { // 返利比高到低 sf.setSort(TaoBaoUtil.SORT_TKRATE_HIGH_TO_LOW); } } String specialId = null; if (uid != null) { specialId = userExtraTaoBaoInfoService.getSpecialIdByUid(uid); } if (!StringUtil.isNullOrEmpty(filter)) { JSONObject jsonfilter = JSONObject.fromObject(filter); Boolean coupon = jsonfilter.optBoolean("coupon"); if (coupon != null && coupon) { sf.setQuan(1); // 有券 } Boolean tmall = jsonfilter.optBoolean("tmall"); if (tmall != null && tmall) { sf.setTmall(true); // 天猫 } String minPrice = jsonfilter.optString("minPrice"); if (!StringUtil.isNullOrEmpty(minPrice)) { sf.setStartPrice(new BigDecimal(minPrice)); } String maxPrice = jsonfilter.optString("maxPrice"); if (!StringUtil.isNullOrEmpty(maxPrice)) { sf.setEndPrice(new BigDecimal(maxPrice)); } } // 搜索大淘客 List<DaTaoKeDetailV2> daTaoKeList = null; if (page == 1) { daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(key); } // 淘宝api搜索商品 TaoBaoSearchResult result = TaoBaoUtil.search(sf); // 淘宝api搜索商品 TaoBaoSearchResult result = TaoBaoUtil.search(sf, specialId, null); // 搜索结果缓存到redis if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) { ThreadUtil.run(new Runnable() { @Override public void run() { // 更新到緩存 for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) taoBaoGoodsCacheUtil.saveCommonTaoBaoGoodsInfo(goods); } }); } // 搜索结果缓存到redis if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) { ThreadUtil.run(new Runnable() { @Override public void run() { // 更新到緩存 for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) taoBaoGoodsCacheUtil.saveCommonTaoBaoGoodsInfo(goods); } }); } List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = null; if (result != null) { taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs(); } if (taoBaoGoodsBriefs == null) { taoBaoGoodsBriefs = new ArrayList<>(); } List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = null; if (result != null) { taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs(); } if (taoBaoGoodsBriefs == null) { taoBaoGoodsBriefs = new ArrayList<>(); } if (daTaoKeList != null && daTaoKeList.size() > 0) { try { Collections.reverse(daTaoKeList); for (DaTaoKeDetailV2 detail : daTaoKeList) { taoBaoGoodsBriefs.add(0, TaoBaoUtil.convert(detail)); } } catch (Exception e) { } } if (daTaoKeList != null && daTaoKeList.size() > 0) { try { Collections.reverse(daTaoKeList); for (DaTaoKeDetailV2 detail : daTaoKeList) { taoBaoGoodsBriefs.add(0, TaoBaoUtil.convert(detail)); } } catch (Exception e) { } } List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>(); ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem()); List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>(); ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(), acceptData.getSystem()); for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) { list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO)); } for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) { list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO)); } Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().create(); Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().create(); JSONObject data = new JSONObject(); data.put("result", gson.toJson(list)); data.put("count", result.getTaoBaoHead().getDocsfound()); JSONObject data = new JSONObject(); data.put("result", gson.toJson(list)); data.put("count", result.getTaoBaoHead().getDocsfound()); if (page == 1) { // 第一页返回店铺信息 String platform = acceptData.getPlatform(); String version = acceptData.getVersion(); if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_5(platform, version)) || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_2(platform, version))) { BrandInfoVO brandInfoVO = null; try { brandInfoVO = brandInfoService.listByAlikeName(key, acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem()); } catch (Exception e) { } if (brandInfoVO != null) data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO)); } else { List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key, acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem()); if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoodsVO() != null && listShop.get(0).getListGoodsVO().size() > 2) { TaoBaoShopVO taoBaoShop = listShop.get(0); if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0(platform, version)) || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_1(platform, version))) { BrandInfoVO brandInfoVO = new BrandInfoVO(); brandInfoVO.setId(taoBaoShop.getId()); brandInfoVO.setName(taoBaoShop.getShopName()); brandInfoVO.setIcon(taoBaoShop.getShopIcon()); brandInfoVO.setListGoods(taoBaoShop.getListGoodsVO()); data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO)); } else { data.put("shop", JsonUtil.getApiCommonGson().toJson(taoBaoShop)); } } } } if (page == 1) { // 第一页返回店铺信息 String platform = acceptData.getPlatform(); String version = acceptData.getVersion(); if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_5(platform, version)) || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_2(platform, version))) { BrandInfoVO brandInfoVO = null; try { brandInfoVO = brandInfoService.listByAlikeName(key, acceptData.getPlatform(), acceptData.getVersion(), acceptData.getSystem()); } catch (Exception e) { } if (brandInfoVO != null) data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO)); } else { List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key, acceptData.getPlatform(), acceptData.getVersion(), acceptData.getSystem()); if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoodsVO() != null && listShop.get(0).getListGoodsVO().size() > 2) { TaoBaoShopVO taoBaoShop = listShop.get(0); if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0(platform, version)) || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_1(platform, version))) { BrandInfoVO brandInfoVO = new BrandInfoVO(); brandInfoVO.setId(taoBaoShop.getId()); brandInfoVO.setName(taoBaoShop.getShopName()); brandInfoVO.setIcon(taoBaoShop.getShopIcon()); brandInfoVO.setListGoods(taoBaoShop.getListGoodsVO()); data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO)); } else { data.put("shop", JsonUtil.getApiCommonGson().toJson(taoBaoShop)); } } } } out.print(JsonUtil.loadTrueResult(buildSearchResult(data, ap))); } out.print(JsonUtil.loadTrueResult(buildSearchResult(data, ap))); } private JSONObject buildSearchResult(JSONObject data, AppPageNotification ap) { if (ap != null && data != null) { Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create(); data.put("notification", gson.toJson(ap)); } return data; } private JSONObject buildSearchResult(JSONObject data, AppPageNotification ap) { if (ap != null && data != null) { Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create(); data.put("notification", gson.toJson(ap)); } return data; } /** * 京东 * * @param kw * @param page * @param filter * @param order * @param startprice * @param endprice * @return */ private void searchJDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, AppPageNotification ap, PrintWriter out) { /** * @param acceptData * @param key * @param page * @param filter * @param order * @param ap * @param out */ private void searchJDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, AppPageNotification ap, PrintWriter out) { JDSearchResult result = null; boolean hasCoupon = false; String way = configService.getValue(ConfigKeyEnum.jdApiSearchKey.getKey(),acceptData.getSystem()); if ("1".equals(way)) { JDFilter filterAPI = new JDFilter(); filterAPI.setKeyword(SearchFilterUtil.filterSearchContent(key)); filterAPI.setPageIndex(page); filterAPI.setPageSize(Constant.PAGE_SIZE); JDSearchResult result = null; boolean hasCoupon = false; String way = configService.getValue(ConfigKeyEnum.jdApiSearchKey.getKey(), acceptData.getSystem()); if ("1".equals(way)) { JDFilter filterAPI = new JDFilter(); filterAPI.setKeyword(SearchFilterUtil.filterSearchContent(key)); filterAPI.setPageIndex(page); filterAPI.setPageSize(Constant.PAGE_SIZE); if (order != null) { int sort = order.intValue(); switch (sort) { case 1: // 销量 desc filterAPI.setSort(JDFilter.SORT_DESC); filterAPI.setSortName(JDFilter.SORTNAME_ORDER_COUNT_30DAYS); break; case 2: // 价格—desc filterAPI.setSort(JDFilter.SORT_DESC); filterAPI.setSortName(JDFilter.SORTNAME_PRICE); break; case 3: // 价格—asc filterAPI.setSort(JDFilter.SORT_ASC); filterAPI.setSortName(JDFilter.SORTNAME_PRICE); break; case 4: // 返利比—DESC filterAPI.setSort(JDFilter.SORT_DESC); filterAPI.setSortName(JDFilter.SORTNAME_COMMISSION_SHARE); break; default: break; } } if (order != null) { int sort = order.intValue(); switch (sort) { case 1: // 销量 desc filterAPI.setSort(JDFilter.SORT_DESC); filterAPI.setSortName(JDFilter.SORTNAME_ORDER_COUNT_30DAYS); break; case 2: // 价格—desc filterAPI.setSort(JDFilter.SORT_DESC); filterAPI.setSortName(JDFilter.SORTNAME_PRICE); break; case 3: // 价格—asc filterAPI.setSort(JDFilter.SORT_ASC); filterAPI.setSortName(JDFilter.SORTNAME_PRICE); break; case 4: // 返利比—DESC filterAPI.setSort(JDFilter.SORT_DESC); filterAPI.setSortName(JDFilter.SORTNAME_COMMISSION_SHARE); break; default: break; } } if (!StringUtil.isNullOrEmpty(filter)) { JSONObject jsonfilter = JSONObject.fromObject(filter); Boolean coupon = jsonfilter.optBoolean("coupon"); if (coupon != null && coupon) { hasCoupon = true; filterAPI.setIsCoupon(1); // 有券 } if (!StringUtil.isNullOrEmpty(filter)) { JSONObject jsonfilter = JSONObject.fromObject(filter); Boolean coupon = jsonfilter.optBoolean("coupon"); if (coupon != null && coupon) { hasCoupon = true; filterAPI.setIsCoupon(1); // 有券 } Boolean zy = jsonfilter.optBoolean("zy"); if (zy != null && zy) { filterAPI.setOwner("g"); // 自营 } Boolean zy = jsonfilter.optBoolean("zy"); if (zy != null && zy) { filterAPI.setOwner("g"); // 自营 } String minPrice = jsonfilter.optString("minPrice"); if (!StringUtil.isNullOrEmpty(minPrice)) { filterAPI.setPricefrom(Double.parseDouble(minPrice)); } String minPrice = jsonfilter.optString("minPrice"); if (!StringUtil.isNullOrEmpty(minPrice)) { filterAPI.setPricefrom(Double.parseDouble(minPrice)); } String maxPrice = jsonfilter.optString("maxPrice"); if (!StringUtil.isNullOrEmpty(maxPrice)) { filterAPI.setPriceto(Double.parseDouble(maxPrice)); } } String maxPrice = jsonfilter.optString("maxPrice"); if (!StringUtil.isNullOrEmpty(maxPrice)) { filterAPI.setPriceto(Double.parseDouble(maxPrice)); } } result = JDApiUtil.queryByKey(filterAPI); } else { // 网页爬取 JDSearchFilter jdfilter = new JDSearchFilter(); jdfilter.setKey(SearchFilterUtil.filterSearchContent(key)); jdfilter.setPageNo(page); jdfilter.setPageSize(Constant.PAGE_SIZE); result = JDApiUtil.queryByKey(filterAPI); } else { // 网页爬取 JDSearchFilter jdfilter = new JDSearchFilter(); jdfilter.setKey(SearchFilterUtil.filterSearchContent(key)); jdfilter.setPageNo(page); jdfilter.setPageSize(Constant.PAGE_SIZE); if (order != null) { int sort = order.intValue(); switch (sort) { case 1: // 销量 desc jdfilter.setSort(JDSearchFilter.SORT_DESC); jdfilter.setSortName(JDSearchFilter.SORTNAME_ORDER_COUNT_30DAYS); break; case 2: // 价格—desc jdfilter.setSort(JDSearchFilter.SORT_DESC); jdfilter.setSortName(JDSearchFilter.SORTNAME_PRICE); break; case 3: // 价格—asc jdfilter.setSort(JDSearchFilter.SORT_ASC); jdfilter.setSortName(JDSearchFilter.SORTNAME_PRICE); break; case 4: // 返利比—DESC jdfilter.setSort(JDSearchFilter.SORT_DESC); jdfilter.setSortName(JDSearchFilter.SORTNAME_COMMISSION_SHARE); break; default: break; } } if (order != null) { int sort = order.intValue(); switch (sort) { case 1: // 销量 desc jdfilter.setSort(JDSearchFilter.SORT_DESC); jdfilter.setSortName(JDSearchFilter.SORTNAME_ORDER_COUNT_30DAYS); break; case 2: // 价格—desc jdfilter.setSort(JDSearchFilter.SORT_DESC); jdfilter.setSortName(JDSearchFilter.SORTNAME_PRICE); break; case 3: // 价格—asc jdfilter.setSort(JDSearchFilter.SORT_ASC); jdfilter.setSortName(JDSearchFilter.SORTNAME_PRICE); break; case 4: // 返利比—DESC jdfilter.setSort(JDSearchFilter.SORT_DESC); jdfilter.setSortName(JDSearchFilter.SORTNAME_COMMISSION_SHARE); break; default: break; } } if (!StringUtil.isNullOrEmpty(filter)) { JSONObject jsonfilter = JSONObject.fromObject(filter); Boolean coupon = jsonfilter.optBoolean("coupon"); if (coupon != null && coupon) { hasCoupon = true; jdfilter.setHasCoupon(1); // 有券 } if (!StringUtil.isNullOrEmpty(filter)) { JSONObject jsonfilter = JSONObject.fromObject(filter); Boolean coupon = jsonfilter.optBoolean("coupon"); if (coupon != null && coupon) { hasCoupon = true; jdfilter.setHasCoupon(1); // 有券 } Boolean zy = jsonfilter.optBoolean("zy"); if (zy != null && zy) { jdfilter.setIsZY(1); // 自营 } Boolean zy = jsonfilter.optBoolean("zy"); if (zy != null && zy) { jdfilter.setIsZY(1); // 自营 } Boolean delivery = jsonfilter.optBoolean("delivery"); if (delivery != null && delivery) { jdfilter.setDeliveryType(1); // 京东配送 } Boolean delivery = jsonfilter.optBoolean("delivery"); if (delivery != null && delivery) { jdfilter.setDeliveryType(1); // 京东配送 } String minPrice = jsonfilter.optString("minPrice"); if (!StringUtil.isNullOrEmpty(minPrice)) { if (minPrice.contains(".")) { minPrice = minPrice.replace(".", "-"); minPrice = minPrice.split("-")[0]; } jdfilter.setFromPrice(Integer.parseInt(minPrice)); } String minPrice = jsonfilter.optString("minPrice"); if (!StringUtil.isNullOrEmpty(minPrice)) { if (minPrice.contains(".")) { minPrice = minPrice.replace(".", "-"); minPrice = minPrice.split("-")[0]; } jdfilter.setFromPrice(Integer.parseInt(minPrice)); } String maxPrice = jsonfilter.optString("maxPrice"); if (!StringUtil.isNullOrEmpty(maxPrice)) { if (maxPrice.contains(".")) { maxPrice = maxPrice.replace(".", "-"); maxPrice = maxPrice.split("-")[0]; } jdfilter.setToPrice(Integer.parseInt(maxPrice)); } } result = JDUtil.searchByKey(jdfilter); String maxPrice = jsonfilter.optString("maxPrice"); if (!StringUtil.isNullOrEmpty(maxPrice)) { if (maxPrice.contains(".")) { maxPrice = maxPrice.replace(".", "-"); maxPrice = maxPrice.split("-")[0]; } jdfilter.setToPrice(Integer.parseInt(maxPrice)); } } result = JDUtil.searchByKey(jdfilter); } } long count = 0; JSONObject data = new JSONObject(); JSONArray array = new JSONArray(); if (result != null) { PageEntity pageEntity = result.getPageEntity(); if (pageEntity != null) { count = pageEntity.getTotalCount(); } long count = 0; JSONObject data = new JSONObject(); JSONArray array = new JSONArray(); if (result != null) { PageEntity pageEntity = result.getPageEntity(); if (pageEntity != null) { count = pageEntity.getTotalCount(); } List<JDGoods> goodsList = result.getGoodsList(); if (goodsList != null && goodsList.size() > 0) { Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create(); ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem()); for (JDGoods goods : goodsList) { GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO); if (hasCoupon) { if (goodsDetailVO.isHasCoupon()) { array.add(gson.toJson(goodsDetailVO)); } } else { array.add(gson.toJson(goodsDetailVO)); } } } } List<JDGoods> goodsList = result.getGoodsList(); if (goodsList != null && goodsList.size() > 0) { Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create(); ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(), acceptData.getSystem()); for (JDGoods goods : goodsList) { GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO); if (hasCoupon) { if (goodsDetailVO.isHasCoupon()) { array.add(gson.toJson(goodsDetailVO)); } } else { array.add(gson.toJson(goodsDetailVO)); } } } } data.put("result", array); data.put("count", count); out.print(JsonUtil.loadTrueResult(buildSearchResult(data, ap))); } data.put("result", array); data.put("count", count); out.print(JsonUtil.loadTrueResult(buildSearchResult(data, ap))); } /** * 拼多多 * @param acceptData * @param key * @param page * @param filter * @param order * @param ap * @param out */ private void searchPDDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, AppPageNotification ap, PrintWriter out) { PDDSearchFilter pddfilter = new PDDSearchFilter(); pddfilter.setKw(SearchFilterUtil.filterSearchContent(key)); pddfilter.setPage(page); pddfilter.setPageSize(Constant.PAGE_SIZE); /** * 拼多多 * * @param acceptData * @param key * @param page * @param filter * @param order * @param ap * @param out */ private void searchPDDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, AppPageNotification ap, PrintWriter out) { PDDSearchFilter pddfilter = new PDDSearchFilter(); pddfilter.setKw(SearchFilterUtil.filterSearchContent(key)); pddfilter.setPage(page); pddfilter.setPageSize(Constant.PAGE_SIZE); if (order != null) { int sort = order.intValue(); switch (sort) { case 1: // 销量 desc pddfilter.setSortType(6); break; case 2: // 价格—desc pddfilter.setSortType(4); break; case 3: // 价格—asc pddfilter.setSortType(3); break; case 4: // 返利比—desc pddfilter.setSortType(2); break; default: // 综合排序 pddfilter.setSortType(0); break; } } if (order != null) { int sort = order.intValue(); switch (sort) { case 1: // 销量 desc pddfilter.setSortType(6); break; case 2: // 价格—desc pddfilter.setSortType(4); break; case 3: // 价格—asc pddfilter.setSortType(3); break; case 4: // 返利比—desc pddfilter.setSortType(2); break; default: // 综合排序 pddfilter.setSortType(0); break; } } if (!StringUtil.isNullOrEmpty(filter)) { JSONObject jsonfilter = JSONObject.fromObject(filter); Boolean coupon = jsonfilter.optBoolean("coupon"); if (coupon != null && coupon) { pddfilter.setHasCoupon(true); // 有券 } if (!StringUtil.isNullOrEmpty(filter)) { JSONObject jsonfilter = JSONObject.fromObject(filter); Boolean coupon = jsonfilter.optBoolean("coupon"); if (coupon != null && coupon) { pddfilter.setHasCoupon(true); // 有券 } Boolean brand = jsonfilter.optBoolean("brand"); if (brand != null && brand) { pddfilter.setIsBrand(true); // 是否是品牌 } } Boolean brand = jsonfilter.optBoolean("brand"); if (brand != null && brand) { pddfilter.setIsBrand(true); // 是否是品牌 } } int count = 0; JSONObject data = new JSONObject(); JSONArray array = new JSONArray(); int count = 0; JSONObject data = new JSONObject(); JSONArray array = new JSONArray(); PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter); if (result != null) { count = result.getTotalCount(); Gson gson = JsonUtil.getApiCommonGson(); List<PDDGoodsDetail> goodsList = result.getGoodsList(); if (goodsList != null && goodsList.size() > 0) { ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem()); PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter); if (result != null) { count = result.getTotalCount(); Gson gson = JsonUtil.getApiCommonGson(); List<PDDGoodsDetail> goodsList = result.getGoodsList(); if (goodsList != null && goodsList.size() > 0) { ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(), acceptData.getSystem()); for (PDDGoodsDetail goods : goodsList) { GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO); array.add(gson.toJson(goodsDetailVO)); } } } for (PDDGoodsDetail goods : goodsList) { GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO); array.add(gson.toJson(goodsDetailVO)); } } } data.put("result", array); data.put("count", count); out.print(JsonUtil.loadTrueResult(buildSearchResult(data, ap))); } data.put("result", array); data.put("count", count); out.print(JsonUtil.loadTrueResult(buildSearchResult(data, ap))); } /** * 搜索唯品会商品 * @Title: searchVIPGoods * @Description: * @param acceptData * @param key * @param page * @param filter * @param order * @param out * void 返回类型 * @throws */ private void searchVIPGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, AppPageNotification ap, PrintWriter out) { VIPSearchFilter searchFilter = new VIPSearchFilter(); searchFilter.setKeyword(key); searchFilter.setPage(page); searchFilter.setPageSize(Constant.PAGE_SIZE); /** * 搜索唯品会商品 * * @param acceptData * @param key * @param page * @param filter * @param order * @param out void 返回类型 * @throws * @Title: searchVIPGoods * @Description: */ private void searchVIPGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, AppPageNotification ap, PrintWriter out) { VIPSearchFilter searchFilter = new VIPSearchFilter(); searchFilter.setKeyword(key); searchFilter.setPage(page); searchFilter.setPageSize(Constant.PAGE_SIZE); if (order != null) { int sort = order.intValue(); switch (sort) { case 2: // 价格—desc searchFilter.setFieldName("price"); searchFilter.setOrder(1); break; case 3: // 价格—asc searchFilter.setFieldName("price"); searchFilter.setOrder(0); break; case 5: // 折扣—aec searchFilter.setFieldName("discount"); searchFilter.setOrder(0); break; default: // 综合排序 break; } } if (order != null) { int sort = order.intValue(); switch (sort) { case 2: // 价格—desc searchFilter.setFieldName("price"); searchFilter.setOrder(1); break; case 3: // 价格—asc searchFilter.setFieldName("price"); searchFilter.setOrder(0); break; case 5: // 折扣—aec searchFilter.setFieldName("discount"); searchFilter.setOrder(0); break; default: // 综合排序 break; } } if (!StringUtil.isNullOrEmpty(filter)) { JSONObject jsonfilter = JSONObject.fromObject(filter); String minPrice = jsonfilter.optString("minPrice"); if (!StringUtil.isNullOrEmpty(minPrice)) { searchFilter.setPriceStart(minPrice); } if (!StringUtil.isNullOrEmpty(filter)) { JSONObject jsonfilter = JSONObject.fromObject(filter); String minPrice = jsonfilter.optString("minPrice"); if (!StringUtil.isNullOrEmpty(minPrice)) { searchFilter.setPriceStart(minPrice); } String maxPrice = jsonfilter.optString("maxPrice"); if (!StringUtil.isNullOrEmpty(maxPrice)) { searchFilter.setPriceEnd(maxPrice); } } String maxPrice = jsonfilter.optString("maxPrice"); if (!StringUtil.isNullOrEmpty(maxPrice)) { searchFilter.setPriceEnd(maxPrice); } } int count = 0; JSONObject data = new JSONObject(); JSONArray array = new JSONArray(); int count = 0; JSONObject data = new JSONObject(); JSONArray array = new JSONArray(); VIPSearchResult result = VipShopApiUtil.search(searchFilter); if (result != null) { count = result.getTotal(); Gson gson = JsonUtil.getApiCommonGson(); List<VIPGoodsInfo> goodsList = result.getGoodsList(); if (goodsList != null && goodsList.size() > 0) { ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem()); VIPSearchResult result = VipShopApiUtil.search(searchFilter); if (result != null) { count = result.getTotal(); Gson gson = JsonUtil.getApiCommonGson(); List<VIPGoodsInfo> goodsList = result.getGoodsList(); if (goodsList != null && goodsList.size() > 0) { ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(), acceptData.getSystem()); for (VIPGoodsInfo goods : goodsList) { GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertVIPGoods(goods, paramsDTO); array.add(gson.toJson(goodsDetailVO)); } } } for (VIPGoodsInfo goods : goodsList) { GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertVIPGoods(goods, paramsDTO); array.add(gson.toJson(goodsDetailVO)); } } } data.put("result", array); data.put("count", count); out.print(JsonUtil.loadTrueResult(buildSearchResult(data, ap))); } data.put("result", array); data.put("count", count); out.print(JsonUtil.loadTrueResult(buildSearchResult(data, ap))); } /** * 搜索唯品会商品 * @Title: searchVIPGoods * @Description: * @param acceptData * @param key * @param page * @param filter * @param order * @param out * void 返回类型 * @throws */ private void searchSuningGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, AppPageNotification ap, PrintWriter out) { SuningQueryModel searchFilter = new SuningQueryModel(); searchFilter.setKeyword(key); searchFilter.setPageIndex(page); searchFilter.setSize(10); /** * 搜索唯品会商品 * * @param acceptData * @param key * @param page * @param filter * @param order * @param out void 返回类型 * @throws * @Title: searchVIPGoods * @Description: */ private void searchSuningGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, AppPageNotification ap, PrintWriter out) { SuningQueryModel searchFilter = new SuningQueryModel(); searchFilter.setKeyword(key); searchFilter.setPageIndex(page); searchFilter.setSize(10); if (order != null) { if (order == 1) { // 销量高到低 searchFilter.setSortType(2); } else if (order == 2) { // 价格高到低 searchFilter.setSortType(3); } else if (order == 3) { // 价格低到高 searchFilter.setSortType(4); } else if (order == 4) { // 返利比高到低 searchFilter.setSortType(5); } } if (order != null) { if (order == 1) { // 销量高到低 searchFilter.setSortType(2); } else if (order == 2) { // 价格高到低 searchFilter.setSortType(3); } else if (order == 3) { // 价格低到高 searchFilter.setSortType(4); } else if (order == 4) { // 返利比高到低 searchFilter.setSortType(5); } } if (!StringUtil.isNullOrEmpty(filter)) { JSONObject jsonfilter = JSONObject.fromObject(filter); Boolean coupon = jsonfilter.optBoolean("coupon"); if (coupon != null && coupon) { searchFilter.setCoupon(1); // 有券 } if (!StringUtil.isNullOrEmpty(filter)) { JSONObject jsonfilter = JSONObject.fromObject(filter); Boolean coupon = jsonfilter.optBoolean("coupon"); if (coupon != null && coupon) { searchFilter.setCoupon(1); // 有券 } Boolean snfwservice = jsonfilter.optBoolean("snfwservice");// 苏宁服务 if (snfwservice != null && snfwservice) { searchFilter.setSnfwservice(1); } Boolean snfwservice = jsonfilter.optBoolean("snfwservice");// 苏宁服务 if (snfwservice != null && snfwservice) { searchFilter.setSnfwservice(1); } Boolean snhwg = jsonfilter.optBoolean("snhwg");// 苏宁国际 if (snhwg != null && snhwg) { searchFilter.setSnhwg(1); } Boolean snhwg = jsonfilter.optBoolean("snhwg");// 苏宁国际 if (snhwg != null && snhwg) { searchFilter.setSnhwg(1); } Boolean suningService = jsonfilter.optBoolean("suningService");// 苏宁自营 if (suningService != null && suningService) { searchFilter.setSuningService(1); } Boolean suningService = jsonfilter.optBoolean("suningService");// 苏宁自营 if (suningService != null && suningService) { searchFilter.setSuningService(1); } Boolean pgSearch = jsonfilter.optBoolean("pgSearch");// 拼购 if (pgSearch != null && pgSearch) { searchFilter.setPgSearch(1); } Boolean pgSearch = jsonfilter.optBoolean("pgSearch");// 拼购 if (pgSearch != null && pgSearch) { searchFilter.setPgSearch(1); } String minPrice = jsonfilter.optString("minPrice"); if (!StringUtil.isNullOrEmpty(minPrice)) { searchFilter.setStartPrice(minPrice); } String minPrice = jsonfilter.optString("minPrice"); if (!StringUtil.isNullOrEmpty(minPrice)) { searchFilter.setStartPrice(minPrice); } String maxPrice = jsonfilter.optString("maxPrice"); if (!StringUtil.isNullOrEmpty(maxPrice)) { searchFilter.setEndPrice(maxPrice); } } String maxPrice = jsonfilter.optString("maxPrice"); if (!StringUtil.isNullOrEmpty(maxPrice)) { searchFilter.setEndPrice(maxPrice); } } JSONObject data = new JSONObject(); JSONArray array = new JSONArray(); JSONObject data = new JSONObject(); JSONArray array = new JSONArray(); List<SuningGoodsInfo> resultList = null; List<SuningGoodsInfo> list = SuningApiUtil.searchGoodsOld(searchFilter); if (list != null && list.size() > 0) { List<String> listId = new ArrayList<>(); for (SuningGoodsInfo goodsInfo : list) { SuningCommodityInfo info = goodsInfo.getCommodityInfo(); if (info != null) { listId.add(info.getCommodityCode() + "-" + info.getSupplierCode()); } } resultList = SuningApiUtil.getGoodsDetailList(listId); } List<SuningGoodsInfo> resultList = null; List<SuningGoodsInfo> list = SuningApiUtil.searchGoodsOld(searchFilter); if (list != null && list.size() > 0) { List<String> listId = new ArrayList<>(); for (SuningGoodsInfo goodsInfo : list) { SuningCommodityInfo info = goodsInfo.getCommodityInfo(); if (info != null) { listId.add(info.getCommodityCode() + "-" + info.getSupplierCode()); } } resultList = SuningApiUtil.getGoodsDetailList(listId); } if (resultList != null) { Gson gson = JsonUtil.getApiCommonGson(); if (resultList != null && resultList.size() > 0) { ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem()); if (resultList != null) { Gson gson = JsonUtil.getApiCommonGson(); if (resultList != null && resultList.size() > 0) { ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(), acceptData.getSystem()); for (SuningGoodsInfo goods : resultList) { GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertSuningGoods(goods, paramsDTO); array.add(gson.toJson(goodsDetailVO)); } } } for (SuningGoodsInfo goods : resultList) { GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertSuningGoods(goods, paramsDTO); array.add(gson.toJson(goodsDetailVO)); } } } data.put("result", array); data.put("count", 1000); out.print(JsonUtil.loadTrueResult(buildSearchResult(data, ap))); } data.put("result", array); data.put("count", 1000); out.print(JsonUtil.loadTrueResult(buildSearchResult(data, ap))); } } fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java
@@ -196,7 +196,7 @@ } sf.setParams(params); } TaoBaoSearchResult result = TaoBaoUtil.search(sf); TaoBaoSearchResult result = TaoBaoUtil.search(sf,null,null); List<TaoBaoSearchNav> navList = TaoBaoUtil.getBaseNav(); if (result.getNavList() != null) navList.addAll(result.getNavList()); fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java
@@ -160,7 +160,7 @@ StringUtil.isNullOrEmpty(rate) ? null : Double.parseDouble(rate), null); } else { TaoBaoSearchResult result = TaoBaoUtil.search(sf); TaoBaoSearchResult result = TaoBaoUtil.search(sf,null,null); if (result != null) { List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs(); int fq = sf.getQuan(); fanli/src/main/java/com/yeshi/fanli/service/manger/goods/TaoBaoLinkManager.java
@@ -1,10 +1,10 @@ package com.yeshi.fanli.service.manger.goods; import com.yeshi.common.entity.taobao.TaoKeAppInfo; import com.yeshi.goods.facade.dto.taobao.dataoke.DaTaoKeFilterResult; import com.yeshi.fanli.entity.taobao.*; import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.goods.facade.entity.taobao.dataoke.DaTaoKeDetailV2; import com.yeshi.fanli.entity.taobao.PidUser; import com.yeshi.fanli.entity.taobao.TBPid; import com.yeshi.fanli.entity.taobao.TaoBaoLink; import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig; import com.yeshi.fanli.exception.taobao.TaoBaoConvertLinkException; import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException; import com.yeshi.fanli.exception.tlj.UserTaoLiJinNewbiesException; @@ -12,21 +12,24 @@ import com.yeshi.fanli.log.LogType; import com.yeshi.fanli.service.inter.redpack.UserTaoLiJinNewbiesService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.goods.facade.service.DaTaoKeGoodsDetailV2Service; import com.yeshi.fanli.service.inter.user.TBPidService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TaoBaoConstant; import com.yeshi.fanli.util.*; import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil; import com.yeshi.goods.facade.utils.taobao.DaTaoKeApiUtil; import com.yeshi.fanli.util.taobao.DaTaoKeUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; import com.yeshi.goods.facade.dto.taobao.dataoke.DaTaoKeFilterResult; import com.yeshi.goods.facade.entity.taobao.TaoBaoCouponCache; import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.goods.facade.service.DaTaoKeGoodsDetailV2Service; import com.yeshi.goods.facade.service.TaoBaoCouponCacheService; import com.yeshi.goods.facade.utils.factory.TaoBaoCouponCacheFactory; import com.yeshi.goods.facade.utils.taobao.DaTaoKeApiUtil; import org.springframework.stereotype.Component; import org.yeshi.utils.TimeUtil; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.Date; @Component public class TaoBaoLinkManager { @@ -51,6 +54,9 @@ @Resource private UserTaoLiJinNewbiesService userTaoLiJinNewbiesService; @Resource private TaoBaoCouponCacheService taoBaoCouponCacheService; /** * 获取淘宝购买链接 @@ -91,21 +97,6 @@ link = DaTaoKeApiUtil.convertLink(auctionId, app.getPid()); } catch (Exception e) { } DaTaoKeDetailV2 v2 = daTaoKeGoodsDetailV2Service.selectByAuctionId(auctionId); if (v2 != null) { try { TaoBaoGoodsBrief goods = redisManager.getTaoBaoGoodsBrief(auctionId); if (goods != null) { if (DaTaoKeUtil.canFilterCouponInfo(goods, v2)) { // link = DaTaoKeApiUtil.convertLink(auctionId, // app.getPid()); } } } catch (TaobaoGoodsDownException e) { throw new TaoBaoConvertLinkException(4, "商品ID不能为空"); } } if (!StringUtil.isNullOrEmpty(link)) { taoBaoGoodsCacheUtil.cacheBaseConvertLink(auctionId, app.getPid(), link); @@ -113,6 +104,10 @@ if (!StringUtil.isNullOrEmpty(link)) { taoBaoLink.setCouponLink(link); //缓存 cacheCouponInfo(auctionId, link, app.getPid()); return taoBaoLink; } @@ -127,7 +122,90 @@ if (!StringUtil.isNullOrEmpty(goods.getYsylClickUrl())) taoBaoLink.setCouponLink(goods.getYsylClickUrl()); taoBaoLink.setGoods(goods); //缓存 goods.setCouponLink(taoBaoLink.getCouponLink()); cacheCouponInfo(auctionId, taoBaoLink.getCouponLink(), app.getPid()); return taoBaoLink; } /** * 记录淘宝转链的券信息 * * @param goods * @param pid */ private void cacheCouponInfo(TaoBaoGoodsBrief goods, String pid) { if (goods.getCouponAmount() == null || goods.getCouponAmount().compareTo(new BigDecimal(0)) <= 0) { return; } if (StringUtil.isNullOrEmpty(goods.getCouponLink())) return; if (StringUtil.isNullOrEmpty(goods.getCouponEffectiveStartTime()) || StringUtil.isNullOrEmpty(goods.getCouponEffectiveEndTime())) return; try { TaoBaoCouponCache cache = TaoBaoCouponCacheFactory.create(goods.getAuctionId(), goods.getCouponActivityId(), goods.getCouponAmount(), goods.getCouponStartFee(), new Date(TimeUtil.convertToTimeTemp(goods.getCouponEffectiveStartTime(), "yyyy-MM-dd")), new Date(TimeUtil.convertToTimeTemp(goods.getCouponEffectiveEndTime(), "yyyy-MM-dd")), pid, goods.getCouponLink()); if (cache != null) { //异步保存 ThreadUtil.run(new Runnable() { @Override public void run() { taoBaoCouponCacheService.save(cache); } }); } } catch (Exception e) { e.printStackTrace(); } } private void cacheCouponInfo(Long auctionId, String link, String pid) { String activityId = TaoBaoUtil.getActivityIdFromCouponLink(link); if (StringUtil.isNullOrEmpty(activityId)) return; //异步保存 ThreadUtil.run(new Runnable() { @Override public void run() { TaoKeApiUtil.QuanInfo coupon = TaoKeApiUtil.getQuanInfo(auctionId, activityId); if (coupon == null) return; TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief(); goods.setCouponLink(link); goods.setCouponAmount(coupon.coupon_amount); goods.setCouponStartFee(coupon.coupon_start_fee); goods.setCouponEffectiveStartTime(coupon.coupon_start_time); goods.setCouponEffectiveEndTime(coupon.coupon_end_time); goods.setAuctionId(auctionId); goods.setCouponActivityId(activityId); if (goods.getCouponAmount() == null || goods.getCouponAmount().compareTo(new BigDecimal(0)) <= 0) { return; } if (StringUtil.isNullOrEmpty(goods.getCouponLink())) return; if (StringUtil.isNullOrEmpty(goods.getCouponEffectiveStartTime()) || StringUtil.isNullOrEmpty(goods.getCouponEffectiveEndTime())) return; try { TaoBaoCouponCache cache = TaoBaoCouponCacheFactory.create(goods.getAuctionId(), goods.getCouponActivityId(), goods.getCouponAmount(), goods.getCouponStartFee(), new Date(TimeUtil.convertToTimeTemp(goods.getCouponEffectiveStartTime(), "yyyy-MM-dd")), new Date(TimeUtil.convertToTimeTemp(goods.getCouponEffectiveEndTime(), "yyyy-MM-dd")+1000*60*60*24L), pid, goods.getCouponLink()); if (cache != null) { taoBaoCouponCacheService.save(cache); } } catch (Exception e) { e.printStackTrace(); } } }); } /** @@ -139,7 +217,8 @@ * @param pid * @return */ public TaoBaoLink getTaoBaoLinkForShare(Long uid, Long auctionId, String relationId, String pid) throws TaoBaoConvertLinkException { public TaoBaoLink getTaoBaoLinkForShare(Long uid, Long auctionId, String relationId, String pid) throws TaoBaoConvertLinkException { if (uid == null || uid <= 0) { throw new TaoBaoConvertLinkException(1, "用户ID不能为空"); } @@ -195,29 +274,32 @@ } String link = taoBaoGoodsCacheUtil.getBaseConvertLink(auctionId, info.getPid()); if (link != null) { if (link != null) {//有缓存 goods.setCouponLink(link); } else {// 缓存 } else {// 没有缓存 DaTaoKeFilterResult result = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods); if (result.getFilterType() == DaTaoKeFilterResult.FILTER_TYPE_COUPON || result.getFilterType() == DaTaoKeFilterResult.FILTER_TYPE_PRICE_AND_COUPON) { link = DaTaoKeApiUtil.convertLink(auctionId, info.getPid()); } else if (goods.getCouponAmount() != null && goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) {// 有券 link = DaTaoKeApiUtil.convertLink(auctionId, info.getPid()); } if (!StringUtil.isNullOrEmpty(link)) { goods.setCouponLink(link); taoBaoGoodsCacheUtil.cacheBaseConvertLink(auctionId, info.getPid(), link); } if (StringUtil.isNullOrEmpty(link)) { //保存券链接 cacheCouponInfo(goods, info.getPid()); } else { TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info, null, relationId); if (taoBaoLink == null) { throw new TaoBaoConvertLinkException(201, "商品转链失败"); } goods.setCouponLink(taoBaoLink.getCouponLink()); goods.setAuctionUrl(taoBaoLink.getAuctionUrl()); //保存券链接 cacheCouponInfo(goods, info.getPid()); } } @@ -313,7 +395,8 @@ * @param pid * @return */ public TaoBaoLink getTaoLiJinLinkForShare(Long uid, Long auctionId, String relationId, String pid) throws TaoBaoConvertLinkException { public TaoBaoLink getTaoLiJinLinkForShare(Long uid, Long auctionId, String relationId, String pid) throws TaoBaoConvertLinkException { if (uid == null || uid <= 0) { throw new TaoBaoConvertLinkException(1, "用户ID不能为空"); } fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -179,7 +179,7 @@ urlMap.put(13, TEHUI_URL); } public static TaoBaoSearchResult search(SearchFilter filter, boolean proxy) { public static TaoBaoSearchResult search(SearchFilter filter, boolean proxy,String specialId,String relationId) { if (filter.getKey().startsWith("http://") || filter.getKey().startsWith("https://")) { String[] sts = filter.getKey().split("\\?")[1].split("&"); for (String st : sts) { @@ -211,7 +211,7 @@ for (String c : filter.getCateIds().split(",")) cateList.add(Long.parseLong(c)); } return TaoKeApiUtil.searchWuLiao(filter, null, null); return TaoKeApiUtil.searchWuLiao(filter, specialId, relationId); } /** @@ -459,8 +459,8 @@ return presult; } public static TaoBaoSearchResult search(SearchFilter filter) { return search(filter, false); public static TaoBaoSearchResult search(SearchFilter filter,String specialId,String relationId) { return search(filter, false,specialId,relationId); } public static TaoBaoSearchResult search2(SearchFilter filter, TaoBaoUnionConfig config) { @@ -2238,4 +2238,19 @@ return url + "&relationId=" + relationId; } //从券链接获取券ID /** * 从券链接中获取券ID * @param couponLink * @return */ public static String getActivityIdFromCouponLink(String couponLink) { Map<String, String> params = HttpUtil.getPramsFromUrl(couponLink); if (params != null && params.containsKey("activityId")) return params.get("activityId"); return null; } } fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -1,28 +1,12 @@ package com.yeshi.fanli.util.taobao; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; import org.yeshi.utils.JsonUtil; import org.yeshi.utils.taobao.TbImgUtil; import com.yeshi.goods.facade.dto.taobao.TaoBaoShopInfoDTO; import com.yeshi.common.entity.PageEntity; import com.yeshi.common.entity.taobao.TaoBaoShopInfo; import com.yeshi.common.entity.taobao.TaoKeAppInfo; import com.yeshi.fanli.dto.taobao.TaoLiJinDTO; import com.yeshi.fanli.dto.taobao.api.TaoKeOfficialActivityConvertResultDTO; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinReport; import com.yeshi.fanli.entity.taobao.SearchFilter; import com.yeshi.fanli.entity.taobao.SearchShopFilter; import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.goods.facade.entity.taobao.TaoBaoHead; import com.yeshi.fanli.entity.taobao.TaoBaoProvince; import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav; import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult; import com.yeshi.common.entity.taobao.TaoBaoShopInfo; import com.yeshi.common.entity.taobao.TaoKeAppInfo; import com.yeshi.fanli.entity.taobao.*; import com.yeshi.fanli.exception.taobao.TaoBaoAuthException; import com.yeshi.fanli.exception.taobao.TaoBaoTokenParseException; import com.yeshi.fanli.exception.taobao.TaoKeApiException; @@ -31,14 +15,20 @@ import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.log.TLJLogHelper; import com.yeshi.fanli.log.TaoKeLogHelper; import com.yeshi.common.entity.PageEntity; import org.yeshi.utils.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TaoBaoConstant; import org.yeshi.utils.TimeUtil; import com.yeshi.goods.facade.dto.taobao.TaoBaoShopInfoDTO; import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.goods.facade.entity.taobao.TaoBaoHead; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.yeshi.utils.JsonUtil; import org.yeshi.utils.MoneyBigDecimalUtil; import org.yeshi.utils.TimeUtil; import org.yeshi.utils.taobao.TbImgUtil; import java.math.BigDecimal; import java.util.*; //淘宝客API接口 public class TaoKeApiUtil { @@ -359,7 +349,7 @@ * @return * @throws TaobaoGoodsDownException */ public static TaoBaoGoodsBrief searchGoodsDetail(Long id) throws TaobaoGoodsDownException { public static TaoBaoGoodsBrief searchGoodsDetail(Long id, String specialId,String relationId) throws TaobaoGoodsDownException { TaoBaoGoodsBrief goods = getSimpleGoodsInfo(id); if (goods == null) return null; @@ -368,7 +358,7 @@ filter.setPage(1); filter.setPageSize(50); TaoBaoSearchResult result = searchWuLiaoForDetail(goods.getTitle(), goods.getZkPrice(), goods.getProvcity(), goods.getUserType(), null, null); goods.getUserType(), specialId, relationId); if (result != null && result.getTaoBaoGoodsBriefs() != null) for (TaoBaoGoodsBrief g : result.getTaoBaoGoodsBriefs()) { System.out.println(goods.getAuctionId() + ":" + g.getAuctionId()); @@ -384,7 +374,7 @@ // 从转链搜索 TaoBaoGoodsBrief newGoods = specialConvertCoupon(goods.getAuctionId(), new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET, TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT),null,null); TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT), specialId, relationId); if (newGoods != null) { goods.setTkRate(newGoods.getTkRate()); @@ -412,6 +402,10 @@ return goods; } } public static TaoBaoGoodsBrief searchGoodsDetail(Long id) throws TaobaoGoodsDownException { return searchGoodsDetail(id, null,null); } /** @@ -461,7 +455,7 @@ // 从转链搜索 TaoBaoGoodsBrief newGoods = specialConvertCoupon(goods.getAuctionId(), new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET, TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT),null,null); TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT), null, null); if (newGoods != null) { goods.setTkRate(newGoods.getTkRate()); @@ -1074,7 +1068,7 @@ * @return */ public static QuanInfo getQuanInfo(Long auctionId, String activityId) { QuanInfo info = new QuanInfo(); QuanInfo info = new TaoKeApiUtil.QuanInfo(); Map<String, String> map = new HashMap<>(); map.put("method", "taobao.tbk.coupon.get"); map.put("item_id", auctionId + ""); @@ -1714,19 +1708,22 @@ } } public static TaoBaoGoodsBrief specialConvertCoupon(Long auctionId, TaoKeAppInfo app,String specialId, String relationId) { public static TaoBaoGoodsBrief specialConvertCoupon(Long auctionId, TaoKeAppInfo app, String specialId, String relationId) { String pid = app.getPid(); String[] sts = pid.split("_"); Map<String, String> map = new HashMap<>(); map.put("method", "taobao.tbk.coupon.convert"); map.put("item_id", auctionId + ""); map.put("adzone_id", sts[3]); if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId)) { map.put("special_id", specialId); } else if (!StringUtil.isNullOrEmpty(specialId)) { map.put("special_id", specialId); } else if (!StringUtil.isNullOrEmpty(relationId)) { map.put("relation_id", specialId); if (System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2020-07-22", "yyyy-MM-dd")) { if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId)) { map.put("special_id", specialId); } else if (!StringUtil.isNullOrEmpty(specialId)) { map.put("special_id", specialId); } else if (!StringUtil.isNullOrEmpty(relationId)) { map.put("relation_id", relationId); } } try { @@ -2293,13 +2290,15 @@ return null; } public static class QuanInfo { public String coupon_start_time;// 开始时间 public String coupon_end_time; // 券结束时间 public BigDecimal coupon_amount;// 券金额 public int coupon_total_count;// 券总数量 public int coupon_remain_count;// 券剩余数量 public BigDecimal coupon_start_fee;// 券起始金额 } } class QuanInfo { public String coupon_start_time;// 开始时间 public String coupon_end_time; // 券结束时间 public BigDecimal coupon_amount;// 券金额 public int coupon_total_count;// 券总数量 public int coupon_remain_count;// 券剩余数量 public BigDecimal coupon_start_fee;// 券起始金额 }
Diff too large fanli/src/main/resource/dubbo/consumer.xml
@@ -3,6 +3,15 @@ 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"/> <dubbo:application name="main-consumer"> <dubbo:parameter key="qos.enable" value="true"></dubbo:parameter> <dubbo:parameter key="qos.accept.foreign.ip" value="false"></dubbo:parameter> <dubbo:parameter key="qos.port" value="33333"></dubbo:parameter> </dubbo:application> <dubbo:registry address="zookeeper://134.175.68.214:2181"/> <!-- url=dubbo://192.168.3.122:20882/com.yeshi.goods.facade.service.TaoBaoCouponCacheService --> <dubbo:reference id="taoBaoCouponCacheService" interface="com.yeshi.goods.facade.service.TaoBaoCouponCacheService" check="false" version="1.0.0"/> </beans> fanli/src/main/resource/env-dev/redis.properties
@@ -1,4 +1,4 @@ redis.addr=192.168.1.253 redis.addr=192.168.3.253 redis.port=6379 redis.auth=123456 #redis.addr=193.112.34.40 pom.xml
@@ -159,15 +159,6 @@ <version>5.1.21</version> </dependency> <!-- 为了让Hibernate使用代理模式，需要javassist --> <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <version>3.18.1-GA</version> </dependency> <!-- hibernate 4.3.0 end --> <dependency> <groupId>jstl</groupId> <artifactId>jstl</artifactId> @@ -177,13 +168,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-dbcp2</artifactId> <version>2.0</version> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>2.3.14</version> </dependency> @@ -536,6 +520,9 @@ <artifactId>rocketmq-client</artifactId> <version>4.3.0</version> </dependency> </dependencies> <build> @@ -565,5 +552,6 @@ <module>fanli</module> <module>facade-goods</module> <module>facede-common</module> <module>service-goods</module> </modules> </project> service-goods/pom.xml
@@ -5,7 +5,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> <version>2.3.1.RELEASE</version> <version>2.2.4.RELEASE</version> <relativePath/> <!-- lookup parent from repository --> </parent> @@ -38,6 +38,11 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> <exclusion> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> </exclusions> </dependency> <dependency> @@ -51,6 +56,10 @@ <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> <exclusion> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> </exclusions> </dependency> @@ -67,6 +76,11 @@ <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> <exclusion> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> </exclusions> </dependency> @@ -98,9 +112,13 @@ <artifactId>log4j</artifactId> </exclusion> <exclusion> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> </exclusions> </dependency> <dependency> @@ -115,6 +133,16 @@ <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> <exclusion> <groupId>org.springframework</groupId> <artifactId>spring</artifactId> </exclusion> <exclusion> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> </exclusions> </dependency> @@ -138,6 +166,10 @@ <groupId>io.netty</groupId> <artifactId>netty</artifactId> </exclusion> <exclusion> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> </exclusions> </dependency> @@ -154,6 +186,10 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> <exclusion> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> </exclusions> </dependency> <dependency> @@ -169,6 +205,12 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> <exclusion> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> </exclusions> </dependency> @@ -185,18 +227,49 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> <exclusion> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <version>3.18.1-GA</version> <scope>compile</scope> </dependency> </dependencies> <build> <finalName>service-goods</finalName> <plugins> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> <version>2.6</version> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.1</version> <configuration> <source>1.8</source><!--这里版本需和服务器版本保持一致--> <target>1.8</target> </configuration> </plugin> </plugins> </build> </project> service-goods/src/main/java/com/blks/goods/GoodsApplication.java
@@ -4,16 +4,22 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication @EnableTransactionManagement @MapperScan(basePackages = "com.blks.goods.mapper") @EnableDubbo(scanBasePackages = "com.blks.goods.service.remote") public class GoodsApplication { public class GoodsApplication extends SpringBootServletInitializer { public static void main(String[] args) { SpringApplication.run(GoodsApplication.class, args); } @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { return builder.sources(GoodsApplication.class); } } service-goods/src/main/resources/application.yml
@@ -13,16 +13,16 @@ enabled: true data: mongodb: username: admin password: '123456' host: 192.168.1.253 username: yeshi password: 'Yeshi2016@' host: 172.16.16.44 port: 27017 database: flq authentication-database: admin redis: host: 192.168.1.253 host: 172.16.16.15 port: 6379 password: 123456 password: 'crs-43yhgz0i:Yeshi2016@' timeout: 5000 jedis: pool: @@ -32,7 +32,7 @@ database: 2 datasource: url: jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/test url: jdbc:mysql://172.16.16.17:3306/test username: root password: Yeshi2016@ driver-class-name: com.mysql.jdbc.Driver @@ -59,7 +59,7 @@ name: goods-provider registry: protocol: zookeeper address: zookeeper://134.175.68.214:2181 address: zookeeper://134.175.68.214:2181 # 134.175.68.214 134.175.68.214:2181 client: curator protocol: name: dubbo @@ -67,5 +67,4 @@ scan: base-packages: com.blks.goods.service.remote provider: timeout: 10000 timeout: 10000 utils/src/main/java/org/yeshi/utils/HttpUtil.java
@@ -10,10 +10,7 @@ import java.net.URL; import java.net.URLEncoder; import java.security.KeyStore; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -52,73 +49,93 @@ public class HttpUtil { public static List<String> getUrlListFromText(String text) { List<String> urlList = new ArrayList<String>(); // 链接 String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?"; Pattern p = Pattern.compile(URL_REGEX); Matcher matcher = p.matcher(text); while (matcher.find()) { String url = matcher.group(); if (!StringUtil.isNullOrEmpty(url)) { urlList.add(url); } } return urlList; } public static List<String> getUrlListFromText(String text) { List<String> urlList = new ArrayList<String>(); // 链接 String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?"; Pattern p = Pattern.compile(URL_REGEX); Matcher matcher = p.matcher(text); while (matcher.find()) { String url = matcher.group(); if (!StringUtil.isNullOrEmpty(url)) { urlList.add(url); } } return urlList; } public static String getHost(String host) { try { URL url = new URL(host); return url.getHost(); } catch (MalformedURLException e) { e.printStackTrace(); } return ""; } /** * 获取链接中的参数 * * @param url * @return */ public static Map<String, String> getPramsFromUrl(String url) { Map<String, String> params = new HashMap<>(); if (url != null && url.indexOf("?") > -1) { String paramStr = url.split("\\?")[1]; String[] sts = paramStr.split("&"); for (String st : sts) { if (st.indexOf("=") > -1) { params.put(st.split("=")[0], st.split("=")[1]); } } } return params; } public static String getShortLink(String url) { // return url; String shortLink = getShortLink3(url); if (StringUtil.isNullOrEmpty(shortLink)) shortLink = getShortLink1(url); if (StringUtil.isNullOrEmpty(shortLink)) shortLink = getShortLink2(url); return shortLink; } public static String getHost(String host) { try { URL url = new URL(host); return url.getHost(); } catch (MalformedURLException e) { e.printStackTrace(); } return ""; } private static String getShortLink1(String url) { try { String totalUrl = String.format( "http://suo.im/api.htm?format=json&url=%s&key=5d7728078e676d45275f816b@681bb0446f1e6af4f8fc6ce3cad2a684", URLEncoder.encode(url)); String result = get(totalUrl, null); System.out.println(result); try { JSONObject json = JSONObject.fromObject(result); return json.optString("url"); } catch (Exception e) { } } catch (Exception e) { } return null; } public static String getShortLink(String url) { // return url; String shortLink = getShortLink3(url); if (StringUtil.isNullOrEmpty(shortLink)) shortLink = getShortLink1(url); if (StringUtil.isNullOrEmpty(shortLink)) shortLink = getShortLink2(url); return shortLink; } // 搜狐网址 private static String getShortLink2(String url) { try { String totalUrl = String.format("https://sohu.gg/api/?key=2zumZxsL8MuX&url=%s", URLEncoder.encode(url, "UTF-8")); String result = get(totalUrl, null); if (result != null && result.startsWith("http")) return result; } catch (Exception e) { e.printStackTrace(); } return null; } private static String getShortLink1(String url) { try { String totalUrl = String.format( "http://suo.im/api.htm?format=json&url=%s&key=5d7728078e676d45275f816b@681bb0446f1e6af4f8fc6ce3cad2a684", URLEncoder.encode(url)); String result = get(totalUrl, null); System.out.println(result); try { JSONObject json = JSONObject.fromObject(result); return json.optString("url"); } catch (Exception e) { } } catch (Exception e) { } return null; } private static String getShortLink3(String url) { // 搜狐网址 private static String getShortLink2(String url) { try { String totalUrl = String.format("https://sohu.gg/api/?key=2zumZxsL8MuX&url=%s", URLEncoder.encode(url, "UTF-8")); String result = get(totalUrl, null); if (result != null && result.startsWith("http")) return result; } catch (Exception e) { e.printStackTrace(); } return null; } private static String getShortLink3(String url) { // try { // String totalUrl = String.format("http://h5.flq001.com/short/createShort?url=%s", // URLEncoder.encode(url, "UTF-8")); @@ -128,516 +145,516 @@ // } catch (Exception e) { // e.printStackTrace(); // } return null; } return null; } public static String get(String url) { return get(url, null); } public static String get(String url) { return get(url, null); } /** * get请求 * * @param url * @param timeoutMS-请求超时时间 * @return */ public static String get(String url, int timeoutMS) { HttpClient client = new HttpClient(); client.getHttpConnectionManager().getParams().setConnectionTimeout(timeoutMS); try { GetMethod method = new GetMethod(url); client.executeMethod(method); return method.getResponseBodyAsString(); } catch (Exception e) { /** * get请求 * * @param url * @param timeoutMS-请求超时时间 * @return */ public static String get(String url, int timeoutMS) { HttpClient client = new HttpClient(); client.getHttpConnectionManager().getParams().setConnectionTimeout(timeoutMS); try { GetMethod method = new GetMethod(url); client.executeMethod(method); return method.getResponseBodyAsString(); } catch (Exception e) { } return null; } } return null; } public static String get(String url, Map<String, String> headers) { HttpClient client = new HttpClient(); try { GetMethod method = new GetMethod(url); if (headers != null) { Iterator<String> keys = headers.keySet().iterator(); while (keys.hasNext()) { String key = keys.next(); method.addRequestHeader(key, headers.get(key)); } } client.executeMethod(method); return method.getResponseBodyAsString(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static String get(String url, Map<String, String> headers) { HttpClient client = new HttpClient(); try { GetMethod method = new GetMethod(url); if (headers != null) { Iterator<String> keys = headers.keySet().iterator(); while (keys.hasNext()) { String key = keys.next(); method.addRequestHeader(key, headers.get(key)); } } client.executeMethod(method); return method.getResponseBodyAsString(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static String get(String url, Map<String, String> headers, ProxyIP ipInfo) { HttpClient client = new HttpClient(); if (ipInfo != null) client.getHostConfiguration().setProxy(ipInfo.getIp(), ipInfo.getPort()); client.getHttpConnectionManager().getParams().setConnectionTimeout(5000); try { GetMethod method = new GetMethod(url); if (headers != null) { Iterator<String> keys = headers.keySet().iterator(); while (keys.hasNext()) { String key = keys.next(); method.addRequestHeader(key, headers.get(key)); } } client.executeMethod(method); return method.getResponseBodyAsString(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static String get(String url, Map<String, String> headers, ProxyIP ipInfo) { HttpClient client = new HttpClient(); if (ipInfo != null) client.getHostConfiguration().setProxy(ipInfo.getIp(), ipInfo.getPort()); client.getHttpConnectionManager().getParams().setConnectionTimeout(5000); try { GetMethod method = new GetMethod(url); if (headers != null) { Iterator<String> keys = headers.keySet().iterator(); while (keys.hasNext()) { String key = keys.next(); method.addRequestHeader(key, headers.get(key)); } } client.executeMethod(method); return method.getResponseBodyAsString(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static String get(String url, Map<String, String> headers, ProxyIP ipInfo, String userName, String proxyPwd) { CloseableHttpClient httpclient = null; if (!StringUtil.isNullOrEmpty(userName)) { CredentialsProvider credsProvider = new BasicCredentialsProvider(); credsProvider.setCredentials(new AuthScope(ipInfo.getIp(), ipInfo.getPort()), new UsernamePasswordCredentials(userName, proxyPwd)); httpclient = HttpClients.custom().setDefaultCredentialsProvider(credsProvider).build(); } else HttpClients.createDefault(); HttpHost proxy = null; if (ipInfo.getPort() != 0 && ipInfo.getPort() != 80) { proxy = new HttpHost(ipInfo.getIp(), ipInfo.getPort()); } else proxy = new HttpHost(ipInfo.getIp()); RequestConfig config = RequestConfig.custom().setProxy(proxy).build(); HttpPost post = new HttpPost(url); try { post.setConfig(config); CloseableHttpResponse response = httpclient.execute(post); return EntityUtils.toString(response.getEntity()); } catch (Exception e) { return null; } public static String get(String url, Map<String, String> headers, ProxyIP ipInfo, String userName, String proxyPwd) { CloseableHttpClient httpclient = null; if (!StringUtil.isNullOrEmpty(userName)) { CredentialsProvider credsProvider = new BasicCredentialsProvider(); credsProvider.setCredentials(new AuthScope(ipInfo.getIp(), ipInfo.getPort()), new UsernamePasswordCredentials(userName, proxyPwd)); httpclient = HttpClients.custom().setDefaultCredentialsProvider(credsProvider).build(); } else HttpClients.createDefault(); HttpHost proxy = null; if (ipInfo.getPort() != 0 && ipInfo.getPort() != 80) { proxy = new HttpHost(ipInfo.getIp(), ipInfo.getPort()); } else proxy = new HttpHost(ipInfo.getIp()); RequestConfig config = RequestConfig.custom().setProxy(proxy).build(); HttpPost post = new HttpPost(url); try { post.setConfig(config); CloseableHttpResponse response = httpclient.execute(post); return EntityUtils.toString(response.getEntity()); } catch (Exception e) { return null; } } } public static String getAsString(String url, String fromCharset, String toCharset) { HttpClient client = new HttpClient(); GetMethod method = new GetMethod(url); try { client.executeMethod(method); String response = method.getResponseBodyAsString(); String s1 = new String(response.getBytes(fromCharset), toCharset); return s1; } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static String getAsString(String url, String fromCharset, String toCharset) { HttpClient client = new HttpClient(); GetMethod method = new GetMethod(url); try { client.executeMethod(method); String response = method.getResponseBodyAsString(); String s1 = new String(response.getBytes(fromCharset), toCharset); return s1; } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static String get(String url, Map<String, String> params, Map<String, String> headers) { HttpClient client = new HttpClient(); try { Iterator<String> keys = params.keySet().iterator(); url += "?"; while (keys.hasNext()) { String key = keys.next(); url += String.format("%s=%s&", key, URLEncoder.encode(params.get(key), "UTF-8")); } GetMethod method = new GetMethod(url); if (headers != null) { keys = headers.keySet().iterator(); while (keys.hasNext()) { String key = keys.next(); headers.get(key); method.setRequestHeader(key, headers.get(key)); } } client.executeMethod(method); System.out.println(method.getResponseHeader("cookies")); String result = method.getResponseBodyAsString(); return result; } catch (Exception e) { e.printStackTrace(); } return ""; } public static String get(String url, Map<String, String> params, Map<String, String> headers) { HttpClient client = new HttpClient(); try { Iterator<String> keys = params.keySet().iterator(); url += "?"; while (keys.hasNext()) { String key = keys.next(); url += String.format("%s=%s&", key, URLEncoder.encode(params.get(key), "UTF-8")); } GetMethod method = new GetMethod(url); if (headers != null) { keys = headers.keySet().iterator(); while (keys.hasNext()) { String key = keys.next(); headers.get(key); method.setRequestHeader(key, headers.get(key)); } } client.executeMethod(method); System.out.println(method.getResponseHeader("cookies")); String result = method.getResponseBodyAsString(); return result; } catch (Exception e) { e.printStackTrace(); } return ""; } public static InputStream getAsInputStream(String url) { HttpClient client = new HttpClient(); GetMethod method = new GetMethod(url); try { client.executeMethod(method); return method.getResponseBodyAsStream(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } public static InputStream getAsInputStream(String url) { HttpClient client = new HttpClient(); GetMethod method = new GetMethod(url); try { client.executeMethod(method); return method.getResponseBodyAsStream(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } /** * 下载图片文件 * * @param url * @return */ public static InputStream downLoadImg(String url) throws org.yeshi.utils.exception.HttpException { HttpClient client = new HttpClient(); GetMethod method = new GetMethod(url); try { client.executeMethod(method); Header contentTypeHeader = method.getResponseHeader("Content-Type"); if (contentTypeHeader == null || contentTypeHeader.getValue().contains("text")) throw new org.yeshi.utils.exception.HttpException(2, "图片下载出错"); return method.getResponseBodyAsStream(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } /** * 下载图片文件 * * @param url * @return */ public static InputStream downLoadImg(String url) throws org.yeshi.utils.exception.HttpException { HttpClient client = new HttpClient(); GetMethod method = new GetMethod(url); try { client.executeMethod(method); Header contentTypeHeader = method.getResponseHeader("Content-Type"); if (contentTypeHeader == null || contentTypeHeader.getValue().contains("text")) throw new org.yeshi.utils.exception.HttpException(2, "图片下载出错"); return method.getResponseBodyAsStream(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } public static InputStream getAsInputStream(String url, Map<String, String> headers) { HttpClient client = new HttpClient(); GetMethod method = new GetMethod(url); Iterator<String> keys = headers.keySet().iterator(); while (keys.hasNext()) { String key = keys.next(); method.setRequestHeader(key, headers.get(key)); } public static InputStream getAsInputStream(String url, Map<String, String> headers) { HttpClient client = new HttpClient(); GetMethod method = new GetMethod(url); Iterator<String> keys = headers.keySet().iterator(); while (keys.hasNext()) { String key = keys.next(); method.setRequestHeader(key, headers.get(key)); } try { client.executeMethod(method); return method.getResponseBodyAsStream(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } try { client.executeMethod(method); return method.getResponseBodyAsStream(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } public static InputStream getImage(String url) { HttpClient client = new HttpClient(); GetMethod method = new GetMethod(url); try { method.setRequestHeader("Content-Type", "image/jpeg"); client.executeMethod(method); return method.getResponseBodyAsStream(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } public static InputStream getImage(String url) { HttpClient client = new HttpClient(); GetMethod method = new GetMethod(url); try { method.setRequestHeader("Content-Type", "image/jpeg"); client.executeMethod(method); return method.getResponseBodyAsStream(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } public static String postSimple(String url) { HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); try { client.executeMethod(method); return method.getResponseBodyAsString(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static String postSimple(String url) { HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); try { client.executeMethod(method); return method.getResponseBodyAsString(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static String post(String url) { HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); method.addRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestHeader("Content-Type", "text/html;charset=UTF-8"); try { client.executeMethod(method); return convertInputStreamToString(method.getResponseBodyAsStream()); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static String post(String url) { HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); method.addRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestHeader("Content-Type", "text/html;charset=UTF-8"); try { client.executeMethod(method); return convertInputStreamToString(method.getResponseBodyAsStream()); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static String post(String url, Map<String, String> map) { Iterator<String> its = map.keySet().iterator(); NameValuePair[] params = new NameValuePair[map.keySet().size()]; int p = 0; while (its.hasNext()) { String key = its.next(); NameValuePair np = new NameValuePair(key, map.get(key)); params[p] = np; p++; } public static String post(String url, Map<String, String> map) { Iterator<String> its = map.keySet().iterator(); NameValuePair[] params = new NameValuePair[map.keySet().size()]; int p = 0; while (its.hasNext()) { String key = its.next(); NameValuePair np = new NameValuePair(key, map.get(key)); params[p] = np; p++; } HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); method.addRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestBody(params); try { client.executeMethod(method); return convertInputStreamToString(method.getResponseBodyAsStream()); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); method.addRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestBody(params); try { client.executeMethod(method); return convertInputStreamToString(method.getResponseBodyAsStream()); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static String post(String url, Map<String, String> map, Map<String, String> headers, ProxyIP ipInfo) { HttpClient client = new HttpClient(); if (ipInfo != null) client.getHostConfiguration().setProxy(ipInfo.getIp(), ipInfo.getPort()); PostMethod pm = new PostMethod(url);// 创建HttpPost对象 NameValuePair[] ns = new NameValuePair[map.keySet().size()]; Iterator<String> its = map.keySet().iterator(); int index = 0; while (its.hasNext()) { String key = its.next(); ns[index++] = (new NameValuePair(key, map.get(key))); } public static String post(String url, Map<String, String> map, Map<String, String> headers, ProxyIP ipInfo) { HttpClient client = new HttpClient(); if (ipInfo != null) client.getHostConfiguration().setProxy(ipInfo.getIp(), ipInfo.getPort()); PostMethod pm = new PostMethod(url);// 创建HttpPost对象 NameValuePair[] ns = new NameValuePair[map.keySet().size()]; Iterator<String> its = map.keySet().iterator(); int index = 0; while (its.hasNext()) { String key = its.next(); ns[index++] = (new NameValuePair(key, map.get(key))); } if (headers != null) { its = headers.keySet().iterator(); while (its.hasNext()) { String key = its.next(); pm.setRequestHeader(key, headers.get(key)); } } if (headers != null) { its = headers.keySet().iterator(); while (its.hasNext()) { String key = its.next(); pm.setRequestHeader(key, headers.get(key)); } } try { pm.setRequestBody(ns); client.executeMethod(pm); return pm.getResponseBodyAsString(); } catch (Exception e) { e.printStackTrace(); } return ""; } try { pm.setRequestBody(ns); client.executeMethod(pm); return pm.getResponseBodyAsString(); } catch (Exception e) { e.printStackTrace(); } return ""; } public static String post(String url, Map<String, String> map, Map<String, String> headers) { HttpClient client = new HttpClient(); // client.getHostConfiguration().setProxy("192.168.1.122", 8888); PostMethod pm = new PostMethod(url);// 创建HttpPost对象 NameValuePair[] ns = new NameValuePair[map.keySet().size()]; Iterator<String> its = map.keySet().iterator(); int index = 0; while (its.hasNext()) { String key = its.next(); ns[index++] = (new NameValuePair(key, map.get(key))); } public static String post(String url, Map<String, String> map, Map<String, String> headers) { HttpClient client = new HttpClient(); // client.getHostConfiguration().setProxy("192.168.1.122", 8888); PostMethod pm = new PostMethod(url);// 创建HttpPost对象 NameValuePair[] ns = new NameValuePair[map.keySet().size()]; Iterator<String> its = map.keySet().iterator(); int index = 0; while (its.hasNext()) { String key = its.next(); ns[index++] = (new NameValuePair(key, map.get(key))); } if (headers != null) { its = headers.keySet().iterator(); while (its.hasNext()) { String key = its.next(); pm.setRequestHeader(key, headers.get(key)); } } if (headers != null) { its = headers.keySet().iterator(); while (its.hasNext()) { String key = its.next(); pm.setRequestHeader(key, headers.get(key)); } } try { pm.setRequestBody(ns); client.executeMethod(pm); return pm.getResponseBodyAsString(); } catch (Exception e) { e.printStackTrace(); } return ""; } try { pm.setRequestBody(ns); client.executeMethod(pm); return pm.getResponseBodyAsString(); } catch (Exception e) { e.printStackTrace(); } return ""; } private static String convertInputStreamToString(InputStream inputStream) { BufferedReader br = new BufferedReader(new InputStreamReader(inputStream)); StringBuffer stringBuffer = new StringBuffer(); String str = ""; try { while ((str = br.readLine()) != null) { stringBuffer.append(str); } } catch (IOException e) { e.printStackTrace(); } return stringBuffer.toString(); } private static String convertInputStreamToString(InputStream inputStream) { BufferedReader br = new BufferedReader(new InputStreamReader(inputStream)); StringBuffer stringBuffer = new StringBuffer(); String str = ""; try { while ((str = br.readLine()) != null) { stringBuffer.append(str); } } catch (IOException e) { e.printStackTrace(); } return stringBuffer.toString(); } @SuppressWarnings("deprecation") public static String post(String url, String entity) { HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); method.addRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestBody(entity); try { client.executeMethod(method); return convertInputStreamToString(method.getResponseBodyAsStream()); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } @SuppressWarnings("deprecation") public static String post(String url, String entity) { HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); method.addRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestBody(entity); try { client.executeMethod(method); return convertInputStreamToString(method.getResponseBodyAsStream()); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } @SuppressWarnings("deprecation") public static String post(String url, String entity, String charset) { HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); method.addRequestHeader("Content-Type", "text/html;charset=" + charset); method.setRequestHeader("Content-Type", "text/html;charset=" + charset); method.setRequestBody(entity); try { client.executeMethod(method); return convertInputStreamToString(method.getResponseBodyAsStream()); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } @SuppressWarnings("deprecation") public static String post(String url, String entity, String charset) { HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); method.addRequestHeader("Content-Type", "text/html;charset=" + charset); method.setRequestHeader("Content-Type", "text/html;charset=" + charset); method.setRequestBody(entity); try { client.executeMethod(method); return convertInputStreamToString(method.getResponseBodyAsStream()); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static String postInputStream(String url, File file) throws FileNotFoundException { HttpClient client = new HttpClient(); PostMethod postMethod = new PostMethod(url); Part[] parts = { new StringPart("filename", file.getName()), new StringPart("filelength", file.length() + ""), new StringPart("content-type", "image/jpg"), new FilePart("file", file) }; postMethod.setRequestEntity(new MultipartRequestEntity(parts, postMethod.getParams())); public static String postInputStream(String url, File file) throws FileNotFoundException { HttpClient client = new HttpClient(); PostMethod postMethod = new PostMethod(url); Part[] parts = {new StringPart("filename", file.getName()), new StringPart("filelength", file.length() + ""), new StringPart("content-type", "image/jpg"), new FilePart("file", file)}; postMethod.setRequestEntity(new MultipartRequestEntity(parts, postMethod.getParams())); try { client.executeMethod(postMethod); return convertInputStreamToString(postMethod.getResponseBodyAsStream()); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } try { client.executeMethod(postMethod); return convertInputStreamToString(postMethod.getResponseBodyAsStream()); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return ""; } public static File downloadFile(String url, String targetPath) { try { URL httpurl = new URL(url); FileUtils.copyURLToFile(httpurl, new File(targetPath)); } catch (Exception e) { e.printStackTrace(); } File f = new File(targetPath); if (!f.exists() || f.length() <= 0) return null; return f; } public static File downloadFile(String url, String targetPath) { try { URL httpurl = new URL(url); FileUtils.copyURLToFile(httpurl, new File(targetPath)); } catch (Exception e) { e.printStackTrace(); } File f = new File(targetPath); if (!f.exists() || f.length() <= 0) return null; return f; } @SuppressWarnings("deprecation") public static InputStream postForInputstream(String url, String entity) { HttpClient client = new HttpClient(); @SuppressWarnings("deprecation") public static InputStream postForInputstream(String url, String entity) { HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); method.addRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestBody(entity); try { client.executeMethod(method); return method.getResponseBodyAsStream(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } PostMethod method = new PostMethod(url); method.addRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestHeader("Content-Type", "text/html;charset=UTF-8"); method.setRequestBody(entity); try { client.executeMethod(method); return method.getResponseBodyAsStream(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } public static String post(String url, String fileKey, File f) { PostMethod filePost = new PostMethod(url); HttpClient client = new HttpClient(); try { Part[] parts = { new FilePart(fileKey, f) }; filePost.setRequestEntity(new MultipartRequestEntity(parts, filePost.getParams())); client.getHttpConnectionManager().getParams().setConnectionTimeout(5000); int status = client.executeMethod(filePost); if (status == HttpStatus.SC_OK) { return filePost.getResponseBodyAsString(); } else { System.out.println("上传失败"); } } catch (Exception ex) { ex.printStackTrace(); } finally { filePost.releaseConnection(); } return null; } public static String post(String url, String fileKey, File f) { PostMethod filePost = new PostMethod(url); HttpClient client = new HttpClient(); try { Part[] parts = {new FilePart(fileKey, f)}; filePost.setRequestEntity(new MultipartRequestEntity(parts, filePost.getParams())); client.getHttpConnectionManager().getParams().setConnectionTimeout(5000); int status = client.executeMethod(filePost); if (status == HttpStatus.SC_OK) { return filePost.getResponseBodyAsString(); } else { System.out.println("上传失败"); } } catch (Exception ex) { ex.printStackTrace(); } finally { filePost.releaseConnection(); } return null; } @SuppressWarnings("deprecation") public static String httpsPost(String url, String body, String pwd, InputStream cert) throws Exception { String result = ""; KeyStore keyStore = KeyStore.getInstance("PKCS12"); InputStream instream = cert; try { keyStore.load(instream, pwd.toCharArray()); } finally { instream.close(); } @SuppressWarnings("deprecation") public static String httpsPost(String url, String body, String pwd, InputStream cert) throws Exception { String result = ""; KeyStore keyStore = KeyStore.getInstance("PKCS12"); InputStream instream = cert; try { keyStore.load(instream, pwd.toCharArray()); } finally { instream.close(); } // Trust own CA and all self-signed certs SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, pwd.toCharArray()).build(); // Allow TLSv1 protocol only SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext, new String[] { "TLSv1" }, null, SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER); CloseableHttpClient httpclient = HttpClients.custom().setSSLSocketFactory(sslsf).build(); try { HttpPost httppost = new HttpPost(url); httppost.setHeader("Content-Type", "text/html;charset=UTF-8"); System.out.println("executing request" + httppost.getRequestLine()); httppost.setEntity(new StringEntity(body, "UTF-8")); CloseableHttpResponse response = httpclient.execute(httppost); try { HttpEntity entity = response.getEntity(); if (entity != null) { result = convertInputStreamToString(entity.getContent()); } EntityUtils.consume(entity); } finally { response.close(); } } finally { httpclient.close(); } // Trust own CA and all self-signed certs SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, pwd.toCharArray()).build(); // Allow TLSv1 protocol only SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext, new String[]{"TLSv1"}, null, SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER); CloseableHttpClient httpclient = HttpClients.custom().setSSLSocketFactory(sslsf).build(); try { HttpPost httppost = new HttpPost(url); httppost.setHeader("Content-Type", "text/html;charset=UTF-8"); System.out.println("executing request" + httppost.getRequestLine()); httppost.setEntity(new StringEntity(body, "UTF-8")); CloseableHttpResponse response = httpclient.execute(httppost); try { HttpEntity entity = response.getEntity(); if (entity != null) { result = convertInputStreamToString(entity.getContent()); } EntityUtils.consume(entity); } finally { response.close(); } } finally { httpclient.close(); } return result; } return result; } /** * 获取post返回location * * @param url * @return */ public static String getLocation(String url) { HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); try { client.executeMethod(method); return method.getResponseHeader("location").getValue(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } /** * 获取post返回location * * @param url * @return */ public static String getLocation(String url) { HttpClient client = new HttpClient(); PostMethod method = new PostMethod(url); try { client.executeMethod(method); return method.getResponseHeader("location").getValue(); } catch (HttpException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } } utils/utils.iml
@@ -22,6 +22,7 @@ </content> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="inheritedJdk" /> <orderEntry type="library" name="javas" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" /> <orderEntry type="library" name="Maven: com.opencsv:opencsv:4.3.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" /> @@ -52,16 +53,9 @@ <orderEntry type="library" name="Maven: cglib:cglib:2.2.2" level="project" /> <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" /> <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.21" level="project" /> <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" /> <orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.struts:struts2-core:2.3.14" level="project" /> <orderEntry type="library" name="Maven: org.apache.struts.xwork:xwork-core:2.3.14" level="project" /> <orderEntry type="library" name="Maven: asm:asm-commons:3.3" level="project" /> <orderEntry type="library" name="Maven: asm:asm-tree:3.3" level="project" /> <orderEntry type="library" name="Maven: ognl:ognl:3.0.6" level="project" /> <orderEntry type="library" name="Maven: javassist:javassist:3.11.0.GA" level="project" /> <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" /> <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
