10 Commits

Author SHA1 Message Date
f8beb03362 Merge pull request 'v0.0.10' (#10) from dev into master
Reviewed-on: #10
2026-04-09 03:59:07 +00:00
f5528fbfad Merge pull request 'v0.0.9' (#9) from dev into master
Reviewed-on: #9
2026-04-08 12:34:13 +00:00
90c97f211b Merge pull request 'v0.0.8' (#8) from dev into master
Reviewed-on: #8
2026-04-01 11:18:22 +00:00
42dee2e4ad Merge pull request 'v0.0.7' (#7) from dev into master
Reviewed-on: #7
2026-03-27 15:10:56 +00:00
66eb6108cd Merge pull request 'v0.0.6' (#6) from dev into master
Reviewed-on: #6
2026-03-21 10:16:59 +00:00
82f950e71d Merge pull request 'v0.0.5' (#5) from dev into master
Reviewed-on: #5
2026-03-17 03:24:06 +00:00
cceabb0c8d Merge pull request 'v0.0.5' (#4) from dev into master
Reviewed-on: #4
2026-03-17 03:07:34 +00:00
62de8e4885 Merge pull request 'v0.0.4' (#3) from dev into master
Reviewed-on: #3
2026-03-16 09:18:09 +00:00
9f7460e959 Merge pull request 'v0.0.3' (#2) from dev into master
Reviewed-on: #2
2026-02-10 10:56:12 +00:00
90d4c5e5f6 Merge pull request 'v0.0.2' (#1) from dev into master
Reviewed-on: #1
2026-01-19 09:53:14 +00:00
7 changed files with 7 additions and 68 deletions

12
pom.xml
View File

@@ -7,19 +7,19 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.13</version>
<version>3.5.11</version>
<relativePath/>
</parent>
<groupId>com.imyeyu.spring</groupId>
<artifactId>timi-spring</artifactId>
<version>0.0.15</version>
<version>0.0.10</version>
<packaging>jar</packaging>
<properties>
<java.version>21</java.version>
<maven.test.skip>true</maven.test.skip>
<springboot.version>3.5.13</springboot.version>
<springboot.version>3.5.11</springboot.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -131,17 +131,17 @@
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>3.0.5</version>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.13.1</version>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>com.imyeyu.io</groupId>
<artifactId>timi-io</artifactId>
<version>0.0.5</version>
<version>0.0.3</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>

View File

@@ -346,16 +346,7 @@ public class TimiSpring {
* @return 令牌
*/
public static String getToken() {
return TimiJava.firstNotEmpty(getHeader("Token"), getHeader("token"), getRequestArg("Token"), getRequestArg("token"));
}
/**
* 获取请求密钥,键为 Key 或 key包括请求头和 URI
*
* @return 密钥
*/
public static String getKey() {
return TimiJava.firstNotEmpty(getHeader("Key"), getHeader("key"), getRequestArg("Key"), getRequestArg("key"));
return TimiJava.firstNotEmpty(getHeader("Token"), getHeader("token"), getRequestArg("token"), getRequestArg("Token"));
}
/**

View File

@@ -1,8 +1,6 @@
package com.imyeyu.spring.entity;
import com.fasterxml.jackson.annotation.JsonView;
import com.imyeyu.spring.annotation.table.DeleteColumn;
import com.imyeyu.spring.util.ResponseView;
import com.imyeyu.utils.Time;
import lombok.Data;
@@ -18,19 +16,15 @@ import java.io.Serializable;
public class BaseEntity implements Serializable, Creatable, Updatable, Deletable {
/** 创建时间 */
@JsonView(ResponseView.Public.class)
protected Long createdAt;
/** 更新时间 */
@JsonView(ResponseView.Public.class)
protected Long updatedAt;
/** 删除时间 */
@DeleteColumn
@JsonView(ResponseView.Admin.class)
protected Long deletedAt;
@JsonView(ResponseView.Admin.class)
@Override
public boolean isDeleted() {
return deletedAt != null && deletedAt < Time.now();

View File

@@ -1,8 +1,6 @@
package com.imyeyu.spring.entity;
import com.fasterxml.jackson.annotation.JsonView;
import com.imyeyu.spring.annotation.table.Id;
import com.imyeyu.spring.util.ResponseView;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,6 +16,5 @@ public class Entity extends BaseEntity implements IDEntity<Long> {
/** ID */
@Id
@JsonView(ResponseView.Public.class)
protected Long id;
}

View File

@@ -1,11 +1,9 @@
package com.imyeyu.spring.entity;
import com.fasterxml.jackson.annotation.JsonView;
import com.imyeyu.java.bean.Language;
import com.imyeyu.java.ref.Ref;
import com.imyeyu.spring.annotation.table.AutoUUID;
import com.imyeyu.spring.annotation.table.Id;
import com.imyeyu.spring.util.ResponseView;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -22,23 +20,15 @@ public class Multilingual extends Language implements IDEntity<String>, Creatabl
/** 唯一标识 */
@Id
@AutoUUID
@JsonView(ResponseView.Public.class)
protected String id;
/** 业务类型 */
@JsonView(ResponseView.Public.class)
protected String bizType;
/** 创建时间 */
@JsonView(ResponseView.Admin.class)
protected Long createdAt;
/** 更新时间 */
@JsonView(ResponseView.Admin.class)
protected Long updatedAt;
/** 删除时间 */
@JsonView(ResponseView.Admin.class)
protected Long deletedAt;
/**

View File

@@ -1,9 +1,7 @@
package com.imyeyu.spring.entity;
import com.fasterxml.jackson.annotation.JsonView;
import com.imyeyu.spring.annotation.table.AutoUUID;
import com.imyeyu.spring.annotation.table.Id;
import com.imyeyu.spring.util.ResponseView;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,6 +18,5 @@ public class UUIDEntity extends BaseEntity implements IDEntity<String> {
/** ID */
@Id
@AutoUUID
@JsonView(ResponseView.Public.class)
protected String id;
}

View File

@@ -1,30 +0,0 @@
package com.imyeyu.spring.util;
/**
*
*
* @author 夜雨
* @since 2026-02-25 15:46
*/
public interface ResponseView {
/**
*
*
* @author 夜雨
* @since 2026-02-25 15:46
*/
interface Public {
}
/**
*
*
* @author 夜雨
* @since 2026-02-25 15:46
*/
interface Admin extends Public {
}
}