v6.5.2

v6.5.2

Author: 839536

README.md

@@ -6,7 +6,7 @@
 </p>
 <p align="center">
     <a target="_blank" href="https://search.maven.org/search?q=org.aoju">
-		<img src="https://img.shields.io/badge/maven--central-v6.5.1-blue.svg?label=Maven%20Central" />
+		<img src="https://img.shields.io/badge/maven--central-v6.5.2-blue.svg?label=Maven%20Central" />
 	</a>
 	<a target="_blank" href="https://travis-ci.org/aoju/bus">
 		<img src="https://travis-ci.com/aoju/bus.svg?branch=main">
@@ -97,7 +97,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件，它基于Java17
 <dependency>
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>6.5.1</version>
+    <version>6.5.2</version>
 </dependency>
 ```
 

bus-all/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>6.5.1</version>
+    <version>6.5.2</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

bus-base/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-base</artifactId>
-    <version>6.5.1</version>
+    <version>6.5.2</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java

@@ -73,6 +73,12 @@ public class BaseEntity extends Tracer {
      */
     protected String modified;
 
+    /**
+     * 搜索参数
+     */
+    @Transient
+    protected transient String params;
+
     /**
      * 分页页码
      */

bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java

@@ -58,30 +58,42 @@ public class OAuth2 extends Entity {
      * 当前用户角色
      */
     @Transient
-    private String x_role_id;
+    protected String x_role_id;
 
     /**
      * 当前用户职称
      */
     @Transient
-    private String x_duty_id;
+    protected String x_duty_id;
 
     /**
      * 当前用户组织
      */
     @Transient
-    private String x_org_id;
+    protected String x_org_id;
 
     /**
      * 当前用户设备
      */
     @Transient
-    private String x_device_id;
+    protected String x_device_id;
+
+    /**
+     * 当前应用
+     */
+    @Transient
+    protected String x_app_id;
+
+    /**
+     * 当前租户
+     */
+    @Transient
+    protected String x_tenant_id;
 
     /**
      * 扩展参数信息
      */
     @Transient
-    private String x_extension;
+    protected String x_extension;
 
 }

bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java

@@ -187,7 +187,7 @@ public interface BaseService<T> extends Service {
      * @param entity 对象参数
      * @return 操作结果
      */
-    Long selectCount(T entity);
+    int selectCount(T entity);
 
     /**
      * 通用:查询统计数据

bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java

@@ -176,8 +176,8 @@ public int selectCountByWhere(Object object) {
     }
 
     @Override
-    public Long selectCount(T entity) {
-        return new Long(mapper.selectCount(entity));
+    public int selectCount(T entity) {
+        return mapper.selectCount(entity);
     }
 
     @Override

bus-bom/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-bom</artifactId>
-    <version>6.5.1</version>
+    <version>6.5.2</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>

bus-cache/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-cache</artifactId>
-    <version>6.5.1</version>
+    <version>6.5.2</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -48,11 +48,11 @@
         <jedis.version>4.2.2</jedis.version>
         <xmemcached.version>2.4.7</xmemcached.version>
         <ehcache.version>3.9.4</ehcache.version>
-        <curator.version>4.3.0</curator.version>
+        <curator.version>5.2.1</curator.version>
         <guava.version>30.1.1-jre</guava.version>
         <hession.version>4.0.65</hession.version>
         <druid.version>1.2.8</druid.version>
-        <mysql.version>8.0.28</mysql.version>
+        <mysql.version>8.0.29</mysql.version>
     </properties>
 
     <dependencies>

bus-core/README.md

@@ -14,7 +14,7 @@
 <dependency>
     <groupId>org.aoju</groupId>
     <artifactId>bus-core</artifactId>
-    <version>6.5.1</version>
+    <version>6.5.2</version>
 </dependency>
 ```