Merge branch '4.1.x'

# Conflicts:
#	hsweb-easy-orm-core/pom.xml
#	hsweb-easy-orm-elasticsearch/pom.xml
#	hsweb-easy-orm-rdb/pom.xml
#	hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/operator/builder/fragments/term/AbstractTermFragmentBuilder.java
#	pom.xml

.github/workflows/unit-test.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '11'
         distribution: 'temurin'
         cache: maven
     - name: Cache Maven Repository
@@ -22,7 +22,7 @@ jobs:
         path: ~/.m2
         key: hsweb-easy-orm-maven-repository
     - name: Build with Maven
-      run: mvn -Duser.timezone=Asia/Shanghai test
+      run: mvn -Duser.timezone="Asia/Shanghai" test -Pjava11
     - name: Codecov
       uses: codecov/[email protected]
       with:

hsweb-easy-orm-core/pom.xml

@@ -5,7 +5,8 @@
     <parent>
         <artifactId>hsweb-easy-orm</artifactId>
         <groupId>org.hswebframework</groupId>
-        <version>4.0.15</version>
+        <version>4.1.0</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +22,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.2.2</version>
+            <version>2.13.3</version>
 
         </dependency>
 

hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/ApacheCommonPropertyOperator.java

@@ -28,7 +28,7 @@ public Optional<Object> getProperty(Object object, String name) {
         } catch (NoSuchMethodException ignore) {
 
         } catch (Exception e) {
-           log.info("无法获取属性:{},对象:{}", name, object, e);
+            ApacheCommonPropertyOperator.log.info("无法获取属性:{},对象:{}", name, object, e);
         }
         return Optional.empty();
     }
@@ -46,7 +46,7 @@ public void setProperty(Object object, String name, Object value) {
     @Override
     @SneakyThrows
     public <T> T convert(Object from, Class<T> to) {
-        T newInstance = to.newInstance();
+        T newInstance = to.getConstructor().newInstance();
         try {
             BeanUtils.copyProperties(newInstance, from);
         } catch (Exception err) {

hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/dsl/Query.java

@@ -79,6 +79,16 @@ public <B> Query<T, Q> orderByDesc(StaticMethodReferenceColumn<B> column) {
         return this;
     }
 
+    public <B> Query<T, Q> orderByAsc(MethodReferenceColumn<B> column) {
+        param.orderBy(column.getColumn()).value(column.get()).asc();
+        return this;
+    }
+
+    public <B> Query<T, Q> orderByDesc(MethodReferenceColumn<B> column) {
+        param.orderBy(column.getColumn()).value(column.get()).desc();
+        return this;
+    }
+
     public Query<T, Q> orderByAsc(String column) {
         param.orderBy(column).asc();
         return this;

hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/param/Sort.java

@@ -19,6 +19,9 @@ public class Sort extends Column {
     @Schema(description = "排序方式", allowableValues = {"asc", "desc"}, minLength = 3, maxLength = 4)
     private String order = "asc";
 
+    @Schema(description = "指定值排序")
+    private Object value;
+
     public Sort() {
     }
 
@@ -42,4 +45,8 @@ public void desc() {
         this.order = "desc";
     }
 
+    public Sort value(Object value) {
+        this.value = value;
+        return this;
+    }
 }