zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

format the code and remove the unused import

Browse Source
This commit is contained in:
wuchunlei
2023-10-07 13:42:25 +08:00
parent fb7016d471
commit 6ca47a843f
11 changed files with 165 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -10,5 +10,5 @@ buildNumber.properties
# https://github.com/takari/maven-wrapper#usage-without-binary-jar # https://github.com/takari/maven-wrapper#usage-without-binary-jar
.mvn/wrapper/maven-wrapper.jar .mvn/wrapper/maven-wrapper.jar
/.idea/ /.idea/
src/main/resources/weChatConfig.properties
/src/test/ /src/test/
peanut_book.iml

276
peanut_book.iml
View File

@@ -1,276 +0,0 @@
<?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="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</sourceRoots>
</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" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
<orderEntry type="library" name="Maven: org.objenesis:objenesis:3.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" 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.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.4" level="project" />
<orderEntry type="library" name="Maven: net.jodah:expiringmap:0.5.10" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.6" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.60" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.60" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
<orderEntry type="library" name="Maven: mars:eh-sdk:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.6.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.6.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.18" level="project" />
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: cn.songxinqiang:com.baidu.ueditor:1.1.2-offical" level="project" />
<orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.60" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.6.6" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.1" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.1" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.3" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.6.6" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.18" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.28" level="project" />
<orderEntry type="library" name="Maven: org.redisson:redisson:3.12.5" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.75.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.75.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.75.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.75.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.75.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.75.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.75.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.75.Final" level="project" />
<orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.16" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: io.reactivex.rxjava2:rxjava:2.2.21" level="project" />
<orderEntry type="library" name="Maven: de.ruedigermoeller:fst:2.57" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
<orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.0.13" level="project" />
<orderEntry type="library" name="Maven: org.jodd:jodd-core:5.0.13" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.18" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.14" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.7" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.4" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.5" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
<orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.4" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.14" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.2" level="project" />
<orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.13.1" level="project" />
<orderEntry type="library" name="Maven: e-iceblue:spire.doc:10.9.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.17" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:ooxml-schemas:1.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
<orderEntry type="module-library">
<library name="Maven: com.aspose.words:aspose-words:aspose-words-22.10-jdk16">
<CLASSES>
<root url="jar://$MODULE_DIR$/src/main/resources/lib/aspose-words-22.10-jdk16.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Maven: org.jsoup:jsoup:1.14.3" level="project" />
<orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.15.20.ALL" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" 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" />
<orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.3" level="project" />
<orderEntry type="library" name="Maven: com.microsoft.sqlserver:sqljdbc4:4.0" level="project" />
<orderEntry type="library" name="Maven: org.postgresql:postgresql:42.3.3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.13" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.13" level="project" />
<orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.11" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.2" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.10" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.9.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.9.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.9.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.9.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.9.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.9.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.9.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.9.0" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.9.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.9.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.9.0" level="project" />
<orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.7.0" level="project" />
<orderEntry type="library" name="Maven: com.github.axet:kaptcha:0.0.9" level="project" />
<orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.7.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.13" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.13" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.7.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.7.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.7.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.7.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.7.0" level="project" />
<orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" 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.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" />
<orderEntry type="library" name="Maven: com.qiniu:qiniu-java-sdk:7.2.23" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
<orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.10.2" level="project" />
<orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:3.4.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-sts:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.2.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-kms:2.7.0" level="project" />
<orderEntry type="library" name="Maven: com.qcloud:cos_api:4.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.13.2" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.9.9" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.79" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.22" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.19" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.6.6" level="project" />
<orderEntry type="library" name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.6.7.Final" level="project" />
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.jboss:jandex:2.4.2.Final" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" level="project" />
<orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.6" level="project" />
<orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.6" level="project" />
<orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.6.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.6.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.3.18" level="project" />
<orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-apache-httpclient:0.4.9" level="project" />
<orderEntry type="library" name="Maven: com.twelvemonkeys.common:common-lang:3.5" level="project" />
<orderEntry type="library" name="Maven: com.github.yulichang:mybatis-plus-join-boot-starter:1.4.6" level="project" />
<orderEntry type="library" name="Maven: com.github.yulichang:mybatis-plus-join-extension:1.4.6" level="project" />
<orderEntry type="library" name="Maven: com.github.yulichang:mybatis-plus-join-core:1.4.6" level="project" />
<orderEntry type="library" name="Maven: com.github.yulichang:mybatis-plus-join-annotation:1.4.6" level="project" />
<orderEntry type="library" name="Maven: com.github.yulichang:mybatis-plus-join-adapter-v33x:1.4.6" level="project" />
<orderEntry type="library" name="Maven: com.github.yulichang:mybatis-plus-join-adapter-base:1.4.6" level="project" />
<orderEntry type="library" name="Maven: com.github.yulichang:mybatis-plus-join-adapter-v3431:1.4.6" level="project" />
<orderEntry type="library" name="Maven: com.github.yulichang:mybatis-plus-join-adapter-v352:1.4.6" level="project" />
</component>
</module>

