feat:修复已知问题,提升系统稳定性

This commit is contained in:
njydsz
2024-09-25 11:38:06 +08:00
parent bbed2aadbc
commit 8d094e48ac
493 changed files with 5108 additions and 22521 deletions

View File

@@ -2,22 +2,26 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<name>remi-comm</name>
<packaging>pom</packaging>
<description>瑞米平台-公共依赖</description>
<description>瑞米平台-公共依赖模块</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<artifactId>remi-cloud</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<properties>
<!--jdk-->
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<!--UFT-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<!--子模块管理-->
@@ -40,17 +44,531 @@
<module>remi-comm-web</module>
</modules>
<dependencyManagement>
<dependencies>
<!-- SpringBoot 依赖配置 -->
<dependency>
<artifactId>spring-boot-dependencies</artifactId>
<groupId>org.springframework.boot</groupId>
<scope>import</scope>
<type>pom</type>
<version>${spring-boot.version}</version>
</dependency>
<!-- SpringCloud 微服务 -->
<dependency>
<artifactId>spring-cloud-dependencies</artifactId>
<groupId>org.springframework.cloud</groupId>
<scope>import</scope>
<type>pom</type>
<version>${spring-cloud.version}</version>
</dependency>
<!-- SpringCloud Alibaba 微服务 -->
<dependency>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<groupId>com.alibaba.cloud</groupId>
<scope>import</scope>
<type>pom</type>
<version>${spring-cloud-alibaba.version}</version>
</dependency>
<!--内部服务依赖开始-->
<!--remi-comm-->
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-minio</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-redis</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-jdbc</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-domain</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-exception</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-feign</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-job</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-log</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-swagger</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-thread</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-util</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-auth</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-safe</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<dependency>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-web</artifactId>
<version>${remi-comm.version}</version>
</dependency>
<!--内部服务依赖结束-->
<!--数据库相关依赖开始-->
<!-- mybatis-plus -->
<dependency>
<artifactId>mybatis-plus-boot-starter</artifactId>
<groupId>com.baomidou</groupId>
<version>${mybatis-plus.version}</version>
</dependency>
<dependency>
<artifactId>mybatis-plus-annotation</artifactId>
<groupId>com.baomidou</groupId>
<version>${mybatis-plus.version}</version>
</dependency>
<dependency>
<artifactId>mybatis-plus-extension</artifactId>
<groupId>com.baomidou</groupId>
<version>${mybatis-plus.version}</version>
</dependency>
<!--mybatis-->
<dependency>
<artifactId>mybatis-spring-boot-starter</artifactId>
<groupId>org.mybatis.spring.boot</groupId>
<version>${mybatis.version}</version>
</dependency>
<!-- druid-->
<dependency>
<artifactId>druid-spring-boot-starter</artifactId>
<groupId>com.alibaba</groupId>
<version>${druid.version}</version>
</dependency>
<!-- mysql -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
<!-- oracle -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>${ojdbc.version}</version>
</dependency>
<dependency>
<groupId>com.oracle.database.nls</groupId>
<artifactId>orai18n</artifactId>
<version>${ojdbc.version}</version>
</dependency>
<!-- sqlserver -->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>${mssql-jdbc.version}</version>
</dependency>
<!-- db2 -->
<dependency>
<groupId>com.ibm.db2</groupId>
<artifactId>jcc</artifactId>
<version>${db2-jdbc.version}</version>
</dependency>
<!-- postgresql -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
<!-- h2 database -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.db.version}</version>
</dependency>
<!--数据库相关依赖结束-->
<!--其他公共依赖开始-->
<!-- commons -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${commons-text.version}</version>
</dependency>
<dependency>
<artifactId>commons-io</artifactId>
<groupId>commons-io</groupId>
<version>${commons-io.version}</version>
</dependency>
<dependency>
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<artifactId>commons-codec</artifactId>
<groupId>commons-codec</groupId>
<version>${commons-codec.version}</version>
</dependency>
<dependency>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
<version>${commons-logging.version}</version>
</dependency>
<dependency>
<artifactId>commons-net</artifactId>
<groupId>commons-net</groupId>
<version>${commons-net.version}</version>
</dependency>
<dependency>
<artifactId>commons-collections</artifactId>
<groupId>commons-collections</groupId>
<version>${commons-collections.version}</version>
</dependency>
<!-- 获取文件类型 -->
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>${tika.version}</version>
</dependency>
<!-- qiniu-java-sdk -->
<dependency>
<groupId>com.qiniu</groupId>
<artifactId>qiniu-java-sdk</artifactId>
<version>${qiniu.version}</version>
</dependency>
<!-- aliyun-java-sdk -->
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>${aliyun-sdk-oss.version}</version>
</dependency>
<!-- Minio-java-sdk -->
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
<version>${minio.version}</version>
</dependency>
<!-- aws-s3-sdk-->
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>${awssdk.version}</version>
</dependency>
<!-- 腾讯-cos-sdk-->
<dependency>
<groupId>com.qcloud</groupId>
<artifactId>cos_api</artifactId>
<version>${cos_api.version}</version>
</dependency>
<!-- validator -->
<dependency>
<artifactId>commons-validator</artifactId>
<groupId>commons-validator</groupId>
<version>${commons-validator.version}</version>
</dependency>
<dependency>
<artifactId>hibernate-validator</artifactId>
<groupId>org.hibernate.validator</groupId>
<version>${hibernate-validator.version}</version>
</dependency>
<dependency>
<artifactId>hibernate-validator</artifactId>
<groupId>org.hibernate</groupId>
<version>${hibernate-validator.version}</version>
</dependency>
<!-- okhttp3 -->
<dependency>
<artifactId>okhttp</artifactId>
<groupId>com.squareup.okhttp3</groupId>
<version>${okhttp3.version}</version>
</dependency>
<dependency>
<artifactId>logging-interceptor</artifactId>
<groupId>com.squareup.okhttp3</groupId>
<version>${okhttp3.version}</version>
</dependency>
<!-- httpclient -->
<dependency>
<artifactId>httpclient</artifactId>
<groupId>org.apache.httpcomponents</groupId>
<version>${httpclient.version}</version>
</dependency>
<!--javax-servlet-->
<dependency>
<artifactId>javax.servlet-api</artifactId>
<groupId>javax.servlet</groupId>
<version>${javax.version}</version>
</dependency>
<!--user-agent-->
<dependency>
<artifactId>device-detector</artifactId>
<groupId>io.github.mngsk</groupId>
<version>${device.version}</version>
</dependency>
<!-- guava -->
<dependency>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
<version>${guava.version}</version>
</dependency>
<!-- apm-toolkit-trace -->
<dependency>
<artifactId>apm-toolkit-trace</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>${trace.version}</version>
</dependency>
<!--fastjson-->
<dependency>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba</groupId>
<version>${fastjson.version}</version>
</dependency>
<!--jackson-core -->
<dependency>
<artifactId>jackson-core</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<artifactId>jackson-annotations</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<artifactId>jackson-databind</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<version>${jackson.version}</version>
</dependency>
<!-- gson -->
<dependency>
<artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId>
<version>${gson.version}</version>
</dependency>
<!--user-agent-->
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>${bitwalker.version}</version>
</dependency>
<!--ip2region-->
<dependency>
<groupId>org.lionsoul</groupId>
<artifactId>ip2region</artifactId>
<version>${ip2region.version}</version>
</dependency>
<!-- hutool-all -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-extra</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-http</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-json</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-crypto</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- dom4j -->
<dependency>
<artifactId>dom4j</artifactId>
<groupId>org.dom4j</groupId>
<version>${dom4j.version}</version>
</dependency>
<!--xxl-job-->
<dependency>
<artifactId>xxl-job-core</artifactId>
<groupId>com.xuxueli</groupId>
<version>${xxl-job.version}</version>
</dependency>
<!--knife4j-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-gateway-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
</dependency>
<!-- easyexcel -->
<dependency>
<artifactId>easyexcel</artifactId>
<groupId>com.alibaba</groupId>
<version>${easyexcel.version}</version>
</dependency>
<!--velocity-->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
</dependency>
<!--cglib-->
<dependency>
<artifactId>cglib</artifactId>
<groupId>cglib</groupId>
<version>${cglib.version}</version>
</dependency>
<!--lombok-->
<dependency>
<artifactId>lombok</artifactId>
<groupId>org.projectlombok</groupId>
<version>${lombok.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-mapstruct-binding</artifactId>
<version>${lombok-mapstruct.version}</version>
</dependency>
<!--mapstruct-->
<dependency>
<artifactId>mapstruct</artifactId>
<groupId>org.mapstruct</groupId>
<version>${mapstruct.version}</version>
</dependency>
<dependency>
<artifactId>mapstruct-processor</artifactId>
<groupId>org.mapstruct</groupId>
<version>${mapstruct.version}</version>
</dependency>
<!--slf4j-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<version>${slf4j.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>${slf4j.version}</version>
</dependency>
<!--其他公共依赖结束-->
</dependencies>
</dependencyManagement>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
<distributionManagement>
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<repositories>
<repository>
<id>public</id>
<name>remi nexus</name>
<url>https://remi.njydsz.com/repository/remi-top</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>public</id>
<name>remi nexus</name>
<url>https://remi.njydsz.com/repository/remi-top</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>

View File

@@ -8,9 +8,9 @@
<description>remi-comm-auth</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -18,27 +18,27 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<!--公共依赖-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
</dependency>
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-redis</artifactId>
</dependency>
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-exception</artifactId>
</dependency>
<!--spring-->

View File

@@ -7,9 +7,9 @@
<description>remi-comm-core</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,12 +17,12 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>

View File

@@ -26,28 +26,28 @@ public class SpringBeans implements ApplicationContextAware {
}
/**
* Created by dianjiu on 2022-06-23 ,contact lidianjiu@njydsz.com. 获取applicationContext.
* Created by dianjiu on 2022-06-23 ,contact dianjiuxyz@gmail.com. 获取applicationContext.
*/
public static ApplicationContext getApplicationContext() {
return applicationContext;
}
/**
* Created by dianjiu on 2022-06-23 ,contact lidianjiu@njydsz.com. 通过name获取 Bean.
* Created by dianjiu on 2022-06-23 ,contact dianjiuxyz@gmail.com. 通过name获取 Bean.
*/
public static Object getBean(String name) {
return getApplicationContext().getBean(name);
}
/**
* Created by dianjiu on 2022-06-23 ,contact lidianjiu@njydsz.com. 通过class获取Bean.
* Created by dianjiu on 2022-06-23 ,contact dianjiuxyz@gmail.com. 通过class获取Bean.
*/
public static <T> T getBean(Class<T> clazz) {
return getApplicationContext().getBean(clazz);
}
/**
* Created by dianjiu on 2022-06-23 ,contact lidianjiu@njydsz.com. 通过name,以及Clazz返回指定的Bean.
* Created by dianjiu on 2022-06-23 ,contact dianjiuxyz@gmail.com. 通过name,以及Clazz返回指定的Bean.
*/
public static <T> T getBean(String name, Class<T> clazz) {
return getApplicationContext().getBean(name, clazz);

View File

@@ -7,9 +7,9 @@
<description>remi-comm-domain</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,24 +17,24 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<!--remi-comm-core-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
</dependency>
<!--remi-comm-util-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-util</artifactId>
</dependency>
<!--mybatis-plus-->

View File

@@ -7,9 +7,9 @@
<description>remi-comm-email</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,19 +17,19 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<!--common-core-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
</dependency>
<!--springboot-mail整合包-->

View File

@@ -7,9 +7,9 @@
<description>remi-comm-exception</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,19 +17,19 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<!--remi-comm-domain-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-domain</artifactId>
</dependency>
<!--spring-->

View File

@@ -7,9 +7,9 @@
<description>remi-comm-feign</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,24 +17,19 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<!--openfeign-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<!--remi-comm-util-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-util</artifactId>
</dependency>
<!--servlet-api-->
@@ -42,6 +37,11 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<!--openfeign-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<!--slf4j-->
<dependency>
<groupId>org.slf4j</groupId>

View File

@@ -7,9 +7,9 @@
<description>remi-comm-jdbc</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,24 +17,24 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<!--remi-comm-core-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
</dependency>
<!--remi-comm-util-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-util</artifactId>
</dependency>
<!-- mybatis-plus -->
@@ -71,6 +71,35 @@
<groupId>mysql</groupId>
<scope>runtime</scope>
</dependency>
<!-- oracle -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
</dependency>
<dependency>
<groupId>com.oracle.database.nls</groupId>
<artifactId>orai18n</artifactId>
</dependency>
<!-- sqlserver -->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
</dependency>
<!-- db2 -->
<dependency>
<groupId>com.ibm.db2</groupId>
<artifactId>jcc</artifactId>
</dependency>
<!-- postgresql -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<!-- h2 database -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
<!--slf4j-->
<dependency>
<groupId>org.slf4j</groupId>

View File

@@ -7,9 +7,9 @@
<description>remi-comm-job</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,19 +17,19 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<!--remi-comm-core-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
</dependency>
<!-- xxl-job 核心包-->

View File

@@ -8,9 +8,9 @@
<description>remi-comm-log</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -18,12 +18,12 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
@@ -44,22 +44,17 @@
</dependency>
<!--公共依赖-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
</dependency>
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-util</artifactId>
</dependency>
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-redis</artifactId>
</dependency>
<!--项目依赖-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<artifactId>remi-sys-api</artifactId>
</dependency>
<!--lombok-->
<dependency>
<groupId>org.projectlombok</groupId>

View File

@@ -4,6 +4,7 @@ import ai.remi.comm.core.spring.SpringProperties;
import ai.remi.comm.log.annotation.LogRecord;
import ai.remi.comm.log.domain.OperateLog;
import ai.remi.comm.log.enums.BusinessStatus;
import ai.remi.comm.log.enums.OperatorUser;
import ai.remi.comm.log.filter.PropertyPreExcludeFilter;
import ai.remi.comm.log.service.AsyncLogService;
import ai.remi.comm.redis.service.RedisService;
@@ -14,7 +15,6 @@ import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSON;
import ai.remi.comm.log.enums.RedisKeyEnum;
import eu.bitwalker.useragentutils.UserAgent;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
@@ -137,10 +137,10 @@ public class LogRecordAspect {
//从请求头获取操作人
String accessToken = request.getHeader("X-Access-Token");
threadInfo.put("token", accessToken);
threadInfo.put("userId", redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "id"));
threadInfo.put("userCode", redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "userCode"));
threadInfo.put("userName", redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "userName"));
threadInfo.put("userNameEn", redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "userNameEn"));
threadInfo.put("userId", redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "id"));
threadInfo.put("userCode", redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "userCode"));
threadInfo.put("userName", redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "userName"));
threadInfo.put("userNameEn", redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "userNameEn"));
//从请求头获取系统语言
threadInfo.put("language", request.getHeader("X-USER-LANGUAGE"));
//从请求头获取业务流水号
@@ -201,7 +201,7 @@ public class LogRecordAspect {
}
// 保存数据库
//asyncLogService.saveOperateLog(operateLog);
asyncLogService.saveOperateLog(operateLog);
} catch (Exception exp) {
// 记录本地异常日志
log.error("异常信息:{}", exp.getMessage());
@@ -272,13 +272,13 @@ public class LogRecordAspect {
*/
private void setOperateUser(String accessToken, OperateLog operateLog) {
if (StringUtils.isNotBlank(accessToken)) {
String id = String.valueOf(redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "id"));
String id = String.valueOf(redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "id"));
operateLog.setUserId(id);
String userCode = String.valueOf(redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "userCode"));
String userCode = String.valueOf(redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "userCode"));
operateLog.setUserCode(userCode);
String userName = String.valueOf(redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "userName"));
String userName = String.valueOf(redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "userName"));
operateLog.setUserName(userName);
String userNameEn = String.valueOf(redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "userNameEn"));
String userNameEn = String.valueOf(redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "userNameEn"));
operateLog.setUserNameEn(userNameEn);
}
}

