8 Commits

Author SHA1 Message Date
42dee2e4ad Merge pull request 'v0.0.7' (#7) from dev into master
Reviewed-on: #7
2026-03-27 15:10:56 +00:00
Timi
d77cf10b1b v0.0.7
All checks were successful
CI/CD / build-deploy (pull_request) Successful in 1m40s
2026-03-27 23:10:20 +08:00
66eb6108cd Merge pull request 'v0.0.6' (#6) from dev into master
Reviewed-on: #6
2026-03-21 10:16:59 +00:00
Timi
3a343724a8 v0.0.6
All checks were successful
CI/CD / build-deploy (pull_request) Successful in 1m55s
2026-03-21 18:16:20 +08:00
82f950e71d Merge pull request 'v0.0.5' (#5) from dev into master
Reviewed-on: #5
2026-03-17 03:24:06 +00:00
Timi
83b1265c0a v0.0.5
All checks were successful
CI/CD / build-deploy (pull_request) Successful in 1m24s
2026-03-17 11:23:45 +08:00
cceabb0c8d Merge pull request 'v0.0.5' (#4) from dev into master
Reviewed-on: #4
2026-03-17 03:07:34 +00:00
Timi
b16656af12 v0.0.5
Some checks failed
CI/CD / build-deploy (pull_request) Failing after 5m26s
2026-03-17 11:06:53 +08:00
3 changed files with 10 additions and 27 deletions

24
pom.xml
View File

@@ -7,22 +7,22 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.0</version> <version>3.5.11</version>
<relativePath/> <relativePath/>
</parent> </parent>
<groupId>com.imyeyu.spring</groupId> <groupId>com.imyeyu.spring</groupId>
<artifactId>timi-spring</artifactId> <artifactId>timi-spring</artifactId>
<version>0.0.4</version> <version>0.0.7</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<java.version>21</java.version> <java.version>21</java.version>
<springboot.version>3.4.0</springboot.version> <maven.test.skip>true</maven.test.skip>
<springboot.version>3.5.11</springboot.version>
<maven.compiler.source>21</maven.compiler.source> <maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target> <maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.test.skip>true</maven.test.skip>
</properties> </properties>
<build> <build>
@@ -102,20 +102,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<version>${springboot.version}</version> <version>${springboot.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-parameter-names</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -155,7 +141,7 @@
<dependency> <dependency>
<groupId>com.imyeyu.io</groupId> <groupId>com.imyeyu.io</groupId>
<artifactId>timi-io</artifactId> <artifactId>timi-io</artifactId>
<version>0.0.2</version> <version>0.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>

View File

@@ -2,6 +2,7 @@ package com.imyeyu.spring.config;
import com.imyeyu.spring.bean.RedisConfigParams; import com.imyeyu.spring.bean.RedisConfigParams;
import com.imyeyu.spring.util.Redis; import com.imyeyu.spring.util.Redis;
import io.lettuce.core.api.StatefulConnection;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.springframework.cache.annotation.CachingConfigurer; import org.springframework.cache.annotation.CachingConfigurer;
import org.springframework.cache.interceptor.KeyGenerator; import org.springframework.cache.interceptor.KeyGenerator;
@@ -39,7 +40,7 @@ public abstract class AbstractRedisConfig implements CachingConfigurer {
* 连接池配置 * 连接池配置
* <p>参考: * <p>参考:
* <pre> * <pre>
* GenericObjectPoolConfig&lt;?&gt; config = new GenericObjectPoolConfig&lt;&gt;(); * GenericObjectPoolConfig&lt;StatefulConnection&lt;?, ?&gt;&gt; config = new GenericObjectPoolConfig&lt;&gt;();
* config.setMaxTotal(config.getMaxActive()); * config.setMaxTotal(config.getMaxActive());
* config.setMinIdle(config.getMinIdle()); * config.setMinIdle(config.getMinIdle());
* config.setMaxIdle(config.getMaxIdle()); * config.setMaxIdle(config.getMaxIdle());
@@ -48,7 +49,7 @@ public abstract class AbstractRedisConfig implements CachingConfigurer {
* *
* @return GenericObjectPoolConfig * @return GenericObjectPoolConfig
*/ */
public abstract GenericObjectPoolConfig<?> getPoolConfig(); public abstract GenericObjectPoolConfig<StatefulConnection<?, ?>> getPoolConfig();
/** /**
* Redis key 生成策略 * Redis key 生成策略

View File

@@ -1,13 +1,9 @@
package com.imyeyu.spring.bean; package com.imyeyu.spring.entity;
import com.imyeyu.java.bean.Language; import com.imyeyu.java.bean.Language;
import com.imyeyu.java.ref.Ref; import com.imyeyu.java.ref.Ref;
import com.imyeyu.spring.annotation.table.AutoUUID; import com.imyeyu.spring.annotation.table.AutoUUID;
import com.imyeyu.spring.annotation.table.Id; import com.imyeyu.spring.annotation.table.Id;
import com.imyeyu.spring.entity.Creatable;
import com.imyeyu.spring.entity.Deletable;
import com.imyeyu.spring.entity.IDEntity;
import com.imyeyu.spring.entity.Updatable;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -19,7 +15,7 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class Multilingual extends Language implements IDEntity<String>, Creatable, Updatable, Deletable { public class Multilingual extends Language implements IDEntity<String>, Creatable, Updatable, Deletable, Destroyable {
/** 唯一标识 */ /** 唯一标识 */
@Id @Id