paypal 收款账号切换到live

generate 全部失败 抛异常

.gitignore

@@ -1,2 +1,50 @@
 sql/*.sql
 
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+.log
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+.mvn
+mvnw*
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+
+### VS Code ###
+.vscode/
+
+### generated files ###
+bin/
+gen/
+
+### MAC ###
+.DS_Store
+
+### Other ###
+logs/
+log
+temp/
+
+docker-compose.yml

Dockerfile

@@ -0,0 +1,7 @@
+FROM openjdk:8
+VOLUME /tmp
+#时区设置
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' > /etc/timezone
+ADD ./target/aida-0.0.1-SNAPSHOT.jar /app.jar
+ENTRYPOINT ["java","-jar","/app.jar"]

README.md

@@ -1,2 +1,3 @@
 # Aida 1.2
-Version of aida 1.2
+Version of aida 1.3
+修改预先登录接口、逻辑

aida.iml

@@ -1,192 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module version="4">
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
       <configuration />
     </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </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" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.2.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.12.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.12.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.29" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.29" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.29" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.2.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.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.29" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.5.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.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:5.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" 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.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.2.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.2.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.2.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.2.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.2.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.2.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-jwt:1.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.18" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.61" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.29" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.2" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:2.0.6.graal" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.6.graal" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.6.graal" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.1" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.4.0-b180830.0359" 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-impl:4.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:4.0.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.eclipse.angus:angus-activation:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.whvcse:easy-captcha:1.6.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:31.1-jre" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.tencentcloudapi:tencentcloud-sdk-java-ses:3.1.572" level="project" />
-    <orderEntry type="library" name="Maven: com.tencentcloudapi:tencentcloud-sdk-java-common:3.1.572" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.7.5" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp:logging-interceptor:2.7.5" level="project" />
-    <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
   </component>
 </module>

files/CODE-CREATE LIMITED-3015240422190522-merchant.private.key.txt

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC1XpZ0+EIoJvQk
+GHAdpcpr35S+UnxNdOE+1sZsIDWuyzXG0d6vOudITmYFTqVzJRaAArhwp+NQ/R9y
+onsuUsEc0x2qTntySYMedHfI2TSl6qTsqpHykSLr6u0E4TuYUiGs/nf3t0A/rEvm
+KK6OP4vNgUlANhOKDwiCAdmJkiOBEHJwLsN1xlcnBkUR0Wr+uauVo+A0opkM7HrB
+aXXTcy+gpold+uCgCbRzFCiDr0uKsLJgb3Ce1aXTwa8k2dDg6mzhE0U65yhsNzjC
+Cqg+g8tfEVha9Nrsmd6hG2iFHnk4rCqRXhjuI1V10GiZUppMWJtGD2tj7ZK0XXKh
+5sAclu9RAgMBAAECggEBAKSQy8IclKKsHbA2wFwWV6Ijv2olnAYH/G0xId9wJmWQ
+mx3oxb6Hmt3fzPAZ2UOuLkk+rq4Bl9+fnQ494bk5e2G1KWCjT512mFNk6F9EvmGh
+k73uUvkeueoIQsG/wHxIYaf/SUlqbBCaPE/9L82AWVDBc36g0n/dfiHAnesWv8JV
+agiTF/SIWDPtzRaVh8VObFOusHdqnRuLqV7n0FSVJePSNBFSSOz5XTttOtM4whg8
+kw3jlCHbVMVKtPYcebxGf0vkDapyGJiZ6wc1rD4MXJTciG+WQNfNE+Af2UB606VC
+Nlq/CRkXr2Ix9ASSMeE4TcH+0EoxeITpP2NV+3hAzgECgYEA7mWSd6HgPXMdwO33
+efmx0qky+I/4bhicG9Go6021fRY+jUhRcj6VtDWBzuZwblgTSiDH4t2TbfB+hvQD
+GVTJNc21+hXEVNu0ajqLuMiCgqaZCeNeJYYYowbLSbYd4t/nQh1vCZ/44aRWqG8G
+eWEGruMaqSlGyFG7kyaoQaY1X6ECgYEAwsMGiupkNZ/JU3PZd2X2X+37b8BXcIt7
+itL413GDiLwCNII5pArD7GHYFQzN4GaUCt/VjrRXbTY1xYCk2RA0FyBMsxAGa+eH
+9iTSLQvDJpxV/44UY3L9ZFcz4t0WjRcsdqPt30yUBNWiAIGcjtae2tMvtfxKICLQ
+sYXAS+ciMbECgYEA4tnerV5pfq/7QSpw0y4Ky5ZcPXDqiwF6E3LH1dlleTlgnpqR
+fjAVzp0X/+UCWc4P1PsqmjQU5YnzLMIn7MPkkAFHSEnMQJ+sp2U8rcKHhoG3oVQt
+s3FOIlwFuAfHmqtLaXuOvM7wSu9R0weLVpdAf8z2AsCXbWlxH86qT4Y0xeECgYBM
+NJkbw8i//qx8vciqYjf7oxeNy1mrTLhjQldhnSXVW5MVTpsVJ60vkb1Fx0PK+PgW
+JSzfcIsAzYROqh5WXHO1VMsOCUgp8mcNlayzOXX7ZpJzsvkhTH3/Q+umadGIFTgt
+l8jcZY9JMPn5br1+WlW/04BImdW7K0QzId1zFZYYkQKBgQDqswTLEpbBDOE/3uk4
+laZ9kTLJMP/hVmDJ0/jbETMdCkzIORnr3xFxmZIHG17E2In9PVumD0ESCh7qbCDE
+isbfLSgfJR6ItdOM6W2R0GAsXQ3e0byBpR7qm0j9J3zYRhQwfVbZtkX0uywB9a/4
+q2bz4491ESrbryx16FZKUJeX8g==
+-----END PRIVATE KEY-----

files/CODE-CREATE LIMITED.merchant.aqs.public.key.pem

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtV6WdPhCKCb0JBhwHaXK
+a9+UvlJ8TXThPtbGbCA1rss1xtHerzrnSE5mBU6lcyUWgAK4cKfjUP0fcqJ7LlLB
+HNMdqk57ckmDHnR3yNk0peqk7KqR8pEi6+rtBOE7mFIhrP5397dAP6xL5iiujj+L
+zYFJQDYTig8IggHZiZIjgRBycC7DdcZXJwZFEdFq/rmrlaPgNKKZDOx6wWl103Mv
+oKaJXfrgoAm0cxQog69LirCyYG9wntWl08GvJNnQ4Ops4RNFOucobDc4wgqoPoPL
+XxFYWvTa7JneoRtohR55OKwqkV4Y7iNVddBomVKaTFibRg9rY+2StF1yoebAHJbv
+UQIDAQAB
+-----END PUBLIC KEY-----

pom.xml

@@ -76,6 +76,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
@@ -138,6 +144,89 @@
             <artifactId>tencentcloud-sdk-java-ses</artifactId>
             <version>3.1.572</version>
         </dependency>
+
+        <!--minio-->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>8.0.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>9.2.1.jre8</version>
+        </dependency>
+
+        <!-- RabbitMQ -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+
+        <!-- redis 连接池 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+
+        <!--支付宝 SDK-->
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>4.22.57.ALL</version>
+        </dependency>
+
+        <!--PayPal SDK-->
+        <dependency>
+            <groupId>com.paypal.sdk</groupId>
+            <artifactId>checkout-sdk</artifactId>
+            <version>1.0.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.paypal.sdk</groupId>
+            <artifactId>rest-api-sdk</artifactId>
+            <version>LATEST</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20230618</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>5.2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>5.2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.17.1</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>
@@ -157,4 +246,30 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <!-- 本地开发环境 -->
+            <id>dev</id>
+            <properties>
+                <profiles.active>dev</profiles.active>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <!-- 测试环境 -->
+            <id>test</id>
+            <properties>
+                <profiles.active>test</profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <!-- 生产环境 -->
+            <id>prod</id>
+            <properties>
+                <profiles.active>prod</profiles.active>
+            </properties>
+        </profile>
+    </profiles>
 </project>

src/main/java/com/ai/da/AiDaApplication.java

@@ -3,9 +3,11 @@ package com.ai.da;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @Slf4j
 @SpringBootApplication
+@EnableScheduling
 public class AiDaApplication {
 
     public static void main(String[] args) {

src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java

@@ -0,0 +1,216 @@
+package com.ai.da.common.RabbitMQ;
+
+import com.ai.da.common.config.exception.BusinessException;
+import com.ai.da.common.constant.CommonConstant;
+import com.ai.da.common.utils.RedisUtil;
+import com.ai.da.model.dto.GenerateThroughImageTextDTO;
+import com.ai.da.model.vo.GenerateResultVO;
+import com.ai.da.service.GenerateService;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
+import com.rabbitmq.client.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.tomcat.jni.Time;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+
+@Slf4j
+@Component
+public class GenerateConsumer {
+
+    @Resource
+    private GenerateService generateService;
+
+    @Resource
+    private RedisUtil redisUtil;
+
+    @Value("${redis.key.orderForGenerate}")
+    private String consumptionOrderKey;
+
+    @Value("${redis.key.generateCancelSet}")
+    private String cancelSetKey;
+
+    @Value("${redis.key.generateExceptionMap}")
+    private String exceptionMapKey;
+
+    @Value("${redis.key.generateResult}")
+    private String generateResultKey;
+
+    public void generate(Message msg, Channel channel, String consumerName) {
+        log.info("============start listening==========");
+        long start = System.currentTimeMillis();
+
+        GenerateThroughImageTextDTO generateThroughImageTextDTO = JSONObject.parseObject(msg.getBody(), GenerateThroughImageTextDTO.class);
+        String uniqueId = generateThroughImageTextDTO.getUniqueId();
+        log.info("From " + consumerName + " : " + uniqueId);
+
+        try {
+            // 2、判断当前消息是否在取消列表中
+            Boolean isMember = redisUtil.isElementExistsInSet(cancelSetKey, uniqueId);
+            if (isMember) {
+                try {
+                    // 2.1 手动确认该消息
+                    channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+                } catch (IOException ex) {
+                    log.error("手动确认，不返回队列重新消费");
+                }
+                // 2.2 将该消息从取消列表中删除
+//                redisUtil.removeFromSet(cancelSetKey, uniqueId);
+            } else {
+//                GenerateCollectionVO generateCollectionVO = generateService.generateThroughImageText(generateThroughImageTextDTO);
+                generateService.generateThroughImageText(generateThroughImageTextDTO);
+                // 将消息从redis排队队列中删除,需保证被消费的消息存储到db之后再从redis删除
+                redisUtil.removeFromZSet(consumptionOrderKey, uniqueId);
+                /*if (!Objects.isNull(generateCollectionVO)) {
+                    HashMap<String, String> generateResult = new HashMap<>();
+                    generateResult.put(uniqueId, JSONObject.toJSONString(generateCollectionVO));
+                    // 将结果存在redis中 ,为空时不要存
+                    redisUtil.addToMap(resultMapKey, generateResult);
+                }*/
+
+            }
+        } catch (BusinessException e) {
+            log.error(e.getMsg());
+            // channel.basicNack() 为不确认deliveryTag对应的消息，第二个参数是否应用于多消息，第三个参数是否requeue
+            try {
+                // 第二个参数，是否批量确认消息，当传false时，只确认当前 deliveryTag对应的消息;当传true时，会确认当前及之前所有未确认的消息。
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+                // 将消息从redis排队队列中删除,需保证被消费的消息存储到db之后再从redis删除
+                redisUtil.removeFromZSet(consumptionOrderKey, uniqueId);
+                String key = generateResultKey + ":" + uniqueId;
+                GenerateResultVO generateResultVO = new GenerateResultVO(generateThroughImageTextDTO.getUniqueId(), null, null, "Fail");
+                redisUtil.addToString(key, new Gson().toJson(generateResultVO), CommonConstant.GENERATE_RESULT_EXPIRE_TIME);
+            } catch (IOException exception) {
+                log.error("手动确认，取消返回队列，不再重新消费");
+            }
+            // 将入参和错误信息存入数据库
+            String exceptionMessage = JSONObject.toJSONString(generateThroughImageTextDTO) +
+                    " Exception message ： " + e.getMsg();
+            HashMap<String, String> exceptionInfo = new HashMap<>();
+            exceptionInfo.put(String.valueOf(uniqueId), exceptionMessage);
+            // 存redis
+            redisUtil.addToMap(exceptionMapKey, exceptionInfo);
+        }
+        long end = System.currentTimeMillis();
+
+        log.info(" task_id： " + uniqueId + "----------" + consumerName + " 执行时长：" + (end - start) + "毫秒");
+        log.info("=============end listening===========");
+    }
+
+    public void processGenerateResult(Message msg, Channel channel) {
+        log.info("============ProcessGenerateResult listening==========");
+        long start = System.currentTimeMillis();
+
+        Map<String, String> generateResult = JSONObject.parseObject(msg.getBody(), Map.class);
+        log.info("generate response : {}", generateResult);
+
+        try {
+            log.info("tasks_id : {} start ", generateResult.get("tasks_id"));
+            if (generateResult.get("status").equals("SUCCESS")) {
+                String url = generateResult.get("image_url");
+                String taskId = generateResult.get("tasks_id");
+                String category = generateResult.get("category");
+                generateService.processGenerateResult(taskId, url, category);
+            } else {
+                // 修改redis中的数据状态为exception
+                String key = generateResultKey + ":" + generateResult.get("tasks_id");
+                redisUtil.addToString(key, new Gson().toJson(new GenerateResultVO(generateResult.get("tasks_id"), null, null, "Fail")), CommonConstant.GENERATE_RESULT_EXPIRE_TIME);
+                // 将异常信息存到exception中
+                HashMap<String, String> exceptionInfo = new HashMap<>();
+                exceptionInfo.put(generateResult.get("tasks_id"), generateResult.get("data"));
+                // 存redis
+                redisUtil.addToMap(exceptionMapKey, exceptionInfo);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            try {
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+                // 将消息从redis排队队列中删除,需保证被消费的消息存储到db之后再从redis删除
+                redisUtil.removeFromZSet(consumptionOrderKey, generateResult.get("tasks_id"));
+            } catch (IOException exception) {
+                log.error("手动确认，取消返回队列，不再重新消费");
+            }
+            // 将入参和错误信息存入数据库
+            String exceptionMessage = JSONObject.toJSONString(generateResult) +
+                    " Exception message ： " + e.getMessage();
+            HashMap<String, String> exceptionInfo = new HashMap<>();
+            exceptionInfo.put(String.valueOf(generateResult.get("tasks_id")), exceptionMessage);
+            // 存redis
+            redisUtil.addToMap(exceptionMapKey, exceptionInfo);
+        }
+
+        long end = System.currentTimeMillis();
+        log.info("tasks_id : {}, end , message : {}, 执行时长： {} 毫秒", generateResult.get("tasks_id"), generateResult.get("message"), (end - start));
+        log.info("============ProcessGenerateResult End listening==========");
+
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer1(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 1");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer2(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 2");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer3(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 3");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer4(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 4");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer5(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 5");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer6(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 6");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer7(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 7");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer8(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 8");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer9(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 9");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_RESULT_QUEUE)
+    @RabbitHandler
+    public void getGenerateResult(Message msg, Channel channel) {
+        processGenerateResult(msg, channel);
+    }
+}

src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java

@@ -0,0 +1,60 @@
+package com.ai.da.common.RabbitMQ;
+
+import org.springframework.amqp.core.Queue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MQConfig {
+
+    public static final String GENERATE_EXCHANGE_FANOUT = "generate-exchange";
+    //    public static final String GENERATE_QUEUE = "generate-queue-prod";
+//    public static final String GENERATE_QUEUE = "generate-queue-test";
+//     ==================================================================
+//    public static final String GENERATE_QUEUE = "generate-queue-local";
+    public static final String GENERATE_QUEUE = "generate-queue-dev";
+
+//    public static final String SR_QUEUE = "SR-queue-local";
+        public static final String SR_QUEUE = "SR-queue-dev";
+
+//        public static final String SR_RESULT_QUEUE = "SuperResolution-local";
+    public static final String SR_RESULT_QUEUE = "SuperResolution-dev";
+
+//    public static final String GENERATE_RESULT_QUEUE = "GenerateImage-local";
+    public static final String GENERATE_RESULT_QUEUE = "GenerateImage-dev";
+
+    public MQConfig() {
+    }
+
+//    @Bean
+//    FanoutExchange fanoutRasaExchange() {
+//        return new FanoutExchange(GENERATE_EXCHANGE_FANOUT);
+//    }
+
+    /**
+     * 创建队列,使用工作模式，不用定义交换机
+     */
+    @Bean
+    public Queue generateQueue() {
+        return new Queue(GENERATE_QUEUE);
+    }
+
+    @Bean
+    public Queue SRQueue() {
+        return new Queue(SR_QUEUE);
+    }
+
+    @Bean
+    public Queue SRResultQueue() {
+        return new Queue(SR_RESULT_QUEUE);
+    }
+
+    /**
+     * 将队列绑定到交换机上【队列订阅交换机】
+     */
+//    @Bean
+//    Binding bindingExchangeRasa() {
+//        return BindingBuilder.bind(queueRasa()).to(fanoutRasaExchange());
+//    }
+
+}

src/main/java/com/ai/da/common/RabbitMQ/MQPublisher.java

@@ -0,0 +1,28 @@
+package com.ai.da.common.RabbitMQ;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Component
+public class MQPublisher {
+
+//    private final String url = "http://localhost:15672/api/queues/%2f/generate-queue";
+
+    @Resource
+    private AmqpTemplate amqpTemplate;
+
+    public void sendGenerateMessage(String mm) {
+        log.info("send message:" + mm);
+        amqpTemplate.convertAndSend(MQConfig.GENERATE_QUEUE, mm);
+    }
+
+    public void sendSRMessage(String mm) {
+        log.info("send message:" + mm);
+        amqpTemplate.convertAndSend(MQConfig.SR_QUEUE, mm);
+    }
+
+}

src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java

@@ -0,0 +1,234 @@
+package com.ai.da.common.RabbitMQ;
+
+import com.ai.da.common.config.exception.BusinessException;
+import com.ai.da.common.utils.RedisUtil;
+import com.ai.da.model.dto.SuperResolutionDTO;
+import com.ai.da.model.dto.TaskDTO;
+import com.ai.da.service.SuperResolutionService;
+import com.ai.da.service.TaskListService;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.rabbitmq.client.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+
+@Slf4j
+@Component
+public class SRConsumer {
+
+    @Resource
+    private RedisUtil redisUtil;
+
+    @Resource
+    private TaskListService taskListService;
+
+    @Value("${redis.key.orderForSR}")
+    private String consumptionOrderKey;
+
+    @Value("${redis.key.SRCancelSet}")
+    private String cancelSetKey;
+
+    @Value("${redis.key.SRExceptionMap}")
+    private String exceptionMapKey;
+
+    @Value("${redis.key.taskList}")
+    private String taskListKey;
+
+    @Resource
+    private SuperResolutionService superResolutionService;
+
+    /**
+     * 请求超分处理
+     */
+    public void superResolution(Message msg, Channel channel, String consumerName) {
+        log.info("============SR start listening==========");
+        long start = System.currentTimeMillis();
+
+        SuperResolutionDTO superResolutionDTO;
+        String uniqueId = null;
+
+        try {
+            superResolutionDTO = JSONObject.parseObject(msg.getBody(), SuperResolutionDTO.class);
+            uniqueId = superResolutionDTO.getUniqueId();
+            log.info("From " + consumerName + " : " + uniqueId);
+            superResolutionService.updateSROutput(uniqueId, "Executing", null);
+            taskListService.updateTaskStatusOrOutputRedis(uniqueId, "Executing", null);
+            /*try {
+                    Thread.sleep(2 * 60 * 1000);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }*/
+            // 2、判断当前消息是否在取消列表中
+            Boolean isMember = redisUtil.isElementExistsInSet(cancelSetKey, uniqueId);
+            if (isMember) {
+                try {
+                    // 2.1 手动确认该消息
+                    channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+                } catch (IOException ex) {
+                    log.error("手动确认，不返回队列重新消费");
+                }
+            } else {
+                // 请求python端进行超分
+                superResolutionService.SR(superResolutionDTO);
+            }
+        } catch (BusinessException e) {
+            log.error(e.getMsg());
+            superResolutionDTO = JSONObject.parseObject(msg.getBody(), SuperResolutionDTO.class);
+            // channel.basicNack() 为不确认deliveryTag对应的消息，第二个参数是否应用于多消息，第三个参数是否requeue
+            setErrorMessage(msg, channel, e.getMsg(), superResolutionDTO);
+            try {
+                // 2.1 手动确认该消息
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            } catch (IOException ex) {
+                log.error("手动确认，不返回队列重新消费, error message : " + e.getMessage());
+            }
+        } catch (JSONException e) {
+            log.error(e.getMessage());
+            setErrorMessage(msg, channel, e.getMessage(), null);
+            try {
+                // 2.1 手动确认该消息
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            } catch (IOException ex) {
+                log.error("手动确认，不返回队列重新消费, error message : " + e.getMessage());
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            superResolutionDTO = JSONObject.parseObject(msg.getBody(), SuperResolutionDTO.class);
+            setErrorMessage(msg, channel, e.getMessage(), superResolutionDTO);
+            try {
+                // 2.1 手动确认该消息
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            } catch (IOException ex) {
+                log.error("手动确认，不返回队列重新消费, error message : " + e.getMessage());
+            }
+        }
+
+        long end = System.currentTimeMillis();
+
+        log.info(" task_id： " + uniqueId + "----------" + consumerName + " 执行时长：" + (end - start) + "毫秒");
+        log.info("=============SR end listening===========");
+    }
+
+    /**
+     * 获取超分结果
+     */
+    public void getSRResult(Message msg, Channel channel, String consumerName) {
+        log.info("============SRResult start listening==========");
+        long start = System.currentTimeMillis();
+
+        JSONObject result = null;
+        String taskId = null;
+
+        try {
+            result = JSONObject.parseObject(msg.getBody(), JSONObject.class);
+            log.info("SR response : {}", result);
+            taskId = result.get("tasks_id").toString();
+        } catch (JSONException e) {
+            log.error("SRResult 返回数据格式不合规范");
+            log.error(e.getMessage());
+            setErrorMessage(msg, channel, e.getMessage(), null);
+            try {
+                // 第二个参数，是否批量确认消息，当传false时，只确认当前 deliveryTag对应的消息;当传true时，会确认当前及之前所有未确认的消息。
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            } catch (IOException exception) {
+                log.error("手动确认，取消返回队列，不再重新消费");
+            }
+        } catch (Exception e){
+            log.error(e.getMessage());
+            setErrorMessage(msg, channel, e.getMessage(), null);
+            try {
+                // 第二个参数，是否批量确认消息，当传false时，只确认当前 deliveryTag对应的消息;当传true时，会确认当前及之前所有未确认的消息。
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            } catch (IOException exception) {
+                log.error("手动确认，取消返回队列，不再重新消费");
+            }
+        }
+
+
+        try {
+            // 2、判断状态是否成功
+            if ("SUCCESS".equals(result.get("status").toString())) {
+                String output = result.get("data").toString();
+                superResolutionService.setSRResult(taskId, output, "success");
+                taskListService.updateTaskStatusOrOutputRedis(taskId, "success", output);
+            } else {
+                superResolutionService.setSRResult(taskId, null, "fail");
+                taskListService.updateTaskStatusOrOutputRedis(taskId, "fail", null);
+                HashMap<String, String> exceptionInfo = new HashMap<>();
+                // 获取输入信息
+                String task = redisUtil.getFromString(taskListKey + taskId + taskId.substring(taskId.lastIndexOf("-") + 1));
+                Gson gson = new Gson();
+                Type type = new TypeToken<TaskDTO<SuperResolutionDTO>>() {
+                }.getType();
+                TaskDTO<SuperResolutionDTO> taskDTO = gson.fromJson(task, type);
+                // 将输入信息和报错信息均存入redis todo 加判空
+                exceptionInfo.put(taskId, "Input ==> " + taskDTO.getInputParam() + "Fail Message ==> " + result.get("message").toString());
+                // 将报错信息存入redis
+                redisUtil.addToMap(exceptionMapKey, exceptionInfo);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            // channel.basicNack() 为不确认deliveryTag对应的消息，第二个参数是否应用于多消息，第三个参数是否requeue
+            try {
+                // 第二个参数，是否批量确认消息，当传false时，只确认当前 deliveryTag对应的消息;当传true时，会确认当前及之前所有未确认的消息。
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            } catch (IOException exception) {
+                log.error("手动确认，取消返回队列，不再重新消费");
+            }
+        }
+
+        long end = System.currentTimeMillis();
+
+        log.info(" task_id： " + taskId + "----------" + consumerName + " 执行时长：" + (end - start) + "毫秒");
+        log.info("=============SRResult end listening===========");
+    }
+
+    private void setErrorMessage(Message msg, Channel channel, String message, SuperResolutionDTO superResolutionDTO) {
+        String uniqueId;
+        try {
+            // 第二个参数，是否批量确认消息，当传false时，只确认当前 deliveryTag对应的消息;当传true时，会确认当前及之前所有未确认的消息。
+            channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            uniqueId = superResolutionDTO.getUniqueId();
+            // 将消息从redis排队队列中删除,需保证被消费的消息存储到db之后再从redis删除
+            redisUtil.removeFromZSet(consumptionOrderKey, uniqueId);
+        } catch (Exception exception) {
+            log.error("手动确认，取消返回队列，不再重新消费");
+            throw new BusinessException("发生错误，手动确认消息");
+        }
+        // 将入参和错误信息存入redis
+        String exceptionMessage = JSONObject.toJSONString(superResolutionDTO) +
+                " Exception message ： " + message;
+//                    " Exception message ： " + e.getMessage();
+        HashMap<String, String> exceptionInfo = new HashMap<>();
+        uniqueId = superResolutionDTO.getUniqueId();
+        exceptionInfo.put(String.valueOf(uniqueId), exceptionMessage);
+        // 存redis
+        redisUtil.addToMap(exceptionMapKey, exceptionInfo);
+        taskListService.updateTaskStatusOrOutputRedis(uniqueId, "fail", null);
+    }
+
+    @RabbitListener(queues = MQConfig.SR_QUEUE)
+    @RabbitHandler
+    public void SRConsumer1(Message msg, Channel channel) {
+        superResolution(msg, channel, "consumer 1");
+    }
+
+
+    @RabbitListener(queues = MQConfig.SR_RESULT_QUEUE)
+    @RabbitHandler
+    public void SRResultConsumer1(Message msg, Channel channel) {
+        getSRResult(msg, channel, "consumer 1");
+    }
+
+}

src/main/java/com/ai/da/common/config/AlipayClientConfig.java

@@ -0,0 +1,43 @@
+package com.ai.da.common.config;
+
+import com.alipay.api.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+
+import javax.annotation.Resource;
+
+@Configuration
+//加载配置文件
+@PropertySource("classpath:alipay-sandbox.properties")
+public class AlipayClientConfig {
+
+    @Resource
+    private Environment config;
+
+    @Bean
+    public AlipayClient alipayClient() throws AlipayApiException {
+
+        AlipayConfig alipayConfig = new AlipayConfig();
+
+        //设置网关地址
+        alipayConfig.setServerUrl(config.getProperty("alipay.gateway-url"));
+        //设置应用Id
+        alipayConfig.setAppId(config.getProperty("alipay.app-id"));
+        //设置应用私钥
+        alipayConfig.setPrivateKey(config.getProperty("alipay.merchant-private-key"));
+        //设置请求格式，固定值json
+        alipayConfig.setFormat(AlipayConstants.FORMAT_JSON);
+        //设置字符集
+        alipayConfig.setCharset(AlipayConstants.CHARSET_UTF8);
+        //设置支付宝公钥
+        alipayConfig.setAlipayPublicKey(config.getProperty("alipay.alipay-public-key"));
+        //设置签名类型
+        alipayConfig.setSignType(AlipayConstants.SIGN_TYPE_RSA2);
+        //构造client
+        AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig);
+
+        return alipayClient;
+    }
+}

src/main/java/com/ai/da/common/config/CRMReportInterface.java

@@ -0,0 +1,393 @@
+package com.ai.da.common.config;
+
+import com.ai.da.mapper.primary.entity.CustomerData;
+import com.ai.da.mapper.primary.entity.TransactionData;
+
+import java.io.FileWriter;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class CRMReportInterface {
+
+    // JDBC 驱动器名称以及数据库 URL
+    static final String JDBC_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+    static final String DB_URL = "jdbc:sqlserver://118.142.0.178:1550;databaseName=Hayman_prod";
+
+    // 数据库凭据
+    static final String USER = "user01";
+    static final String PASS = "haySIS-2302";
+
+    public static void main(String[] args) {
+        Connection conn = null;
+        Statement stmt = null;
+        try {
+            // 注册 JDBC 驱动器
+            Class.forName(JDBC_DRIVER);
+
+            // 打开一个连接
+            System.out.println("连接数据库...");
+            conn = DriverManager.getConnection(DB_URL, USER, PASS);
+
+            // 执行查询步骤1: 生成 RW0095 报告以获取客户完整数据
+            System.out.println("执行步骤1：生成 RW0095 报告...");
+            // 执行相应的查询并获取数据
+//            List<CustomerData> customerData = retrieveCustomerData();
+            // 执行查询步骤2: 使用 MZG013 报告检查客户的销售历史
+            System.out.println("执行步骤2：使用 MZG013 报告检查客户的销售历史...");
+            // 执行相应的查询并获取数据
+            List<TransactionData> transactionData = retrieveTransactionData();
+            List<String> collect = transactionData.stream().map(TransactionData::getUserMember).collect(Collectors.toList());
+            List<CustomerData> customerData = retrieveCustomerData(collect);
+            for (TransactionData transactionDatum : transactionData) {
+                for (CustomerData customerDatum : customerData) {
+                    if (customerDatum.getMbrCode().equals(transactionDatum.getUserMember())) {
+                        customerDatum.setLastMonth(transactionDatum.getSumAmt());
+                        break;
+                    }
+                }
+            }
+            // 执行步骤3: 合并（vlookup）RW0095中的客户购买金额
+            System.out.println("执行步骤3：合并客户购买金额...");
+            // 执行相应的操作，如vlookup
+
+            // 执行步骤4: 按“发行店”筛选以分离不同文件并逐个发送给店铺
+            System.out.println("执行步骤4：按发行店筛选并发送文件给店铺...");
+            // 执行相应的操作，如过滤和导出
+            String filePath = "C:\\Users\\10233\\Desktop\\CRM.csv";
+            exportToCSV(customerData, filePath);
+            // 关闭连接
+            conn.close();
+        } catch (SQLException se) {
+            // 处理 JDBC 错误
+            se.printStackTrace();
+        } catch (Exception e) {
+            // 处理 Class.forName 错误
+            e.printStackTrace();
+        } finally {
+            // 关闭资源
+            try {
+                if (stmt != null) stmt.close();
+            } catch (SQLException se2) {
+            } // 什么都不做
+            try {
+                if (conn != null) conn.close();
+            } catch (SQLException se) {
+                se.printStackTrace();
+            }
+        }
+        System.out.println("接口执行完成！");
+    }
+
+    private static void exportToCSV(List<CustomerData> customerDataList, String filePath) throws IOException {
+        FileWriter writer = new FileWriter(filePath);
+
+//        // 写入 CSV 文件的第一行，即字段名
+//        writer.append("User Member,Mbr Name,Sh Code,Sum Amt\n");
+//
+//        // 遍历数据列表，并将每一行数据写入 CSV 文件
+//        for (TransactionData transaction : transactionDataList) {
+//            writer.append(transaction.getUserMember()).append(",");
+//            writer.append(transaction.getMbrName()).append(",");
+//            writer.append(transaction.getShCode()).append(",");
+//            writer.append(String.valueOf(transaction.getSumAmt())).append("\n");
+//        }
+        writer.append("mbrCode,mbrName,mbrMobile,mbrGroup,mbrStatus,joinDate,mbrIssue,birthMonth,mbrSex,offBonus,effBonus,sumBonus,lastMonth\n");
+
+        // 遍历 customerDataList，并将数据写入 CSV 文件
+        for (CustomerData customer : customerDataList) {
+            writer.append(customer.getMbrCode()).append(",");
+            writer.append(customer.getMbrName()).append(",");
+            writer.append(customer.getMbrMobile()).append(",");
+            writer.append(customer.getMbrGroup()).append(",");
+            writer.append(customer.getMbrStatus()).append(",");
+            writer.append(customer.getJoinDate().toString()).append(","); // 日期需要根据实际情况格式化
+            writer.append(customer.getMbrIssue()).append(",");
+            writer.append(Integer.toString(customer.getBirthMonth())).append(",");
+            writer.append(customer.getMbrSex()).append(",");
+            writer.append(Double.toString(customer.getOffBonus())).append(",");
+            writer.append(Double.toString(customer.getEffBonus())).append(",");
+            writer.append(Double.toString(customer.getSumBonus())).append(",");
+            writer.append(Double.toString(customer.getLastMonth())).append("\n");
+        }
+
+        writer.close();
+    }
+
+    public static List<CustomerData> retrieveCustomerData(List<String> collect) {
+        List<CustomerData> customerDataList = new ArrayList<>();
+        Connection conn = null;
+        Statement stmt = null;
+        try {
+            // 注册 JDBC 驱动器
+            Class.forName(JDBC_DRIVER);
+
+            // 打开一个连接
+            System.out.println("连接数据库...");
+            conn = DriverManager.getConnection(DB_URL, USER, PASS);
+
+            // 执行查询
+            System.out.println("创建声明...");
+            stmt = conn.createStatement();
+            String sql;
+            // 构建 IN 子句的字符串，用于添加到 SQL 查询中
+            StringBuilder inClause = new StringBuilder("(");
+            for (String code : collect) {
+                inClause.append("'").append(code).append("',");
+            }
+            inClause.deleteCharAt(inClause.length() - 1); // 删除最后一个逗号
+            inClause.append(")");
+
+            // 构建完整的 SQL 查询语句
+            sql = "SELECT * FROM V_RW0095B WHERE mbr_code IN " + inClause.toString();
+            ResultSet rs = stmt.executeQuery(sql);
+
+
+            // 处理结果集
+            while (rs.next()) {
+                // 将每行数据转换为 CustomerData 对象并添加到列表中
+                CustomerData customer = new CustomerData();
+                customer.setMbrCode(rs.getString("mbr_code"));
+                customer.setMbrName(rs.getString("mbr_name"));
+                customer.setMbrMobile(rs.getString("mbr_mobile"));
+                customer.setMbrGroup(rs.getString("mbr_group"));
+                customer.setMbrStatus(rs.getString("mbr_status"));
+                customer.setJoinDate(rs.getDate("join_date"));
+                customer.setMbrIssue(rs.getString("mbr_issue"));
+                customer.setBirthMonth(rs.getInt("birth_m"));
+                customer.setMbrSex(rs.getString("mbr_sex"));
+                customer.setOffBonus(rs.getDouble("off_bonus"));
+                customer.setEffBonus(rs.getDouble("eff_bonus"));
+                customer.setSumBonus(rs.getDouble("sum_bonus"));
+                customerDataList.add(customer);
+
+            }
+
+            // 清理环境
+            rs.close();
+            stmt.close();
+            conn.close();
+        } catch (SQLException se) {
+            // 处理 JDBC 错误
+            se.printStackTrace();
+        } catch (Exception e) {
+            // 处理 Class.forName 错误
+            e.printStackTrace();
+        } finally {
+            // 关闭资源
+            try {
+                if (stmt != null) stmt.close();
+            } catch (SQLException se2) {
+            } // 什么都不做
+            try {
+                if (conn != null) conn.close();
+            } catch (SQLException se) {
+                se.printStackTrace();
+            }
+        }
+        System.out.println("查询执行完成！");
+        return customerDataList;
+    }
+
+    public static List<TransactionData> retrieveTransactionData() {
+        List<TransactionData> transactionDataList = new ArrayList<>();
+        Connection conn = null;
+        Statement stmt = null;
+        try {
+            // 注册 JDBC 驱动器
+            Class.forName(JDBC_DRIVER);
+
+            // 打开一个连接
+            System.out.println("连接数据库...");
+            conn = DriverManager.getConnection(DB_URL, USER, PASS);
+
+            // 执行查询
+            System.out.println("创建声明...");
+            stmt = conn.createStatement();
+            String sql;
+            sql = "SELECT user_member,mbr_name,sum(trx_bas_amt) sumAmtByMebBySh FROM V_MZG013\n" +
+                    "WHERE trx_date >= DATEADD(day, -7, GETDATE())\n" +
+                    "and user_member is not NULL\n" +
+                    "GROUP BY user_member,mbr_name";
+            ResultSet rs = stmt.executeQuery(sql);
+
+            // 处理结果集
+            while (rs.next()) {
+                // 将每行数据转换为 TransactionData 对象并添加到列表中
+                TransactionData transaction = new TransactionData();
+                transaction.setUserMember(rs.getString("user_member"));
+                transaction.setMbrName(rs.getString("mbr_name"));
+//                transaction.setShCode(rs.getString("sh_code"));
+                transaction.setSumAmt(rs.getDouble("sumAmtByMebBySh"));
+//                transaction.setTrxNo(rs.getString("trx_no"));
+//                transaction.setTrxDate(rs.getTimestamp("trx_date"));
+//                transaction.setTrxType(rs.getString("trx_type"));
+//                transaction.setTrxStatus(rs.getString("trx_status"));
+//                transaction.setTrxTotQty(rs.getDouble("trx_tot_qty"));
+//                transaction.setCurrCode(rs.getString("curr_code"));
+//                transaction.setExchRate(rs.getDouble("exch_rate"));
+//                transaction.setDiscountPerc(rs.getDouble("discount_perc"));
+//                transaction.setTrxAccAmt(rs.getDouble("trx_acc_amt"));
+//                transaction.setTrxBasAmt(rs.getDouble("trx_bas_amt"));
+//                transaction.setOutstandAmt(rs.getDouble("outstand_amt"));
+//                transaction.setReceiveAmt(rs.getDouble("receive_amt"));
+//                transaction.setChangeAmt(rs.getDouble("change_amt"));
+//                transaction.setTrxTotBonus(rs.getDouble("trx_tot_bonus"));
+//                transaction.setDepositNo(rs.getString("deposit_no"));
+//                transaction.setDepositAmt(rs.getDouble("deposit_amt"));
+//                transaction.setDepositStatus(rs.getString("deposit_status"));
+//                transaction.setTrxAmtDesc(rs.getString("trx_amt_desc"));
+//                transaction.setRemark(rs.getString("remark"));
+//                transaction.setShCode(rs.getString("sh_code"));
+//                transaction.setWhCodeFrom(rs.getString("wh_code_from"));
+//                transaction.setWhCodeTo(rs.getString("wh_code_to"));
+//                transaction.setIssuedBy(rs.getString("issued_by"));
+//                transaction.setClientCode(rs.getString("client_code"));
+//                transaction.setClientName(rs.getString("client_name"));
+//                transaction.setSalesmanCode(rs.getString("salesman_code"));
+//                transaction.setCtypeCode(rs.getString("ctype_code"));
+//                transaction.setUpdatedOn(rs.getTimestamp("updated_on"));
+//                transaction.setDocType(rs.getString("doc_type"));
+//                transaction.setRefNo(rs.getString("ref_no"));
+//                transaction.setAdjType(rs.getString("adj_type"));
+//                transaction.setRefType(rs.getString("ref_type"));
+//                transaction.setOrderNo(rs.getString("order_no"));
+//                transaction.setRecoverF(rs.getString("recover_f"));
+//                transaction.setRecoverT(rs.getString("recover_t"));
+//                transaction.setRequestBy(rs.getString("request_by"));
+//                transaction.setError(rs.getString("error"));
+//                transaction.setAuthorizedDate(rs.getTimestamp("authorized_date"));
+//                transaction.setAuthorizedBy(rs.getString("authorized_by"));
+//                transaction.setChangeCurrCode(rs.getString("change_curr_code"));
+//                transaction.setChgRate(rs.getDouble("chg_rate"));
+//                transaction.setCashier(rs.getString("cashier"));
+//                transaction.setCashiNo(rs.getString("cashi_no"));
+//                transaction.setSalesmanCode2(rs.getString("salesman_code2"));
+//                transaction.setClassId(rs.getString("class_id"));
+//                transaction.setDisAmt(rs.getDouble("dis_amt"));
+//                transaction.setAcStatus(rs.getString("ac_status"));
+//                transaction.setReprint(rs.getString("reprint"));
+//                transaction.setAlt1(rs.getString("alt_1"));
+//                transaction.setAlt2(rs.getString("alt_2"));
+//                transaction.setAlt3(rs.getString("alt_3"));
+//                transaction.setAlt4(rs.getString("alt_4"));
+//                transaction.setAlt5(rs.getString("alt_5"));
+//                transaction.setAltD1(rs.getDate("alt_d1"));
+//                transaction.setAltD2(rs.getDate("alt_d2"));
+//                transaction.setAltD3(rs.getDate("alt_d3"));
+//                transaction.setAltD4(rs.getDate("alt_d4"));
+//                transaction.setAltD5(rs.getDate("alt_d5"));
+//                transaction.setSalesmanCode3(rs.getString("salesman_code3"));
+//                transaction.setContractNo(rs.getString("contract_no"));
+//                transaction.setExpireDate(rs.getTimestamp("expire_date"));
+//                transaction.setDepositNetAmt(rs.getDouble("deposit_netamt"));
+//                transaction.setClientRestriction(rs.getString("client_restriction"));
+//                transaction.setRefStatus(rs.getString("ref_status"));
+//                transaction.setMbrDis(rs.getDouble("mbr_dis"));
+//                transaction.setPmtDiscount(rs.getDouble("pmt_discount"));
+//                transaction.setPmtAmount(rs.getDouble("pmt_amount"));
+//                transaction.setPmtNo(rs.getString("pmt_no"));
+//                transaction.setRefCode(rs.getString("ref_code"));
+//                transaction.setDocApproved(rs.getString("doc_approved"));
+//                transaction.setRefractionNo(rs.getString("refraction_no"));
+//                transaction.setCcpTot(rs.getDouble("ccp_tot"));
+//                transaction.setCcpRed(rs.getDouble("ccp_red"));
+//                transaction.setCcpExpired(rs.getDouble("ccp_expired"));
+//                transaction.setPrintedTimes(rs.getInt("printed_times"));
+//                transaction.setPickupShop(rs.getString("pickup_shop"));
+//                transaction.setDeliveryDate(rs.getDate("delivery_date"));
+//                transaction.setDeliveryTime(rs.getString("delivery_time"));
+//                transaction.setWsCode(rs.getString("ws_code"));
+//                transaction.setClCode(rs.getString("cl_code"));
+//                transaction.setClDesc(rs.getString("cl_desc"));
+//                transaction.setRatio(rs.getString("ratio"));
+//                transaction.setUserMember(rs.getString("user_member"));
+//                transaction.setHflag(rs.getString("hflag"));
+//                transaction.setIssueShop(rs.getString("issue_shop"));
+//                transaction.setHoUpdBy(rs.getString("ho_upd_by"));
+//                transaction.setHoUpdOn(rs.getTimestamp("ho_upd_on"));
+//                transaction.setBonusExpired(rs.getDouble("bonus_expired"));
+//                transaction.setBonusRed(rs.getDouble("bonus_red"));
+//                transaction.setConfirmedOn(rs.getTimestamp("confirmed_on"));
+//                transaction.setConfirmedBy(rs.getString("confirmed_by"));
+//                transaction.setDocConfirmed(rs.getString("doc_confirmed"));
+//                transaction.setBrNo(rs.getString("br_no"));
+//                transaction.setChangeAmt2(rs.getDouble("change_amt2"));
+//                transaction.setSalesDate(rs.getDate("sales_date"));
+//                transaction.setMbrName(rs.getString("mbr_name"));
+//                transaction.setCanEntryDis(rs.getString("can_entry_dis"));
+//                transaction.setReactiveClient(rs.getString("reactive_client"));
+//                transaction.setReactiveMbr(rs.getString("reactive_mbr"));
+//                transaction.setShUpdBy(rs.getString("sh_upd_by"));
+//                transaction.setShUpdOn(rs.getTimestamp("sh_upd_on"));
+//                transaction.setTax1(rs.getDouble("tax1"));
+//                transaction.setTax2(rs.getDouble("tax2"));
+//                transaction.setTax3(rs.getDouble("tax3"));
+//                transaction.setTax4(rs.getDouble("tax4"));
+//                transaction.setTax5(rs.getDouble("tax5"));
+//                transaction.setAltChar1(rs.getString("alt_char1"));
+//                transaction.setAltChar2(rs.getString("alt_char2"));
+//                transaction.setAltChar3(rs.getString("alt_char3"));
+//                transaction.setAltChar4(rs.getString("alt_char4"));
+//                transaction.setAltChar5(rs.getString("alt_char5"));
+//                transaction.setAltNum1(rs.getDouble("alt_num1"));
+//                transaction.setAltNum2(rs.getDouble("alt_num2"));
+//                transaction.setAltNum3(rs.getDouble("alt_num3"));
+//                transaction.setAltNum4(rs.getDouble("alt_num4"));
+//                transaction.setAltNum5(rs.getDouble("alt_num5"));
+//                transaction.setNewClient(rs.getString("new_client"));
+//                transaction.setNewMbr(rs.getString("new_mbr"));
+//                transaction.setPmtExtraDiscount(rs.getDouble("pmt_extra_discount"));
+//                transaction.setPmtExtraAmount(rs.getDouble("pmt_extra_amount"));
+//                transaction.setManualDiscount(rs.getDouble("manual_discount"));
+//                transaction.setManualAmount(rs.getDouble("manual_amount"));
+//                transaction.setUsermbrDiscount(rs.getDouble("usermbr_discount"));
+//                transaction.setClientDiscount(rs.getDouble("client_discount"));
+//                transaction.setHoldVoid(rs.getString("hold_void"));
+//                transaction.setPayBasAmt(rs.getDouble("pay_bas_amt"));
+//                transaction.setPayDesc(rs.getString("pay_desc"));
+//                transaction.setPayCode(rs.getString("pay_code"));
+//                transaction.setCardNo(rs.getString("card_no"));
+//                transaction.setPayCurr(rs.getString("pay_curr"));
+//                transaction.setPayCurrAmt(rs.getDouble("pay_curr_amt"));
+//                transaction.setOnbehalfPaid(rs.getString("onbehalf_paid"));
+//                transaction.setOnbehalfLoc(rs.getString("onbehalf_loc"));
+//                transaction.setOldCardNo(rs.getString("old_card_no"));
+//                transaction.setTrxYear(rs.getInt("TRX_YEAR"));
+//                transaction.setTrxMonth(rs.getInt("TRX_MONTH"));
+
+                transactionDataList.add(transaction);
+            }
+
+
+            // 清理环境
+            rs.close();
+            stmt.close();
+            conn.close();
+        } catch (SQLException | ClassNotFoundException e) {
+            // 处理异常
+            e.printStackTrace();
+        }
+        System.out.println("查询执行完成！");
+        return transactionDataList;
+    }
+
+    // 示例：导出数据到CSV文件
+    private static void exportToCSV(ResultSet resultSet, String filePath) throws SQLException, IOException {
+        FileWriter writer = new FileWriter(filePath);
+
+        while (resultSet.next()) {
+            // 将结果写入CSV文件
+            // 这里需要根据实际情况将数据写入CSV文件
+        }
+
+        writer.close();
+    }
+}
+

src/main/java/com/ai/da/common/config/FileProperties.java

@@ -29,6 +29,7 @@ public class FileProperties {
         }
         return linux;
     }
+
     public String getLinuxDomain() {
         String os = System.getProperty("os.name");
         if ((!os.toLowerCase().startsWith("win")) && (!os.toLowerCase().startsWith("mac"))) {

src/main/java/com/ai/da/common/config/MinIoClientConfig.java

@@ -0,0 +1,34 @@
+package com.ai.da.common.config;
+
+import io.minio.MinioClient;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+public class MinIoClientConfig {
+    @Value("${minio.endpoint}")
+    private String endpoint;
+    @Value("${minio.accessKey}")
+    private String accessKey;
+    @Value("${minio.secretKey}")
+    private String secretKey;
+
+    /**
+     * 注入minio 客户端
+     *
+     * @return
+     */
+    @Bean
+    public MinioClient minioClient() {
+
+        return MinioClient.builder()
+                .endpoint(endpoint)
+                .credentials(accessKey, secretKey)
+                .build();
+    }
+
+}
+

src/main/java/com/ai/da/common/config/MyTaskScheduler.java

@@ -0,0 +1,132 @@
+package com.ai.da.common.config;
+
+import com.ai.da.common.utils.SendEmailUtil;
+import com.ai.da.mapper.primary.AccountMapper;
+import com.ai.da.mapper.primary.TrialOrderMapper;
+import com.ai.da.mapper.primary.entity.Account;
+import com.ai.da.mapper.primary.entity.TrialOrder;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+@Component
+public class MyTaskScheduler {
+
+    @Resource
+    private AccountMapper accountMapper;
+
+    @Resource
+    private TrialOrderMapper trialOrderMapper;
+
+    // 定时任务，每十五天执行一次
+//    @Scheduled(cron = "0 0 0 ? * MON")
+    @Scheduled(cron = "0 0 0 */15 * ?")
+    public void checkExpiry() {
+        // 检测正式用户是否快要过期
+        QueryWrapper<Account> qw = new QueryWrapper<>();
+        qw.lambda().eq(Account::getIsTrial, 0);
+//        qw.lambda().eq(Account::getId, 88);
+        List<Account> accountList = accountMapper.selectList(qw);
+        for (Account account : accountList) {
+            // 用户到期时间戳
+            Long timestamp = account.getValidEndTime(); // 替换为你的时间戳
+
+            if (null == timestamp) {
+                continue;
+            }
+            // 获取当前时间戳
+            Long currentTimestamp = System.currentTimeMillis();
+
+            // 计算时间差（毫秒）
+            long timeDifference = currentTimestamp - timestamp;
+
+            if (timeDifference < 0) {
+                continue;
+            }
+
+            // 判断是否在30天以内（30天的毫秒数）
+            long thirtyDaysInMillis = 30L * 24 * 60 * 60 * 1000;
+            boolean within30Days = timeDifference <= thirtyDaysInMillis;
+
+            if (within30Days) {
+                // 发邮件
+                SendEmailUtil.sendWillBeExpiredEmail(account, null);
+            }
+        }
+    }
+    @Scheduled(cron = "0 0 8 * * ?")
+    public void sendTrialOrderExcelToManagements() {
+        // 获取前一天日期
+        LocalDate yesterday = LocalDate.now().minusDays(1);
+
+        // 查询前一天的试用订单
+        QueryWrapper<TrialOrder> qw = new QueryWrapper<>();
+        qw.lambda().between(TrialOrder::getCreateTime, yesterday.atStartOfDay(), yesterday.atTime(23, 59, 59));
+        List<TrialOrder> trialOrders = trialOrderMapper.selectList(qw);
+
+        if (!trialOrders.isEmpty()) {
+            // 创建Excel工作簿
+            try (Workbook workbook = new XSSFWorkbook()) {
+                // 创建工作表
+                Sheet sheet = workbook.createSheet("Trial Orders");
+                // 创建标题行
+                Row headerRow = sheet.createRow(0);
+                headerRow.createCell(0).setCellValue("ID");
+                headerRow.createCell(1).setCellValue("Title");
+                headerRow.createCell(2).setCellValue("Surname");
+                headerRow.createCell(3).setCellValue("Given Name");
+                headerRow.createCell(4).setCellValue("Username");
+                headerRow.createCell(5).setCellValue("Email");
+                headerRow.createCell(6).setCellValue("Country");
+                headerRow.createCell(7).setCellValue("Occupation");
+                headerRow.createCell(8).setCellValue("Create Time");
+                headerRow.createCell(9).setCellValue("Update Time");
+                headerRow.createCell(10).setCellValue("Status");
+
+                // 填充数据
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                int rowNum = 1;
+                for (TrialOrder trialOrder : trialOrders) {
+                    Row row = sheet.createRow(rowNum++);
+                    row.createCell(0).setCellValue(trialOrder.getId());
+                    row.createCell(1).setCellValue(trialOrder.getTitle());
+                    row.createCell(2).setCellValue(trialOrder.getSurname());
+                    row.createCell(3).setCellValue(trialOrder.getGivenName());
+                    row.createCell(4).setCellValue(trialOrder.getUserName());
+                    row.createCell(5).setCellValue(trialOrder.getEmail());
+                    row.createCell(6).setCellValue(trialOrder.getCountry());
+                    row.createCell(7).setCellValue(trialOrder.getOccupation());
+                    row.createCell(8).setCellValue(trialOrder.getCreateTime().format(formatter));
+                    row.createCell(9).setCellValue(trialOrder.getUpdateTime().format(formatter));
+                    row.createCell(10).setCellValue(trialOrder.getStatus());
+                }
+
+                // 保存Excel文件
+                String fileName = "trialOrder-" + yesterday.format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx";
+                try (FileOutputStream fileOut = new FileOutputStream(fileName)) {
+                    workbook.write(fileOut);
+                    SendEmailUtil.sendExcelEmail("1023316923@qq.com", null, Files.readAllBytes(Paths.get(fileName)), fileName);
+                    SendEmailUtil.sendExcelEmail("calvinwong@aidlab.hk", null, Files.readAllBytes(Paths.get(fileName)), fileName);
+                    SendEmailUtil.sendExcelEmail("kaicpang.pang@connect.polyu.hk", null, Files.readAllBytes(Paths.get(fileName)), fileName);
+                    SendEmailUtil.sendExcelEmail("kimwong@code-create.com.hk", null, Files.readAllBytes(Paths.get(fileName)), fileName);
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}

src/main/java/com/ai/da/common/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.ai.da.common.config.mybatis.plus;
+package com.ai.da.common.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
@@ -8,11 +8,17 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@MapperScan("com.ai.da.mapper")
 public class MybatisPlusConfig {
 
-    @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+    @Bean(name = "primaryMybatisPlusInterceptor")
+    public MybatisPlusInterceptor primaryMybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+
+    @Bean(name = "secondaryMybatisPlusInterceptor")
+    public MybatisPlusInterceptor secondaryMybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
         return interceptor;

src/main/java/com/ai/da/common/config/PayPalClient.java

@@ -0,0 +1,51 @@
+package com.ai.da.common.config;
+
+import com.paypal.core.PayPalEnvironment;
+import com.paypal.core.PayPalHttpClient;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+import java.util.Iterator;
+
+@Configuration
+@Slf4j
+@PropertySource("classpath:paypal-sandbox.properties")
+public class PayPalClient {
+
+    public PayPalHttpClient client(String mode, String clientId, String clientSecret) {
+        log.info("mode={}, clientId={}, clientSecret={}", mode, clientId, clientSecret);
+        PayPalEnvironment environment = mode.equals("live") ? new PayPalEnvironment.Live(clientId, clientSecret) : new PayPalEnvironment.Sandbox(clientId, clientSecret);
+        return new PayPalHttpClient(environment);
+    }
+
+    /**
+     * @param jo
+     * @param pre
+     * @return
+     */
+    /*public String prettyPrint(JSONObject jo, String pre) {
+        Iterator<?> keys = jo.keys();
+        StringBuilder pretty = new StringBuilder();
+        while (keys.hasNext()) {
+            String key = (String) keys.next();
+            pretty.append(String.format("%s%s: ", pre, StringUtils.capitalize(key)));
+            if (jo.get(key) instanceof JSONObject) {
+                pretty.append(prettyPrint(jo.getJSONObject(key), pre + "\t"));
+            } else if (jo.get(key) instanceof JSONArray) {
+                int sno = 1;
+                for (Object jsonObject : jo.getJSONArray(key)) {
+                    pretty.append(String.format("\n%s\t%d:\n", pre, sno++));
+                    pretty.append(prettyPrint((JSONObject) jsonObject, pre + "\t\t"));
+                }
+            } else {
+                pretty.append(String.format("%s\n", jo.getString(key)));
+            }
+        }
+        return pretty.toString();
+    }*/
+}
+

src/main/java/com/ai/da/common/config/PrimaryDataSourceConfig.java

@@ -0,0 +1,63 @@
+package com.ai.da.common.config;
+
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import javax.sql.DataSource;
+
+@Configuration
+@MapperScan(basePackages = "com.ai.da.mapper.primary", sqlSessionFactoryRef = "primarySqlSessionFactory")
+public class PrimaryDataSourceConfig {
+    @Autowired
+    private MybatisPlusProperties mybatisPlusProperties;
+
+    @Primary
+    @Bean(name = "primaryDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.primary")
+    public DataSource dataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Primary
+    @Bean(name = "primarySqlSessionFactory")
+    public SqlSessionFactory sqlSessionFactory(
+            @Qualifier("primaryDataSource") DataSource dataSource,
+            ApplicationContext applicationContext,
+            @Qualifier("primaryMybatisPlusInterceptor") MybatisPlusInterceptor mybatisPlusInterceptor) throws Exception {
+        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+        bean.setDataSource(dataSource);
+        bean.setMapperLocations(applicationContext.getResources("classpath:mapper/primary/*.xml"));
+        // 设置 MyBatis Plus 全局配置
+        GlobalConfig globalConfig = this.mybatisPlusProperties.getGlobalConfig();
+        if (globalConfig != null) {
+            bean.setGlobalConfig(globalConfig);
+        }
+        bean.setPlugins(mybatisPlusInterceptor);
+        return bean.getObject();
+    }
+
+    @Primary
+    @Bean(name = "primarySqlSessionTemplate")
+    public SqlSessionTemplate sqlSessionTemplate(
+            @Qualifier("primarySqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
+}
+
+
+
+

src/main/java/com/ai/da/common/config/RedisConfig.java

@@ -0,0 +1,42 @@
+package com.ai.da.common.config;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+public class RedisConfig {
+    @Bean(name = "redisTemplate")
+    public RedisTemplate<String, Object> getRedisTemplate(RedisConnectionFactory factory) {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(factory);
+
+        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+
+        redisTemplate.setKeySerializer(stringRedisSerializer); // key的序列化类型
+
+        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        // 方法过期，改为下面代码
+//        objectMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        objectMapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance,
+                ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
+        jackson2JsonRedisSerializer.setObjectMapper(objectMapper);
+        jackson2JsonRedisSerializer.setObjectMapper(objectMapper);
+
+        redisTemplate.setValueSerializer(jackson2JsonRedisSerializer); // value的序列化类型
+        redisTemplate.setHashKeySerializer(stringRedisSerializer);
+        redisTemplate.setHashValueSerializer(jackson2JsonRedisSerializer);
+        redisTemplate.afterPropertiesSet();
+        return redisTemplate;
+    }
+}

src/main/java/com/ai/da/common/config/SecondaryDataSourceConfig.java

@@ -0,0 +1,49 @@
+package com.ai.da.common.config;
+
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.sql.DataSource;
+
+@Configuration
+@MapperScan(basePackages = "com.ai.da.mapper.secondary", sqlSessionFactoryRef = "secondarySqlSessionFactory")
+public class SecondaryDataSourceConfig {
+
+    @Bean(name = "secondaryDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.secondary")
+    public DataSource dataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "secondarySqlSessionFactory")
+    public SqlSessionFactory sqlSessionFactory(
+            @Qualifier("secondaryDataSource") DataSource dataSource,
+            ApplicationContext applicationContext,
+            @Qualifier("secondaryMybatisPlusInterceptor") MybatisPlusInterceptor mybatisPlusInterceptor) throws Exception {
+        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+//        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+        bean.setDataSource(dataSource);
+        bean.setMapperLocations(applicationContext.getResources("classpath:mapper/secondary/*.xml"));
+        bean.setPlugins(mybatisPlusInterceptor);
+        return bean.getObject();
+    }
+
+    @Bean(name = "secondarySqlSessionTemplate")
+    public SqlSessionTemplate sqlSessionTemplate(
+            @Qualifier("secondarySqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
+}
+
+
+

src/main/java/com/ai/da/common/config/WebConfig.java

@@ -5,13 +5,22 @@ import org.hibernate.validator.HibernateValidator;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 import javax.validation.Validation;
 import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
 
 @Configuration
-public class WebConfig {
+public class WebConfig extends WebMvcConfigurerAdapter {
+
+    static final String ORIGINS[] = new String[]{"GET", "POST", "PUT", "DELETE"};
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**").allowedOrigins("*").allowCredentials(true).allowedMethods(ORIGINS).maxAge(3600);
+    }
 
     @Bean
     public Validator validator() {

src/main/java/com/ai/da/common/config/exception/BusinessException.java

@@ -1,8 +1,19 @@
 package com.ai.da.common.config.exception;
 
+import com.ai.da.common.context.UserContext;
 import com.ai.da.common.response.ResultEnum;
+import com.ai.da.model.enums.Language;
+import com.ai.da.model.vo.AuthPrincipalVo;
 import lombok.Data;
 
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+
 /**
  * @author: dangweijian
  * @description: 业务异常
@@ -15,14 +26,48 @@ public class BusinessException extends RuntimeException {
     private String msg;
 
     public BusinessException(ResultEnum resultEnum) {
-        super(resultEnum.getMsg());
         this.code = resultEnum.getCode();
-        this.msg = resultEnum.getMsg();
+        this.msg = getMessageFromResource(resultEnum.getMsg(), getUserLocale());
     }
 
     public BusinessException(String msg) {
-        super(msg);
         this.code = ResultEnum.FAIL.getCode();
-        this.msg = msg;
+        this.msg = getMessageFromResource(msg, getUserLocale());
+    }
+
+    public BusinessException(String msg, Integer code) {
+        this.code = code;
+        this.msg = getMessageFromResource(msg, getUserLocale());
+    }
+
+    public BusinessException(Throwable cause) {
+        this.code = ResultEnum.FAIL.getCode();
+        this.msg = getMessageFromResource(cause.getMessage(), getUserLocale());
+    }
+
+    private static Locale getUserLocale() {
+        AuthPrincipalVo userInfo = UserContext.getUserHolder();
+        if (Objects.isNull(userInfo)) {
+            return new Locale("en");
+        }
+        return new Locale(Language.valueOf(userInfo.getLanguage()).getValue());
+    }
+
+    public static String getMessageFromResource(String msg) {
+        return getMessageFromResource(msg, getUserLocale());
+    }
+
+    public static String getMessageFromResource(String msg, Locale userLocale) {
+        try (InputStream inputStream = BusinessException.class.getClassLoader().getResourceAsStream("messages_" + userLocale.getLanguage() + ".properties")) {
+            if (inputStream != null) {
+                ResourceBundle bundle = new PropertyResourceBundle(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+                if (bundle.containsKey(msg)) {
+                    return bundle.getString(msg);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return msg; // 如果找不到对应的资源文件，返回原始的消息
     }
 }

src/main/java/com/ai/da/common/config/exception/ExceptionCatch.java

@@ -56,6 +56,7 @@ public class ExceptionCatch {
 
     /**
      * 处理参数校验异常
+     *
      * @param e
      * @return ResponseData
      */
@@ -63,19 +64,22 @@ public class ExceptionCatch {
     @ExceptionHandler(BindException.class)
     public Response<String> bindExceptionHandler(BindException e) {
         log.error("参数错误bind：{}", e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
-        return Response.fail(ResultEnum.FAIL.getCode(), e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
+        BusinessException businessException = new BusinessException(e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
+        return Response.error(businessException.getCode(), businessException.getMsg());
     }
 
     /**
      * 处理参数校验异常
+     *
      * @param e
      * @return ResponseData
      */
     @ResponseBody
     @ExceptionHandler(MethodArgumentNotValidException.class)
-    public Response<String> methodArgumentNotValidExceptionHandler(MethodArgumentNotValidException e) {
+    public Response<String> handleValidationException(MethodArgumentNotValidException e) {
         log.error("参数错误bind：{}", e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
-        return Response.fail(ResultEnum.FAIL.getCode(), e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
+        BusinessException businessException = new BusinessException(e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
+        return Response.error(businessException.getCode(), businessException.getMsg());
     }
 
     //初始化,不可预知异常自定义错误编码

src/main/java/com/ai/da/common/constant/CommonConstant.java

@@ -0,0 +1,14 @@
+package com.ai.da.common.constant;
+
+public class CommonConstant {
+    // 单位 秒  10分钟过期
+//    public static final Long TASK_EXPIRE_TIME =  24 * 60 * 60L;
+    public static final Long TASK_EXPIRE_TIME =  10 * 60L;
+    // 单位 秒  两天过期
+    public static final Long CREDITS_EXPIRE_TIME = 2 * 24 * 60 * 60L;
+    // 单位 分钟
+    public static final Integer MINIO_IMAGE_EXPIRE_TIME = 24 * 60;
+    // 单位 秒 一天过期 in redis
+    public static final Long GENERATE_RESULT_EXPIRE_TIME = 24 * 60 * 60L;
+
+}

src/main/java/com/ai/da/common/constant/PayPalCheckoutConstant.java

@@ -0,0 +1,173 @@
+package com.ai.da.common.constant;
+
+public class PayPalCheckoutConstant {
+
+    public static final String CAPTURE = "CAPTURE";
+    /**
+     * 该标签将覆盖PayPal网站上PayPal帐户中的公司名称
+     */
+    public static final String BRANDNAME = "AIDA";
+    /**
+     * LOGIN。当客户单击PayPal Checkout时，客户将被重定向到页面以登录PayPal并批准付款。
+     * BILLING。当客户单击PayPal Checkout时，客户将被重定向到一个页面，以输入信用卡或借记卡以及完成购买所需的其他相关账单信息
+     * NO_PREFERENCE。当客户单击“ PayPal Checkout”时，将根据其先前的交互方式将其重定向到页面以登录PayPal并批准付款，或重定向至页面以输入信用卡或借记卡以及完成购买所需的其他相关账单信息使用PayPal。
+     * 默认值：NO_PREFERENCE
+     */
+    public static final String LANDINGPAGE = "NO_PREFERENCE";
+    /**
+     * CONTINUE。将客户重定向到PayPal付款页面后，将出现“ 继续”按钮。当结帐流程启动时最终金额未知时，请使用此选项，并且您想将客户重定向到商家页面而不处理付款。
+     * PAY_NOW。将客户重定向到PayPal付款页面后，出现“ 立即付款”按钮。当启动结帐时知道最终金额并且您要在客户单击“ 立即付款”时立即处理付款时，请使用此选项。
+     */
+    public static final String USERACTION = "PAY_NOW";
+    /**
+     * GET_FROM_FILE。使用贝宝网站上客户提供的送货地址。
+     * NO_SHIPPING。从PayPal网站编辑送货地址。推荐用于数字商品
+     * SET_PROVIDED_ADDRESS。使用商家提供的地址。客户无法在PayPal网站上更改此地址
+     */
+//    public static final String SHIPPINGPREFERENCE = "SET_PROVIDED_ADDRESS";
+    public static final String SHIPPINGPREFERENCE = "NO_SHIPPING";
+    /**
+     * 交易异常
+     */
+    public static final String FAILURE = "failure";
+    /**
+     * 交易成功
+     */
+    public static final String SUCCESS = "success";
+
+    /**
+     * ipn回调。支付成功
+     */
+    public static final String PAYMENT_STATUS_COMPLETED = "Completed";
+    /**
+     * ipn回调。退款成功
+     */
+    public static final String PAYMENT_STATUS_REFUNDED = "Refunded";
+    /**
+     * ipn回调。待定
+     */
+    public static final String PAYMENT_STATUS_PENDING = "Pending";
+
+    /**
+     * ipn回调，付款因退款或其他类型的冲销而被冲销。资金已从您的帐户余额中删除，并退还给买方
+     */
+    public static final String PAYMENT_STATUS_REVERSED = "Reversed";
+
+    /**
+     *  ipn回调, 撤销已被取消。例如，您赢得了与客户的纠纷，并且撤回的交易资金已退还给您
+     */
+    public static final String PAYMENT_STATUS_CANCELED_REVERSAL = "Canceled_Reversal";
+
+    /**
+     *  ipn回调，付款被拒绝
+     */
+    public static final String PAYMENT_STATUS_DENIED = "Denied";
+
+    /**
+     *  ipn回调， 此授权已过期，无法捕获
+     */
+    public static final String PAYMENT_STATUS_EXPIRED = "Expired";
+
+    /**
+     *  ipn回调，  德国的ELV付款是通过Express Checkout进行的
+     */
+    public static final String PAYMENT_STATUS_CREATED = "Created";
+
+    /**
+     * ipn回调， 付款失败。仅当付款是通过您客户的银行帐户进行的。
+     */
+    public static final String PAYMENT_STATUS_FAILED = "Failed";
+
+    /**
+     *   ipn回调，付款已被接受
+     */
+    public static final String PAYMENT_STATUS_PROCESSED = "Processed";
+
+    /**
+     *   ipn回调，此授权已失效
+     */
+    public static final String PAYMENT_STATUS_VOIDED = "Voided";
+
+    //订单状态
+    /**
+     * 1、支付完成;捕获的付款的资金已记入收款人的PayPal帐户
+     * 2、退款完成;该交易的资金已记入客户的帐户
+     */
+    public static final String STATE_COMPLETED = "COMPLETED";
+    /**
+     * 部分退款；少于所捕获付款金额的金额已部分退还给付款人。
+     */
+    public static final String STATE_PARTIALLY_REFUNDED = "PARTIALLY_REFUNDED";
+
+
+    /**
+     * 1、支付待定;捕获的付款资金尚未记入收款人的PayPal帐户。有关更多信息请参见status.details。
+     * 2、退款待定;有关更多信息，请参见status_details.reason。
+     */
+    /**
+     * 支付待定：
+     * capture_status_details
+     * reason 枚举
+     * 捕获的付款状态为PENDING或DENIED的原因。可能的值为：
+     * BUYER_COMPLAINT。付款人与贝宝（PayPal）对此捕获的付款提出了争议。
+     * CHARGEBACK。响应于付款人与用于支付此已捕获付款的金融工具的发行人对此已捕获的付款提出异议，已收回的资金被撤回。
+     * ECHECK。由尚未结清的电子支票支付的付款人。
+     * INTERNATIONAL_WITHDRAWAL。访问您的在线帐户。在您的“帐户概览”中，接受并拒绝此笔付款。
+     * OTHER。无法提供其他特定原因。有关此笔付款的更多信息，请在线访问您的帐户或联系PayPal。
+     * PENDING_REVIEW。捕获的付款正在等待人工审核。
+     *（手动收取）RECEIVING_PREFERENCE_MANDATES_MANUAL_ACTION。收款人尚未为其帐户设置适当的接收首选项。有关如何接受或拒绝此付款的更多信息，请在线访问您的帐户。通常在某些情况下提供此原因，例如，当所捕获付款的货币与收款人的主要持有货币不同时。
+     * REFUNDED。收回的资金已退还。
+     * TRANSACTION_APPROVED_AWAITING_FUNDING。付款人必须将这笔付款的资金汇出。通常，此代码适用于手动EFT。
+     * UNILATERAL。收款人没有PayPal帐户。
+     * VERIFICATION_REQUIRED。收款人的PayPal帐户未通过验证。
+     */
+    /**
+     * 退款待定
+     * 退款具有“PENDING”或“FAILED”状态的原因。 可能的值为：
+     * ECHECK。客户的帐户通过尚未结清的eCheck进行注资。
+     */
+    public static final String STATE_PENDING = "PENDING";
+    /**
+     * 退款;大于或等于此捕获的付款金额的金额已退还给付款人
+     */
+    public static final String STATE_REFUNDED = "REFUNDED";
+    /**
+     * 支付拒绝
+     */
+    public static final String STATE_DENIED = "DENIED";
+    /**
+     * 退款失败
+     */
+    public static final String STATE_FAILED = "FAILED";
+
+    /**
+     * 争议状态
+     */
+    public static final String BUYER_COMPLAINT = "BUYER_COMPLAINT";
+
+    /**
+     * 沙箱环境请求网关地址
+     */
+    public static final String SANDBOX = "https://api.sandbox.paypal.com";
+    /**
+     * 生产环境请求网关地址
+     */
+    public static final String LIVE = "https://api.paypal.com";
+    /**
+     * 添加物流信息请求路径
+     */
+    public static final String ADD_TRACK_URL = "/v1/shipping/trackers-batch";
+
+    /**
+     * 修改物流信息请求路径
+     */
+    public static final String UPDATE_TRACK_URL = "/v1/shipping/trackers/";
+
+    public final static String CMD_NOTIFY_VALIDATE = "_notify-validate";
+
+    public final static String PAYPAL_TOKEN_KEY = "PayPalAccessToken";
+
+
+}
+
+

src/main/java/com/ai/da/common/context/UserContext.java

@@ -8,6 +8,7 @@ public class UserContext {
     public static AuthPrincipalVo getUserHolder() {
         return userHolder.get();
     }
+
     public static void delete() {
         userHolder.remove();
     }

src/main/java/com/ai/da/common/enums/AliPayTradeStateEnum.java

@@ -0,0 +1,39 @@
+package com.ai.da.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum AliPayTradeStateEnum {
+
+    /**
+     * 支付成功
+     */
+    SUCCESS("TRADE_SUCCESS"),
+
+    /**
+     * 未支付
+     */
+    NOTPAY("WAIT_BUYER_PAY"),
+
+    /**
+     * 已关闭
+     */
+    CLOSED("TRADE_CLOSED"),
+
+    /**
+     * 退款成功
+     */
+    REFUND_SUCCESS("REFUND_SUCCESS"),
+
+    /**
+     * 退款失败
+     */
+    REFUND_ERROR("REFUND_ERROR");
+
+    /**
+     * 类型
+     */
+    private final String type;
+}

src/main/java/com/ai/da/common/enums/AuthenticationOperationTypeEnum.java

@@ -7,7 +7,7 @@ import java.util.stream.Stream;
  * @description: 操作类型  登入 忘记密码
  * @create: 2022-8-10 17:33
  **/
-public enum OperationTypeEnum {
+public enum AuthenticationOperationTypeEnum {
     /**
      * 登入
      */
@@ -25,7 +25,7 @@ public enum OperationTypeEnum {
      */
     FORGET_PWD;
 
-    public static OperationTypeEnum of(String name){
-        return Stream.of(OperationTypeEnum.values()).filter(v ->v.name().equals(name)).findFirst().orElse(null);
+    public static AuthenticationOperationTypeEnum of(String name) {
+        return Stream.of(AuthenticationOperationTypeEnum.values()).filter(v -> v.name().equals(name)).findFirst().orElse(null);
     }
 }

src/main/java/com/ai/da/common/enums/CollectionLevel2TypeEnum.java

@@ -27,7 +27,16 @@ public enum CollectionLevel2TypeEnum {
     /**
      * 裤子
      */
-    TROUSERS("Trousers");
+    TROUSERS("Trousers"),
+    /**
+     * 男装上装
+     */
+    TOPS("Tops"),
+    /**
+     * 男装下装
+     */
+    BOTTOMS("Bottoms"),
+    ;
 
     private String realName;
 

src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java

@@ -0,0 +1,31 @@
+package com.ai.da.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum CreditsEventsEnum {
+
+    PRICE("price","6"),
+
+    BUY_CREDITS("Buy Credits","600"),
+
+    INIT("init", "500"),
+
+    DAILY_CHECKIN("Daily Check-In", "20"),
+
+    SOCIAL_MEDIA_SHARING("Social Media Sharing","20"),
+
+//    SUPER_RESOLUTION("Super Resolution","300"),
+    SUPER_RESOLUTION("Super Resolution","5"),
+
+    OTHER("Other","10");
+
+    private String name;
+
+    /**
+     * 对应事件需要消耗or获得的积分
+     */
+    private String value;
+}

src/main/java/com/ai/da/common/enums/CurrencyCodesEnum.java

@@ -0,0 +1,40 @@
+package com.ai.da.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+public enum CurrencyCodesEnum {
+
+    AUSTRALIAN_DOLLAR("AUD"),
+    BRAZILIAN_REAL("BRL"),
+    CANADIAN_DOLLAR("CAD"),
+    CHINESE_RENMENBI("CNY"),
+    CZECH_KORUNA("CZK"),
+    DANISH_KRONE("DKK"),
+    EURO("EUR"),
+    HONG_KONG_DOLLAR("HKD"),
+    HUNGARIAN_FORINT("HUF"),
+    ISRAELI_NEW_SHEKEL("ILS"),
+    JAPANESE_YEN("JPY"),
+    MALAYSIAN_RINGGIT("MYR"),
+    MEXICAN_PESO("MXN"),
+    NEW_TAIWAN_DOLLAR("TWD"),
+    NEW_ZEALAND_DOLLAR("NZD"),
+    NORWEGIAN_KRONE("NOK"),
+    PHILIPPINE_PESO("PHP"),
+    POLISH_ZLOTY("PLN"),
+    POUND_STERLING("GBP"),
+    RUSSIAN_RUBLE("RUB"),
+    SINGAPORE_DOLLAR("SGD"),
+    SWEDISH_KRONA("SEK"),
+    SWISS_FRANC("CHF"),
+    THAI_BAHT("THB"),
+    UNITED_STATES_DOLLAR("USD");
+
+    private String code;
+
+    CurrencyCodesEnum(String code) {
+        this.code = code;
+    }
+}

src/main/java/com/ai/da/common/enums/CurrentDesignPictureTypeEnum.java

@@ -20,15 +20,15 @@ public enum CurrentDesignPictureTypeEnum {
     /**
      * USER_LIBRARY
      */
-    USER_LIBRARY(2,"userLibrary"),
+//    USER_LIBRARY(2, "userLibrary"),
     /**
      * SYS_FILE
      */
-    SYS_FILE(3,"sysFile"),
+    SYS_FILE(2, "sysFile"),
     /**
      * noPIN
      */
-    NO_PIN(4,"noPIN");
+    NO_PIN(3, "noPIN");
 
     private Integer code;
     private String desc;
@@ -41,6 +41,7 @@ public enum CurrentDesignPictureTypeEnum {
     public static CurrentDesignPictureTypeEnum of(String name) {
         return Stream.of(CurrentDesignPictureTypeEnum.values()).filter(v -> v.name().equals(name)).findFirst().orElse(null);
     }
+
     public static List<CurrentDesignPictureTypeEnum> ofList(List<Integer> codes) {
         return Stream.of(CurrentDesignPictureTypeEnum.values()).filter(v -> codes.contains(v.code)).collect(Collectors.toList());
     }

src/main/java/com/ai/da/common/enums/CurrentDesignPrintPictureTypeEnum.java

@@ -33,6 +33,7 @@ public enum CurrentDesignPrintPictureTypeEnum {
         this.code = code;
         this.desc = desc;
     }
+
     public static List<CurrentDesignPrintPictureTypeEnum> ofList(List<Integer> codes) {
         return Stream.of(CurrentDesignPrintPictureTypeEnum.values()).filter(v -> codes.contains(v.code)).collect(Collectors.toList());
     }

src/main/java/com/ai/da/common/enums/DesignTypeEnum.java

@@ -15,7 +15,8 @@ public enum DesignTypeEnum {
     /**
      * Library
      */
-    LIBRARY("Library");
+    LIBRARY("Library"),
+    GENERATE("Generate");
 
     private String realName;
 

src/main/java/com/ai/da/common/enums/GenerateModeEnum.java

@@ -0,0 +1,45 @@
+package com.ai.da.common.enums;
+
+import lombok.Getter;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Getter
+public enum GenerateModeEnum {
+
+    /**
+     * 通过文本生成
+     */
+    TEXT(1, "text","txt2img"),
+
+    /**
+     * 通过图片生成
+     */
+    IMAGE(2, "image", "img2img"),
+
+    /**
+     * 通过文本和图片生成
+     */
+    TEXT_IMAGE(2, "text-image","img2img");
+
+    private Integer code;
+    private String value;
+    private String type;
+
+    GenerateModeEnum(int code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    GenerateModeEnum(Integer code, String value, String type) {
+        this.code = code;
+        this.value = value;
+        this.type = type;
+    }
+
+    public static List<String> getGenerateModeList(){
+        return Stream.of(TEXT,IMAGE,TEXT_IMAGE).map(GenerateModeEnum::getValue).collect(Collectors.toList());
+    }
+}

src/main/java/com/ai/da/common/enums/LayersPriorityEnum.java

@@ -0,0 +1,56 @@
+package com.ai.da.common.enums;
+
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+public enum LayersPriorityEnum {
+
+    EARRING_FRONT("earring_front","Earring",99),
+    BAG_FRONT("bag_front","Bag",98),
+    HAIRSTYLE_FRONT("hairstyle_front","Hairstyle",97),
+    OUTWEAR_FRONT("outwear_front","Outwear",20),
+    TOPS_FRONT("tops_front","Tops",19),
+    DRESS_FRONT("dress_front","Dress",18),
+    BLOUSE_FRONT("blouse_front","Blouse",17),
+    SKIRT_FRONT("skirt_front","Skirt",16),
+    TROUSERS_FRONT("trousers_front","Trousers",15),
+    BOTTOMS_FRONT("bottoms_front","Bottoms",14),
+    SHOES_RIGHT("shoes_right","Shoes",1),
+    SHOES_LEFT("shoes_left","Shoes",1),
+    BODY("body","Body",0),
+    BOTTOMS_BACK("bottoms_back","Bottoms",-14),
+    TROUSERS_BACK("trousers_back","Trousers",-15),
+    SKIRT_BACK("skirt_back","Skirt",-16),
+    BLOUSE_BACK("blouse_back","Blouse",-17),
+    DRESS_BACK("dress_back","Dress",-18),
+    TOPS_BACK("tops_back","Tops",-19),
+    OUTWEAR_BACK("outwear_back","Outwear",-20),
+    HAIRSTYLE_BACK("hairstyle_back","Hairstyle",-97),
+    BAG_BACK("bag_back","Bag",-98),
+    EARRING_BACK("earring_back","Earring",-99);
+
+    @Getter
+    private String realName;
+    @Getter
+    private String type;
+    @Getter
+    private Integer value;
+
+
+    LayersPriorityEnum(String realName, String type,Integer value) {
+        this.realName = realName;
+        this.type = type;
+        this.value = value;
+    }
+
+    public static LayersPriorityEnum getValueByType(String type){
+        return Stream.of(LayersPriorityEnum.values()).filter(l -> l.getType().equals(type)).findFirst().orElse(null);
+    }
+
+    public static LayersPriorityEnum getValueByLayerCategory(String layerCategory){
+        return Stream.of(LayersPriorityEnum.values()).filter(l -> l.getRealName().equals(layerCategory)).findFirst().orElse(null);
+    }
+}

src/main/java/com/ai/da/common/enums/LibraryTopTypeEnum.java

@@ -30,6 +30,7 @@ public enum LibraryTopTypeEnum {
     public String getRealName() {
         return realName;
     }
+
     public static LibraryTopTypeEnum uploadOf(String realName) {
         return Stream.of(LibraryTopTypeEnum.values())
                 .filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null);

src/main/java/com/ai/da/common/enums/ModelNameEnum.java

@@ -0,0 +1,22 @@
+package com.ai.da.common.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum ModelNameEnum {
+
+    /**
+     * 使用模型0
+     */
+    MODEL_0("0", "model_0");
+
+
+    private String code;
+    private String modelName;
+
+
+    ModelNameEnum(String code, String modelName) {
+        this.code = code;
+        this.modelName = modelName;
+    }
+}

src/main/java/com/ai/da/common/enums/OrderStatusEnum.java

@@ -0,0 +1,54 @@
+package com.ai.da.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum OrderStatusEnum {
+    /**
+     * 未支付
+     */
+    NOT_PAY("未支付"),
+
+
+    /**
+     * 支付成功
+     */
+    SUCCESS("支付成功"),
+
+    /**
+     * 已关闭
+     */
+    TIMEOUT_CLOSED("超时已关闭"),
+
+    /**
+     * 已取消
+     */
+    CANCEL("用户已取消"),
+
+    /**
+     * 退款中
+     */
+    REFUND_PROCESSING("退款中"),
+
+    /**
+     * 已退款
+     */
+    REFUND_SUCCESS("已退款"),
+
+    /**
+     * 退款异常
+     */
+    REFUND_ABNORMAL("退款异常"),
+
+    /**
+     * paypal订单状态为 APPROVED
+     */
+    ORDER_PROCESSING("订单处理中");
+
+    /**
+     * 类型
+     */
+    private final String type;
+}

src/main/java/com/ai/da/common/enums/PayPalOrderStatusEnum.java

@@ -0,0 +1,30 @@
+package com.ai.da.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum PayPalOrderStatusEnum {
+
+    // The order was created with the specified context.
+    // 订单已创建并具有指定的上下文。
+    CREATED("CREATED"),
+    // The order was saved and persisted. The order status continues to be in progress until a capture is made with final_capture = true for all purchase units within the order.
+    // 订单已保存并持久化。订单状态仍处于进行中，直到对订单中的所有购买单元进行了 final_capture = true 的捕获为止
+    SAVED("SAVED"),
+    // The customer approved the payment through the PayPal wallet or another form of guest or unbranded payment. For example, a card, bank account, or so on.
+    // 客户通过PayPal钱包或其他形式的游客或非品牌支付批准了付款。例如，信用卡、银行账户等。
+    APPROVED("APPROVED"),
+    // All purchase units in the order are voided.
+    // 订单中的所有购买单元都已作废。
+    VOIDED("VOIDED"),
+    // The payment was authorized or the authorized payment was captured for the order.
+    // 订单的支付已被授权或已捕获授权的支付。
+    COMPLETED("COMPLETED"),
+    // The order requires an action from the payer (e.g. 3DS authentication). Redirect the payer to the "rel":"payer-action" HATEOAS link returned as part of the response prior to authorizing or capturing the order.
+    // 订单需要支付者执行某项操作（例如3DS身份验证）。在授权或捕获订单之前，请将支付者重定向到响应中返回的"rel":"payer-action" HATEOAS链接。
+    PAYER_ACTION_REQUIRED("PAYER_ACTION_REQUIRED");
+
+    private final String status;
+}

src/main/java/com/ai/da/common/enums/PayTypeEnum.java

@@ -0,0 +1,28 @@
+package com.ai.da.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum PayTypeEnum {
+    /**
+     * 微信
+     */
+    WXPAY("微信"),
+
+    /**
+     * 支付宝
+     */
+    ALIPAY("支付宝"),
+
+    /**
+     * PayPal
+     */
+    PAYPAL("PayPal");
+
+    /**
+     * 类型
+     */
+    private final String type;
+}

src/main/java/com/ai/da/common/enums/PythonToJavaApiOperationTypeEnum.java

@@ -4,7 +4,7 @@ import java.util.stream.Stream;
 
 /**
  * @author yanglei
- * @description python调用java 操作数类型 generatePrint ->生成印花 designCollection ->设计collection
+ * @description python调用java 操作数类型 generatePrint ->生成印花 designCollection ->设计collection generateSketch->设计草图
  * @create 2022-10-3 17:33
  **/
 public enum PythonToJavaApiOperationTypeEnum {
@@ -19,7 +19,12 @@ public enum PythonToJavaApiOperationTypeEnum {
     /**
      * 设计collection
      */
-    DESIGN_COLLECTION("designCollection");
+    DESIGN_COLLECTION("designCollection"),
+
+    /**
+     * 生成草图
+     */
+    GENERATE_SKETCH("generateSketch");
 
     private String realName;
 

src/main/java/com/ai/da/common/enums/SwitchCategoryEnum.java

@@ -28,6 +28,8 @@ public enum SwitchCategoryEnum {
      * 裤子
      */
     TROUSERS("Trousers"),
+    TOPS("Tops"),
+    BOTTOMS("Bottoms"),
     ;
 
     private String realName;

src/main/java/com/ai/da/common/enums/SysFileLevel2TypeEnum.java

@@ -1,5 +1,6 @@
 package com.ai.da.common.enums;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -57,6 +58,7 @@ public enum SysFileLevel2TypeEnum {
     public static SysFileLevel2TypeEnum uploadOf(String uploadPathName) {
         return Stream.of(SysFileLevel2TypeEnum.values()).filter(v -> v.getUploadPathName().equals(uploadPathName)).findFirst().orElse(null);
     }
+
     public static SysFileLevel2TypeEnum realNameOf(String realName) {
         return Stream.of(SysFileLevel2TypeEnum.values()).filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null);
     }
@@ -64,10 +66,29 @@ public enum SysFileLevel2TypeEnum {
     public static SysFileLevel2TypeEnum realNameOfPython(String realName) {
         return Stream.of(BLOUSE, DRESS, OUTWEAR, SKIRT, TROUSERS).filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null);
     }
+
     public static List<String> ofPython() {
         return Stream.of(BLOUSE, DRESS, OUTWEAR, SKIRT, TROUSERS).map(SysFileLevel2TypeEnum::getRealName).collect(Collectors.toList());
     }
+
     public static List<String> ofPythonPath() {
         return Stream.of(BLOUSE, DRESS, OUTWEAR, SKIRT, TROUSERS).map(SysFileLevel2TypeEnum::getUploadPathName).collect(Collectors.toList());
     }
+
+    public static final List<String> ACCESSORIES_LIST = Arrays.asList(
+            SysFileLevel2TypeEnum.BAG.getRealName(),
+            SysFileLevel2TypeEnum.EARRINGS.getRealName(),
+            SysFileLevel2TypeEnum.HAIRSTYLE.getRealName(),
+            SysFileLevel2TypeEnum.SHOES.getRealName(),
+            SysFileLevel2TypeEnum.BODY.getRealName()
+    );
+
+    public static final List<String> IMAGES_LIST = Arrays.asList(
+            SysFileLevel2TypeEnum.BLOUSE.getRealName(),
+            SysFileLevel2TypeEnum.DRESS.getRealName(),
+            SysFileLevel2TypeEnum.OUTWEAR.getRealName(),
+            SysFileLevel2TypeEnum.SKIRT.getRealName(),
+            SysFileLevel2TypeEnum.TROUSERS.getRealName()
+    );
+
 }

src/main/java/com/ai/da/common/httpdata/token/TokenQuery.java

@@ -25,6 +25,7 @@ public class TokenQuery {
         }
         return null;
     }
+
     public static JSONObject generateUser(Map<String, Object> param, String token) {
         HttpResponse httpResponse = HttpUtil.createPost(GENERATE_USER_DOMAIN + TokenApis.GENERATE_USER.getUrl())
                 .body(JSONObject.toJSONString(param != null ? param : new HashMap<>()))

src/main/java/com/ai/da/common/response/PageBaseResponse.java

@@ -30,7 +30,6 @@ public class PageBaseResponse<T>{
     private List<T> content;
 
 
-
     public PageBaseResponse(List<T> list, long page, long size, long total, long pages) {
         this.page = page;
         this.size = size;

src/main/java/com/ai/da/common/response/PageResponse.java

@@ -31,7 +31,6 @@ public class PageResponse<T> extends Response<List<T>> {
     private List<T> content;
 
 
-
     public PageResponse(Response<List<T>> response, long page, long size, long total, long pages) {
         if (response != null) {
             this.setData(response.getData());

src/main/java/com/ai/da/common/response/Response.java

@@ -31,9 +31,9 @@ public class Response<T> implements Serializable {
         return success(ResultEnum.SUCCESS.getCode(), ResultEnum.SUCCESS.getMsg(), null);
     }
 
-    public static <T> Response<T> success(String msg){
-        return success(ResultEnum.SUCCESS.getCode(), msg, null);
-    }
+//    public static <T> Response<T> success(String msg) {
+//        return success(ResultEnum.SUCCESS.getCode(), msg, null);
+//    }
 
     public static <T> Response<T> success(T data) {
         return success(ResultEnum.SUCCESS.getCode(), ResultEnum.SUCCESS.getMsg(), data);
@@ -48,7 +48,6 @@ public class Response<T> implements Serializable {
     }
 
 
-
     public static <T> Response<T> fail(String msg) {
         return fail(ResultEnum.FAIL.getCode(), msg);
     }

src/main/java/com/ai/da/common/response/ResultEnum.java

@@ -15,14 +15,17 @@ public enum ResultEnum {
 
     NO_LOGIN(false, -100, "User not logged in"),
     NO_PERMISSION(false, -200, "No access"),
-    ACCOUNT_LOCK(false,-300,"Account frozen");
+    ACCOUNT_LOCK(false, -300, "Account frozen"),
 
+    PROMPT(false, 1, "Prompt"),
+    WARNING(false, 2, "Warning"),
+
+    ;
     private int code;
     private String msg;
     private boolean isOK;
 
 
-
     ResultEnum(boolean isOK, int code, String msg) {
         this.isOK = isOK;
         this.code = code;

src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java

@@ -7,18 +7,14 @@ import com.ai.da.common.security.jwt.JWTTokenHelper;
 import com.ai.da.common.utils.LocalCacheUtils;
 import com.ai.da.common.utils.MultiReadHttpServletRequest;
 import com.ai.da.common.utils.MultiReadHttpServletResponse;
+import com.ai.da.common.utils.RequestInfoUtil;
 import com.ai.da.model.vo.AuthPrincipalVo;
-import lombok.AllArgsConstructor;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Required;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.lang.NonNull;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.StopWatch;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import javax.annotation.Resource;
@@ -28,7 +24,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.sql.Statement;
 import java.util.Arrays;
 import java.util.List;
 
@@ -47,10 +42,15 @@ public class AuthenticationFilter extends OncePerRequestFilter {
     private SecurityProperties properties;
 
     private static final List<String> FILTER_URL =
-            Arrays.asList("/favicon.ico","/doc.html","api/account/login","api/account/preLogin","api/account/sendEmail",
+            Arrays.asList("/favicon.ico", "/doc.html", "api/account/login", "api/account/preLogin", "api/account/sendEmail","api/account/noLoginRequired",
                     "/webjars/", "/swagger-resources", "/v2/api-docs", "api/account/resetPwd",
                     "/api/python/saveGeneratePicture", "/api/python/getLibraryByUserId",
-                    "/api/third/party/addUser","/api/third/party/editUser","/api/element/initDefaultSysFile");
+                    "/api/third/party/addUser","/api/third/party/addTrialUser", "/api/third/party/editUser", "/api/element/initDefaultSysFile",
+                    "/api/third/party/addNoLoginRequiredNew","/api/third/party/deleteNoLoginRequiredNew",
+                    "/api/third/party/existNoLoginRequired","/api/third/party/getRedirectUrl",
+//                    "/api/python/chatStream",
+                    "/api/python/flush","/api/account/healthy","/api/ali-pay/trade/notify","/api/paypal/ipn/back"
+            );
 
     @Override
     protected void doFilterInternal(HttpServletRequest httpServletRequest, @NonNull HttpServletResponse httpServletResponse, @NonNull FilterChain filterChain) throws ServletException, IOException {
@@ -81,17 +81,25 @@ public class AuthenticationFilter extends OncePerRequestFilter {
             filterChain.doFilter(httpServletRequest, httpServletResponse);
         }
     }
+
     private Boolean calculateUrl(String requestURI) {
         String filterUrl = FILTER_URL.stream().filter(url -> requestURI.contains(url)).findFirst().orElse(null);
         return null == filterUrl ? Boolean.TRUE : Boolean.FALSE;
     }
+
     private void extracted(HttpServletRequest request) throws AuthenticationException {
         String jwtToken = request.getHeader(properties.getJwtTokenHeader());
         log.debug("后台检查令牌:{}", jwtToken);
 
         if (StrUtil.isBlank(jwtToken)) {
+            String ipAddress = RequestInfoUtil.getIpAddress(request);
+            log.info("本次请求的ip为 ： " + ipAddress);
             throw new RuntimeException("请传入token！");
         }
+        if(jwtToken.equals("Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA")){
+            //写死 暂时放行
+            return;
+        }
         // 检查token
         boolean validate = jwtTokenHelper.validateToken(jwtToken);
         if (validate) {
@@ -105,10 +113,7 @@ public class AuthenticationFilter extends OncePerRequestFilter {
             UserContext.setUserHolder(principal);
             //校验token
             String cacheToken = LocalCacheUtils.getTokenCache(String.valueOf(principal.getId()));
-            if(jwtToken.equals("Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA")){
-                //写死 暂时放行
-                return;
-            }
+
             if(StringUtils.isEmpty(cacheToken)){
                 throw new RuntimeException("TOKEN已过期，请重新登录！");
             }

src/main/java/com/ai/da/common/task/AliPayTask.java

@@ -0,0 +1,42 @@
+package com.ai.da.common.task;
+
+import com.ai.da.mapper.primary.entity.OrderInfo;
+import com.ai.da.common.enums.PayTypeEnum;
+import com.ai.da.service.AliPayService;
+import com.ai.da.service.OrderInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@Component
+public class AliPayTask {
+
+    @Resource
+    private OrderInfoService orderInfoService;
+
+    @Resource
+    private AliPayService aliPayService;
+
+    /**
+     * 从第0秒开始每隔30秒执行1次，查询创建超过5分钟，并且未支付的订单
+     */
+//    @Scheduled(cron = "0/30 * * * * ?")
+    public void orderConfirm(){
+
+        log.info("Alipay orderConfirm 被执行......");
+
+        List<OrderInfo> orderInfoList = orderInfoService.getNoPayOrderByDuration(5, PayTypeEnum.ALIPAY.getType());
+
+        for (OrderInfo orderInfo : orderInfoList) {
+            String orderNo = orderInfo.getOrderNo();
+            log.warn("超时订单 ===> {}", orderNo);
+
+            //核实订单状态：调用支付宝查单接口
+            aliPayService.checkOrderStatus(orderNo);
+        }
+    }
+}

src/main/java/com/ai/da/common/task/GenerateTask.java

@@ -0,0 +1,21 @@
+package com.ai.da.common.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class GenerateTask {
+
+    @Scheduled(cron = "0 0 */1 * * ?")
+    public void generateScheduled(){
+        log.info("测试定时器：generate");
+
+        try{
+
+        }catch(Exception e){
+
+        }
+    }
+}

src/main/java/com/ai/da/common/task/PaypalTask.java

@@ -0,0 +1,42 @@
+package com.ai.da.common.task;
+
+import com.ai.da.common.enums.PayTypeEnum;
+import com.ai.da.mapper.primary.entity.OrderInfo;
+import com.ai.da.service.OrderInfoService;
+import com.ai.da.service.PayPalCheckoutService;
+import com.paypal.http.exceptions.SerializeException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@Component
+public class PaypalTask {
+
+    @Resource
+    private OrderInfoService orderInfoService;
+
+    @Resource
+    private PayPalCheckoutService payPalCheckoutService;
+
+    @Scheduled(cron = "0/30 * * * * ?")
+    public void orderConfirm() throws SerializeException {
+
+        log.info("PayPal orderConfirm 被执行......");
+
+        List<OrderInfo> orderInfoList = orderInfoService.getNoPayOrderByDuration(5, PayTypeEnum.PAYPAL.getType());
+
+        for (OrderInfo orderInfo : orderInfoList) {
+            String orderNo = orderInfo.getOrderNo();
+            log.warn("超时订单 ===> {}", orderNo);
+
+            //核实订单状态：调用支付宝查单接口
+            payPalCheckoutService.checkOrderStatus(orderNo);
+
+        }
+    }
+}

src/main/java/com/ai/da/common/utils/AccessLimitUtils.java

@@ -27,12 +27,13 @@ public class AccessLimitUtils {
         Integer useCount = LocalCacheUtils.getAidaInterfaceCurrentLimitingCache(interfaceName);
         if (useCount > count) {
             //系统繁忙
-            throw new BusinessException("system busy !");
+            throw new BusinessException("system.busy");
         } else {
             useCount++;
             LocalCacheUtils.setAidaInterfaceCurrentLimitingCache(interfaceName, useCount);
         }
     }
+
     /**
      * 校验过后 接口完毕 去掉限流
      *

src/main/java/com/ai/da/common/utils/AlipayHKEncryptionUtil.java

@@ -0,0 +1,329 @@
+package com.ai.da.common.utils;
+
+import com.ai.da.model.dto.AlipayHKParametersDTO;
+import com.ai.da.model.dto.AlipayHKRequestDTO;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import lombok.extern.slf4j.Slf4j;
+import org.bouncycastle.util.io.pem.PemObject;
+import org.bouncycastle.util.io.pem.PemReader;
+import org.springframework.beans.factory.annotation.Value;
+
+import javax.crypto.*;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.security.*;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.UUID;
+
+@Slf4j
+public class AlipayHKEncryptionUtil {
+
+    @Value("${alipay.hk.merchant-id}")
+    private static String merchantId;
+
+    @Value("${alipay.hk.segment-id}")
+    private static String segmentId;
+
+    @Value("${alipay.hk.AESKey}")
+    private static String aesKey;
+
+    @Value("${alipay.hk.rsaPrivateKey}")
+    private static String privateKeyPath;
+
+    @Value("${alipay.hk.rsaPublicKey}")
+    private static String publicKeyPath;
+
+    /**
+     * 加密
+     * @param param
+     * @param serviceName
+     * @return
+     * @throws NoSuchPaddingException
+     * @throws NoSuchAlgorithmException
+     * @throws InvalidAlgorithmParameterException
+     * @throws InvalidKeyException
+     * @throws IllegalBlockSizeException
+     * @throws BadPaddingException
+     * @throws IOException
+     */
+    public static AlipayHKRequestDTO AESCBCWithRSA(HashMap<String, Object> param, String serviceName) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException, IOException {
+        // Pre-shared secret key, DO NOT hardcode this key
+        String key = aesKey;
+        // The path to the rsa private key file, DO NOT save this key to a publicly accessible location
+        // 使用私钥创建数字签名
+        // Mode, aes-128-cbc for 128bit key
+        String mode = "aes-128-cbc";
+        // Padding mode
+        String padding = "pkcs7";
+        // signature alogrithm
+        String signatureAlgorithm = "rsa-sha256";
+//        String signatureAlgorithm = "SHA256withRSA";
+        // Message body
+        AlipayHKParametersDTO requestMessage = new AlipayHKParametersDTO();
+        requestMessage.setService(serviceName);
+        requestMessage.setMerchant_id(merchantId);
+        requestMessage.setRequest_time(Long.toString(System.currentTimeMillis() / 1000L));
+        requestMessage.setRequest_uuid(UUID.randomUUID().toString());
+//        HashMap<String, Object> param = new HashMap<>();
+        requestMessage.setParameters(param);
+        /*String orderRef = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+        param.put("order_ref", orderRef);
+        param.put("amount", 208.12);
+        param.put("subject", "四月帳單 April Bill");
+        param.put("wallet", "ALIPAYHK");
+        param.put("segment_id", segmentId);
+        param.put("payment_solution", "WAP");*/
+
+
+        // Serialize message body
+        Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+        String content = gson.toJson(requestMessage);
+
+        // Secure random iv 获取随机种子
+        SecureRandom secureRandom = new SecureRandom();
+        byte[] iv = new byte[16]; //NEVER REUSE THIS IV WITH THE SAME KEY
+        secureRandom.nextBytes(iv);
+
+        // Algorithms
+        String alogrithm = "AES/CBC/PKCS5Padding";
+
+        // 创建 AES 密钥对象
+        SecretKey secretKey = new SecretKeySpec(key.getBytes(), "AES");
+        // 为加密算法提供一个随机的初始化向量，以增强加密安全性
+        IvParameterSpec parameterSpec = new IvParameterSpec(iv);
+        // 创建 Cipher 对象
+        Cipher cipher = Cipher.getInstance(alogrithm);
+        // 初始化为加密模式 Cipher.ENCRYPT_MODE
+        cipher.init(Cipher.ENCRYPT_MODE, secretKey, parameterSpec);
+
+        // Cipher text 对请求内容加密
+        byte[] cipherText = cipher.doFinal(content.getBytes());
+
+        // Concat iv and cipher text for signing
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        outputStream.write(iv);
+        outputStream.write(cipherText);
+        byte signMessage[] = outputStream.toByteArray();
+
+        // Sign key 读取rsa私钥文件，解析并得到私钥对象 privateKey
+        String rsaPrivateKeyPath = privateKeyPath;
+        PrivateKey privateKey = null;
+        byte[] signature;
+        try {
+            privateKey = readPrivateKeyFromFile(rsaPrivateKeyPath);
+            Signature signer = Signature.getInstance("SHA256withRSA");
+            signer.initSign(privateKey);
+            // 将加密内容和随机向量均加签
+            signer.update(signMessage);
+            signature = signer.sign();
+        } catch (SignatureException e) {
+            throw new RuntimeException(e);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            throw new RuntimeException(e);
+        }
+
+        Base64.Encoder encoder = Base64.getEncoder();
+        // Combine result
+        AlipayHKRequestDTO alipayHKRequestDTO = new AlipayHKRequestDTO();
+        alipayHKRequestDTO.setMerchant_id(merchantId);
+        alipayHKRequestDTO.setNonce(encoder.encodeToString(iv));
+        alipayHKRequestDTO.setMessage(encoder.encodeToString(cipherText));
+        alipayHKRequestDTO.setTag(encoder.encodeToString(signature));
+        String cipherSuite = mode + "-" + padding + "-with-" + signatureAlgorithm;
+        alipayHKRequestDTO.setCipher_suite(cipherSuite);
+
+        // Encode to json
+        String jsonEncoded = JSONObject.toJSONString(alipayHKRequestDTO);
+        log.info(jsonEncoded);
+
+//        String info = AlipayHKRequestUtil.createOrder(alipayHKRequestDTO);
+//        log.info(info);
+        return alipayHKRequestDTO;
+
+    }
+
+    /**
+     * 从文件中读取RSA私钥
+     * @param filePath
+     * @return
+     * @throws Exception
+     */
+    private static PrivateKey readPrivateKeyFromFile(String filePath) throws Exception {
+        BufferedReader reader = new BufferedReader(new FileReader(filePath));
+        StringBuilder keyBuffer = new StringBuilder();
+        String line;
+
+        // 读取文本文件中的内容
+        while ((line = reader.readLine()) != null) {
+            keyBuffer.append(line);
+        }
+        reader.close();
+
+        // 去除私钥内容中的头部和尾部信息
+        String privateKeyContent = keyBuffer.toString()
+                .replace("-----BEGIN PRIVATE KEY-----", "")
+                .replace("-----END PRIVATE KEY-----", "")
+                .replaceAll("\\s+", ""); // 去除空格、换行等字符
+
+        // 进行 Base64 解码
+        byte[] privateKeyBytes = Base64.getDecoder().decode(privateKeyContent);
+
+        // 根据 PKCS8 格式的私钥字节数组构造私钥对象
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(privateKeyBytes);
+        return keyFactory.generatePrivate(keySpec);
+    }
+
+    /**
+     * 使用 AES 密钥和随机向量进行解密
+     */
+    public static String decryptAES(String encryptedText, String iv) throws Exception {
+        byte[] encryptedBytes = Base64.getDecoder().decode(encryptedText);
+        byte[] ivBytes = Base64.getDecoder().decode(iv);
+
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        SecretKeySpec secretKeySpec = new SecretKeySpec(aesKey.getBytes(), "AES");
+        IvParameterSpec ivParameterSpec = new IvParameterSpec(ivBytes);
+
+        cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec);
+        byte[] decryptedBytes = cipher.doFinal(encryptedBytes);
+
+        return new String(decryptedBytes, StandardCharsets.UTF_8);
+    }
+
+    public static void test() throws Exception {
+        // 加密数据
+        AlipayHKParametersDTO requestMessage = new AlipayHKParametersDTO();
+        requestMessage.setService("create_order");
+        requestMessage.setMerchant_id(merchantId);
+        requestMessage.setRequest_time(Long.toString(System.currentTimeMillis() / 1000L));
+        requestMessage.setRequest_uuid(UUID.randomUUID().toString());
+        HashMap<String, Object> param = new HashMap<>();
+        requestMessage.setParameters(param);
+        String orderRef = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+        param.put("order_ref", orderRef);
+        param.put("amount", 208.12);
+        param.put("subject", "四月帳單 April Bill");
+        param.put("wallet", "ALIPAYHK");
+        param.put("segment_id", segmentId);
+        param.put("payment_solution", "WAP");
+        Gson gson = new Gson();
+        String plaintext = gson.toJson(requestMessage);
+        System.out.println(plaintext);
+
+        // 生成 AES 密钥
+        String key = aesKey;
+        SecretKey aesKey = new SecretKeySpec(key.getBytes(), "AES");
+
+        // 使用 RSA 公钥加密 AES 密钥
+        String rsaPublicKeyPath = publicKeyPath;
+        PublicKey publicKey = readPublicKey(new File(rsaPublicKeyPath));
+
+        Cipher rsaCipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+//        Cipher rsaCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        rsaCipher.init(Cipher.ENCRYPT_MODE, publicKey);
+        byte[] encryptedAesKey = rsaCipher.doFinal(aesKey.getEncoded());
+
+        // 使用 AES-128-CBC 加密数据
+        Cipher aesCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        byte[] ivBytes = generateRandomIV(aesCipher.getBlockSize());
+        IvParameterSpec ivSpec = new IvParameterSpec(ivBytes);
+
+        aesCipher.init(Cipher.ENCRYPT_MODE, aesKey, ivSpec);
+        byte[] encryptedData = aesCipher.doFinal(plaintext.getBytes());
+
+        // 数字签名（使用 RSA 私钥）
+        String rsaPrivateKeyPath = privateKeyPath;
+        PrivateKey privateKey = readPrivateKeyFromFile(rsaPrivateKeyPath);
+        Signature signer = Signature.getInstance("SHA256withRSA");
+        signer.initSign(privateKey);
+        signer.update(encryptedData);
+        byte[] signatureBytes = signer.sign();
+        Base64.Encoder encoder = Base64.getEncoder();
+
+        // 将加密后的数据和签名进行Base64编码
+        String base64EncryptedData = Base64.getEncoder().encodeToString(encryptedData);
+        String base64Signature = Base64.getEncoder().encodeToString(signatureBytes);
+
+        // 输出加密后的数据和签名
+        System.out.println("加密后的数据：" + base64EncryptedData);
+        System.out.println("数字签名：" + base64Signature);
+
+
+        HashMap<String, String> result = new HashMap<String, String>();
+        result.put("merchant_id",merchantId);
+        result.put("nonce", encoder.encodeToString(ivBytes));
+        result.put("message", encoder.encodeToString(encryptedData));
+        result.put("tag", encoder.encodeToString(signatureBytes));
+
+        String mode = "aes-128-cbc";
+        // Padding mode
+        String padding = "pkcs7";
+        // signature alogrithm
+        String signatureAlgorithm = "rsa-sha256";
+        String cipherSuite = mode + "-" + padding + "-with-" + signatureAlgorithm;
+        result.put("cipher_suite", cipherSuite);
+
+        System.out.println("map 格式：" + result);
+        // Encode to json
+        String jsonEncoded = JSONObject.toJSONString(result);
+        System.out.println("json 格式：" + jsonEncoded);
+
+        AlipayHKRequestDTO alipayHKRequestDTO = new AlipayHKRequestDTO();
+        alipayHKRequestDTO.setMerchant_id(merchantId);
+        alipayHKRequestDTO.setNonce(encoder.encodeToString(ivBytes));
+        alipayHKRequestDTO.setMessage(encoder.encodeToString(encryptedData));
+        alipayHKRequestDTO.setTag(encoder.encodeToString(signatureBytes));
+        alipayHKRequestDTO.setCipher_suite(cipherSuite);
+
+//        String info = AlipayHKRequestUtil.createOrder(result);
+//        log.info(info);
+
+        // 解密和验证
+//        byte[] decryptedAesKey = rsaCipher.doFinal(encryptedAesKey);
+        byte[] decryptedAesKey = rsaCipher.doFinal(aesKey.getEncoded());
+        SecretKey decryptedAesSecretKey = new SecretKeySpec(decryptedAesKey, "AES");
+
+        aesCipher.init(Cipher.DECRYPT_MODE, decryptedAesSecretKey, ivSpec);
+        byte[] decryptedData = aesCipher.doFinal(Base64.getDecoder().decode(base64EncryptedData));
+
+        // 验证数字签名
+        Signature verifier = Signature.getInstance("SHA256withRSA");
+        verifier.initVerify(publicKey);
+        verifier.update(decryptedData);
+        boolean signatureValid = verifier.verify(Base64.getDecoder().decode(base64Signature));
+
+        System.out.println("解密后的数据：" + new String(decryptedData));
+        System.out.println("数字签名验证结果：" + signatureValid);
+    }
+
+    public static PublicKey readPublicKey(File file) throws Exception {
+        KeyFactory factory = KeyFactory.getInstance("RSA");
+
+        try (FileReader keyReader = new FileReader(file);
+             PemReader pemReader = new PemReader(keyReader)) {
+
+            PemObject pemObject = pemReader.readPemObject();
+            byte[] content = pemObject.getContent();
+            X509EncodedKeySpec pubKeySpec = new X509EncodedKeySpec(content);
+            return factory.generatePublic(pubKeySpec);
+        }
+    }
+
+    private static byte[] generateRandomIV(int blockSize) {
+        SecureRandom random = new SecureRandom();
+        byte[] iv = new byte[blockSize];
+        random.nextBytes(iv);
+        return iv;
+    }
+}

src/main/java/com/ai/da/common/utils/AlipayHKRequestUtil.java

@@ -0,0 +1,53 @@
+package com.ai.da.common.utils;
+
+import com.ai.da.common.config.exception.BusinessException;
+import com.ai.da.model.dto.AlipayHKRequestDTO;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.util.concurrent.TimeUnit;
+
+import com.alibaba.fastjson.JSONObject;
+
+@Slf4j
+public class AlipayHKRequestUtil {
+
+    public static String createOrder(AlipayHKRequestDTO alipayHKRequestDTO) throws IOException {
+        OkHttpClient client = new OkHttpClient().newBuilder()
+                .connectTimeout(30, TimeUnit.SECONDS)
+                .pingInterval(5, TimeUnit.SECONDS)//websocket轮训间隔(单位:秒)
+                .readTimeout(60, TimeUnit.SECONDS)//读取超时(单位:秒)
+                .writeTimeout(60, TimeUnit.SECONDS)//写入超时(单位:秒)
+                .build();
+        MediaType mediaType = MediaType.parse("application/json;charset=utf-8");
+        long epochMilli = Instant.now().toEpochMilli();
+        log.info("Alipay-HK send request unix timestamp: {}", epochMilli);
+
+        String jsonString = JSONObject.toJSONString(alipayHKRequestDTO, SerializerFeature.WriteMapNullValue);
+        log.info(jsonString);
+
+        RequestBody body = RequestBody.create(mediaType, jsonString);
+
+        Request request = new Request.Builder()
+//                .url("https://aqs-api.sandbox-codpayment.com")
+                .url("https://aqs-api.sandbox-codpayment.com/v1/service")
+                .method("POST", body)
+                .addHeader("Content-Type", "application/json;charset=utf-8")
+                .build();
+        Response response = null;
+        String bodyString;
+        try {
+//            log.info("generateSketchOrPrint请求入参content###{}", JSON.toJSONString(alipayHKRequestDTO, SerializerFeature.WriteMapNullValue));
+            response = client.newCall(request).execute();
+        } catch (Exception e) {
+//            log.error("PythonService##generateSketchOrPrint异常###{}", ExceptionUtil.getThrowableList(ioException));
+//            throw new BusinessException("generate.interface.error");
+            throw new BusinessException(e.getMessage());
+        }
+        return response.body().string();
+    }
+
+}

src/main/java/com/ai/da/common/utils/AsyncCallerUtil.java

@@ -0,0 +1,75 @@
+package com.ai.da.common.utils;
+
+import com.ai.da.common.config.exception.BusinessException;
+import com.ai.da.model.dto.GenerateToPythonDTO;
+import com.ai.da.python.PythonService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.*;
+
+@Slf4j
+@Component
+public class AsyncCallerUtil {
+
+    // 存放状态 表示当前任务是否需要继续等待，默认持续等待
+    public static Map<String, Boolean> waitingStatus = new HashMap<>();
+
+    private static PythonService pythonService;
+
+    @Autowired
+    public void setPythonService(PythonService pythonService) {
+        AsyncCallerUtil.pythonService = pythonService;
+    }
+
+    public CompletableFuture<List<String>> callGenerateAsync(GenerateToPythonDTO generateToPython) {
+//        return CompletableFuture.supplyAsync(() -> pythonService.generateSketchOrPrint(generateToPython));
+        return null;
+    }
+
+    public List<String> generate(GenerateToPythonDTO generateToPython) {
+        ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(5);
+        String taskId = generateToPython.getTasks_id();
+        ScheduledFuture<?> timeoutTask = null;
+        if (!waitingStatus.containsKey(taskId)) waitingStatus.put(taskId, true);
+
+        try {
+            CompletableFuture<List<String>> generateResult = callGenerateAsync(generateToPython);
+            // 5秒后第一次确认，之后每隔10秒确认一次用户选择结果
+            timeoutTask = scheduledExecutorService.scheduleAtFixedRate(() -> {
+                // 调用另一个接口获取用户的选择
+                if (!waitingStatus.get(taskId)) {
+                    // 如果用户选择取消，则取消对generate的调用
+                    generateResult.cancel(true);
+                    waitingStatus.remove(taskId);
+                } else log.info("===============持续等待===============");
+            }, 5, 10, TimeUnit.SECONDS);
+
+            log.info("阻塞等待结果...");
+            // 阻塞，等待结果
+            List<String> result = generateResult.get();
+            // 取消定时任务
+            timeoutTask.cancel(true);
+            waitingStatus.remove(taskId);
+            return result;
+        } catch (CancellationException e) {
+            // generateResult.cancel(true);通过抛出异常取消该任务
+            log.info("==========成功取消generate任务==========");
+            return null;
+        } catch (InterruptedException | ExecutionException | BusinessException e) {
+            // 处理异常
+            log.error("发生错误 ： " + e, e);
+            // 取消定时任务
+            assert timeoutTask != null;
+            timeoutTask.cancel(true);
+            throw new BusinessException(e.getMessage());
+        } finally {
+            // 关闭线程池
+//            executorService.shutdown();
+//            scheduledExecutorService.shutdown();
+        }
+    }
+
+}

src/main/java/com/ai/da/common/utils/DateUtil.java

@@ -12,11 +12,13 @@ import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
+
 @Slf4j
 public class DateUtil {
     public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
     public static final String YYYYMM = "yyyyMM";
     public static final String YYYY_MM_DD = "yyyyMMdd";
+
     /**
      * LocalDate -> Date
      */
@@ -30,8 +32,10 @@ public class DateUtil {
     public static Date asDate(LocalDateTime localDateTime) {
         return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
     }
+
     /**
      * date 装 String
+     *
      * @param date
      * @param formatter
      * @return
@@ -43,8 +47,10 @@ public class DateUtil {
         LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zoneId);
         return dateTimeFormatter.format(localDateTime);
     }
+
     /**
      * 根据时区获取时间
+     *
      * @param timeZone "Asia/Tokyo"
      * @return
      */
@@ -62,4 +68,17 @@ public class DateUtil {
         return date;
     }
 
+    /**
+     * 获取指定时区的时间戳的前十位
+     * @param timeZone 时区
+     * @return 当前时间戳的前十位
+     */
+    public static String getTimeStamp(String timeZone){
+        ZoneId zoneId = ZoneId.of(timeZone);
+
+        long epochSecond = Instant.now().atZone(zoneId).toEpochSecond();
+
+        return String.valueOf(epochSecond).substring(0, 10);
+    }
+
 }

src/main/java/com/ai/da/common/utils/FileUtil.java

@@ -5,27 +5,19 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.model.vo.FileVO;
-import org.apache.tomcat.util.http.fileupload.FileUtils;
-import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.FileSystemUtils;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URL;
-import java.security.MessageDigest;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-//import org.apache.poi.util.IOUtils;
-//import org.apache.poi.xssf.streaming.SXSSFSheet;
-
 public class FileUtil extends cn.hutool.core.io.FileUtil {
 
     private static final Logger log = LoggerFactory.getLogger(com.ai.da.common.utils.FileUtil.class);
@@ -152,6 +144,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         }
         return new FileVO(height, width);
     }
+
     /**
      * 获取文件尺寸
      */
@@ -170,6 +163,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         }
         return new FileVO(height, width);
     }
+
     /**
      * 获取远程文件流
      */
@@ -181,9 +175,10 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
             return url.openStream();
         } catch (IOException ioException) {
             log.error("获取文件尺寸异常###{}###path##{}", ExceptionUtil.stacktraceToString(ioException), path);
-            throw new BusinessException("get file is failed!");
+            throw new BusinessException("get.file.failed");
         }
     }
+
     /**
      * 将文件名解析成文件的上传路径
      */
@@ -212,6 +207,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         }
         return null;
     }
+
     /**
      * 将文件名解析成文件的上传路径
      */
@@ -250,6 +246,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         }
         return false;
     }
+
     /**
      * 获取指定文件夹下所有文件，不含文件夹里的文件
      *
@@ -297,5 +294,20 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         return files;
     }
 
+    // 判断文件是否存在
+    public static boolean isFileExists(String filePath) {
+        File file = new File(filePath);
+        return file.exists() && file.isFile();
+    }
+
+    // 根据路径获取文件
+    public static File getFile(String filePath) {
+        File file = new File(filePath);
+        if (file.exists() && file.isFile()) {
+            return file;
+        } else {
+            return null;
+        }
+    }
 
 }

src/main/java/com/ai/da/common/utils/ImageUtil.java

@@ -17,6 +17,7 @@ public class ImageUtil {
     static int r, g, b; // 分别用来存放获取的RGB值
     static int heigth, width;
     static int id = 0;
+
     public static void find() {
         // 读取要操作的图片，这里的图片路径请改成自己要处理的图片
         try {

src/main/java/com/ai/da/common/utils/LocalCacheUtils.java

@@ -1,11 +1,7 @@
 package com.ai.da.common.utils;
 
-import com.ai.da.mapper.entity.Collection;
-import com.ai.da.mapper.entity.SysFile;
 import com.ai.da.model.vo.SysFileVO;
 import com.google.common.cache.*;
-import com.google.common.collect.Lists;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
@@ -25,8 +21,8 @@ public final class LocalCacheUtils {
      * token
      */
     private static LoadingCache<String, String> tokenCache = loadTokenCache();
+
     /**
-     *
      * 缓存接口这里是LoadingCache，LoadingCache在缓存项不存在时可以自动加载缓存
      */
     private static LoadingCache<String, String> loadTokenCache() {
@@ -44,6 +40,7 @@ public final class LocalCacheUtils {
                 });
         return tokenCache;
     }
+
     /**
      * 邮箱,短信验证码
      */
@@ -176,8 +173,10 @@ public final class LocalCacheUtils {
                     return 0;
                 }
             });
+
     /**
      * 添加token本地缓存
+     *
      * @param key
      * @param value
      */
@@ -187,6 +186,7 @@ public final class LocalCacheUtils {
 
     /**
      * 获取token本地缓存
+     *
      * @param key
      * @return
      */
@@ -202,8 +202,10 @@ public final class LocalCacheUtils {
         }
         return null;
     }
+
     /**
      * 删除token本地缓存(登出)
+     *
      * @param key
      * @return
      */
@@ -214,8 +216,10 @@ public final class LocalCacheUtils {
             log.error("delTokenCache方法错误", e);
         }
     }
+
     /**
      * 添加验证码本地缓存
+     *
      * @param key
      * @param value
      */
@@ -225,6 +229,7 @@ public final class LocalCacheUtils {
 
     /**
      * 获取验证码本地缓存
+     *
      * @param key
      * @return
      */
@@ -240,8 +245,10 @@ public final class LocalCacheUtils {
         }
         return null;
     }
+
     /**
      * 添加系统文本地缓存
+     *
      * @param key
      * @param sysFile
      */
@@ -251,6 +258,7 @@ public final class LocalCacheUtils {
 
     /**
      * 获取系统文件本地缓存
+     *
      * @param key
      * @return
      */
@@ -263,8 +271,10 @@ public final class LocalCacheUtils {
         }
         return null;
     }
+
     /**
      * 清除所有系统文件本地缓存
+     *
      * @return
      */
     public static void clearAllSysFileCache() {
@@ -274,8 +284,10 @@ public final class LocalCacheUtils {
             log.error("clearAllSysFileCache方法错误", e);
         }
     }
+
     /**
      * 添加系统文本地缓存,通过类型
+     *
      * @param level1Type
      * @param sysFileList
      */
@@ -285,6 +297,7 @@ public final class LocalCacheUtils {
 
     /**
      * 获取系统文件本地缓存
+     *
      * @param level2Type
      * @return
      */
@@ -296,8 +309,10 @@ public final class LocalCacheUtils {
         }
         return null;
     }
+
     /**
      * 清除所有系统文件本地缓存
+     *
      * @return
      */
     public static void clearAllSysFileCacheByLevel2Type() {
@@ -307,8 +322,10 @@ public final class LocalCacheUtils {
             log.error("clearAllSysFileCacheByLevel2Type方法错误", e);
         }
     }
+
     /**
      * 添加系统文件范围最大最小值本地缓存
+     *
      * @param key
      * @param value
      */
@@ -318,6 +335,7 @@ public final class LocalCacheUtils {
 
     /**
      * 获取系统文件范围最大最小值本地缓存
+     *
      * @param key
      * @return
      */
@@ -333,8 +351,10 @@ public final class LocalCacheUtils {
         }
         return null;
     }
+
     /**
      * 清除所有系统文件范围最大最小值本地缓存
+     *
      * @return
      */
     public static void clearAllMaxMinValueCache() {
@@ -344,8 +364,10 @@ public final class LocalCacheUtils {
             log.error("clearAllMaxMinValueCache方法错误", e);
         }
     }
+
     /**
      * 添加系design文件进度统计
+     *
      * @param key
      * @param value
      */
@@ -355,6 +377,7 @@ public final class LocalCacheUtils {
 
     /**
      * 获取design文件进度统计
+     *
      * @param key
      * @return
      */
@@ -367,8 +390,10 @@ public final class LocalCacheUtils {
         }
         return null;
     }
+
     /**
      * 进度统计完后 删除进度
+     *
      * @param key
      * @return
      */
@@ -382,6 +407,7 @@ public final class LocalCacheUtils {
 
     /**
      * 设置本次接口流量数
+     *
      * @param key
      * @param value
      */
@@ -391,6 +417,7 @@ public final class LocalCacheUtils {
 
     /**
      * 获取本次接口流量数
+     *
      * @param key
      * @return
      */
@@ -403,4 +430,49 @@ public final class LocalCacheUtils {
         return null;
     }
 
+    /**
+     * 预签名URL缓存
+     */
+    private static LoadingCache<String, String> presignedUrlCache = CacheBuilder.newBuilder()
+            .concurrencyLevel(10)
+            .expireAfterWrite((24 * 60 - 1), TimeUnit.MINUTES)
+            .initialCapacity(100)
+            .maximumSize(10000)
+            .recordStats()
+            .build(new CacheLoader<String, String>() {
+                @Override
+                public String load(String key) throws Exception {
+                    return "null";
+                }
+            });
+
+    /**
+     * 添加预签名URL到缓存
+     *
+     * @param key   URL的唯一标识
+     * @param value 预签名URL
+     */
+    public static void setPresignedUrlCache(String key, String value) {
+        presignedUrlCache.put(key, value);
+    }
+
+    /**
+     * 获取预签名URL
+     *
+     * @param key URL的唯一标识
+     * @return 预签名URL，如果不存在则返回null
+     */
+    public static String getPresignedUrlCache(String key) {
+        try {
+            String value = presignedUrlCache.get(key);
+            if ("null".equals(value)) {
+                return null;
+            }
+            return value;
+        } catch (ExecutionException e) {
+            log.error("getPresignedUrlCache方法错误", e);
+        }
+        return null;
+    }
+
 }

src/main/java/com/ai/da/common/utils/MD5Utils.java

@@ -58,6 +58,7 @@ public class MD5Utils {
         }
         return md5;
     }
+
     /**
      * MD5加密文件
      *
@@ -74,6 +75,16 @@ public class MD5Utils {
         return md5;
     }
 
+    public static String encryptFile(InputStream inputStream) {
+        String md5 = null;
+        try {
+            md5 = DigestUtils.md5DigestAsHex(inputStream);
+        } catch (IOException ioException) {
+            log.error("文件InputStream md5加密异常ioException##{}", ExceptionUtil.getThrowableList(ioException));
+        }
+        return md5;
+    }
+
     public static void main(String[] args) throws FileNotFoundException, IOException {
         File file1 = new File("/Users/yanglei/Documents/阳磊日报2019-04-23.numbers");
         File file2 = new File("/Users/yanglei/Documents/7777.numbers");

src/main/java/com/ai/da/common/utils/MinioUtil.java

@@ -0,0 +1,420 @@
+package com.ai.da.common.utils;
+
+import com.ai.da.common.config.exception.BusinessException;
+import com.ai.da.mapper.primary.entity.ObjectItem;
+import io.minio.*;
+import io.minio.errors.MinioException;
+import io.minio.http.Method;
+import io.minio.messages.DeleteError;
+import io.minio.messages.DeleteObject;
+import io.minio.messages.Item;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * @description： minio工具类
+ * @version：3.0
+ */
+@Component
+public class MinioUtil {
+    @Autowired
+    private MinioClient minioClient;
+
+    /**
+     * description: 判断bucket是否存在，不存在则创建
+     *
+     * @return: void
+     */
+    public void existBucket(String name) {
+        try {
+            boolean exists = minioClient.bucketExists(BucketExistsArgs.builder().bucket(name).build());
+            if (!exists) {
+                minioClient.makeBucket(MakeBucketArgs.builder().bucket(name).build());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 创建存储bucket
+     *
+     * @param bucketName 存储bucket名称
+     * @return Boolean
+     */
+    public Boolean makeBucket(String bucketName) {
+        try {
+            minioClient.makeBucket(MakeBucketArgs.builder()
+                    .bucket(bucketName)
+                    .build());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 删除存储bucket
+     *
+     * @param bucketName 存储bucket名称
+     * @return Boolean
+     */
+    public Boolean removeBucket(String bucketName) {
+        try {
+            minioClient.removeBucket(RemoveBucketArgs.builder()
+                    .bucket(bucketName)
+                    .build());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * description: 上传文件
+     *
+     * @param bucketName
+     * @param path
+     * @param multipartFile
+     * @return: java.lang.String
+     */
+    public List<String> uploadBatch(String bucketName, String path, MultipartFile[] multipartFile) {
+        List<String> names = new ArrayList<>(multipartFile.length);
+        for (MultipartFile file : multipartFile) {
+            String fileName = file.getOriginalFilename();
+            String[] split = fileName.split("\\.");
+            if (split.length > 1) {
+                fileName = path + "/" + UUID.randomUUID() + "." + split[1];
+            } else {
+                fileName = path + "/" + UUID.randomUUID();
+            }
+            InputStream in = null;
+            try {
+                in = file.getInputStream();
+                minioClient.putObject(PutObjectArgs.builder()
+                        .bucket(bucketName)
+                        .object(fileName)
+                        .stream(in, in.available(), -1)
+                        .contentType(file.getContentType())
+                        .build()
+                );
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                if (in != null) {
+                    try {
+                        in.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            names.add(fileName);
+        }
+        return names;
+    }
+
+    /**
+     * description: 上传文件
+     *
+     * @param bucketName
+     * @param path
+     * @param file
+     * @return: java.lang.String
+     */
+    public String upload(String bucketName, String path, MultipartFile file) {
+        String fileName = file.getOriginalFilename();
+        String[] split = fileName.split("\\.");
+        if (split.length > 1) {
+            fileName = path + "/" + UUID.randomUUID() + "." + split[split.length - 1];
+        } else {
+            fileName = path + "/" + UUID.randomUUID();
+        }
+        InputStream in = null;
+        try {
+            in = file.getInputStream();
+            minioClient.putObject(PutObjectArgs.builder()
+                    .bucket(bucketName)
+                    .object(fileName)
+                    .stream(in, in.available(), -1)
+                    .contentType(file.getContentType())
+                    .build()
+            );
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return bucketName + "/" + fileName;
+    }
+
+    public String upload(String bucketName, String path, MultipartFile file, String copy) {
+        InputStream in = null;
+        try {
+            in = file.getInputStream();
+            minioClient.putObject(PutObjectArgs.builder()
+                    .bucket(bucketName)
+                    .object(path)
+                    .stream(in, in.available(), -1)
+                    .contentType(file.getContentType())
+                    .build()
+            );
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return bucketName + "/" + path;
+    }
+
+//    public String upload(String bucketName, String path, File file) {
+//        InputStream in = null;
+//        try {
+//            in = new FileInputStream(file);
+//            minioClient.putObject(PutObjectArgs.builder()
+//                    .bucket(bucketName)
+//                    .object(path)
+//                    .stream(in, in.available(), -1)
+//                    .contentType(file.getContentType())
+//                    .build()
+//            );
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        } finally {
+//            if (in != null) {
+//                try {
+//                    in.close();
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//        }
+//        return fileName;
+//    }
+
+    public InputStream download(String bucketName, String objectName) throws MinioException, IOException {
+        try {
+            return minioClient.getObject(GetObjectArgs.builder().bucket(bucketName).object(objectName).build());
+        } catch (InvalidKeyException e) {
+            throw new RuntimeException(e);
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public InputStream download(String path) throws MinioException, IOException {
+        if (!path.contains("/")) {
+            throw new BusinessException("the.path.is.error");
+        }
+        int index = path.indexOf("/");
+        String bucketName = path.substring(0, index);
+        String objectName = path.substring(index + 1);
+        return download(bucketName, objectName);
+    }
+
+    /**
+     * description: 下载文件
+     *
+     * @param path
+     * @param bucketName
+     * @return: org.springframework.http.ResponseEntity<byte [ ]>
+     */
+//    public ResponseEntity<byte[]> download(String path, String bucketName) {
+//        ResponseEntity<byte[]> responseEntity = null;
+//        InputStream in = null;
+//        ByteArrayOutputStream out = null;
+//        try {
+//            in = minioClient.getObject(GetObjectArgs.builder().bucket(bucketName).object(path).build());
+//            out = new ByteArrayOutputStream();
+//            IOUtils.copy(in, out);
+//            //封装返回值
+//            byte[] bytes = out.toByteArray();
+//            HttpHeaders headers = new HttpHeaders();
+//            try {
+//                headers.add("Content-Disposition", "attachment;filename=" + URLEncoder.encode(path, "UTF-8"));
+//            } catch (UnsupportedEncodingException e) {
+//                e.printStackTrace();
+//            }
+//            headers.setContentLength(bytes.length);
+//            headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
+//            headers.setAccessControlExposeHeaders(Arrays.asList("*"));
+//            responseEntity = new ResponseEntity<byte[]>(bytes, headers, HttpStatus.OK);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        } finally {
+//            try {
+//                if (in != null) {
+//                    try {
+//                        in.close();
+//                    } catch (IOException e) {
+//                        e.printStackTrace();
+//                    }
+//                }
+//                if (out != null) {
+//                    out.close();
+//                }
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//            }
+//        }
+//        return responseEntity;
+//    }
+
+    /**
+     * 查看文件对象
+     *
+     * @param bucketName 存储bucket名称
+     * @return 存储bucket内文件对象信息
+     */
+    public List<ObjectItem> listObjects(String bucketName) {
+        Iterable<Result<Item>> results = minioClient.listObjects(
+                ListObjectsArgs.builder().bucket(bucketName).build());
+        List<ObjectItem> objectItems = new ArrayList<>();
+        try {
+            for (Result<Item> result : results) {
+                Item item = result.get();
+                ObjectItem objectItem = new ObjectItem();
+                objectItem.setObjectName(item.objectName());
+                objectItem.setSize(item.size());
+                objectItems.add(objectItem);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+        return objectItems;
+    }
+
+    /**
+     * 批量删除文件对象
+     *
+     * @param bucketName 存储bucket名称
+     * @param objects    对象名称集合
+     */
+    public Iterable<Result<DeleteError>> removeObjects(String bucketName, List<String> objects) {
+        List<DeleteObject> dos = objects.stream().map(e -> new DeleteObject(e)).collect(Collectors.toList());
+        Iterable<Result<DeleteError>> results = minioClient.removeObjects(RemoveObjectsArgs.builder().bucket(bucketName).objects(dos).build());
+        return results;
+    }
+
+    public void deleteObject(String bucketName, String objectName) {
+        try {
+            minioClient.removeObject(RemoveObjectArgs.builder().bucket(bucketName).object(objectName).build());
+            System.out.println("Object " + objectName + " successfully removed from bucket " + bucketName);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.err.println("Error while removing object " + objectName + " from bucket " + bucketName + ": " + e.getMessage());
+        }
+    }
+
+    public void deleteObject(String path) {
+        if (!path.contains("/")) {
+            throw new BusinessException("The path is error!");
+        }
+        int index = path.indexOf("/");
+        String bucketName = path.substring(0, index);
+        String objectName = path.substring(index + 1);
+        deleteObject(bucketName, objectName);
+    }
+
+    /**
+     * 获取文件的临时URL
+     *
+     * @param bucketName 存储桶名称
+     * @param fileName   文件名
+     * @param expiry     过期时间（单位：分）
+     * @return 文件的临时URL，如果出现异常则返回null
+     */
+    public String getPresignedUrl(String bucketName, String fileName, int expiry) {
+        try {
+            return minioClient.getPresignedObjectUrl(
+                    GetPresignedObjectUrlArgs.builder()
+                            .bucket(bucketName)
+                            .object(fileName)
+                            .expiry(expiry, TimeUnit.MINUTES)
+                            .method(Method.GET)
+                            .build()
+            );
+        } catch (MinioException | InvalidKeyException | IOException | NoSuchAlgorithmException e) {
+            e.printStackTrace();
+            throw new BusinessException(e.getMessage());
+        }
+    }
+
+    public String getPresignedUrl(String path, int expiry) {
+        if (LocalCacheUtils.getPresignedUrlCache(path) != null) {
+            return LocalCacheUtils.getPresignedUrlCache(path);
+        } else {
+            if (!path.contains("/")) {
+                throw new BusinessException("The path is error!");
+            }
+            int index = path.indexOf("/");
+            String bucketName = path.substring(0, index);
+            String fileName = path.substring(index + 1);
+            String presignedUrl = getPresignedUrl(bucketName, fileName, expiry);
+            LocalCacheUtils.setPresignedUrlCache(path, presignedUrl);
+            return presignedUrl;
+        }
+    }
+
+    /**
+     * 将桶名、文件名从url中分离出来
+     *
+     * @param url    带桶名、文件名的url
+     * @param expiry 图片过期时间
+     * @return 可以直接访问的minio图片地址
+     */
+    public String splitThenGetPreviewUrl(String url, int expiry) {
+        String[] parts = url.split("/");
+        String bucketName = parts[0];
+        StringBuilder fileName = new StringBuilder();
+        for (int i = 1; i < parts.length; i++) {
+            fileName.append(parts[i]);
+            if (i != parts.length - 1) {
+                fileName.append("/");
+            }
+        }
+        return getPresignedUrl(bucketName, String.valueOf(fileName), expiry);
+    }
+
+    public boolean doesObjectExist(String bucketName, String objectName) {
+        try {
+            minioClient.statObject(
+                    StatObjectArgs.builder()
+                            .bucket(bucketName)
+                            .object(objectName)
+                            .build()
+            );
+            return true;
+        } catch (Exception e) {
+            // 如果发生异常，说明文件不存在或者出现了其他错误
+            return false;
+        }
+    }
+}
+
+

src/main/java/com/ai/da/common/utils/MultiReadHttpServletRequest.java

@@ -45,24 +45,20 @@ public class MultiReadHttpServletRequest extends HttpServletRequestWrapper {
             while ((line = reader.readLine()) != null) {
                 sb.append(line);
             }
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             e.printStackTrace();
-        }
-        finally {
+        } finally {
             if (inputStream != null) {
                 try {
                     inputStream.close();
-                }
-                catch (IOException e) {
+                } catch (IOException e) {
                     e.printStackTrace();
                 }
             }
             if (reader != null) {
                 try {
                     reader.close();
-                }
-                catch (IOException e) {
+                } catch (IOException e) {
                     e.printStackTrace();
                 }
             }
@@ -72,6 +68,7 @@ public class MultiReadHttpServletRequest extends HttpServletRequestWrapper {
 
     /**
      * 复制输入流
+     *
      * @param inputStream 请求输入流
      * @return 复制出来的输入流
      */
@@ -84,8 +81,7 @@ public class MultiReadHttpServletRequest extends HttpServletRequestWrapper {
                 byteArrayOutputStream.write(buffer, 0, len);
             }
             byteArrayOutputStream.flush();
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             e.printStackTrace();
         }
         return new ByteArrayInputStream(byteArrayOutputStream.toByteArray());

src/main/java/com/ai/da/common/utils/ObjectUtils.java

@@ -1,4 +1,5 @@
 package com.ai.da.common.utils;
+
 import java.util.*;
 import java.lang.reflect.Field;
 

src/main/java/com/ai/da/common/utils/OrderNoUtils.java

@@ -0,0 +1,46 @@
+package com.ai.da.common.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
+
+/**
+ * 订单号工具类
+ *
+ * @author qy
+ * @since 1.0
+ */
+public class OrderNoUtils {
+
+    /**
+     * 获取订单编号
+     * @return
+     */
+    public static String getOrderNo() {
+        return "ORDER_" + getNo();
+    }
+
+    /**
+     * 获取退款单编号
+     * @return
+     */
+    public static String getRefundNo() {
+        return "REFUND_" + getNo();
+    }
+
+    /**
+     * 获取编号
+     * @return
+     */
+    public static String getNo() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        String newDate = sdf.format(new Date());
+        String result = "";
+        Random random = new Random();
+        for (int i = 0; i < 3; i++) {
+            result += random.nextInt(10);
+        }
+        return newDate + result;
+    }
+
+}

src/main/java/com/ai/da/common/utils/PantoneUtils.java

@@ -0,0 +1,31 @@
+package com.ai.da.common.utils;
+
+public class PantoneUtils {
+
+    public static int[] rgbToHsv(int[] rgb) {
+        //切割rgb数组
+        int red = rgb[0];
+        int green = rgb[1];
+        int blue = rgb[2];
+
+        float r = (float) red / 255;
+        float g = (float) green / 255;
+        float b = (float) blue / 255;
+
+        float min = Math.min(Math.min(r, g), b);
+
+        float[] hsv = {60, 0, Math.max(Math.max(r, g), b)};
+
+        hsv[1] = (hsv[2] == 0) ? 0 : 1 - min / hsv[2];
+
+        hsv[0] = 60 * (
+                (hsv[2] == min) ? Float.NaN :
+                        (hsv[2] == r) ? (g - b) / (hsv[2] - min) + ((g < b) ? 6 : 0) :
+                                (hsv[2] == g) ? (b - r) / (hsv[2] - min) + 2 :
+                                        (r - g) / (hsv[2] - min) + 4
+        );
+
+        return new int[]{Math.round(hsv[0]), Math.round(hsv[1] * 100), Math.round(hsv[2] * 100)};
+    }
+
+}

src/main/java/com/ai/da/common/utils/RandomsUtil.java

@@ -37,6 +37,7 @@ public class RandomsUtil {
     public static String generateVerifyCode(Long randomStart, Long randomEnd) {
         return String.valueOf(RandomUtil.randomLong(randomStart, randomEnd));
     }
+
     /**
      * 生成随机系统图片
      *
@@ -47,5 +48,9 @@ public class RandomsUtil {
         return RandomUtil.randomLong(randomStart, randomEnd);
     }
 
+    public static Integer randomSysFile(Integer randomEnd) {
+        return RandomUtil.randomInt(randomEnd);
+    }
+
 
 }

src/main/java/com/ai/da/common/utils/RedisUtil.java

@@ -0,0 +1,167 @@
+package com.ai.da.common.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ZSetOperations;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@Component
+public class RedisUtil {
+
+    @Resource
+    private RedisTemplate<String, String> redisTemplate;
+
+    public Boolean hasKey(String key){
+        return redisTemplate.hasKey(key);
+    }
+
+    //- - - - - - - - - - - - - - - - - - - - -  ZSet类型 - - - - - - - - - - - - - - - - - - - -
+
+    /**
+     * 向ZSet中添加元素
+     */
+    public void addToZSet(String key, String value, Double score) {
+        redisTemplate.opsForZSet().add(key, value, score);
+    }
+
+    /**
+     * 从ZSet中删除元素
+     */
+    public void removeFromZSet(String key, String value) {
+        redisTemplate.opsForZSet().remove(key, value);
+    }
+
+    /**
+     * 获取指定元素的当前排列顺序
+     */
+    public Long getRank(String key, String value) {
+        return redisTemplate.opsForZSet().rank(key, value);
+    }
+
+    /**
+     * 获取当前ZSet中的最大score
+     */
+    public Double getMaxScore(String key) {
+        Set<ZSetOperations.TypedTuple<String>> set = redisTemplate.opsForZSet().reverseRangeWithScores(key, 0, 0);
+
+        if (!CollectionUtils.isEmpty(set)) {
+            Double score = set.iterator().next().getScore();
+            return score + 1.0;
+        } else {
+            return 1.0;
+        }
+    }
+
+    /**
+     * 判断元素是否存在
+     */
+    public Boolean isElementExistsInZSet(String key, String value) {
+        return redisTemplate.opsForZSet().score(key, value) != null;
+    }
+
+    /**
+     * 获取当前ZSet中数据量的总和
+     */
+    public Long getZSetTotalCount(String key) {
+        return redisTemplate.opsForZSet().zCard(key);
+    }
+
+
+    public Set<String> getZSetTotalData(String key){
+        return redisTemplate.opsForZSet().range(key, 0, -1);
+    }
+
+    //- - - - - - - - - - - - - - - - - - - - -  set类型 - - - - - - - - - - - - - - - - - - - -
+
+    /**
+     * 将数据放入set缓存
+     */
+    public void addToSet(String key, String value) {
+        redisTemplate.opsForSet().add(key, value);
+    }
+
+    /**
+     * 弹出变量中的元素
+     */
+    public void removeFromSet(String key, String value) {
+        redisTemplate.opsForSet().remove(key, value);
+    }
+
+    /**
+     * 检查给定的元素是否在变量中。
+     */
+    public Boolean isElementExistsInSet(String key, String obj) {
+        return redisTemplate.opsForSet().isMember(key, obj);
+    }
+
+
+    //- - - - - - - - - - - - - - - - - - - - -  hash类型 - - - - - - - - - - - - - - - - - - - -
+
+    /**
+     * 加入缓存
+     */
+    public void addToMap(String key, Map<String, String> map) {
+        redisTemplate.opsForHash().putAll(key, map);
+    }
+
+    /**
+     * 验证指定 key 下 有没有指定的 hashkey
+     */
+    public Boolean isElementExistsInMap(String key, String hashKey) {
+        return redisTemplate.opsForHash().hasKey(key, hashKey);
+    }
+
+    /**
+     * 获取指定key的值string
+     */
+    public String getMapValue(String key1, String key2) {
+        return String.valueOf(redisTemplate.opsForHash().get(key1, key2));
+    }
+
+    /**
+     * 删除指定 hash 的 HashKey
+     *
+     * @return 删除成功的 数量
+     */
+    public Long removeFromMap(String key, String hashKeys) {
+        return redisTemplate.opsForHash().delete(key, hashKeys);
+    }
+
+    //- - - - - - - - - - - - - - - - - - - - -  String类型 - - - - - - - - - - - - - - - - - - - -
+    public void addToString(String key, String value){
+        redisTemplate.opsForValue().set(key,value);
+    }
+
+    public void addToString(String key, String value, Long expiresIn){
+        redisTemplate.opsForValue().set(key,value,expiresIn, TimeUnit.SECONDS);
+    }
+
+    public String getFromString(String key){
+        return redisTemplate.opsForValue().get(key);
+    }
+
+    public Set<String> getKeysFromString(String key){
+        return redisTemplate.keys(key);
+    }
+
+    public List<String> getMultiValue(Set<String> keys){
+        return redisTemplate.opsForValue().multiGet(keys);
+    }
+
+    public Long getExpire(String key){
+        return redisTemplate.getExpire(key);
+    }
+
+    public void removeFromString(String key){
+        redisTemplate.delete(key);
+    }
+
+}

src/main/java/com/ai/da/common/utils/RequestInfoUtil.java

@@ -10,8 +10,8 @@ public class RequestInfoUtil {
      * @param request
      * @return java.lang.String
      * @version 1.0
-     *
-     *
+     * <p>
+     * <p>
      * 使用了ng等代理服务器要在ng加以下配置
      * location / {
      * proxy_pass http://127.0.0.1:10678;
@@ -20,7 +20,6 @@ public class RequestInfoUtil {
      * proxy_set_header REMOTE-HOST $remote_addr;
      * proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
      * }
-
      */
     public static String getIpAddress(HttpServletRequest request) {
         String ip = request.getHeader("x-forwarded-for");

src/main/java/com/ai/da/common/utils/RsaDecryptUtils.java

@@ -59,6 +59,7 @@ public class RsaDecryptUtils {
 
     /**
      * 解密
+     *
      * @param args
      * @throws NoSuchAlgorithmException
      */

src/main/java/com/ai/da/common/utils/SendEmailUtil.java

@@ -1,5 +1,7 @@
 package com.ai.da.common.utils;
 
+import com.ai.da.mapper.primary.entity.Account;
+import com.ai.da.mapper.primary.entity.TrialOrder;
 import com.alibaba.fastjson.JSONObject;
 import com.ai.da.common.config.exception.BusinessException;
 import com.tencentcloudapi.common.Credential;
@@ -7,11 +9,14 @@ import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import com.tencentcloudapi.common.profile.ClientProfile;
 import com.tencentcloudapi.common.profile.HttpProfile;
 import com.tencentcloudapi.ses.v20201002.SesClient;
+import com.tencentcloudapi.ses.v20201002.models.Attachment;
 import com.tencentcloudapi.ses.v20201002.models.SendEmailRequest;
 import com.tencentcloudapi.ses.v20201002.models.SendEmailResponse;
 import com.tencentcloudapi.ses.v20201002.models.Template;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
 
+import java.util.Base64;
 import java.util.Date;
 
 /**
@@ -31,6 +36,7 @@ public class SendEmailUtil {
      * 发信地址
      */
     private static String SEND_ADDRESS = "info@aida.com.hk";
+    private final static String CODE_CREATE_SEND_ADDRESS = "info@code-create.com.hk";
     /**
      * 登入主题
      */
@@ -96,9 +102,10 @@ public class SendEmailUtil {
             return Boolean.TRUE;
         } catch (TencentCloudSDKException e) {
             log.info("邮件发送失败###{}", e.toString());
-            throw new BusinessException(e.getMessage());
+            throw new BusinessException("failed.to.send.mail");
         }
     }
+
     private static Template contractTemplate(Long templateId, String verifyCode, String ip) {
         Template template = new Template();
         template.setTemplateID(templateId);
@@ -113,4 +120,281 @@ public class SendEmailUtil {
         template.setTemplateData(jsonObject.toJSONString());
         return template;
     }
+
+    /**
+     * 发送不同类型的邮件
+     *
+     * @param receiverAddress 收件人邮箱地址
+     * @param senderAddress   发件人邮箱地址
+     * @param emailType       邮件类型：1 - 提交试用请求，2 - 审批通过，3 - 试用请求通过通知
+     * @return 发送结果
+     */
+    private final static Long YOUR_TRIAL_TEMPLATE_ID = 117214L;
+    private final static Long APPROVAL_TEMPLATE_ID = 117215L;
+    private final static Long NOTIFICATION_TEMPLATE_ID = 117216L;
+    private final static Long NOTIFICATION_CHINESE_TEMPLATE_ID = 122229L;
+    private final static Long TRIAL_ORDER_LIST_ID = 122273L;
+    public static void sendCustomEmail(String receiverAddress, String senderAddress, TrialOrder trialOrder, int emailType, String country) {
+        try {
+            // 实例化一个认证对象
+            Credential cred = new Credential(SECRET_ID, SECRET_KEy);
+            HttpProfile httpProfile = new HttpProfile();
+            httpProfile.setEndpoint("ses.tencentcloudapi.com");
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setHttpProfile(httpProfile);
+            SesClient client = new SesClient(cred, "ap-hongkong", clientProfile);
+            SendEmailRequest req = new SendEmailRequest();
+            if (StringUtils.isEmpty(senderAddress)) {
+                senderAddress = SEND_ADDRESS;
+            }
+            req.setFromEmailAddress(senderAddress);
+            req.setDestination(new String[]{receiverAddress});
+
+            // 根据邮件类型设置不同的主题和模板
+            String subject = "";
+            Template template = new Template();
+            switch (emailType) {
+                case 1:
+                    subject = "试用订单请求";
+                    template.setTemplateID(YOUR_TRIAL_TEMPLATE_ID);
+                    template.setTemplateData(buildTrialOrderData(trialOrder));
+                    break;
+                case 2:
+                    subject = "试用订单审批通过";
+                    template.setTemplateID(APPROVAL_TEMPLATE_ID);
+                    template.setTemplateData(buildApprovalData(trialOrder));
+                    break;
+                case 3:
+                    subject = "Approval Confirmation for AiDA System Trial Access";
+                    if (country.equals("China")) {
+                        template.setTemplateID(NOTIFICATION_CHINESE_TEMPLATE_ID);
+                    }else {
+                        template.setTemplateID(NOTIFICATION_TEMPLATE_ID);
+                    }
+                    template.setTemplateData(buildNotificationData(trialOrder));
+                    break;
+                default:
+                    break;
+            }
+
+            req.setSubject(subject);
+            req.setTemplate(template);
+
+            // 发送邮件
+            SendEmailResponse resp = client.SendEmail(req);
+            log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp));
+        } catch (TencentCloudSDKException e) {
+            log.info("邮件发送失败###{}", e.toString());
+            throw new BusinessException("failed.to.send.mail");
+        }
+    }
+
+    public static void sendExcelEmail(String receiverAddress, String senderAddress, byte[] fileContent, String fileName) {
+        try {
+            // 实例化一个认证对象
+            Credential cred = new Credential(SECRET_ID, SECRET_KEy);
+            HttpProfile httpProfile = new HttpProfile();
+            httpProfile.setEndpoint("ses.tencentcloudapi.com");
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setHttpProfile(httpProfile);
+            SesClient client = new SesClient(cred, "ap-hongkong", clientProfile);
+            SendEmailRequest req = new SendEmailRequest();
+            if (StringUtils.isEmpty(senderAddress)) {
+                senderAddress = SEND_ADDRESS;
+            }
+            req.setFromEmailAddress(senderAddress);
+            req.setDestination(new String[]{receiverAddress});
+
+            // 根据邮件类型设置不同的主题和模板
+            String subject = "";
+            Template template = new Template();
+            subject = "昨日试用订单数据";
+            template.setTemplateID(TRIAL_ORDER_LIST_ID);
+
+            req.setSubject(subject);
+            req.setTemplate(template);
+
+            Attachment attachment = new Attachment();
+            attachment.setFileName(fileName); // 设置附件文件名
+            // 设置附件内容
+            attachment.setContent(Base64.getEncoder().encodeToString(fileContent));
+            req.setAttachments(new Attachment[] {attachment});
+            // 发送邮件
+            SendEmailResponse resp = client.SendEmail(req);
+            log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp));
+        } catch (TencentCloudSDKException e) {
+            log.info("邮件发送失败###{}", e.toString());
+            throw new BusinessException("failed.to.send.mail");
+        }
+    }
+    private final static Long WILLBEEXPIRED_TEMPLATE_ID = 118178L;
+    public static void sendWillBeExpiredEmail(Account account, String senderAddress) {
+        try {
+            // 实例化一个认证对象
+            Credential cred = new Credential(SECRET_ID, SECRET_KEy);
+            HttpProfile httpProfile = new HttpProfile();
+            httpProfile.setEndpoint("ses.tencentcloudapi.com");
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setHttpProfile(httpProfile);
+            SesClient client = new SesClient(cred, "ap-hongkong", clientProfile);
+            SendEmailRequest req = new SendEmailRequest();
+            if (StringUtils.isEmpty(senderAddress)) {
+                senderAddress = SEND_ADDRESS;
+            }
+            req.setFromEmailAddress(senderAddress);
+            req.setDestination(new String[]{account.getUserEmail()});
+
+            // 根据邮件类型设置不同的主题和模板
+            String subject = "";
+            Template template = new Template();
+            subject = "Renewal notice";
+            template.setTemplateID(WILLBEEXPIRED_TEMPLATE_ID);
+            template.setTemplateData(buildAccountData(account));
+
+            req.setSubject(subject);
+            req.setTemplate(template);
+
+            // 发送邮件
+            SendEmailResponse resp = client.SendEmail(req);
+            log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp));
+        } catch (TencentCloudSDKException e) {
+            log.info("邮件发送失败###{}", e.toString());
+            throw new BusinessException("failed.to.send.mail");
+        }
+    }
+
+    private static String buildAccountData(Account account) {
+        JSONObject jsonObject = new JSONObject();
+        // 设置试用订单相关数据
+        jsonObject.put("userName", account.getUserName());
+
+        // 用户到期时间戳
+        Long timestamp = account.getValidEndTime(); // 替换为你的时间戳
+        if (null != timestamp) {
+            // 获取当前时间戳
+            Long currentTimestamp = System.currentTimeMillis();
+
+            // 计算时间差（毫秒）
+            long timeDifference = currentTimestamp - timestamp;
+
+            // 向上取整计算天数
+            long days = (timeDifference + 24 * 60 * 60 * 1000 - 1) / (24 * 60 * 60 * 1000);
+            jsonObject.put("days", days);
+        }
+        return jsonObject.toJSONString();
+    }
+
+    // 构建试用订单数据
+    private static String buildTrialOrderData(TrialOrder trialOrder) {
+        JSONObject jsonObject = new JSONObject();
+        // 设置试用订单相关数据
+        jsonObject.put("surname", trialOrder.getSurname());
+        jsonObject.put("givenName", trialOrder.getGivenName());
+        jsonObject.put("userName", trialOrder.getUserName());
+        jsonObject.put("email", trialOrder.getEmail());
+        jsonObject.put("country", trialOrder.getCountry());
+        return jsonObject.toJSONString();
+    }
+
+    // 构建审批通过数据
+    private static String buildApprovalData(TrialOrder trialOrder) {
+        JSONObject jsonObject = new JSONObject();
+        // 设置审批通过相关数据
+        jsonObject.put("surname", trialOrder.getSurname());
+        jsonObject.put("givenName", trialOrder.getGivenName());
+        jsonObject.put("userName", trialOrder.getUserName());
+        jsonObject.put("email", trialOrder.getEmail());
+        jsonObject.put("country", trialOrder.getCountry());
+        return jsonObject.toJSONString();
+    }
+
+    // 构建试用订单通过通知数据
+    private static String buildNotificationData(TrialOrder trialOrder) {
+        JSONObject jsonObject = new JSONObject();
+        // 设置试用订单通过通知相关数据
+        jsonObject.put("title", trialOrder.getTitle());
+        jsonObject.put("surname", trialOrder.getSurname());
+        jsonObject.put("givenName", trialOrder.getGivenName());
+        jsonObject.put("userName", trialOrder.getUserName());
+        jsonObject.put("email", trialOrder.getEmail());
+        return jsonObject.toJSONString();
+    }
+
+    private final static Long UPGRADE_NOTIFICATION_ID = 118855L;
+    public static void sendUpgradeNotification(Account account, String senderAddress) {
+        try {
+            // 实例化一个认证对象
+            Credential cred = new Credential(SECRET_ID, SECRET_KEy);
+            HttpProfile httpProfile = new HttpProfile();
+            httpProfile.setEndpoint("ses.tencentcloudapi.com");
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setHttpProfile(httpProfile);
+            SesClient client = new SesClient(cred, "ap-hongkong", clientProfile);
+            SendEmailRequest req = new SendEmailRequest();
+            if (StringUtils.isEmpty(senderAddress)) {
+                senderAddress = CODE_CREATE_SEND_ADDRESS;
+            }
+            req.setFromEmailAddress(senderAddress);
+            req.setDestination(new String[]{account.getUserEmail()});
+
+            // 根据邮件类型设置不同的主题和模板
+            String subject = "";
+            Template template = new Template();
+            subject = "Upcoming AiDA 3.0 Launch and Scheduled Maintenance";
+            template.setTemplateID(UPGRADE_NOTIFICATION_ID);
+            template.setTemplateData(buildAccountData(account));
+
+            req.setSubject(subject);
+            req.setTemplate(template);
+
+            // 发送邮件
+            SendEmailResponse resp = client.SendEmail(req);
+            log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp));
+        } catch (TencentCloudSDKException e) {
+            log.info("邮件发送失败###{}", e.toString());
+            throw new BusinessException("failed.to.send.mail");
+        }
+    }
+
+    private final static Long GENERATE_EXCEPTION_WARNING_ID = 122589L;
+    public static void sendGenerateExceptionWarning(String message){
+        try {
+            // 实例化一个认证对象
+            Credential cred = new Credential(SECRET_ID, SECRET_KEy);
+            HttpProfile httpProfile = new HttpProfile();
+            httpProfile.setEndpoint("ses.tencentcloudapi.com");
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setHttpProfile(httpProfile);
+            SesClient client = new SesClient(cred, "ap-hongkong", clientProfile);
+            SendEmailRequest req = new SendEmailRequest();
+            req.setFromEmailAddress(CODE_CREATE_SEND_ADDRESS);
+            req.setDestination(new String[]{"xupei3360@163.com"});
+
+            // 根据邮件类型设置不同的主题和模板
+            String subject = "";
+            Template template = new Template();
+            subject = "Warning: AiDA 3.0 Generate Exception Warning";
+            template.setTemplateID(GENERATE_EXCEPTION_WARNING_ID);
+
+            JSONObject parameter = new JSONObject();
+            parameter.put("errorMessage", message);
+            parameter.put("time", DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS));
+
+            template.setTemplateData(parameter.toJSONString());
+
+            req.setSubject(subject);
+            req.setTemplate(template);
+
+            // 发送邮件
+            SendEmailResponse resp = client.SendEmail(req);
+            log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp));
+        } catch (TencentCloudSDKException e) {
+            log.info("邮件发送失败###{}", e.toString());
+            throw new BusinessException("failed.to.send.mail");
+        }
+    }
+
+
+
+
 }

src/main/java/com/ai/da/common/utils/SnowflakeUtil.java

@@ -0,0 +1,137 @@
+package com.ai.da.common.utils;
+
+
+public class SnowflakeUtil {
+
+    // ==============================Fields===========================================
+    /** 开始时间截 (2015-01-01) */
+    private final long twepoch = 1420041600000L;
+
+    /** 机器id所占的位数 */
+    private final long workerIdBits = 5L;
+
+    /** 数据标识id所占的位数 */
+    private final long datacenterIdBits = 5L;
+
+    /** 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数) */
+    private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
+
+    /** 支持的最大数据标识id，结果是31 */
+    private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+
+    /** 序列在id中占的位数 */
+    private final long sequenceBits = 12L;
+
+    /** 机器ID向左移12位 */
+    private final long workerIdShift = sequenceBits;
+
+    /** 数据标识id向左移17位(12+5) */
+    private final long datacenterIdShift = sequenceBits + workerIdBits;
+
+    /** 时间截向左移22位(5+5+12) */
+    private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+
+    /** 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095) */
+    private final long sequenceMask = -1L ^ (-1L << sequenceBits);
+
+    /** 工作机器ID(0~31) */
+    private long workerId;
+
+    /** 数据中心ID(0~31) */
+    private long datacenterId;
+
+    /** 毫秒内序列(0~4095) */
+    private long sequence = 0L;
+
+    /** 上次生成ID的时间截 */
+    private long lastTimestamp = -1L;
+
+    //==============================Constructors=====================================
+    /**
+     * 构造函数
+     * @param workerId 工作ID (0~31)
+     * @param datacenterId 数据中心ID (0~31)
+     */
+    public SnowflakeUtil(long workerId, long datacenterId) {
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format
+                    ("worker Id can't be greater than %d or less than 0", maxWorkerId));
+        }
+        if (datacenterId > maxDatacenterId || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format
+                    ("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+        }
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+    }
+
+    // ==============================Methods==========================================
+    /**
+     * 获得下一个ID (该方法是线程安全的)
+     * @return SnowflakeId
+     */
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+
+        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
+        if (timestamp < lastTimestamp) {
+            throw new RuntimeException(
+                    String.format
+                            ("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+
+        //如果是同一时间生成的，则进行毫秒内序列
+        if (lastTimestamp == timestamp) {
+            sequence = (sequence + 1) & sequenceMask;
+            //毫秒内序列溢出
+            if (sequence == 0) {
+                //阻塞到下一个毫秒,获得新的时间戳
+                timestamp = tilNextMillis(lastTimestamp);
+            }
+        }
+        //时间戳改变，毫秒内序列重置
+        else {
+            sequence = 0L;
+        }
+
+        //上次生成ID的时间截
+        lastTimestamp = timestamp;
+
+        //移位并通过或运算拼到一起组成64位的ID
+        return ((timestamp - twepoch) << timestampLeftShift) //
+                | (datacenterId << datacenterIdShift) //
+                | (workerId << workerIdShift) //
+                | sequence;
+    }
+
+    /**
+     * 阻塞到下一个毫秒，直到获得新的时间戳
+     * @param lastTimestamp 上次生成ID的时间截
+     * @return 当前时间戳
+     */
+    protected long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    /**
+     * 返回以毫秒为单位的当前时间
+     * @return 当前时间(毫秒)
+     */
+    protected long timeGen() {
+        return System.currentTimeMillis();
+    }
+
+    //==============================Test=============================================
+    /** 测试 */
+    public static void main(String[] args) {
+        SnowflakeUtil idWorker = new SnowflakeUtil(0, 0);
+        long id = idWorker.nextId();
+        System.out.println("id:"+id);
+        //id:768842202204864512
+    }
+}
+

src/main/java/com/ai/da/common/utils/paypalRequest/AuthenticationRequest.java

@@ -0,0 +1,30 @@
+package com.ai.da.common.utils.paypalRequest;
+
+import com.alibaba.fastjson.JSONObject;
+import com.paypal.http.HttpRequest;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+
+@Component
+public class AuthenticationRequest extends HttpRequest<HashMap> {
+
+    public AuthenticationRequest() {
+        super("/v1/oauth2/token", "POST", HashMap.class);
+        this.header("Content-Type", "application/x-www-form-urlencoded");
+        body();
+    }
+
+    public AuthenticationRequest authorization(String clientId, String clientSecret) {
+        this.header(clientId, clientSecret);
+        return this;
+    }
+
+    public AuthenticationRequest body() {
+        HashMap<String, String> body = new HashMap<>();
+        body.put("grant_type", "client_credentials");
+        this.requestBody(body);
+        return this;
+    }
+}

src/main/java/com/ai/da/common/utils/paypalRequest/WebhookVerifyRequest.java

@@ -0,0 +1,26 @@
+package com.ai.da.common.utils.paypalRequest;
+
+import com.ai.da.model.dto.WebhookVerifyDTO;
+import com.alibaba.fastjson.JSONObject;
+import com.paypal.http.HttpRequest;
+import com.paypal.orders.OrdersCreateRequest;
+
+import java.io.Serializable;
+import java.util.HashMap;
+
+public class WebhookVerifyRequest extends HttpRequest<HashMap> {
+    public WebhookVerifyRequest() {
+        super("/v1/notifications/verify-webhook-signature", "POST", HashMap.class);
+        this.header("Content-Type", "application/json");
+    }
+
+    public WebhookVerifyRequest authorization(String authorization) {
+        this.header("Authorization", "Bearer " + String.valueOf(authorization));
+        return this;
+    }
+
+    public WebhookVerifyRequest requestBody(HashMap<String,String> webhookVerify) {
+        super.requestBody(webhookVerify);
+        return this;
+    }
+}

src/main/java/com/ai/da/controller/AccountController.java

@@ -1,7 +1,8 @@
 package com.ai.da.controller;
 
+import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
-import com.ai.da.common.security.jwt.JWTTokenHelper;
+import com.ai.da.mapper.primary.entity.TrialOrder;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.AccountLoginVO;
 import com.ai.da.model.vo.AccountPreLoginVO;
@@ -9,11 +10,15 @@ import com.ai.da.service.AccountService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 @Api(tags = "Account模块")
@@ -30,6 +35,7 @@ public class AccountController {
     public Response<AccountPreLoginVO> preLogin(@Valid @RequestBody AccountPreLoginDTO accountDTO) {
         return Response.success(accountService.preLogin(accountDTO));
     }
+
     @ApiOperation(value = "登入")
     @PostMapping("/login")
     public Response<AccountLoginVO> login(@Valid @RequestBody AccountLoginDTO accountDTO, HttpServletRequest request) {
@@ -66,4 +72,85 @@ public class AccountController {
         return Response.success(accountService.isLogin(accountLogoutDTO));
     }
 
+    @ApiOperation(value = "获取当前用户语言")
+    @PostMapping("/getUserLanguage")
+    public Response<String> getUserLanguage() {
+        return Response.success(accountService.getUserLanguage());
+    }
+
+    @ApiOperation(value = "切换当前用户语言")
+    @GetMapping("/changeUserLanguage")
+    public Response<String> changeUserLanguage(String language) {
+        return Response.success(accountService.changeUserLanguage(language));
+    }
+
+    @ApiOperation(value = "试用用户退出登录")
+    @GetMapping("/trialUserLogout")
+    public Response<Boolean> trialUserLogout() {
+        return Response.success(accountService.trialUserLogout());
+    }
+
+    @ApiOperation(value = "完成新手教程")
+    @PostMapping("/completeGuidance")
+    public Response<Boolean> completeGuidance() {
+        return Response.success(accountService.completeGuidance());
+    }
+
+    @ApiOperation(value = "试用订单列表")
+    @PostMapping("/trialOrderList")
+    public Response<PageBaseResponse<TrialOrder>> trialOrderList(@Valid @RequestBody TrialOrderDTO trialOrderDTO) {
+        return Response.success(PageBaseResponse.success(accountService.trialOrderList(trialOrderDTO)));
+    }
+
+    @ApiOperation(value = "通过试用订单审批")
+    @PostMapping("/trialOrderApproval")
+    public Response<Boolean> trialOrderApproval(@RequestParam("ids") List<Long> ids) {
+        return Response.success(accountService.trialOrderApproval(ids));
+    }
+
+    @ApiOperation(value = "拒绝试用订单审批")
+    @PostMapping("/trialOrderRefuse")
+    public Response<Boolean> trialOrderRefuse(@RequestParam("ids") List<Long> ids) {
+        return Response.success(accountService.trialOrderRefuse(ids));
+    }
+
+    @ApiOperation(value = "获取是否自动审评")
+    @PostMapping("/getIsAutoApproval")
+    public Response<Boolean> getIsAutoApproval() {
+        return Response.success(accountService.getIsAutoApproval());
+    }
+
+    @ApiOperation(value = "切换是否自动审评")
+    @PostMapping("/switchIsAutoApproval")
+    public Response<Boolean> switchIsAutoApproval() {
+        return Response.success(accountService.switchIsAutoApproval());
+    }
+
+    @ApiOperation(value = "aws状态检测")
+    @GetMapping("/healthy")
+    @ResponseStatus(HttpStatus.OK)
+    public Response<Map<String,Integer>> checkStatus(){
+        Map<String,Integer> returnMap = new HashMap<>();
+        returnMap.put("code",200);
+        return Response.success(returnMap);
+    }
+
+    @ApiOperation(value = "查询账号到期时间")
+    @PostMapping("/getExpiredTime")
+    public Response<Long> getExpiredTime(){
+        return Response.success(accountService.getExpiredTime());
+    }
+
+    @ApiOperation(value = "免密登录")
+    @PostMapping("/noLoginRequired")
+    public Response<AccountLoginVO> noLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request){
+        return Response.success(accountService.noLoginRequired(noLoginRequiredDTO, request));
+    }
+
+    @PostMapping("upgradeNotification")
+    @ApiOperation(value = "升级邮件通知")
+    public Response<Boolean> upgradeNotification() {
+        accountService.upgradeNotification();
+        return Response.success(true);
+    }
 }

src/main/java/com/ai/da/controller/AliPayController.java

@@ -0,0 +1,113 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.response.Response;
+import com.ai.da.service.AliPayService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+@CrossOrigin
+@RestController
+@RequestMapping("/api/ali-pay")
+@Api(tags = "网站支付宝支付")
+@Slf4j
+public class AliPayController {
+
+    @Resource
+    private AliPayService aliPayService;
+
+    @ApiOperation("统一收单下单并支付页面接口的调用")
+    @PostMapping("/trade/page/pay/{amount}")
+    public Response<String> tradePagePay(@PathVariable Integer amount, @RequestParam String returnUrl){
+        log.info("统一收单下单并支付页面接口的调用");
+        //支付宝开放平台接受 request 请求对象后
+        // 会为开发者生成一个html 形式的 form表单，包含自动提交的脚本
+        String formStr = aliPayService.tradeCreate(amount, returnUrl);
+        //我们将form表单字符串返回给前端程序，之后前端将会调用自动提交脚本，进行表单的提交
+        //此时，表单会自动提交到action属性所指向的支付宝开放平台中，从而为用户展示一个支付页面
+        return Response.success(formStr);
+    }
+
+    @ApiOperation("支付通知")
+    @PostMapping("/trade/notify")
+    public String tradeNotify(@RequestParam Map<String, String> params){
+        return aliPayService.tradeNotify(params);
+    }
+
+    /**
+     * 用户取消订单
+     * @param orderNo
+     * @return
+     */
+    @ApiOperation("用户取消订单")
+    @PostMapping("/trade/close/{orderNo}")
+    public Response<String> cancel(@PathVariable String orderNo){
+        log.info("取消订单");
+        aliPayService.cancelOrder(orderNo);
+        return Response.success("订单已取消");
+    }
+
+    /**
+     * 查询订单
+     * @param orderNo
+     * @return
+     */
+    @ApiOperation("查询订单：测试订单状态用")
+    @GetMapping("/trade/query/{orderNo}")
+    public Response<String> queryOrder(@PathVariable String orderNo)  {
+        log.info("查询订单");
+        String result = aliPayService.queryOrder(orderNo);
+        return Response.success(result);
+
+    }
+
+    /**
+     * 不在页面提供申请退款接口
+     * @param orderNo
+     * @param reason
+     * @return
+     */
+    @ApiOperation("申请退款")
+    @PostMapping("/trade/refund/{orderNo}/{reason}")
+    public Response<String> refunds(@PathVariable String orderNo, @PathVariable String reason){
+        log.info("申请退款");
+        aliPayService.refund(orderNo, reason);
+        return Response.success();
+    }
+
+    /**
+     * 查询退款
+     * @param orderNo
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation("查询退款：测试用")
+    @GetMapping("/trade/fastpay/refund/{orderNo}")
+    public Response<String> queryRefund(@PathVariable String orderNo) {
+        log.info("查询退款");
+        String result = aliPayService.queryRefund(orderNo);
+        return Response.success(result);
+    }
+
+    /**
+     * 根据账单类型和日期获取账单url地址
+     *
+     * @param billDate
+     * @param type
+     * @return
+     */
+    @ApiOperation("获取账单url")
+    @GetMapping("/bill/downloadurl/query/{billDate}/{type}")
+    public Response<String> queryTradeBill(
+            @PathVariable String billDate,
+            @PathVariable String type)  {
+        log.info("获取账单url");
+        String downloadUrl = aliPayService.queryBill(billDate, type);
+        return Response.success(downloadUrl);
+    }
+
+}

src/main/java/com/ai/da/controller/AlipayHKController.java

@@ -0,0 +1,22 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.response.Response;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@CrossOrigin
+@RestController
+@RequestMapping("/api/ali-pay-hk")
+@Api(tags = "网站支付 香港支付宝")
+@Slf4j
+public class AlipayHKController {
+
+    public Response<String> createOrder(){
+        return Response.success();
+    }
+
+
+}

src/main/java/com/ai/da/controller/ClassificationController.java

@@ -0,0 +1,100 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.response.Response;
+import com.ai.da.model.dto.ClassificationDTO;
+import com.ai.da.model.vo.ClassificationVO;
+import com.ai.da.service.ClassificationService;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 控制器
+ *
+ * @author SHAHAIBO
+ * @since 2023-11-03
+ */
+@RestController
+@AllArgsConstructor
+@NoArgsConstructor
+@RequestMapping("/api/classification")
+@Api(value = "", tags = "分类")
+public class ClassificationController {
+
+    @Resource
+    private ClassificationService classificationService;
+
+    /**
+     * 新增修改
+     */
+    @PostMapping("/saveOrUpdate")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "新增修改", notes = "传入ClassificationDTO")
+    public Response<Boolean> saveOrUpdate(@Valid @RequestBody ClassificationDTO classificationDTO) {
+        return Response.success(classificationService.saveOrUpdate(classificationDTO));
+    }
+
+    /**
+     * 删除
+     */
+    @PostMapping("/delete")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "删除", notes = "传入ClassificationDTO")
+    public Response<Boolean> delete(@Valid @RequestBody ClassificationDTO classificationDTO) {
+        return Response.success(classificationService.delete(classificationDTO));
+    }
+
+    @PostMapping("/queryClassification")
+    @ApiOperationSupport(order = 3)
+    @ApiModelProperty(value = "查询", notes = "传入ClassificationDTO")
+    public Response<List<ClassificationVO>> queryClassification(@Valid @RequestBody ClassificationDTO classificationDTO) {
+        return Response.success(classificationService.queryClassification(classificationDTO));
+    }
+
+    @PostMapping("/relationLibrary")
+    @ApiOperationSupport(order = 4)
+    @ApiModelProperty(value = "关联", notes = "传入ClassificationDTO")
+    public Response<Boolean> relationLibrary(@Valid @RequestBody ClassificationDTO classificationDTO) {
+        return Response.success(classificationService.relationLibrary(classificationDTO));
+    }
+
+    @PostMapping("/getRelClassificationIdList")
+    @ApiOperationSupport(order = 5)
+    @ApiModelProperty(value = "获取关联分类IDList", notes = "传入ClassificationDTO")
+    public Response<List<Long>> getRelClassificationIdList(@Valid @RequestBody ClassificationDTO classificationDTO) {
+        return Response.success(classificationService.getRelClassificationIdList(classificationDTO));
+    }
+
+    /**
+     * 多选 获取共有标签
+     * @param classificationDTO
+     * @return
+     */
+    @PostMapping("/getRelPublicClassificationIdList")
+    @ApiOperationSupport(order = 5)
+    @ApiModelProperty(value = "获取关联公共分类IDList", notes = "传入ClassificationDTO")
+    public Response<List<Long>> getRelPublicClassificationIdList(@Valid @RequestBody ClassificationDTO classificationDTO) {
+        return Response.success(classificationService.getRelPublicClassificationIdList(classificationDTO));
+    }
+
+    /**
+     * 多选 编辑共有标签
+     * @param classificationDTO
+     * @return
+     */
+    @PostMapping("/editRelPublicClassificationIdList")
+    @ApiOperationSupport(order = 5)
+    @ApiModelProperty(value = "编辑关联公共分类IDList", notes = "传入ClassificationDTO")
+    public Response<Boolean> editRelPublicClassificationIdList(@Valid @RequestBody ClassificationDTO classificationDTO) {
+        return Response.success(classificationService.editRelPublicClassificationIdList(classificationDTO));
+    }
+
+}

src/main/java/com/ai/da/controller/ConvenientInquiryController.java

@@ -0,0 +1,63 @@
+package com.ai.da.controller;
+
+
+import com.ai.da.common.context.UserContext;
+import com.ai.da.common.response.Response;
+import com.ai.da.mapper.primary.DesignMapper;
+import com.ai.da.mapper.primary.TrialOrderMapper;
+import com.ai.da.mapper.primary.entity.TrialOrder;
+import com.ai.da.model.dto.UserDesignStatisticDTO;
+import io.netty.util.internal.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Api(tags = "便利查询")
+@Slf4j
+@RestController
+@RequestMapping("/api/inquiry")
+public class ConvenientInquiryController {
+
+    @Resource
+    private TrialOrderMapper trialOrderMapper;
+
+    @Resource
+    private DesignMapper designMapper;
+
+    @ApiOperation("获取当前所有试用用户")
+    @GetMapping("/getTrial")
+    public Response<List<TrialOrder>> getTrial(){
+        Long accountId = UserContext.getUserHolder().getId();
+        if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)){
+            List<TrialOrder> trialOrders = trialOrderMapper.selectList(null);
+            return Response.success(trialOrders);
+        }else {
+            return Response.fail("Sorry, you don't have permission");
+        }
+    }
+
+    @ApiOperation("获取指定时间区间内所有用户design的使用情况")
+    @GetMapping("/getDesignStatistic")
+    public Response<List<UserDesignStatisticDTO>> getDesignStatistic(@RequestParam String startTime,@RequestParam String endTime){
+        Long accountId = UserContext.getUserHolder().getId();
+        if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)){
+            if (StringUtil.isNullOrEmpty(startTime)) startTime = "2024-02-01 00:00:00";
+            if (StringUtil.isNullOrEmpty(endTime)){
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+                Date date = new Date();
+                endTime = simpleDateFormat.format(date);
+            }
+            List<UserDesignStatisticDTO> designStatistic = designMapper.getDesignStatistic(startTime, endTime);
+            return Response.success(designStatistic);
+        }else {
+            return Response.fail("Sorry, you don't have permission");
+        }
+    }
+
+}

src/main/java/com/ai/da/controller/CreditsController.java

@@ -0,0 +1,42 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.context.UserContext;
+import com.ai.da.common.response.PageBaseResponse;
+import com.ai.da.common.response.Response;
+import com.ai.da.mapper.primary.entity.CreditsDetail;
+import com.ai.da.model.dto.QueryIncomeOrExpenditureDTO;
+import com.ai.da.service.CreditsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+@CrossOrigin
+@RestController
+@RequestMapping("/api/credits")
+@Api(tags = "积分")
+@Slf4j
+public class CreditsController {
+
+    @Resource
+    private CreditsService creditsService;
+
+    @ApiOperation("获取当前积分")
+    @GetMapping("/getCredits")
+    public Response<String> getCredits() {
+        String credits = creditsService.getCredits(UserContext.getUserHolder().getId());
+        return Response.success(credits);
+    }
+
+    @ApiOperation("获取积分详细")
+    @PostMapping("/getCreditsDetail")
+    public Response<PageBaseResponse<CreditsDetail>> getCreditsDetail(@Valid @RequestBody QueryIncomeOrExpenditureDTO queryPageByTimeDTO) {
+        PageBaseResponse<CreditsDetail> credits = creditsService.queryCreditsDetailsPage(queryPageByTimeDTO);
+        return Response.success(credits);
+    }
+
+
+}

src/main/java/com/ai/da/controller/DesignController.java

@@ -1,20 +1,23 @@
 package com.ai.da.controller;
 
+import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.common.response.Response;
 import com.ai.da.model.dto.*;
+import com.ai.da.model.vo.CollectionSketchVO;
 import com.ai.da.model.vo.DesignCollectionVO;
-import com.ai.da.model.vo.DesignItemDetailVO;
 import com.ai.da.model.vo.DesignLikeVO;
 import com.ai.da.service.DesignService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.math.BigDecimal;
+import java.util.List;
 
 
 @Api(tags = "design模块")
@@ -27,15 +30,23 @@ public class DesignController {
 
     @ApiOperation(value = "设计 Conllection")
     @PostMapping("/designCollection")
+    @CrossOrigin
     public Response<DesignCollectionVO> designCollection(@Valid @RequestBody DesignCollectionDTO designDTO) {
         return Response.success(designService.designCollection(designDTO));
     }
 
+    @ApiOperation(value = "design进度条")
+    @GetMapping("/designProcess")
+    public Response<Integer> designProcess(@RequestParam("processId") String processId) {
+        return Response.success(designService.designProcess(processId));
+    }
+
     @ApiOperation(value = "重新设计 Collection")
     @PostMapping("/reDesignCollection")
     public Response<DesignCollectionVO> reDesignCollection(@Valid @RequestBody ReDesignCollectionDTO reDesignDTO) {
         return Response.success(designService.reDesignCollection(reDesignDTO));
     }
+
     @ApiOperation(value = "designItem list,刷新用")
     @GetMapping("/designItemList")
     public Response<DesignCollectionVO> designItemList(@ApiParam("designId") @RequestParam("designId") Long designId) {
@@ -60,4 +71,16 @@ public class DesignController {
         return Response.success(designService.dislike(disDesignLikeDTO));
     }
 
+    @ApiOperation(value = "sketchBoard upload generate design前裁剪")
+    @PostMapping("/sketchBoardsBoundingBox")
+    public Response<List<CollectionSketchVO>> sketchesBoundingBox(@Valid @RequestBody SketchesBoundingBoxDTO sketchesBoundingBoxDTO) {
+        return Response.success(designService.sketchesBoundingBox(sketchesBoundingBoxDTO));
+    }
+
+    @ApiOperation(value = "通过designItemId获取模特图")
+    @PostMapping("/getModel")
+    public Response<List<String>> getModel(@RequestBody List<Long> designItemIdList){
+        return Response.success(designService.getModel(designItemIdList));
+    }
+
 }

src/main/java/com/ai/da/controller/DesignDetailController.java

@@ -1,8 +1,6 @@
 package com.ai.da.controller;
 
 import com.ai.da.common.response.Response;
-import com.ai.da.mapper.entity.CollectionElement;
-import com.ai.da.mapper.entity.DesignItem;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.*;
 import com.ai.da.service.DesignItemService;
@@ -15,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.math.BigDecimal;
+import java.io.IOException;
 
 
 @Api(tags = "design Detail模块")
@@ -35,6 +33,7 @@ public class DesignDetailController {
         response.setData(designService.generateHighDesign(generateHighDesignDTO));
         return response;
     }
+
     @ApiOperation(value = "删除高级design图片")
     @PostMapping("/deleteHighDesign")
     public Response<Boolean> deleteHighDesign(@Valid @RequestBody GenerateHighDesignDTO generateHighDesignDTO) {
@@ -42,10 +41,12 @@ public class DesignDetailController {
         response.setData(designService.deleteHighDesign(generateHighDesignDTO));
         return response;
     }
+
     @ApiOperation(value = "查询design详情")
     @GetMapping("/getDetail")
-    public Response<DesignItemDetailVO> getDetail(@ApiParam("designItemId") @RequestParam("designItemId") Long designItemId) {
-        return Response.success(designService.detail(designItemId));
+    public Response<DesignItemDetailVO> getDetail(@ApiParam("designItemId") @RequestParam("designItemId") Long designItemId,
+                                                  @ApiParam("designPythonOutfitId") @RequestParam(value = "designPythonOutfitId", required = false) Long designPythonOutfitId) {
+        return Response.success(designService.detail(designPythonOutfitId, designItemId));
     }
 
     @ApiOperation(value = "切换系统的element")
@@ -55,10 +56,11 @@ public class DesignDetailController {
                                                            @ApiParam("操作类型 PREV 上一步  NEXT 下一步") @RequestParam("operateType") String operateType) {
         return Response.success(designItemService.getNextSysElement(id, type, operateType));
     }
+
     @ApiOperation(value = "单个design")
     @PostMapping("/designSingle")
-    public Response<DesignCollectionItemVO> designSingle(@Valid @RequestBody DesignSingleDTO designSingleDTO ) {
-        return Response.success(designItemService.designSingle(designSingleDTO));
+    public Response<DesignSingleVO> designSingle(@Valid @RequestBody DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO) {
+        return Response.success(designItemService.designSingleIncludeLayers(designSingleIncludeLayersDTO));
     }
 
     @ApiOperation(value = "print打点")
@@ -70,5 +72,9 @@ public class DesignDetailController {
         return response;
     }
 
-
+    @ApiOperation(value = "编辑图层大小和位置  废弃")
+    @PostMapping("/editLayers")
+    public Response<ComposeLayersVO> editPositionAndScale(@Valid @RequestBody EditLayersPositionAndScaleVO positionAndScaleVO) throws IOException {
+        return Response.success(designItemService.editLayersPositionAndScale(positionAndScaleVO));
+    }
 }

src/main/java/com/ai/da/controller/ElementController.java

@@ -1,7 +1,7 @@
 package com.ai.da.controller;
 
+import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.common.response.Response;
-import com.ai.da.common.utils.FileUtil;
 import com.ai.da.common.utils.MD5Utils;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.*;
@@ -12,12 +12,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
@@ -51,11 +49,14 @@ public class ElementController {
     public Response<CollectionElementVO> upload(@RequestParam("file") MultipartFile file,
                                                 @ApiParam("一级类型 Moodboard Printboard  Sketchboard MarketingSketch Colorboard")
                                                 @RequestParam(value = "level1Type") String level1Type,
+                                                @RequestParam(name = "gender", required = false) String gender,
                                                 @ApiParam("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
                                                 @RequestParam(value = "timeZone") String timeZone) {
-        Assert.isTrue(!StringUtils.isEmpty(file.getOriginalFilename()),"Please select a file!");
+        if (null == file || StringUtils.isEmpty(file.getOriginalFilename())) {
+            throw new BusinessException("file.cannot.be.empty");
+        }
         return Response.success(collectionElementService.upload(
-                new CollectionElementUploadDTO(file, level1Type, timeZone, MD5Utils.encryptFile(file))));
+                new CollectionElementUploadDTO(file, level1Type, gender, timeZone, MD5Utils.encryptFile(file))));
     }
 
     @ApiOperation(value = "element文件删除")
@@ -67,7 +68,7 @@ public class ElementController {
 
     @ApiOperation(value = "生成印花")
     @PostMapping("/generatePrint")
-    public Response<CollectionGeneratePrintVO> generatePrint(@Valid @RequestBody CollectionGeneratePrintDTO generatePrintDTO) {
+    public Response<GenerateCollectionItemVO> generatePrint(@Valid @RequestBody CollectionGeneratePrintDTO generatePrintDTO) {
         return Response.success(collectionElementService.generatePrint(generatePrintDTO));
     }
 
@@ -95,6 +96,7 @@ public class ElementController {
     public Response<List<PantoneVO>> getRgbByHsvBatch(@RequestBody @Valid List<GetRgbByHsvBatchDTO> rgbByHsvBatch) {
         return Response.success(panToneService.getRgbByHsvBatch(rgbByHsvBatch));
     }
+
     @ApiOperation(value = "刷新历史数据")
     @PostMapping("/refreshHistoryData")
     public Response<Boolean> refreshHistoryData() {

src/main/java/com/ai/da/controller/GenerateController.java

@@ -0,0 +1,86 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.response.Response;
+import com.ai.da.model.dto.GenerateLikeDTO;
+import com.ai.da.model.dto.GenerateThroughImageTextDTO;
+import com.ai.da.model.vo.*;
+import com.ai.da.service.GenerateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author XP
+ */
+@Api(tags = "Generate模块")
+@Slf4j
+@RestController
+@RequestMapping("/api/generate")
+public class GenerateController {
+
+    @Resource
+    private GenerateService generateService;
+
+    @ApiOperation("自动识别sketch的caption  暂时未上")
+    @PostMapping("/caption")
+    public Response<GenerateCaptionVO> generateCaption(@RequestParam Long sketchElementId) {
+        return Response.success(generateService.generateCaption(sketchElementId));
+    }
+
+    /*@ApiOperation("通过文字、图片生成图片")
+    @PostMapping("/sketchAndPrint")
+    public void generateThroughImageText(@Valid @RequestBody GenerateThroughImageTextDTO generateThroughImageTextDTO) {
+//        return Response.success(generateService.generateThroughImageText(generateThroughImageTextDTO));
+        generateService.generateThroughImageText(generateThroughImageTextDTO);
+    }*/
+
+    @ApiOperation("喜欢生成的图片")
+    @PostMapping("/like")
+    public Response<GenerateLikeVO> like(@Valid @RequestBody GenerateLikeDTO generateLikeDTO) {
+        return Response.success(generateService.generateLike(generateLikeDTO));
+    }
+
+    @ApiOperation(value = "取消喜欢")
+    @GetMapping("/dislike")
+    public Response<Boolean> dislike(@ApiParam("generateDetailId") @RequestParam Long generateDetailId,
+                                     @ApiParam("timeZone") @RequestParam String timeZone) {
+        return Response.success(generateService.generateDislike(generateDetailId, timeZone));
+    }
+
+    @ApiOperation(value = "发起生成请求，异步获取结果")
+    @PostMapping("/prepare")
+    public Response<PrepareForGenerateVO> prepareForGenerate(@Valid @RequestBody GenerateThroughImageTextDTO generateThroughImageTextDTO) {
+        return Response.success(generateService.prepareForGenerate(generateThroughImageTextDTO));
+    }
+
+    @ApiOperation(value = "取消继续生成")
+    @GetMapping("/stopWaiting")
+    public Response<String> stopWaiting(@RequestParam("userId") Long userId,
+                                        @RequestParam("uniqueId") List<String> uniqueId,
+                                        @RequestParam("timeZone") String timeZone) {
+        generateService.cancelGenerate(userId, uniqueId, timeZone);
+        return Response.success("stop waiting successfully");
+    }
+
+    /*@ApiOperation(value = "获取生成结果")
+    @GetMapping("/result")
+    public Response<GenerateCollectionVO> getGenerateResult(@RequestParam("uniqueId") String uniqueId) {
+        GenerateCollectionVO generateResult = generateService.getGenerateResult(uniqueId);
+        return Response.success(generateResult);
+    }*/
+
+    @ApiOperation(value = "获取生成结果")
+    @PostMapping("/result")
+    public Response<List<GenerateResultVO>> getGenerateResults(@Valid @RequestBody List<String> taskIdList) {
+        List<GenerateResultVO> generateResult = generateService.getGenerateResultList(taskIdList);
+        return Response.success(generateResult);
+    }
+
+
+}

src/main/java/com/ai/da/controller/LibraryController.java

@@ -1,18 +1,14 @@
 package com.ai.da.controller;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.system.UserInfo;
 import com.ai.da.common.config.FileProperties;
+import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.common.context.UserContext;
 import com.ai.da.common.enums.LibraryLevel1TypeEnum;
 import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
-import com.ai.da.common.utils.CopyUtil;
-import com.ai.da.common.utils.DateUtil;
-import com.ai.da.common.utils.FileUtil;
-import com.ai.da.common.utils.MD5Utils;
-import com.ai.da.mapper.entity.Library;
-import com.ai.da.mapper.entity.LibraryModelPoint;
+import com.ai.da.common.utils.*;
+import com.ai.da.mapper.primary.entity.Library;
+import com.ai.da.mapper.primary.entity.LibraryModelPoint;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.*;
 import com.ai.da.service.LibraryModelPointService;
@@ -22,6 +18,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -29,8 +26,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.File;
+import java.text.ParseException;
 import java.util.Date;
-import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 
@@ -47,6 +44,11 @@ public class LibraryController {
     private LibraryModelPointService libraryModelPointService;
     @Resource
     private FileProperties fileProperties;
+    @Resource
+    private MinioUtil minioUtil;
+
+    @Value("${minio.bucketName.sysImage}")
+    private String sysImage;
 
     @ApiOperation(value = "Library分页列表")
     @PostMapping("/queryLibraryPage")
@@ -68,23 +70,44 @@ public class LibraryController {
                                             @ApiParam("二级类型 争对 Sketchboard; 有 Outwear Dress Blouse  Skirt Trousers")
                                             @RequestParam(value = "level2Type", required = false) String level2Type,
                                             @ApiParam("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
-                                                @RequestParam(value = "timeZone") String timeZone) {
-        Assert.isTrue(!StringUtils.isEmpty(file.getOriginalFilename()),"Please select a file!");
+                                            @RequestParam(value = "timeZone") String timeZone,
+                                            @RequestParam(value = "modelType") String modelType,
+                                            @RequestParam(value = "sex") String sex,
+                                            @RequestParam(value = "checkMd5") Integer checkMd5) {
+        if (null == file || StringUtils.isEmpty(file.getOriginalFilename())) {
+            throw new BusinessException("file.cannot.be.empty");
+        }
         Integer high = null;
         Integer width = null;
         if (level1Type.equals(LibraryLevel1TypeEnum.MODELS.getRealName())) {
+            if (StringUtils.isEmpty(modelType)) {
+                throw new BusinessException("modelType.cannot.be.empty");
+            }
+            if (StringUtils.isEmpty(sex)) {
+                throw new BusinessException("modelSex.cannot.be.empty");
+            }
             FileVO fileVO = FileUtil.getFileSize(file);
             high = fileVO.getHigh();
             width = fileVO.getWidth();
         }
-        return Response.success(libraryService.upload(new LibraryUploadDTO(file, level1Type,level2Type,
-                timeZone, MD5Utils.encryptFile(file),high,width)));
+        String md5 = MD5Utils.encryptFile(file);
+        if (checkMd5 == null || checkMd5 == 1) {
+            if (!libraryService.checkMd5(level1Type, level2Type, sex, md5)) {
+                LibraryUpdateVo libraryUpdateVo = new LibraryUpdateVo();
+                libraryUpdateVo.setCheckMd5(Boolean.FALSE);
+                return Response.success(libraryUpdateVo);
             }
+        }
+        return Response.success(libraryService.upload(new LibraryUploadDTO(file, level1Type, level2Type,
+                timeZone, md5, high, width, modelType, sex)));
+    }
+
     @ApiOperation(value = "保存或者编辑template打点")
     @PostMapping("/saveOrEditTemplatePoint")
     public Response<LibraryModelPointVO> saveOrEditTemplatePoint(@Valid @RequestBody LibraryModelPointDTO libraryModelPoint) {
         return Response.success(libraryModelPointService.saveOrEditTemplatePoint(libraryModelPoint));
     }
+
     @ApiOperation(value = "批量Library修改用户文件名")
     @PostMapping("/batchUpdateLibraryName")
     public Response<Boolean> batchUpdateLibraryName(@Valid @RequestBody LibraryUpdateDTO libraryUpdateDTO) {
@@ -95,12 +118,7 @@ public class LibraryController {
     @ApiOperation(value = "批量删除library")
     @PostMapping("/batchDeleteLibrary")
     public Response<Boolean> batchDeleteLibrary(@Valid @RequestBody LibraryDeleteDTO deleteDTO) {
-        List<Library> librarys = libraryService.getByIds(deleteDTO.getLibraryIds());
-        Assert.notEmpty(librarys,"librarys does not exist!");
-        libraryService.removeBatchByIds(deleteDTO.getLibraryIds());
-        librarys.forEach(library -> {
-            FileUtil.delete(library.getUrl());
-        });
+        libraryService.batchDeleteLibrary(deleteDTO);
         return Response.success(Boolean.TRUE);
     }
 
@@ -110,23 +128,34 @@ public class LibraryController {
     public Response<String> modelsDot(@ApiParam("file") @RequestPart(value = "file", required = false) MultipartFile file,
                                       @ApiParam("models对象") @RequestPart("models") ModelsDotDTO modelsDotDTO) {
         if (Objects.nonNull(file)) {
-            Assert.isTrue(!StringUtils.isEmpty(file.getOriginalFilename()),"Please select a file!");
+            if (StringUtils.isEmpty(file.getOriginalFilename())) {
+                throw new BusinessException("file.cannot.be.empty");
+            }
             AuthPrincipalVo userInfo = UserContext.getUserHolder();
             //需要宽高和地址参数design
             FileVO fileVO = FileUtil.getFileSize(file);
             modelsDotDTO.setHigh(fileVO.getHigh());
             modelsDotDTO.setWidth(fileVO.getWidth());
             //存储template临时地址
-            String path = calculateTempFileUrl(userInfo.getId());
-            File uploadFile = FileUtil.upload(file, path);
-            modelsDotDTO.setTemplateUrl(calculateTemplateUrl(uploadFile));
+            String path = calculateTempFileUrlNew(userInfo.getId());
+            String uploadPath = minioUtil.upload("aida-tmp", path, file);
+            String minioPath = libraryService.processMannequins(uploadPath);
+            modelsDotDTO.setTemplateUrl(minioPath);
         } else {
-            Assert.notNull(modelsDotDTO.getLibraryId(),"libraryId cannot be empty!");
-            Assert.notNull(modelsDotDTO.getTemplateId(),"templateId cannot be empty!");
+            if (null == modelsDotDTO.getLibraryId()) {
+                throw new BusinessException("libraryId.cannot.be.empty");
+            }
+            if (null == modelsDotDTO.getTemplateId()) {
+                throw new BusinessException("templateId.cannot.be.empty");
+            }
             LibraryModelPoint modelPoint = libraryModelPointService.getById(modelsDotDTO.getTemplateId());
-            Assert.notNull(modelPoint,"template does not exist!");
+            if (Objects.isNull(modelPoint)) {
+                throw new BusinessException("modelPoint.not.found");
+            }
             Library library = libraryService.getById(modelsDotDTO.getLibraryId());
-            Assert.notNull(library,"library does not exist!");
+            if (Objects.isNull(library)) {
+                throw new BusinessException("library.not.found");
+            }
             modelsDotDTO.setHigh(library.getHigh());
             modelsDotDTO.setWidth(library.getWidth());
             modelsDotDTO.setTemplateUrl(library.getUrl());
@@ -134,15 +163,26 @@ public class LibraryController {
         Response<String> response = new Response();
         log.info("Models打点预览入参####{}", JSON.toJSONString(modelsDotDTO));
         String url = libraryModelPointService.modelsDot(modelsDotDTO);
-        response.setData(url);
+        response.setData(minioUtil.getPresignedUrl(url, 24 * 60));
         return response;
     }
 
+    @ApiOperation(value = "更新sketchboard level2type")
+    @PostMapping("/updateLibraryLevel2Type")
+    public Response<Boolean> updateLibraryLevel2Type(@RequestBody LibraryLevel2TypeUpdateDTO libraryLevel2TypeUpdateDTO) {
+        return Response.success(libraryService.updateLibraryLevel2Type(libraryLevel2TypeUpdateDTO));
+    }
+
     private String calculateTempFileUrl(Long userId) {
         String rootPath = fileProperties.getSys().getPath();
         String day = DateUtil.dateToStr(new Date(), DateUtil.YYYYMM);
-        return rootPath + day + File.separator + "tmp" + File.separator + userId + File.separator+ UUID.randomUUID().toString();
+        return rootPath + day + File.separator + "tmp" + File.separator + userId + File.separator + UUID.randomUUID();
     }
+
+    private String calculateTempFileUrlNew(Long userId) {
+        return userId.toString();
+    }
+
     private String calculateTemplateUrl(File uploadFile) {
         String linuxDomain = fileProperties.getLinuxDomain();
         if (!StringUtils.isEmpty(linuxDomain)) {
@@ -155,4 +195,11 @@ public class LibraryController {
         return "/workspace/python_code/Multi-layer-Virtual-Try-on/dataset_for_test/Img_model.png";
     }
 
+    @PostMapping("moveLibraryData")
+    @ApiOperation(value = "用户library数据迁移")
+    public Response<Boolean> moveLibraryDate() throws ParseException {
+        libraryService.moveLibraryDate();
+        return Response.success(true);
+    }
+
 }

src/main/java/com/ai/da/controller/OrderInfoController.java

@@ -0,0 +1,48 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.enums.OrderStatusEnum;
+import com.ai.da.common.response.PageBaseResponse;
+import com.ai.da.common.response.Response;
+import com.ai.da.mapper.primary.entity.OrderInfo;
+import com.ai.da.model.dto.QueryPageByTimeDTO;
+import com.ai.da.service.OrderInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+@CrossOrigin //开放前端的跨域访问
+@Api(tags = "商品订单管理")
+@RestController
+@RequestMapping("/api/order-info")
+public class OrderInfoController {
+
+    @Resource
+    private OrderInfoService orderInfoService;
+
+    @ApiOperation("订单列表")
+    @PostMapping("/list")
+    public Response<PageBaseResponse<OrderInfo>> list(@Valid @RequestBody QueryPageByTimeDTO queryPageByTimeDTO){
+        PageBaseResponse<OrderInfo> orderByAccountId = orderInfoService.getOrderByPage(queryPageByTimeDTO);
+//        List<OrderInfo> list = orderInfoService.listOrderByCreateTimeDesc();
+        return Response.success(orderByAccountId);
+    }
+
+    /**
+     * 查询本地订单状态
+     * @param orderNo
+     * @return
+     */
+    @ApiOperation("查询本地订单状态")
+    @GetMapping("/query-order-status/{orderNo}")
+    public Response<String> queryOrderStatus(@PathVariable String orderNo){
+        String orderStatus = orderInfoService.getOrderStatus(orderNo);
+        if(OrderStatusEnum.SUCCESS.getType().equals(orderStatus)){
+            return Response.success("支付成功"); //支付成功
+        }
+        return Response.success(101,"支付中......");
+    }
+
+}

src/main/java/com/ai/da/controller/PayPalCheckoutController.java

@@ -0,0 +1,72 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.response.Response;
+import com.ai.da.service.PayPalCheckoutService;
+import com.paypal.http.HttpResponse;
+import com.paypal.http.exceptions.SerializeException;
+import com.paypal.orders.Order;
+import com.paypal.payments.Refund;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+
+@RestController
+@Api(tags = "PayPalCheckout接口")
+@RequestMapping("/api/paypal")
+public class PayPalCheckoutController {
+
+    @Resource
+    private PayPalCheckoutService payPalCheckoutService;
+
+    @ApiOperation(value = "创建订单")
+    @PostMapping(value = "/trade/{amount}")
+    public Response<HashMap<String, String>> createOrder(@PathVariable Integer amount, @RequestParam String returnUrl) throws SerializeException {
+        HashMap<String, String> approvalUrl = payPalCheckoutService.createOrder(amount,returnUrl);
+        return Response.success(approvalUrl);
+    }
+
+    @ApiOperation(value = "ipn异步回调")
+    @PostMapping(value = "/ipn/back")
+    public Response<String> callback(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        Boolean result = payPalCheckoutService.doPost(request, response);
+        if (result){
+            return Response.success(200,"success");
+        }else {
+            return Response.fail(500,"failure");
+        }
+    }
+
+    @ApiOperation(value = "查询指定订单")
+    @PostMapping(value = "/trade/query/{orderNo}")
+    public Response<Order> queryOrder(@PathVariable String orderNo) throws SerializeException {
+        Order s = payPalCheckoutService.queryOrder(orderNo);
+        return Response.success(s);
+    }
+
+    /** 不提供退款接口 */
+    @ApiOperation("申请退款")
+    @PostMapping("/trade/refund/{orderNo}/{reason}")
+    public Response<HttpResponse<Refund>> refund(@PathVariable String orderNo, @PathVariable String reason) throws IOException {
+        Boolean response = payPalCheckoutService.refundOrder(orderNo,reason);
+        if (response){
+            return Response.success();
+        }else {
+            return Response.fail("Request for refund failed.");
+        }
+    }
+
+    @ApiOperation("执行扣款")
+    @PostMapping("/trade/capture/{orderNo}")
+    public Response<com.paypal.orders.Order> captureOrder(@PathVariable String orderNo) throws IOException {
+        Order response = payPalCheckoutService.captureOrder(orderNo);
+        return Response.success(response);
+    }
+}
+

src/main/java/com/ai/da/controller/ProductController.java

@@ -0,0 +1,42 @@
+package com.ai.da.controller;
+
+
+import com.ai.da.common.response.Response;
+import com.ai.da.mapper.primary.entity.Product;
+import com.ai.da.service.ProductService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@CrossOrigin //开放前端的跨域访问
+@Api(tags = "商品管理")
+@RestController
+@RequestMapping("/api/product")
+public class ProductController {
+
+    @Resource
+    private ProductService productService;
+
+    @ApiOperation("测试接口")
+    @GetMapping("/test")
+    public Response<String> test(){
+
+        return Response.success("now" + new Date());
+    }
+
+    @ApiOperation("商品列表")
+    @GetMapping("/list")
+    public Response<List<Product>> list(){
+
+        List<Product> list = productService.list();
+        return Response.success(list);
+    }
+
+}

src/main/java/com/ai/da/controller/PythonController.java

@@ -3,14 +3,19 @@ package com.ai.da.controller;
 import com.ai.da.common.enums.CollectionLevel1TypeEnum;
 import com.ai.da.common.response.Response;
 import com.ai.da.common.utils.CopyUtil;
-import com.ai.da.common.utils.MD5Utils;
-import com.ai.da.model.dto.CollectionDeleteFileDTO;
-import com.ai.da.model.dto.CollectionElementUploadDTO;
-import com.ai.da.model.dto.CollectionGeneratePrintDTO;
-import com.ai.da.model.dto.CollectionSavePrintDTO;
-import com.ai.da.model.vo.*;
+import com.ai.da.mapper.primary.entity.Library;
+import com.ai.da.model.dto.ChatFlushDTO;
+import com.ai.da.model.dto.ChatRobotLibraryDTO;
+import com.ai.da.model.dto.ChatSendDTO;
+import com.ai.da.model.dto.SuperResolutionDTO;
+import com.ai.da.model.vo.ChatRobotVO;
+import com.ai.da.model.vo.PythonLibraryVo;
+import com.ai.da.model.vo.SysFileVO;
 import com.ai.da.python.PythonService;
-import com.ai.da.service.*;
+import com.ai.da.service.ChatRobotService;
+import com.ai.da.service.LibraryService;
+import com.ai.da.service.SuperResolutionService;
+import com.ai.da.service.SysFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -19,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -38,16 +43,32 @@ public class PythonController {
     private SysFileService sysFileService;
     @Resource
     private LibraryService libraryService;
+    @Resource
+    private ChatRobotService chatRobotService;
+
+    @Resource
+    private SuperResolutionService superResolutionService;
 
     @ApiOperation(value = "python服务保存图片到java服务")
     @PostMapping("/saveGeneratePicture")
     public Response<String> upload(@RequestParam("file") MultipartFile file,
                                    @ApiParam("操作类型 generatePrint ->生成印花 " +
-                                                        "designCollection ->设计collection generateAdvancedDesign ->生成高级design")
+                                           "designCollection ->设计collection generateAdvancedDesign ->生成高级design" +
+                                           "generateSketch -> 生成草图")
                                    @RequestParam(value = "operateType") String operateType) {
         return Response.success(pythonService.upload(file, operateType));
     }
 
+//    @ApiOperation(value = "python服务保存多张图片到java服务")
+//    @PostMapping("/saveMultiGeneratePicture")
+//    public Response<List<String>> uploadMultiple(@RequestParam("files") MultipartFile[] files,
+//                                                 @ApiParam("操作类型 generatePrint ->生成印花 " +
+//                                                         "designCollection ->设计collection generateAdvancedDesign ->生成高级design" +
+//                                                         "generateSketch -> 生成草图")
+//                                                 @RequestParam(value = "operateType") String operateType) {
+//        return Response.success(pythonService.upload(files, operateType));
+//    }
+
     @ApiOperation(value = "通过文件类型获取系统文件")
     @GetMapping("/getSysFileByLevel2Type")
     public Response<List<SysFileVO>> getSysFileByLevel2Type(/*@RequestParam(value = "level2Type",required = false) String level2Type*/) {
@@ -64,4 +85,38 @@ public class PythonController {
                 Collectors.mapping(PythonLibraryVo::getUrl, Collectors.toList()))));
     }
 
+    @CrossOrigin
+    @ApiOperation(value = "发送用户输入消息")
+    @PostMapping("/chatStream")
+    public Response<ChatRobotVO> MessageToPythonChatStream(@RequestBody ChatSendDTO chatSendDTO) {
+        log.info(chatSendDTO.toString());
+        return Response.success(chatRobotService.sendMessageToChatRobot(chatSendDTO));
+    }
+
+    @ApiOperation(value = "血条")
+    @GetMapping("/getBloodBars")
+    public Response<BigDecimal> getBloodBars(@RequestParam(value = "userId") Long userId) {
+        return Response.success(chatRobotService.getBloodBars(userId));
+    }
+
+    @CrossOrigin
+    @ApiOperation(value = "likeOrUnlike")
+    @PostMapping("/pictureLikeOrUnLike")
+    public Response<Library> pictureLikeOrUnLike(@RequestBody ChatRobotLibraryDTO chatRobotLibraryDTO) {
+        return Response.success(chatRobotService.pictureLikeOrUnLike(chatRobotLibraryDTO));
+    }
+
+    @CrossOrigin
+    @ApiOperation(value = "刷新会话缓存")
+    @PostMapping("/flush")
+    public Response<String> ChatBufferFlush(@RequestBody ChatFlushDTO chatFlushDTO) {
+        return Response.success(chatRobotService.chatBufferFlush(chatFlushDTO));
+    }
+
+    @ApiOperation(value = "超分辨率")
+    @PostMapping("/prepareForSR")
+    public Response<List<String>> superResolution(@RequestBody List<SuperResolutionDTO> superResolutionDTO) {
+        return Response.success(superResolutionService.prepareForSR(superResolutionDTO));
+    }
+
 }

src/main/java/com/ai/da/controller/SavedCollectionController.java

@@ -1,13 +1,17 @@
 package com.ai.da.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.common.context.UserContext;
 import com.ai.da.common.response.PageBaseResponse;
-import com.ai.da.common.response.PageResponse;
 import com.ai.da.common.response.Response;
 import com.ai.da.common.utils.CopyUtil;
-import com.ai.da.mapper.entity.Account;
-import com.ai.da.mapper.entity.Collection;
-import com.ai.da.mapper.entity.UserLikeGroup;
+import com.ai.da.common.utils.MinioUtil;
+import com.ai.da.mapper.primary.TDesignPythonOutfitMapper;
+import com.ai.da.mapper.primary.entity.Account;
+import com.ai.da.mapper.primary.entity.Library;
+import com.ai.da.mapper.primary.entity.TDesignPythonOutfit;
+import com.ai.da.mapper.primary.entity.UserLikeGroup;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.*;
 import com.ai.da.service.*;
@@ -19,19 +23,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -46,6 +44,12 @@ public class SavedCollectionController {
     private UserLikeService userLikeService;
     @Resource
     private AccountService accountService;
+    @Resource
+    private TDesignPythonOutfitMapper designPythonOutfitMapper;
+    @Resource
+    private MinioUtil minioUtil;
+    @Resource
+    private ClassificationService classificationService;
 
     @ApiOperation(value = "History用户分页分组列表")
     @PostMapping("/queryUserGroup")
@@ -64,7 +68,34 @@ public class SavedCollectionController {
         if (Objects.nonNull(query.getEndDate())) {
             queryWrapper.le("update_date", new Date(query.getEndDate()));
         }
-        queryWrapper.orderByDesc("id");
+        // 新增分类过滤
+        if (CollectionUtil.isNotEmpty(query.getClassificationIdList())) {
+            List<Long> historyIdList = new ArrayList<>();
+            if (query.getIntersection() == 0) {
+                for (Long classificationId : query.getClassificationIdList()) {
+                    historyIdList.addAll(classificationService.getLibraryIdListByClassificationId(classificationId));
+                }
+                if (CollectionUtil.isNotEmpty(historyIdList)) {
+                    queryWrapper.in("id", historyIdList);
+                }else {
+                    return Response.success(PageBaseResponse.success(new Page<>()));
+                }
+            }else {
+                for (int i = 0; i < query.getClassificationIdList().size(); i++) {
+                    List<Long> historyIdListByClassificationId = classificationService.getLibraryIdListByClassificationId(query.getClassificationIdList().get(i));
+                    if (i == 0) {
+                        historyIdList.addAll(historyIdListByClassificationId);
+                    }else {
+                        historyIdList.retainAll(historyIdListByClassificationId);
+                    }
+                    if (CollectionUtil.isEmpty(historyIdList)) {
+                        return Response.success(PageBaseResponse.success(new Page<>()));
+                    }
+                }
+                queryWrapper.in("id", historyIdList);
+            }
+        }
+        queryWrapper.orderByDesc("update_date");
         IPage<UserLikeGroup> page = userLikeGroupService.getBaseMapper().selectPage(
                 new Page<>(query.getPage(), query.getSize()), queryWrapper);
         if (CollectionUtils.isEmpty(page.getRecords())) {
@@ -72,7 +103,9 @@ public class SavedCollectionController {
         }
         List<Long> groupIds = page.getRecords().stream().map(UserLikeGroup::getId).collect(Collectors.toList());
         List<UserLikeVO> groupDetails = userLikeService.getGroupDetails(groupIds);
-        Assert.notEmpty(groupDetails,"History detail does not exist!");
+        if (CollectionUtils.isEmpty(groupDetails)) {
+            throw new BusinessException("groupDetails.not.found");
+        }
         Map<Long, List<UserLikeVO>> groupDetailMap = groupDetails.stream()
                 .collect(Collectors.groupingBy(UserLikeVO::getUserLikeGroupId));
 
@@ -84,6 +117,10 @@ public class SavedCollectionController {
                 userLikeGroupVO.setAuthor(account.getUserName());
                 //count 和detail
                 List<UserLikeVO> details = groupDetailMap.get(group.getId());
+                for (UserLikeVO detail : details) {
+                    TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(detail.getDesignOutfitId());
+                    detail.setUrl(minioUtil.getPresignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60));
+                }
                 userLikeGroupVO.setGroupDetails(details);
                 userLikeGroupVO.setSketchCount(CollectionUtils.isEmpty(details) ? 0 : details.size());
                 return userLikeGroupVO;

src/main/java/com/ai/da/controller/TaskListController.java

@@ -0,0 +1,40 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.response.PageBaseResponse;
+import com.ai.da.common.response.Response;
+import com.ai.da.model.dto.QueryTaskHistoryDTO;
+import com.ai.da.model.dto.SuperResolutionDTO;
+import com.ai.da.model.dto.TaskDTO;
+import com.ai.da.model.vo.TaskVO;
+import com.ai.da.service.TaskListService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+@Api(tags = "任务列表模块")
+@Slf4j
+@RestController
+@RequestMapping("/api/tasks")
+public class TaskListController {
+
+    @Resource
+    private TaskListService taskListService;
+
+    @PostMapping("/getList")
+    @ApiOperation("获取未执行完的任务")
+    public Response<List<TaskDTO<SuperResolutionDTO>>> getTaskList(@Valid @RequestBody List<String> taskIdList) {
+        return Response.success(taskListService.getExecTask(taskIdList));
+    }
+
+    @PostMapping("/getAllTask")
+    @ApiOperation("获取所有任务")
+    public Response<PageBaseResponse<TaskVO>> getAllTask(@Valid @RequestBody QueryTaskHistoryDTO queryTaskHistoryDTO) {
+        return Response.success(taskListService.getAllTask(queryTaskHistoryDTO));
+    }
+
+}

src/main/java/com/ai/da/controller/ThirdPartyController.java

@@ -7,14 +7,15 @@ import com.ai.da.service.AccountService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.security.cert.X509Certificate;
 
 
 @Api(tags = "Third Party Modules")
@@ -37,4 +38,73 @@ public class ThirdPartyController {
     public Response<Boolean> editUser(@RequestBody AccountEditDTO accountEditDTO) {
         return Response.success(accountService.editUser(accountEditDTO));
     }
+
+    @CrossOrigin
+    @ApiOperation(value = "Add user information")
+    @PostMapping("/addTrialUser")
+    public Response<Boolean> addTrialUser(@RequestBody AccountTrialDTO accountTrialDTO, HttpServletRequest request) {
+        return Response.success(accountService.addTrialUser(accountTrialDTO, request));
+    }
+
+    @CrossOrigin
+    @ApiOperation(value = "add No Login Required")
+    @PostMapping("/addNoLoginRequired")
+    public Response<Boolean> addNoLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO) {
+        return Response.success(accountService.addNoLoginRequired(noLoginRequiredDTO));
+    }
+
+    @CrossOrigin
+    @ApiOperation(value = "add No Login Required")
+    @PostMapping("/deleteNoLoginRequired")
+    public Response<Boolean> deleteNoLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO) {
+        return Response.success(accountService.deleteNoLoginRequired(noLoginRequiredDTO));
+    }
+
+    @CrossOrigin
+    @ApiOperation(value = "add No Login Required")
+    @PostMapping("/existNoLoginRequired")
+    public Response<Boolean> existNoLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
+        return Response.success(accountService.existNoLoginRequired(noLoginRequiredDTO, request));
+    }
+
+    @GetMapping("/your-secured-endpoint")
+//    @PreAuthorize("hasRole('ROLE_USER')")
+    public String securedEndpoint(HttpServletRequest request, @AuthenticationPrincipal PreAuthenticatedAuthenticationToken authenticationToken) {
+        // 从请求属性中获取证书
+        X509Certificate[] certificates = (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate");
+        if (certificates != null && certificates.length > 0) {
+            X509Certificate clientCertificate = certificates[0];
+            // 可以从 clientCertificate 中获取证书信息，例如主题、颁发者等
+            String subject = clientCertificate.getSubjectX500Principal().getName();
+            String issuer = clientCertificate.getIssuerX500Principal().getName();
+            // 处理逻辑
+            return "Secured Endpoint. Client Subject: " + subject + ", Issuer: " + issuer;
+        } else {
+            // 证书不存在或获取失败
+            return "Failed to retrieve client certificate.";
+        }
+    }
+
+    @CrossOrigin
+    @ApiOperation(value = "add No Login Required")
+    @PostMapping("/addNoLoginRequiredNew")
+    public Response<String> addNoLoginRequiredNew(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
+        return Response.success(accountService.addNoLoginRequiredNew(noLoginRequiredDTO, request));
+    }
+
+    @CrossOrigin
+    @ApiOperation(value = "add No Login Required")
+    @PostMapping("/deleteNoLoginRequiredNew")
+    public Response<Boolean> deleteNoLoginRequiredNew(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
+        return Response.success(accountService.deleteNoLoginRequiredNew(noLoginRequiredDTO, request));
+    }
+
+    @Value("${redirect_url}")
+    private String REDIRECT_URL;
+    @CrossOrigin
+    @ApiOperation(value = "add No Login Required")
+    @PostMapping("/getRedirectUrl")
+    public Response<String> getRedirectUrl() {
+        return Response.success(REDIRECT_URL);
+    }
 }

src/main/java/com/ai/da/controller/WorkspaceController.java

@@ -0,0 +1,124 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.response.Response;
+import com.ai.da.mapper.primary.entity.Workspace;
+import com.ai.da.model.dto.WorkspaceDTO;
+import com.ai.da.model.enums.BizJson;
+import com.ai.da.model.vo.ModelsVO;
+import com.ai.da.model.vo.WorkspaceVO;
+import com.ai.da.service.WorkspaceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import lombok.NoArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileNotFoundException;
+import java.util.List;
+
+/**
+ * 控制器
+ *
+ * @author SHAHAIBO
+ * @since 2023-08-01
+ */
+@RestController
+@AllArgsConstructor
+@NoArgsConstructor
+@RequestMapping("/api/workspace")
+@Api(value = "", tags = "工作空间")
+public class WorkspaceController {
+
+    @Resource
+    private WorkspaceService workspaceService;
+
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "详情", notes = "传入workspace")
+    public Response<Workspace> detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
+        Workspace detail = workspaceService.getByIdNew(id);
+        return Response.success(detail);
+    }
+
+    /**
+     * 分页
+     */
+    @PostMapping("/list")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "分页", notes = "传入workspace")
+    public Response<WorkspaceVO> list(@Valid @RequestBody WorkspaceDTO query) {
+        WorkspaceVO response = workspaceService.getPage(query);
+        return Response.success(response);
+    }
+
+    /**
+     * 新增或编辑
+     */
+    @PostMapping("/saveOrUpdate")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "新增或编辑", notes = "传入workspace")
+    public Response saveOrUpdate(@Valid @RequestBody Workspace workspace) {
+        return Response.success(workspaceService.saveOrUpdate(workspace));
+    }
+
+
+    /**
+     * 删除
+     */
+    @DeleteMapping("/remove")
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "删除", notes = "传入id")
+    public Response<List<Long>> remove(@Valid @RequestBody List<Workspace> workspaceList) {
+        return Response.success(workspaceService.delete(workspaceList));
+    }
+
+    @GetMapping("/enumValues")
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "获取枚举类值")
+    public Response<List<BizJson>> enumValues(@RequestParam("enumName") String enumName) {
+        List<BizJson> bizJsonList = workspaceService.getEnumValues(enumName);
+        return Response.success(bizJsonList);
+    }
+
+    @GetMapping("/getMannequins")
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "获取模特")
+    public Response<List<ModelsVO>> getMannequins(@RequestParam("sex") String sex) {
+        List<ModelsVO> modelsVO = workspaceService.getMannequins(sex);
+        return Response.success(modelsVO);
+    }
+
+
+    @PostMapping("system_file_copy")
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "minio数据迁移")
+    public Response<Boolean> systemFileCopy() {
+        workspaceService.systemFileCopy();
+        return Response.success(true);
+    }
+
+    @PostMapping("moveFile")
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "增加一级性别路径")
+    public Response<Boolean> moveFile() {
+        workspaceService.moveFile();
+        return Response.success(true);
+    }
+
+    @PostMapping("maleDataInsert")
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "男装数据入库入minio")
+    public Response<Boolean> maleDataInsert() throws FileNotFoundException {
+        workspaceService.maleDataInsert();
+        return Response.success(true);
+    }
+}

src/main/java/com/ai/da/mapper/DesignMapper.java

@@ -1,17 +0,0 @@
-package com.ai.da.mapper;
-
-import com.ai.da.common.config.mybatis.plus.CommonMapper;
-import com.ai.da.mapper.entity.Collection;
-import com.ai.da.mapper.entity.Design;
-
-/**
- * Mapper 接口
- *
- * @author easy-generator
- * @since 2022-06-13
- */
-public interface DesignMapper extends CommonMapper<Design> {
-
-    //返回插入数据后生成的主键
-    Long insertDesign(Design design);
-}

src/main/java/com/ai/da/mapper/primary/AccountLoginLogMapper.java

@@ -1,10 +1,7 @@
-package com.ai.da.mapper;
+package com.ai.da.mapper.primary;
 
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
-import com.ai.da.mapper.entity.Account;
-import com.ai.da.mapper.entity.AccountLoginLog;
-
-import java.util.List;
+import com.ai.da.mapper.primary.entity.AccountLoginLog;
 
 /**
  * Mapper 接口