View File

@@ -12,16 +12,12 @@ import lombok.Getter;
*/
@Getter
@AllArgsConstructor
public enum RedisKeyEnum {
public enum OperatorUser {
/**
* 客户登录token,24小时失效 1:{} = customerId 2:{} = token 使用方式 RedisKeysEnum.CUSTOMER_LOGIN_TOKEN.getKey(customerId,token)
*/
APP_CODE("sdt-saas-iam:app-code:{}:{}"),
USER_INFO("sdt-saas-iam:user-info:{}"),
TICKET("sdt-saas-iam:ticket:{}"),
AUTH_CODE("sdt-saas-iam:auth-code:{}"),
ACCESS_TOKEN("sdt-saas-iam:access-token:{}"),
REFRESH_TOKEN("sdt-saas-iam:refresh-token:{}");
APP_CODE("remi-saas-iam:app-code:{}:{}"),
USER_INFO("remi-saas-iam:user-info:{}");
/**

View File

@@ -1,7 +1,14 @@
package ai.remi.comm.log.service;
import ai.remi.comm.log.domain.OperateLog;
import ai.remi.comm.util.auth.CompanyAuthInfo;
import ai.remi.comm.util.auth.RequestHolder;
import ai.remi.comm.util.bean.BeanCopyUtils;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* 异步调用日志服务
*/
@@ -12,18 +19,18 @@ public class AsyncLogService {
* 通过OpenFeign客户端注入
*/
//@Resource
//private SysClientApi sysClientApi;
//private IamClientApi iamClientApi;
/**
* 保存系统日志记录
*/
//@Async
//public void saveOperateLog(OperateLog operateLog) {
//CompanyAuthInfo companyAuthInfo = new CompanyAuthInfo();
//companyAuthInfo.setDeptTenantId(operateLog.getDeptTenantId());
//companyAuthInfo.setCompanyTenantId(operateLog.getCompanyTenantId());
//RequestHolder.add(companyAuthInfo);
@Async
public void saveOperateLog(OperateLog operateLog) {
CompanyAuthInfo companyAuthInfo = new CompanyAuthInfo();
companyAuthInfo.setDeptTenantId(operateLog.getDeptTenantId());
companyAuthInfo.setCompanyTenantId(operateLog.getCompanyTenantId());
RequestHolder.add(companyAuthInfo);
//LogRecordPostDTO logRecordPostDTO = BeanCopyUtils.copyPropertiesThird(operateLog, LogRecordPostDTO.class);
//sysClientApi.addLogRecord(logRecordPostDTO);
//}
//iamClientApi.addLogRecord(logRecordPostDTO);
}
}

View File

@@ -7,9 +7,9 @@
<description>remi-comm-minio</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,12 +17,12 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
@@ -34,7 +34,7 @@
</dependency>
<!--remi-comm-core-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
</dependency>
<!--minio-->

View File

@@ -7,9 +7,9 @@
<description>remi-comm-redis</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,19 +17,19 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<!--common-core-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
</dependency>
<!--redis-->

View File

@@ -8,9 +8,9 @@
<description>remi-comm-safe</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -18,31 +18,31 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<!--公共依赖-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
</dependency>
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-redis</artifactId>
</dependency>
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-util</artifactId>
</dependency>
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-exception</artifactId>
</dependency>
<!--spring-->

View File

@@ -7,9 +7,9 @@
<description>remi-comm-swagger</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,19 +17,19 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<!--common-core-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
</dependency>
<!--spring-boot-->

View File

@@ -7,9 +7,9 @@
<description>remi-comm-thread</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,12 +17,12 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
@@ -32,6 +32,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!--<dependency>
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
</dependency>-->
<!--nacos-->
<!--<dependency>-->
<!-- <groupId>com.alibaba.cloud</groupId>-->

View File

@@ -12,7 +12,7 @@ import java.util.concurrent.ThreadPoolExecutor;
/**
* @author DianJiu 【公众号 点九开源】
* @email lidianjiu@njydsz.com
* @email dianjiuxyz@gmail.com
* @date 2022-07-14
* @desc
*/

View File

@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
/**
* @author DianJiu 【公众号 点九开源】
* @email lidianjiu@njydsz.com
* @email dianjiuxyz@gmail.com
* @date 2022-07-20
* @desc
*/

View File

@@ -18,7 +18,7 @@ import java.util.concurrent.ThreadPoolExecutor;
/**
* @author DianJiu 【公众号 点九开源】
* @author DianJiu 【公众号 点九开源】
* @email lidianjiu@njydsz.com
* @email dianjiuxyz@gmail.com
* @date 2022-07-20
* @desc 重写默认线程池配置
* 基于ThreadPoolTaskExecutor线程池配置
@@ -230,7 +230,6 @@ public class OverrideDefaultThreadPool implements AsyncConfigurer {
return executor;
}
/**
* 使用方式:在某个service方法上使用该注解
*

View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
-->
<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
<id>remi-comm-thread</id>
<classpath>
<dir name="D:/Codes/startdis/startdis-comm/remi-comm-thread/target/classes">
</dir>
</classpath>
</application>

View File

@@ -7,9 +7,9 @@
<description>remi-comm-util</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,19 +17,19 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<!--common-core-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
</dependency>
<!-- Jaxb -->
@@ -110,8 +110,8 @@
</dependency>
<!-- commons -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
</dependency>
<dependency>
<artifactId>commons-io</artifactId>
@@ -133,10 +133,6 @@
<artifactId>commons-collections</artifactId>
<groupId>commons-collections</groupId>
</dependency>
<dependency>
<artifactId>commons-fileupload</artifactId>
<groupId>commons-fileupload</groupId>
</dependency>
<!--slf4j-->
<dependency>
<groupId>org.slf4j</groupId>

View File

@@ -1,5 +1,7 @@
package ai.remi.comm.util.array;
import com.google.common.primitives.Ints;
import java.util.Arrays;
public class SortUtils {
@@ -109,7 +111,7 @@ public class SortUtils {
int[] left = Arrays.stream(arr).boxed().filter(e -> e < pivot).mapToInt(e -> e).toArray();
int[] middle = Arrays.stream(arr).boxed().filter(e -> e == pivot).mapToInt(e -> e).toArray();
int[] right = Arrays.stream(arr).boxed().filter(e -> e > pivot).mapToInt(e -> e).toArray();
return concat(quickSort2(left), middle, quickSort2(right));
return Ints.concat(quickSort2(left), middle, quickSort2(right));
}
/**
@@ -143,15 +145,4 @@ public class SortUtils {
arr[i] = arr[j];
arr[j] = temp;
}
public static int[] concat(int[] left, int[] middle, int[] right) {
int totalLength = left.length + middle.length + right.length;
int[] result = new int[totalLength];
System.arraycopy(left, 0, result, 0, left.length);
System.arraycopy(middle, 0, result, left.length, middle.length);
System.arraycopy(right, 0, result, left.length + middle.length, right.length);
return result;
}
}

View File

@@ -0,0 +1,51 @@
package ai.remi.comm.util.bytes;
/**
* 字节转换
*
* @author dianjiu
* @date 2020-09-19 23:21
*/
public class ConvertBytesUtils {
private static final long KB = 1024;
private static final long MB = KB * 1024;
private static final long GB = MB * 1024;
/**
* 字节转换
*
* @param size 字节大小
* @return 转换后值
*/
public static String convertFileSizeToString(long size) {
float fileSize = convertFileSize(size);
if (size >= GB) {
return String.format("%.1f GB" , fileSize);
} else if (size >= MB) {
return String.format(fileSize > 100 ? "%.0f MB" : "%.1f MB" , fileSize);
} else if (size >= KB) {
float f = (float) size / KB;
return String.format(fileSize > 100 ? "%.0f KB" : "%.1f KB" , fileSize);
} else {
return String.format("%d B" , size);
}
}
/**
* 字节转换
*
* @param size 字节大小
* @return 转换后值
*/
public static float convertFileSize(long size) {
if (size >= GB) {
return (float) size / GB;
} else if (size >= MB) {
return (float) size / MB;
} else if (size >= KB) {
return (float) size / KB;
} else {
return size;
}
}
}

View File

@@ -15,12 +15,4 @@ public class CronUtils {
public static boolean isValid(String cronExpression) {
return CronExpression.isValidExpression(cronExpression);
}
public static void main(String[] args) {
String validCron = "0 0 12 * * ?";
String invalidCron = "invalid";
System.out.println("Valid Cron: " + isValid(validCron)); // 输出 true
System.out.println("Invalid Cron: " + isValid(invalidCron)); // 输出 false
}
}

View File

@@ -2,7 +2,7 @@ package ai.remi.comm.util.security;
/**
* @author DianJiu 【公众号 点九开源】
* @email lidianjiu@njydsz.com
* @email dianjiuxyz@gmail.com
* @date 2022-07-26
* @desc 公钥加密,私钥解密;私钥加签,公钥验签。
*/

View File

@@ -7,9 +7,9 @@
<description>remi-comm-web</description>
<parent>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm</artifactId>
<version>3.1.1</version>
<version>3.1.0</version>
</parent>
<!-- 打包上传到私服, 需要和配置文件中的server节点配合使用 -->
@@ -17,39 +17,39 @@
<repository>
<id>maven-releases</id>
<name>release</name>
<url>https://repository.njydsz.com/repository/maven-releases/</url>
<url>https://remi.njydsz.com/repository/remi-top-releases/</url>
</repository>
<snapshotRepository>
<id>maven-snapshots</id>
<name>snapshot</name>
<url>https://repository.njydsz.com/repository/maven-snapshots/</url>
<url>https://remi.njydsz.com/repository/remi-top-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<!-- common-core -->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-core</artifactId>
</dependency>
<!--common-jdbc-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-jdbc</artifactId>
</dependency>
<!-- common-util -->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-util</artifactId>
</dependency>
<!--remi-comm-exception-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-exception</artifactId>
</dependency>
<!--common-swagger-->
<dependency>
<groupId>ai.remi.top.cloud</groupId>
<groupId>ai.remi.top.comm</groupId>
<artifactId>remi-comm-swagger</artifactId>
</dependency>
<!--spring-web-->