diff --git a/.github/workflows/depoly.yml b/.github/workflows/depoly.yml
index 8281c92..eab6a49 100644
--- a/.github/workflows/depoly.yml
+++ b/.github/workflows/depoly.yml
@@ -2,7 +2,7 @@ name: Maven Package
on:
release:
- types: [created]
+ types: [ created ]
jobs:
build:
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
new file mode 100644
index 0000000..a7f59f5
--- /dev/null
+++ b/.github/workflows/snapshot.yml
@@ -0,0 +1,39 @@
+name: Maven Package
+
+on:
+ push:
+ branches:
+ - snapshot
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v4
+ - name: Set up JDK 17
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: '17'
+
+ - name: Build with Maven
+ run: mvn -B package --file pom.xml
+
+ - name: Set up Apache Maven Central
+ uses: actions/setup-java@v4
+ with: # running setup-java again overwrites the settings.xml
+ distribution: 'temurin'
+ java-version: '17'
+ server-id: maven # Value of the distributionManagement/repository/id field of the pom.xml
+ server-username: MAVEN_USERNAME # env variable for username in deploy
+ server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy
+ gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+ gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+
+ - name: Publish to Apache Maven Central
+ run: mvn deploy -Prelease
+ env:
+ MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+ MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+ MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
\ No newline at end of file
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
index 1fa9b91..dc5f62d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
@@ -30,7 +30,7 @@ public class MPJInterceptorConfig {
System.out.println(" _ _ |_ _ _|_. ___ _ | _ . _ . _ \n" +
"| | |\\/|_)(_| | |_\\ |_)||_|_\\ | (_) | | | \n" +
" / | /\n" +
- " 1.5.1");
+ " 1.5.2-SNAPSHOT");
}
}
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index c2a2adf..a965395 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -5,10 +5,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- org.springframework.boot
- spring-boot-starter-parent
- 3.3.4
-
+ com.github.yulichang
+ mybatis-plus-join-root
+ ${revision}
com.github.yulichang
mybatis-plus-join-test
@@ -47,9 +46,6 @@
- 1.5.2
- 3.5.8
-
17
17
17
@@ -94,10 +90,19 @@
mybatis-plus-spring-boot3-starter
${mybatis.plus.version}
+
+ com.baomidou
+ mybatis-plus-jsqlparser
+ ${mybatis.plus.version}
+
org.springframework
spring-jdbc
+
+ com.mysql
+ mysql-connector-j
+
diff --git a/mybatis-plus-join-test/test-join/pom.xml b/mybatis-plus-join-test/test-join/pom.xml
index c4c2633..a1e4bdd 100644
--- a/mybatis-plus-join-test/test-join/pom.xml
+++ b/mybatis-plus-join-test/test-join/pom.xml
@@ -34,28 +34,10 @@
com.fasterxml.jackson.core
jackson-core
+
+ com.github.yulichang
+ mybatis-plus-join-processor
+ ${revision}
+
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
-
- com.github.yulichang
- mybatis-plus-join-processor
- ${revision}
-
-
- org.projectlombok
- lombok
-
-
-
-
-
-
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/dto/UserDTO.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/dto/UserDTO.java
index c75b2ba..cb5609b 100644
--- a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/dto/UserDTO.java
+++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/dto/UserDTO.java
@@ -1,5 +1,6 @@
package com.github.yulichang.test.join.dto;
+import com.github.yulichang.test.join.entity.AddressDO;
import com.github.yulichang.test.join.entity.UserDO;
import com.github.yulichang.test.join.enums.Sex;
import lombok.Data;
@@ -42,6 +43,8 @@ public class UserDTO {
private List addressList;
+ private List addressList11;
+
private AddressDTO addressDTO;
private List addressIds;
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/unit/PageByMainTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/unit/PageByMainTest.java
index 1b869d9..ddb86ba 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/unit/PageByMainTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/unit/PageByMainTest.java
@@ -34,7 +34,7 @@ public class PageByMainTest {
"LEFT JOIN address t1 ON (t1.user_id = t.id AND t1.user_id >= ? AND t1.del = false)");
MPJLambdaWrapper wrapper = JoinWrappers.lambda(UserDO.class)
.selectAll()
- .selectCollection(AddressDO.class, UserDTO::getAddressList)
+ .selectCollection(AddressDO.class, UserDTO::getAddressList11)
.leftJoin(AddressDO.class, on -> on
.eq(AddressDO::getUserId, UserDO::getId)
.ge(AddressDO::getUserId, 0))
@@ -45,6 +45,7 @@ public class PageByMainTest {
Page page = wrapper.page(new Page<>(1, 8), UserDTO.class);
page.getRecords().forEach(System.out::println);
assert page.getRecords().size() == 8;
+ assert !page.getRecords().get(0).getAddressList11().isEmpty();
}
@Test
diff --git a/plugin/mybatis-plus-join-solon-plugin/pom.xml b/plugin/mybatis-plus-join-solon-plugin/pom.xml
index 3b35e9e..87dac5a 100644
--- a/plugin/mybatis-plus-join-solon-plugin/pom.xml
+++ b/plugin/mybatis-plus-join-solon-plugin/pom.xml
@@ -12,9 +12,17 @@
mybatis-plus-join-solon-plugin
-
- 3.0.1
-
+
+
+
+ org.noear
+ solon
+ 3.0.2
+ import
+ pom
+
+
+
@@ -25,19 +33,16 @@
org.noear
solon
- ${solon.version}
provided
org.noear
mybatis-solon-plugin
- ${solon.version}
provided
org.noear
mybatis-plus-extension-solon-plugin
- ${solon.version}
provided
diff --git a/pom.xml b/pom.xml
index 0167326..ea9c495 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
- 1.5.2
+ 1.5.2-SNAPSHOT
3.5.9
17
@@ -59,34 +59,84 @@
-
- org.projectlombok
- lombok
- 1.18.34
- provided
-
-
- org.springframework
- spring-aop
- 6.1.14
- provided
-
-
- org.jetbrains.kotlin
- kotlin-stdlib-jdk8
- 2.0.21
- provided
-
org.springframework.boot
- spring-boot-configuration-processor
- true
- 3.3.4
+ spring-boot-dependencies
+ 3.3.5
+ import
+ pom
+
+ snapshot
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ true
+
+ maven
+ https://oss.sonatype.org/
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+ -Xdoclint:none
+
+ UTF-8
+ UTF-8
+ UTF-8
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+
+
+ verify
+
+ sign
+
+
+
+ --pinentry-mode
+ loopback
+
+
+
+
+
+
+
+
release