9
src/main/java/com/peanut/modules/book/controller/ActivityController.java
View File

@@ -1,24 +1,15 @@
package com.peanut.modules.book.controller; package com.peanut.modules.book.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.peanut.common.utils.PageUtils; import com.peanut.common.utils.PageUtils;
import com.peanut.common.utils.R; import com.peanut.common.utils.R;
import com.peanut.modules.book.entity.*; import com.peanut.modules.book.entity.*;
import com.peanut.modules.book.service.*; import com.peanut.modules.book.service.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
/** /**

32
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

@@ -71,8 +71,20 @@ public class BuyOrderController {
private PayWechatOrderService payWechatOrderService; private PayWechatOrderService payWechatOrderService;
@Autowired @Autowired
private PayZfbOrderService payZfbOrderService; private PayZfbOrderService payZfbOrderService;
// @Autowired
// private /**
* 订单状态 - 待支付
*/
private static final String ORDER_STATUS_TO_BE_PAID = "0";
/**
* 订单状态 - 待发货
*/
private static final String ORDER_STATUS_TO_BE_SHIPPED = "1";
/**
* 订单状态 - 待收货
*/
private static final String ORDER_STATUS_TO_BE_RECEIVED = "2";
/** /**
* 列表 * 列表
*/ */
@@ -124,23 +136,18 @@ public class BuyOrderController {
/** /**
* 保存 * 下单
*/ */
@RequestMapping("/buysave") @RequestMapping("/buysave")
@Transactional @Transactional
// @RequiresPermissions("book:buyorder:save")
public R buysave(@RequestBody BuyOrderEntity buyOrder){ public R buysave(@RequestBody BuyOrderEntity buyOrder){
BigDecimal realMoney = new BigDecimal(0); BigDecimal realMoney = new BigDecimal(0);
Lock l = new ReentrantLock(); Lock l = new ReentrantLock();
l.lock(); l.lock();
try { try {
// 根据订单获取订单详情
List<BuyOrderDetailEntity> products = buyOrder.getProducts(); List<BuyOrderDetailEntity> products = buyOrder.getProducts();
BigDecimal bigDecimal1 = new BigDecimal(0); BigDecimal bigDecimal1 = new BigDecimal(0);
ArrayList<BuyOrderDetailEntity> list = new ArrayList<>(); ArrayList<BuyOrderDetailEntity> list = new ArrayList<>();
// 遍历商品 查询价格 // 遍历商品 查询价格
@@ -152,12 +159,13 @@ public class BuyOrderController {
BigDecimal big = new BigDecimal(0); BigDecimal big = new BigDecimal(0);
BigDecimal price=null; BigDecimal price=null;
//activityPrice等于0，则原价 //activityPrice等于 0，则原价
if (activityPrice.equals(big)||activityPrice==null) { if (activityPrice.equals(big)||activityPrice==null) {
price = product.getPrice(); price = product.getPrice();
}else { }else {
price = product.getActivityPrice(); price = product.getActivityPrice();
} }
Integer quantity = buyOrderDetail.getQuantity(); Integer quantity = buyOrderDetail.getQuantity();
BigDecimal bigDecimal = new BigDecimal(price.doubleValue() * quantity); BigDecimal bigDecimal = new BigDecimal(price.doubleValue() * quantity);
System.out.println("bigDecimal=================bigDecimal======================"+bigDecimal); System.out.println("bigDecimal=================bigDecimal======================"+bigDecimal);
@@ -170,6 +178,7 @@ public class BuyOrderController {
product.setProductStock(product.getProductStock() - buyOrderDetail.getQuantity()); product.setProductStock(product.getProductStock() - buyOrderDetail.getQuantity());
product.setSumSales(product.getSumSales() + buyOrderDetail.getQuantity()); product.setSumSales(product.getSumSales() + buyOrderDetail.getQuantity());
shopProductService.updateById(product); shopProductService.updateById(product);
BeanUtils.copyProperties(buyOrderDetail,buyOrderDetailEntity); BeanUtils.copyProperties(buyOrderDetail,buyOrderDetailEntity);
buyOrderDetailEntity.setProductName(product.getProductName()); buyOrderDetailEntity.setProductName(product.getProductName());
buyOrderDetailEntity.setProductPrice(product.getPrice()); buyOrderDetailEntity.setProductPrice(product.getPrice());
@@ -200,9 +209,8 @@ public class BuyOrderController {
String timeId = IdWorker.getTimeId().substring(0,32); String timeId = IdWorker.getTimeId().substring(0,32);
buyOrder.setOrderSn(timeId); buyOrder.setOrderSn(timeId);
if("4".equals(buyOrder.getPaymentMethod())){ if("4".equals(buyOrder.getPaymentMethod())){
buyOrder.setOrderStatus("1"); buyOrder.setOrderStatus(ORDER_STATUS_TO_BE_SHIPPED);
} }
//todo 增加结束时间
buyOrder.setPaymentDate(new Date()); buyOrder.setPaymentDate(new Date());
buyOrderService.save(buyOrder); buyOrderService.save(buyOrder);

176
src/main/java/com/peanut/modules/book/entity/BuyOrderDetailEntity.java
View File

@@ -10,101 +10,107 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data; import lombok.Data;
import javax.xml.soap.Text;
/** /**
* 商品订单详情表 * 商品订单详情表
* *
* @author yl * @author yl
* @email yl328572838@163.com * @email yl328572838@163.com
* @date 2022-08-29 15:27:44 * @date 2022-08-29 15:27:44
* @modify wu chunlei
* @date 2023-10-07 13:06:00
*/ */
@Data @Data
@TableName("buy_order_detail") @TableName("buy_order_detail")
public class BuyOrderDetailEntity implements Serializable { public class BuyOrderDetailEntity implements Serializable {
private static final long serialVersionUID = 1L;
/** private static final long serialVersionUID = 1L;
* 订单详情id /**
*/ * 订单详情id
@TableId */
private Long allOrderId; @TableId
/** private Long allOrderId;
* 订单表id /**
*/ * 订单表id
private Integer orderId; */
/** private Integer orderId;
* 用户id /**
*/ * 用户id
private Integer userId; */
/** private Integer userId;
* 商品id /**
*/ * 商品id
private Integer productId; */
/** private Integer productId;
* 商品名称 /**
*/ * 商品名称
private String productName; */
/** private String productName;
* 商品数量 /**
*/ * 商品数量
private Integer quantity; */
/** private Integer quantity;
* 商品单价 /**
*/ * 商品单价
private BigDecimal productPrice; */
/** private BigDecimal productPrice;
* 商品重量 /**
*/ * 商品重量
private Float weight; */
/** private Float weight;
* 商品类型 /**
*/ * 商品类型
private String productType; */
private String productType;
private String shippingSn; /**
private String orderStatus; * 物流单号
private String remark; */
/** private String shippingSn;
* 下单时间 /**
*/ * 订单状态 0-待支付 1-待发货 2-待收货
@TableField(fill = FieldFill.INSERT)//创建注解 */
private Date creatTime; private String orderStatus;
/**
@TableField(exist = false) * 备注
private String image; */
private String remark;
/** /**
* 地址id * 下单时间
*/ */
private Integer addressId; @TableField(fill = FieldFill.INSERT)
private Date creatTime;
/**
/** * 图片
* 面单html */
*/ @TableField(exist = false)
private String fmsHtml; private String image;
/**
/** * 地址id
* 快递公司编码 */
*/ private Integer addressId;
private String shipperCode; /**
* 面单html
/** */
* 快递公司名称 private String fmsHtml;
*/ /**
private String shipperName; * 快递公司编码
*/
/** private String shipperCode;
* 是否已打印 0: 未打印，1：已打印 /**
*/ * 快递公司名称
private String isPrint; */
private String shipperName;
/** /**
* 商品图片地址 * 是否已打印 0: 未打印，1：已打印
*/ */
private String productUrl; private String isPrint;
@TableField("record_id") /**
private Integer recordId; * 商品图片地址
*/
private String productUrl;
/**
* 评价 ID
*/
@TableField("record_id")
private Integer recordId;
} }

3
src/main/java/com/peanut/modules/book/entity/BuyOrderEntity.java
View File

@@ -104,14 +104,11 @@ public class BuyOrderEntity implements Serializable {
private Date shippingTime; private Date shippingTime;
/** /**
* 订单状态 * 订单状态
*
*
* 0: 待付款 * 0: 待付款
* 1: 待发货 * 1: 待发货
* 2: 已发货 * 2: 已发货
* 3：已完成 * 3：已完成
* 4: 交易失败 * 4: 交易失败
*
*/ */
private String orderStatus; private String orderStatus;
/** /**

2
src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java
View File

@@ -190,8 +190,6 @@ public class WechatPayConfig implements Serializable {
* @return * @return
*/ */
@Bean(name = "wxPayClient") @Bean(name = "wxPayClient")
public CloseableHttpClient getWxPayClient(Verifier verifier) { public CloseableHttpClient getWxPayClient(Verifier verifier) {
log.info("获取HttpClient"); log.info("获取HttpClient");

12
src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java
View File

@@ -48,7 +48,7 @@ import java.util.concurrent.locks.ReentrantLock;
@Slf4j @Slf4j
@RestController @RestController
@CrossOrigin //跨域 @CrossOrigin
@RequestMapping("/pay") @RequestMapping("/pay")
@Configuration @Configuration
public class WeChatPayController { public class WeChatPayController {
@@ -254,33 +254,24 @@ public class WeChatPayController {
BuyOrderEntity order = this.buyOrderService.getOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", orderNo)); BuyOrderEntity order = this.buyOrderService.getOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", orderNo));
PayWechatOrderEntity wechatEntity = new PayWechatOrderEntity(); PayWechatOrderEntity wechatEntity = new PayWechatOrderEntity();
if(!ObjectUtils.isEmpty(order)){ if(!ObjectUtils.isEmpty(order)){
wechatEntity = this.payWechatOrderService.getOne(new QueryWrapper<PayWechatOrderEntity>().eq("order_sn", order.getOrderSn())); wechatEntity = this.payWechatOrderService.getOne(new QueryWrapper<PayWechatOrderEntity>().eq("order_sn", order.getOrderSn()));
}else{ }else{
log.error("无效订单！"); log.error("无效订单！");
return R.error(500,"无效订单！"); return R.error(500,"无效订单！");
} }
// 1.根据订单id获取订单信息 // 1.根据订单id获取订单信息
if("order".equals(order.getOrderType())){ if("order".equals(order.getOrderType())){
BuyOrderEntity orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", wechatEntity.getOrderSn())); BuyOrderEntity orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", wechatEntity.getOrderSn()));
BigDecimal realMoney = orderEntity.getRealMoney(); BigDecimal realMoney = orderEntity.getRealMoney();
//更新 订单 记录 //更新 订单 记录
if (wechatEntity.getTotalAmount().compareTo(realMoney) == 0) { if (wechatEntity.getTotalAmount().compareTo(realMoney) == 0) {
buyOrderService.updateOrderStatus(Integer.valueOf(order.getUserId()),order.getOrderSn(),"0"); buyOrderService.updateOrderStatus(Integer.valueOf(order.getUserId()),order.getOrderSn(),"0");
} }
} }
if("point".equals(order.getOrderType())){ if("point".equals(order.getOrderType())){
// List<BookBuyConfigEntity> bookBuyConfigEntity = bookBuyConfigService.getBaseMapper().selectList(new QueryWrapper<BookBuyConfigEntity>().eq("price_type_id", ""));
// 插入花生币 变动记录
PayWechatOrderEntity buy_order_id = payWechatOrderService.getBaseMapper().selectOne(new QueryWrapper<PayWechatOrderEntity>().eq("order_sn", order.getOrderSn())); PayWechatOrderEntity buy_order_id = payWechatOrderService.getBaseMapper().selectOne(new QueryWrapper<PayWechatOrderEntity>().eq("order_sn", order.getOrderSn()));
Integer buyorder= buy_order_id.getBuyOrderId(); Integer buyorder= buy_order_id.getBuyOrderId();
BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(buyorder); BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(buyorder);
String realMoney =bookBuyConfigEntity.getRealMoney(); String realMoney =bookBuyConfigEntity.getRealMoney();
Integer money = Integer.valueOf(realMoney); Integer money = Integer.valueOf(realMoney);
userService.rechargeHSPoint(Integer.valueOf(order.getUserId()),money); userService.rechargeHSPoint(Integer.valueOf(order.getUserId()),money);
@@ -288,7 +279,6 @@ public class WeChatPayController {
transactionDetailsEntity.setUserId(order.getUserId()); transactionDetailsEntity.setUserId(order.getUserId());
transactionDetailsEntity.setChangeAmount(new BigDecimal(money)); transactionDetailsEntity.setChangeAmount(new BigDecimal(money));
transactionDetailsEntity.setOrderType("充值"); transactionDetailsEntity.setOrderType("充值");
// transactionDetailsEntity.setRelationId(wechatEntity.getId().intValue());
transactionDetailsEntity.setRelationId(buy_order_id.getId().intValue()); transactionDetailsEntity.setRelationId(buy_order_id.getId().intValue());
transactionDetailsEntity.setRemark("充值"); transactionDetailsEntity.setRemark("充值");

1
src/main/java/com/peanut/modules/sys/controller/SysLogController.java
View File

@@ -41,7 +41,6 @@ public class SysLogController {
@RequiresPermissions("sys:log:list") @RequiresPermissions("sys:log:list")
public R list(@RequestParam Map<String, Object> params){ public R list(@RequestParam Map<String, Object> params){
PageUtils page = sysLogService.queryPage(params); PageUtils page = sysLogService.queryPage(params);
return R.ok().put("page", page); return R.ok().put("page", page);
} }

2
src/main/resources/application.yml
View File

@@ -12,7 +12,7 @@ connection-timeout: 6000000ms
spring: spring:
# 环境 dev|test|prod # 环境 dev|test|prod
profiles: profiles:
active: prod active: dev
# jackson时间格式化 # jackson时间格式化
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8

50
src/main/resources/weChatConfig.properties Normal file
View File

@@ -0,0 +1,50 @@
wxpay:
#应用编号
wxpay.appId: wx47134a8f15083734
#商户号
wxpay.mchId: 1612860909
# APIv3密钥
wxpay.apiV3Key: 4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF
# 微信支付V3-url前缀
wxpay.baseUrl: https://api.mch.weixin.qq.com/v3
#po9k1ezoyexk.ngrok.xiaomiqiu123.top 内网穿透地址 测试ok 正式环境下切换服务器地址
#wxpay.notifyUrl: http://101.201.146.165:9100
wxpay.notifyUrl: http://59.110.212.44:9100/pb/pay/payNotify
# 退款通知回调, pjm6m9.natappfree.cc 为内网穿透地址
wxpay.refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify
# 密钥路径,resources下 /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
wxpay.keyPemPath:C:/Users/Administrator/IdeaProjects/peanut_book/src/main/resources/cent/apiclient_key.pem
#wxpay.keyPemPath:D:/hs/nuttyreading-java/src/main/resources/cent/apiclient_key.pem
#商户证书序列号
wxpay.serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3
#微信服务器地址
wxpay.domain: https://api.mch.weixin.qq.com
#wxpay:
##应用编号
#wxpay.appId: wx47134a8f15083734
##商户号
#wxpay.mchId: 1612860909
## APIv3密钥
#wxpay.apiV3Key: 4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF
## 微信支付V3-url前缀
#wxpay.baseUrl: https://api.mch.weixin.qq.com/v3
##po9k1ezoyexk.ngrok.xiaomiqiu123.top 内网穿透地址 测试ok 正式环境下切换服务器地址
#
##wxpay.notifyUrl: http://101.201.146.165:9100
#
#wxpay.notifyUrl: http://59.110.212.44:9100/pb/pay/payNotify
#
## 退款通知回调, pjm6m9.natappfree.cc 为内网穿透地址
#wxpay.refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify
## 密钥路径,resources下 /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
#
#wxpay.keyPemPath:/usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
##商户证书序列号
#wxpay.serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3
##微信服务器地址
#wxpay.domain: https://api.mch.weixin.qq.com