* dev_yy: (24 commits) 提交代码修改 修改话费查询bug 修改星巴克下架问题 1 修改区域公司 修改区域公司 提交代码 提交代码 1 提交代码 修改区域公司 修改区域公司 1 1 1.提交代码 修改区域公司 修改区域公司 修改区域公司 修改区域公司 提交代码 ... # Conflicts: # hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java # hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.javadev-discount
commit
f6b80b4fa0
File diff suppressed because one or more lines are too long
@ -0,0 +1,10 @@ |
|||||||
|
package com.hai.common.utils; |
||||||
|
|
||||||
|
/** |
||||||
|
* @author sum1dream |
||||||
|
*/ |
||||||
|
public class CommonUtil { |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
} |
@ -0,0 +1,220 @@ |
|||||||
|
<?xml version="1.0" encoding="UTF-8"?> |
||||||
|
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
||||||
|
<component name="FacetManager"> |
||||||
|
<facet type="web" name="Web"> |
||||||
|
<configuration> |
||||||
|
<webroots /> |
||||||
|
</configuration> |
||||||
|
</facet> |
||||||
|
<facet type="Spring" name="Spring"> |
||||||
|
<configuration /> |
||||||
|
</facet> |
||||||
|
</component> |
||||||
|
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> |
||||||
|
<output url="file://$MODULE_DIR$/target/classes" /> |
||||||
|
<output-test url="file://$MODULE_DIR$/target/test-classes" /> |
||||||
|
<content url="file://$MODULE_DIR$"> |
||||||
|
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> |
||||||
|
<excludeFolder url="file://$MODULE_DIR$/target" /> |
||||||
|
</content> |
||||||
|
<orderEntry type="inheritedJdk" /> |
||||||
|
<orderEntry type="sourceFolder" forTests="false" /> |
||||||
|
<orderEntry type="module" module-name="hai-service" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" /> |
||||||
|
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.6" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.6" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.6" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.34" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.34" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.34" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.12.Final" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.5" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.0.10.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.0.10.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.0.10.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.29.Final" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.29.Final" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.29.Final" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.29.Final" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.29.Final" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.29.Final" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.1.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: ognl:ognl:3.1.12" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.4.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:3.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: tk.mybatis:mapper:3.3.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.47" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.alibaba:druid:1.0.20" level="project" /> |
||||||
|
<orderEntry type="module-library"> |
||||||
|
<library name="Maven: com.alibaba:jconsole:1.8.0"> |
||||||
|
<CLASSES> |
||||||
|
<root url="jar://$MODULE_DIR$/../../../Program Files/Java/jdk1.8.0_191/jre/../lib/jconsole.jar!/" /> |
||||||
|
</CLASSES> |
||||||
|
<JAVADOC /> |
||||||
|
<SOURCES /> |
||||||
|
</library> |
||||||
|
</orderEntry> |
||||||
|
<orderEntry type="module-library"> |
||||||
|
<library name="Maven: com.alibaba:tools:1.8.0"> |
||||||
|
<CLASSES> |
||||||
|
<root url="jar://$MODULE_DIR$/../../../Program Files/Java/jdk1.8.0_191/jre/../lib/tools.jar!/" /> |
||||||
|
</CLASSES> |
||||||
|
<JAVADOC /> |
||||||
|
<SOURCES /> |
||||||
|
</library> |
||||||
|
</orderEntry> |
||||||
|
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.6.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.10" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.10" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.6.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.6.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.6.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.6.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.6.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.0.0.Final" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.6.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: joda-time:joda-time:2.9.9" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.2" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.7" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.6" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.1.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.1.14" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.google.zxing:javase:3.3.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.beust:jcommander:1.48" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.itextpdf:kernel:7.0.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.itextpdf:io:7.0.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.itextpdf.tool:xmlworker:5.5.13" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.itextpdf:itext-asian:5.2.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.xhtmlrenderer:flying-saucer-pdf-itext5:9.0.3" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.xhtmlrenderer:flying-saucer-core:9.0.3" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.3.7" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: cn.jpush.api:jiguang-common:1.1.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mqtt:5.0.8.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:5.0.8.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.29.Final" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.9.79.ALL" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.11.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-miniapp:3.8.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.6" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.ehcache:ehcache:3.5.2" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.gavaghan:geodesy:1.1.3" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-apache-httpclient:0.2.2" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.6" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.6" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-client:1.16" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.16" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-test:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.22" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.8.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.8.0" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.0.5.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.0.9.RELEASE" level="project" /> |
||||||
|
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.9.RELEASE" level="project" /> |
||||||
|
</component> |
||||||
|
</module> |
@ -0,0 +1,121 @@ |
|||||||
|
package com.v1.config; |
||||||
|
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j; |
||||||
|
import me.chanjar.weixin.common.error.WxErrorException; |
||||||
|
import me.chanjar.weixin.mp.api.WxMpService; |
||||||
|
import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; |
||||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||||
|
import org.springframework.stereotype.Component; |
||||||
|
|
||||||
|
import javax.annotation.Resource; |
||||||
|
import java.io.File; |
||||||
|
|
||||||
|
/** |
||||||
|
* @serviceName WeChatQrcodeUtils.java |
||||||
|
* @author Sum1Dream |
||||||
|
* @version 1.0.0 |
||||||
|
* @Description // 生成带参数的二维码
|
||||||
|
* @createTime 16:11 2022/9/2 |
||||||
|
**/ |
||||||
|
@Slf4j |
||||||
|
@Component |
||||||
|
public class WeChatQrcodeUtils { |
||||||
|
|
||||||
|
@Autowired |
||||||
|
private WxMpService wxMpService; |
||||||
|
|
||||||
|
/** |
||||||
|
* <pre> |
||||||
|
* 创建临时二维码ticket |
||||||
|
* @param sceneId 场景值ID,临时二维码时为32位非0整型 |
||||||
|
* @param expireSeconds 该二维码有效时间,以秒为单位。 最大不超过2592000(即30天),此字段如果不填,则默认有效期为30秒。 |
||||||
|
* @auther: cao_wencao |
||||||
|
* @date: 2019/2/18 16:58 |
||||||
|
* </pre> |
||||||
|
*/ |
||||||
|
public WxMpQrCodeTicket qrCodeCreateTmpTicket(int sceneId, Integer expireSeconds) throws WxErrorException { |
||||||
|
WxMpQrCodeTicket wxMpQrCodeTicket = wxMpService.getQrcodeService().qrCodeCreateTmpTicket(sceneId, expireSeconds); |
||||||
|
return wxMpQrCodeTicket; |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* <pre> |
||||||
|
* 创建临时二维码ticket |
||||||
|
* @param sceneStr 场景值ID(字符串形式的ID),字符串类型,长度限制为1到64 |
||||||
|
* @param expireSeconds 该二维码有效时间,以秒为单位。 最大不超过2592000(即30天),此字段如果不填,则默认有效期为30秒。 |
||||||
|
* @auther: cao_wencao |
||||||
|
* @date: 2019/2/18 17:01 |
||||||
|
* </pre> |
||||||
|
*/ |
||||||
|
public WxMpQrCodeTicket qrCodeCreateTmpTicket(String sceneStr, Integer expireSeconds) throws WxErrorException { |
||||||
|
WxMpQrCodeTicket wxMpQrCodeTicket = wxMpService.getQrcodeService().qrCodeCreateTmpTicket(sceneStr, expireSeconds); |
||||||
|
return wxMpQrCodeTicket; |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* <pre> |
||||||
|
* 创建永久二维码ticket |
||||||
|
* @param sceneId 场景值ID,最大值为100000(目前参数只支持1--100000) |
||||||
|
* @auther: cao_wencao |
||||||
|
* @date: 2019/2/18 17:03 |
||||||
|
* </pre> |
||||||
|
*/ |
||||||
|
public WxMpQrCodeTicket qrCodeCreateLastTicket(int sceneId) throws WxErrorException { |
||||||
|
return wxMpService.getQrcodeService().qrCodeCreateLastTicket(sceneId); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* <pre> |
||||||
|
* 创建永久字符串二维码ticket |
||||||
|
* @param sceneStr 参数。字符串类型长度现在为1到64 |
||||||
|
* @auther: cao_wencao |
||||||
|
* @date: 2019/2/18 17:05 |
||||||
|
* </pre> |
||||||
|
*/ |
||||||
|
public WxMpQrCodeTicket qrCodeCreateLastTicket(String sceneStr) throws WxErrorException { |
||||||
|
return wxMpService.getQrcodeService().qrCodeCreateLastTicket(sceneStr); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* <pre> |
||||||
|
* 换取二维码图片文件,jpg格式 |
||||||
|
* @param ticket 二维码ticket |
||||||
|
* @auther: cao_wencao |
||||||
|
* @date: 2019/2/18 17:07 |
||||||
|
* </pre> |
||||||
|
*/ |
||||||
|
public File qrCodePicture(WxMpQrCodeTicket ticket) throws WxErrorException { |
||||||
|
return wxMpService.getQrcodeService().qrCodePicture(ticket); |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* <pre> |
||||||
|
* 换取二维码图片url地址(可以选择是否生成压缩的网址) |
||||||
|
* @param ticket 二维码ticket |
||||||
|
* @param needShortUrl 是否需要压缩的二维码地址 |
||||||
|
* @auther: cao_wencao |
||||||
|
* @date: 2019/2/18 17:10 |
||||||
|
* </pre> |
||||||
|
*/ |
||||||
|
public String qrCodePictureUrl(String ticket, boolean needShortUrl) throws WxErrorException { |
||||||
|
String qrCodeUrl = wxMpService.getQrcodeService().qrCodePictureUrl(ticket, needShortUrl); |
||||||
|
return qrCodeUrl; |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* <pre> |
||||||
|
* 换取二维码图片url地址 |
||||||
|
* @param ticket 二维码ticket |
||||||
|
* @auther: cao_wencao |
||||||
|
* @date: 2019/2/18 17:11 |
||||||
|
* </pre> |
||||||
|
*/ |
||||||
|
public String qrCodePictureUrl(String ticket) throws WxErrorException { |
||||||
|
String url = wxMpService.getQrcodeService().qrCodePictureUrl(ticket); |
||||||
|
return url; |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
} |
@ -0,0 +1,51 @@ |
|||||||
|
package com.v1.config; |
||||||
|
|
||||||
|
import com.hai.config.CommonSysConst; |
||||||
|
import me.chanjar.weixin.mp.api.WxMpService; |
||||||
|
import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; |
||||||
|
import me.chanjar.weixin.mp.config.WxMpConfigStorage; |
||||||
|
import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; |
||||||
|
import org.springframework.context.annotation.Bean; |
||||||
|
import org.springframework.context.annotation.Configuration; |
||||||
|
|
||||||
|
/** |
||||||
|
* @serviceName .java |
||||||
|
* @author Sum1Dream |
||||||
|
* @version 1.0.0 |
||||||
|
* @Description //TODO
|
||||||
|
* @createTime 16:24 2022/9/2 |
||||||
|
**/ |
||||||
|
@Configuration |
||||||
|
public class WxConfig { |
||||||
|
|
||||||
|
|
||||||
|
/** |
||||||
|
* 微信客户端配置存储 |
||||||
|
* |
||||||
|
* @return |
||||||
|
*/ |
||||||
|
@Bean |
||||||
|
public WxMpConfigStorage wxMpConfigStorage() { |
||||||
|
WxMpDefaultConfigImpl configStorage = new WxMpDefaultConfigImpl(); |
||||||
|
// 公众号appId
|
||||||
|
configStorage.setAppId(SysConst.getSysConfig().getWxH5AppId()); |
||||||
|
// 公众号appSecret
|
||||||
|
configStorage.setSecret(SysConst.getSysConfig().getWxH5AppSecret()); |
||||||
|
return configStorage; |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* @Author Sum1Dream |
||||||
|
* @Name wxMpService |
||||||
|
* @Description //TODO
|
||||||
|
* @Date 16:24 2022/9/2 |
||||||
|
* @Param [] |
||||||
|
* @Return WxMpService |
||||||
|
*/ |
||||||
|
@Bean |
||||||
|
public WxMpService wxMpService() { |
||||||
|
WxMpService wxMpService = new WxMpServiceImpl(); |
||||||
|
wxMpService.setWxMpConfigStorage(wxMpConfigStorage()); |
||||||
|
return wxMpService; |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,140 @@ |
|||||||
|
package com.v1.controller; |
||||||
|
|
||||||
|
import com.alibaba.fastjson.JSONObject; |
||||||
|
import com.hai.common.exception.ErrorCode; |
||||||
|
import com.hai.common.exception.ErrorHelp; |
||||||
|
import com.hai.common.exception.SysCode; |
||||||
|
import com.hai.common.pay.util.IOUtil; |
||||||
|
import com.hai.common.pay.util.XmlUtil; |
||||||
|
import com.hai.common.utils.HttpsUtils; |
||||||
|
import com.hai.common.utils.ResponseMsgUtil; |
||||||
|
import com.hai.common.utils.WxUtils; |
||||||
|
import com.hai.model.ResponseData; |
||||||
|
import com.hai.service.CommonService; |
||||||
|
import com.v1.config.SysConst; |
||||||
|
import com.v1.config.WeChatQrcodeUtils; |
||||||
|
import io.swagger.annotations.Api; |
||||||
|
import io.swagger.annotations.ApiOperation; |
||||||
|
|
||||||
|
import me.chanjar.weixin.common.error.WxErrorException; |
||||||
|
import org.slf4j.Logger; |
||||||
|
import org.slf4j.LoggerFactory; |
||||||
|
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||||
|
import org.springframework.stereotype.Controller; |
||||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||||
|
import org.springframework.web.bind.annotation.RequestMethod; |
||||||
|
import org.springframework.web.bind.annotation.RequestParam; |
||||||
|
import org.springframework.web.bind.annotation.ResponseBody; |
||||||
|
|
||||||
|
import javax.annotation.Resource; |
||||||
|
import javax.servlet.http.HttpServletRequest; |
||||||
|
|
||||||
|
import java.util.HashMap; |
||||||
|
import java.util.Map; |
||||||
|
import java.util.SortedMap; |
||||||
|
|
||||||
|
/** |
||||||
|
* @author sum1dream |
||||||
|
*/ |
||||||
|
|
||||||
|
@Controller |
||||||
|
@RequestMapping(value = "/wxMsg") |
||||||
|
@Api(value = "自建站接口") |
||||||
|
public class WxMsgController { |
||||||
|
|
||||||
|
private static Logger log = LoggerFactory.getLogger(ThirdPartyController.class); |
||||||
|
|
||||||
|
@Autowired |
||||||
|
private WeChatQrcodeUtils weChatQrcodeUtils; |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@RequestMapping(value = "/verifyWxToken", method = RequestMethod.GET) |
||||||
|
@ResponseBody |
||||||
|
@ApiOperation(value = "验证servlet") |
||||||
|
public String verifyWxToken(HttpServletRequest request) { |
||||||
|
|
||||||
|
try { |
||||||
|
log.info("进入公众号!!!!!!!"); |
||||||
|
// 反馈给微信服务器
|
||||||
|
String resXml = ""; |
||||||
|
// 微信支付系统发送的数据(<![CDATA[product_001]]>格式)
|
||||||
|
String notifyXml; |
||||||
|
notifyXml = IOUtil.inputStreamToString(request.getInputStream(), "UTF-8"); |
||||||
|
|
||||||
|
log.info("微信支付系统发送的数据:" + notifyXml); |
||||||
|
SortedMap<String, String> map = XmlUtil.parseXmlToTreeMap(notifyXml, "UTF-8"); |
||||||
|
|
||||||
|
// 区分消息类型
|
||||||
|
String msgType = map.get("MsgType"); |
||||||
|
log.info("微信支付系统发送的数据:" + msgType); |
||||||
|
return null; |
||||||
|
} catch (Exception e) { |
||||||
|
return null; |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
@RequestMapping(value = "/getWxToken", method = RequestMethod.POST) |
||||||
|
@ResponseBody |
||||||
|
@ApiOperation(value = "获取微信token") |
||||||
|
public ResponseData getWxToken() { |
||||||
|
try { |
||||||
|
Map<String, Object> params = new HashMap<>(); |
||||||
|
params.put("appid", SysConst.getSysConfig().getWxH5AppId()); |
||||||
|
params.put("secret", SysConst.getSysConfig().getWxH5AppSecret()); |
||||||
|
params.put("grant_type", "client_credential"); |
||||||
|
|
||||||
|
JSONObject accessTokenObject = HttpsUtils.doGet("https://api.weixin.qq.com/cgi-bin/token", params); |
||||||
|
if (accessTokenObject == null) { |
||||||
|
log.error("getH5UserInfo error!", "获取微信access_token失败" ); |
||||||
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "获取微信access_token失败"); |
||||||
|
} |
||||||
|
|
||||||
|
return ResponseMsgUtil.success(accessTokenObject); |
||||||
|
|
||||||
|
} catch (Exception e) { |
||||||
|
return ResponseMsgUtil.exception(e); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* <pre> |
||||||
|
* @desc: 创建生成二维码 |
||||||
|
* @auth: cao_wencao |
||||||
|
* @date: 2019/4/10 14:00 |
||||||
|
* </pre> |
||||||
|
*/ |
||||||
|
|
||||||
|
@RequestMapping(value = "/createQrcode", method = RequestMethod.GET) |
||||||
|
@ResponseBody |
||||||
|
@ApiOperation(value = "创建生成二维码") |
||||||
|
public ResponseData createQrcode(@RequestParam(name = "sceneId", required = false) Integer sceneId) { |
||||||
|
try { |
||||||
|
return ResponseMsgUtil.success(weChatQrcodeUtils.qrCodeCreateLastTicket(sceneId)); |
||||||
|
} catch (WxErrorException e) { |
||||||
|
return ResponseMsgUtil.exception(e); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* <pre> |
||||||
|
* @desc: 通过ticket获取二维码(长链接URL) |
||||||
|
* @auth: cao_wencao |
||||||
|
* @date: 2019/4/10 14:00 |
||||||
|
* </pre> |
||||||
|
*/ |
||||||
|
@RequestMapping(value = "/getQrcodeUrl", method = RequestMethod.GET) |
||||||
|
@ResponseBody |
||||||
|
@ApiOperation(value = "创建生成二维码") |
||||||
|
public ResponseData getQrcodeUrl(@RequestParam(name = "ticket", required = false) String ticket) { |
||||||
|
try { |
||||||
|
return ResponseMsgUtil.success(weChatQrcodeUtils.qrCodePictureUrl(ticket)); |
||||||
|
} catch (WxErrorException e) { |
||||||
|
return ResponseMsgUtil.exception(e); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
} |
@ -0,0 +1,2 @@ |
|||||||
|
wxH5AppId=wxa075e8509802f826 |
||||||
|
wxH5AppSecret=0e606fc1378d35e359fcf3f15570b2c5 |
Loading…
Reference in new issue