修改cheat文件
Change-Id: I0ffce820f7ff78b6fe5b9a714baf17814636dc19
API修改
Change-Id: I63a5b9752afcfe6f8088d2cfc065b385ee2a4464
merge
Change-Id: I783bc0349b858b16bccd1ec21623182239170df2
修改cheat文件
Change-Id: I0ffce820f7ff78b6fe5b9a714baf17814636dc19
merge
Change-Id: I783bc0349b858b16bccd1ec21623182239170df2
修改cheat文件
Change-Id: I0ffce820f7ff78b6fe5b9a714baf17814636dc19
merge
Change-Id: I783bc0349b858b16bccd1ec21623182239170df2
合并API代码
Change-Id: I5ac299271c14d247413d78b5da51adc28977e05d
diff --git a/pom.xml b/pom.xml
index caedede..34a5ced 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,224 +3,223 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <!-- 基本坐标 -->
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.example</groupId>
- <artifactId>simple-maven-project</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <!-- 基本坐标 -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example</groupId>
+ <artifactId>simple-maven-project</artifactId>
+ <version>1.0-SNAPSHOT</version>
- <!-- 指定 Java 版本 -->
- <properties>
- <!-- 使用 Java 9，以支持接口中的 private 方法 -->
- <maven.compiler.source>9</maven.compiler.source>
- <!-- 如果还没定义，请添加 QueryDSL 版本 -->
- <querydsl.version>5.0.0</querydsl.version>
- </properties>
+ <!-- 指定 Java 版本 -->
+ <properties>
+ <!-- 使用 Java 9，以支持接口中的 private 方法 -->
+ <maven.compiler.source>9</maven.compiler.source>
+ <!-- 如果还没定义，请添加 QueryDSL 版本 -->
+ <querydsl.version>5.0.0</querydsl.version>
+ </properties>
- <!-- 添加依赖 -->
- <dependencies>
- <!-- Apache Commons Lang3，用于 Pair 等工具类 -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>5.6.14.Final</version>
- </dependency>
- <dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <version>8.0.32</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.36</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.36</version>
- </dependency>
- <!-- QueryDSL -->
- <dependency>
- <groupId>com.querydsl</groupId>
- <artifactId>querydsl-jpa</artifactId>
- <version>${querydsl.version}</version>
- </dependency>
- <dependency>
- <groupId>com.querydsl</groupId>
- <artifactId>querydsl-apt</artifactId>
- <version>${querydsl.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- <!-- JUnit Jupiter API & Engine for writing and running tests -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>5.9.1</version>
- <scope>test</scope>
- </dependency>
- <!-- JUnit Jupiter Engine -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>5.9.1</version>
- <scope>test</scope>
- </dependency>
- <!-- 添加 Querydsl 核心依赖 -->
- <dependency>
- <groupId>com.querydsl</groupId>
- <artifactId>querydsl-core</artifactId>
- <version>5.0.0</version>
- </dependency>
- <!-- 添加 Querydsl APT，仅在编译时使用 -->
- <dependency>
- <groupId>com.querydsl</groupId>
- <artifactId>querydsl-apt</artifactId>
- <version>5.0.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <!-- 添加依赖 -->
+ <dependencies>
+ <!-- Apache Commons Lang3，用于 Pair 等工具类 -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.12.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>javax.persistence-api</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>5.6.14.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ <version>8.0.32</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.36</version>
+ </dependency>
+ <!-- QueryDSL -->
+ <dependency>
+ <groupId>com.querydsl</groupId>
+ <artifactId>querydsl-jpa</artifactId>
+ <version>${querydsl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.querydsl</groupId>
+ <artifactId>querydsl-apt</artifactId>
+ <version>${querydsl.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ <!-- JUnit Jupiter API & Engine for writing and running tests -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>5.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- JUnit Jupiter Engine -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- 添加 Querydsl 核心依赖 -->
+ <dependency>
+ <groupId>com.querydsl</groupId>
+ <artifactId>querydsl-core</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+ <!-- 添加 Querydsl APT，仅在编译时使用 -->
+ <dependency>
+ <groupId>com.querydsl</groupId>
+ <artifactId>querydsl-apt</artifactId>
+ <version>5.0.0</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- 构建配置 -->
- <build>
- <plugins>
- <!-- 编译插件，设定 Java 9 编译 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <release>9</release>
- <compilerArgs>
- <arg>--add-modules</arg>
- <arg>java.xml.ws.annotation</arg>
- </compilerArgs>
- <annotationProcessorPaths>
- <path>
- <groupId>com.querydsl</groupId>
- <artifactId>querydsl-apt</artifactId>
- <version>${querydsl.version}</version>
- <classifier>jpa</classifier>
- </path>
- <path>
- <groupId>com.querydsl</groupId>
- <artifactId>querydsl-jpa</artifactId>
- <version>${querydsl.version}</version>
- </path>
- <path>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </path>
- <path>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
- <version>2.2</version>
- </path>
- </annotationProcessorPaths>
- <generatedSourcesDirectory>${project.build.directory}/generated-sources/java</generatedSourcesDirectory>
- </configuration>
- </plugin>
- <!-- 执行插件，方便 mvn exec:java 直接运行 -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>3.1.0</version>
- <configuration>
- <mainClass>api.ApiMain</mainClass>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.mysema.maven</groupId>
- <artifactId>apt-maven-plugin</artifactId>
- <version>1.1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
- <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <!-- 确保 test 可以访问 main 的类 -->
- <useSystemClassLoader>true</useSystemClassLoader>
- <useManifestOnlyJar>false</useManifestOnlyJar>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
- <!-- Optional: 将生成目录加入编译生命周期 -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals><goal>add-source</goal></goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- 添加 APT 插件配置，生成 Q 类 -->
- <plugin>
- <groupId>com.mysema.maven</groupId>
- <artifactId>apt-maven-plugin</artifactId>
- <version>1.1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <!-- 生成目录，可根据项目实际调整 -->
- <outputDirectory>target/generated-sources/java</outputDirectory>
- <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>2.5.6</version> <!-- 根据需要调整版本 -->
+ </dependency>
+ </dependencies>
+
+ <!-- 构建配置 -->
+ <build>
+ <plugins>
+ <!-- 编译插件，设定 Java 9 编译 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <configuration>
+ <release>9</release>
+ <compilerArgs>
+ <arg>--add-modules</arg>
+ <arg>java.xml.ws.annotation</arg>
+ </compilerArgs>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>com.querydsl</groupId>
+ <artifactId>querydsl-apt</artifactId>
+ <version>${querydsl.version}</version>
+ <classifier>jpa</classifier>
+ </path>
+ <path>
+ <groupId>com.querydsl</groupId>
+ <artifactId>querydsl-jpa</artifactId>
+ <version>${querydsl.version}</version>
+ </path>
+ <path>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </path>
+ <path>
+ <groupId>javax.persistence</groupId>
+ <artifactId>javax.persistence-api</artifactId>
+ <version>2.2</version>
+ </path>
+ </annotationProcessorPaths>
+ <generatedSourcesDirectory>${project.build.directory}/generated-sources/java</generatedSourcesDirectory>
+ </configuration>
+ </plugin>
+ <!-- 执行插件，方便 mvn exec:java 直接运行 -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <mainClass>api.ApiMain</mainClass>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.mysema.maven</groupId>
+ <artifactId>apt-maven-plugin</artifactId>
+ <version>1.1.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
+ <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.2</version>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <!-- 确保 test 可以访问 main 的类 -->
+ <useSystemClassLoader>true</useSystemClassLoader>
+ <useManifestOnlyJar>false</useManifestOnlyJar>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.5.6</version>
+ </plugin>
+ <!-- Optional: 将生成目录加入编译生命周期 -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- 添加 APT 插件配置，生成 Q 类 -->
+ <plugin>
+ <groupId>com.mysema.maven</groupId>
+ <artifactId>apt-maven-plugin</artifactId>
+ <version>1.1.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <!-- 生成目录，可根据项目实际调整 -->
+ <outputDirectory>target/generated-sources/java</outputDirectory>
+ <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file