Compare commits

..

7 Commits

Author SHA1 Message Date
1afc59dd12 add CI workflow
All checks were successful
CI/CD / build-deploy (pull_request) Successful in 1m1s
2026-01-19 17:39:03 +08:00
97e07db838 add ipv4,ipv5,domain regex 2026-01-13 17:40:50 +08:00
b070950ed6 add camelCaseClassName 2026-01-13 17:24:20 +08:00
e3e9f81f33 add TestAES 2026-01-04 15:26:54 +08:00
3153afad5a move Text hex to Encoder/Decoder 2026-01-04 15:26:45 +08:00
42f0212a40 fix static method 2025-12-26 15:52:00 +08:00
7378078299 update StringInterpolator 2025-11-06 14:08:30 +08:00
11 changed files with 325 additions and 154 deletions

111
.gitea/workflows/ci.yml Normal file
View File

@ -0,0 +1,111 @@
name: CI/CD
on:
pull_request:
branches:
- master
types:
- closed
jobs:
build-deploy:
runs-on: act_runner_java
if: ${{ github.event.pull_request.merged == true }}
env:
JAVA_HOME: /usr/lib/jvm/java-21-openjdk
steps:
- name: Checkout code
run: |
git clone ${{ github.server_url }}/${{ github.repository }}.git .
git checkout ${{ github.sha }}
- name: Set up environment
run: |
echo "PR #${{ github.event.number }} merged into master"
echo "Source branch: ${{ github.event.pull_request.head.ref }}"
echo "Target branch: ${{ github.event.pull_request.base.ref }}"
- name: Run tests
run: |
echo "Running test suite..."
- name: Build project
run: |
mvn -B -DskipTests clean package source:jar javadoc:jar
- name: Deploy to Nexus
if: success()
run: |
if [ -z "${{ secrets.NEXUS_USERNAME }}" ] || [ -z "${{ secrets.NEXUS_PASSWORD }}" ]; then
echo "Missing secrets.NEXUS_USERNAME or secrets.NEXUS_PASSWORD"
exit 1
fi
mkdir -p ~/.m2
cat > ~/.m2/settings.xml <<EOF
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>timi-nexus</id>
<username>${{ secrets.NEXUS_USERNAME }}</username>
<password>${{ secrets.NEXUS_PASSWORD }}</password>
</server>
</servers>
</settings>
EOF
version=$(mvn -q -DforceStdout help:evaluate -Dexpression=project.version)
artifact_id=$(mvn -q -DforceStdout help:evaluate -Dexpression=project.artifactId)
main_jar="target/${artifact_id}-${version}.jar"
sources_jar="target/${artifact_id}-${version}-sources.jar"
javadoc_jar="target/${artifact_id}-${version}-javadoc.jar"
if [ ! -f "$main_jar" ] || [ ! -f "$sources_jar" ] || [ ! -f "$javadoc_jar" ]; then
echo "Missing build artifacts in target"
exit 1
fi
mvn -B deploy:deploy-file \
-Dfile="$main_jar" \
-Dsources="$sources_jar" \
-Djavadoc="$javadoc_jar" \
-DpomFile="./pom.xml" \
-Durl="https://nexus.imyeyu.com/repository/maven-releases/" \
-DrepositoryId="timi-nexus" \
-Dhttps.protocols=TLSv1.2 \
-Djdk.tls.client.protocols=TLSv1.2
- name: Create release
if: ${{ success() && startsWith(github.event.pull_request.title, 'v') }}
env:
GITEA_TOKEN: ${{ secrets.RUNNER_TOKEN }}
GITEA_SERVER_URL: ${{ github.server_url }}
GITEA_REPOSITORY: ${{ github.repository }}
RELEASE_TAG: ${{ github.event.pull_request.title }}
RELEASE_TARGET: ${{ github.sha }}
run: |
if [ -z "$GITEA_TOKEN" ]; then
echo "Missing secrets.RUNNER_TOKEN"
exit 1
fi
api_url="$GITEA_SERVER_URL/api/v1/repos/$GITEA_REPOSITORY/releases"
payload=$(cat <<EOF
{
"tag_name": "$RELEASE_TAG",
"name": "$RELEASE_TAG",
"target_commitish": "$RELEASE_TARGET",
"draft": false,
"prerelease": false
}
EOF
)
response=$(curl -sS -X POST "$api_url" \
-H "Authorization: token $GITEA_TOKEN" \
-H "Content-Type: application/json" \
-d "$payload")
release_id=$(echo "$response" | grep -o '"id":[0-9]*' | head -n 1 | grep -o '[0-9]*')
if [ -z "$release_id" ] || echo "$response" | grep -q '"message"'; then
echo "Create release failed: $response"
exit 1
fi
echo "Release created: id=$release_id"
for asset_path in target/*.jar; do
asset_name=$(basename "$asset_path")
curl -sS -X POST "$api_url/$release_id/assets?name=$asset_name" \
-H "Authorization: token $GITEA_TOKEN" \
-H "Content-Type: application/octet-stream" \
--data-binary @"$asset_path"
done

21
pom.xml
View File

@ -26,29 +26,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.11.2</version>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
@ -77,12 +59,13 @@
<dependency>
<groupId>com.imyeyu.java</groupId>
<artifactId>timi-java</artifactId>
<version>0.0.1</version>
<version>0.0.2</version>
</dependency>
<dependency>
<groupId>de.mkammerer</groupId>
<artifactId>argon2-jvm</artifactId>
<version>2.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>

View File

@ -4,6 +4,7 @@ import com.imyeyu.java.bean.timi.TimiCode;
import com.imyeyu.java.bean.timi.TimiException;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
@ -102,4 +103,42 @@ public class Decoder {
}
return URLDecoder.decode(url, StandardCharsets.UTF_8);
}
/**
* 16 进制字符串转字节数据
*
* @param hex 16 进制字符串
* @return 字节数据
* @throws UnsupportedEncodingException 不支持的编码
*/
public static byte[] hex(String hex) throws UnsupportedEncodingException {
final char[] c = hex.toCharArray();
final byte[] b = new byte[c.length >> 1];
final int len = c.length;
if ((len & 0x01) != 0) {
throw new UnsupportedEncodingException("Odd number of characters.");
}
final int outLen = len >> 1;
if (c.length < outLen) {
throw new UnsupportedEncodingException("Output array is not large enough to accommodate decoded data.");
}
for (int i = 0, j = 0; j < len; i++) {
int f = toDigit(c[j], j) << 4;
j++;
f = f | toDigit(c[j], j);
j++;
b[i] = (byte) (f & 0xFF);
}
return b;
}
private static int toDigit(final char ch, final int index) throws UnsupportedEncodingException {
final int digit = Character.digit(ch, 16);
if (digit == -1) {
throw new UnsupportedEncodingException("Illegal hexadecimal character " + ch + " at index " + index);
}
return digit;
}
}

View File

@ -22,7 +22,7 @@ public class Decryptor {
* @param key 密钥
* @return 解密结果
*/
public byte[] aes(String data, byte[] key) {
public static byte[] aes(String data, byte[] key) {
return aes(data.getBytes(), key);
}
@ -33,7 +33,7 @@ public class Decryptor {
* @param key 密钥
* @return 解密结果
*/
public byte[] aes(byte[] data, byte[] key) {
public static byte[] aes(byte[] data, byte[] key) {
try {
SecretKey secretKey = new SecretKeySpec(key, "AES");
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");

View File

@ -54,7 +54,7 @@ public class Digest {
try {
MessageDigest sha = MessageDigest.getInstance("SHA");
sha.update(bytes);
return Text.byteToHex(sha.digest());
return Encoder.hex(sha.digest());
} catch (NoSuchAlgorithmException e) {
throw new UnsupportedOperationException("unsupported sha1 digest");
}
@ -72,7 +72,7 @@ public class Digest {
try {
MessageDigest sha = MessageDigest.getInstance("SHA-256");
sha.update(bytes);
return Text.byteToHex(sha.digest());
return Encoder.hex(sha.digest());
} catch (NoSuchAlgorithmException e) {
throw new UnsupportedOperationException("unsupported sha256 digest");
}

View File

@ -159,4 +159,20 @@ public class Encoder {
throw new TimiException(TimiCode.ERROR, e.getMessage());
}
}
/**
* 字节数据转 16 进制字符串
*
* @param bytes 字节数据
* @return 16 进制字符串
*/
public static String hex(byte[] bytes) {
final int l = bytes.length;
final char[] c = new char[l << 1];
for (int i = 0, j = 0; i < l; i++) {
c[j++] = Text.HEX_DIGITS_LOWER[(0xF0 & bytes[i]) >>> 4];
c[j++] = Text.HEX_DIGITS_LOWER[0x0F & bytes[i]];
}
return new String(c);
}
}

View File

@ -16,11 +16,11 @@ import java.security.NoSuchAlgorithmException;
*/
public class Encryptor {
public byte[] aesKey() {
public static byte[] aesKey() {
return aesKey(256);
}
public byte[] aesKey(int size) {
public static byte[] aesKey(int size) {
try {
KeyGenerator keyGen = KeyGenerator.getInstance("AES");
keyGen.init(size);
@ -37,7 +37,7 @@ public class Encryptor {
* @param key 密钥
* @return 加密结果
*/
public byte[] aes(String data, byte[] key) {
public static byte[] aes(String data, byte[] key) {
return aes(data.getBytes(), key);
}
@ -48,7 +48,7 @@ public class Encryptor {
* @param key 密钥
* @return 加密结果
*/
public byte[] aes(byte[] data, byte[] key) {
public static byte[] aes(byte[] data, byte[] key) {
try {
SecretKey secretKey = new SecretKeySpec(key, "AES");
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");

View File

@ -76,6 +76,15 @@ public class Regex {
/** 护照 */
public static final String PASSPORT = "^[a-zA-Z0-9]{5,17}$";
// IPv4 正则表达式
public static final String IPv4 = "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$";
// IPv6 正则表达式(简化版)
public static final String IPv6 = "^([0-9a-fA-F]{0,4}:){7}[0-9a-fA-F]{0,4}$|^::1$|^::$|^([0-9a-fA-F]{0,4}:){1,7}:$";
// 域名正则表达式RFC 1123
public static final String DOMAIN = "^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)*[a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?$";
public static boolean isMatch(String regex, String text) {
if (TimiJava.isEmpty(regex) || TimiJava.isEmpty(text)) {
return false;

View File

@ -6,6 +6,8 @@ import com.imyeyu.java.ref.Ref;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
@ -16,26 +18,21 @@ import java.util.regex.Pattern;
*/
public class StringInterpolator {
/** ${} 插值正则 */
public static final String DOLLAR_OBJ = "\\$\\{(.+?)\\}";
/** {} 插值正则 */
public static final String SIMPLE_OBJ = "\\{(.+?)\\}";
/** 缓存解析过的嵌套属性路径 */
private final Map<String, String[]> deepKeyCache = new ConcurrentHashMap<>();
/** 正则匹配器 */
private final Pattern pattern;
/** 为 true 时允许安全插值空,变量可以插值 null 而不抛出异常 */
/** 过滤器映射 */
private final Map<String, CallbackArgReturn<String, String>> filterMap = new HashMap<>();
/** 空值处理策略 */
private boolean nullable = false;
/** 过滤器 */
private Map<String, CallbackArgReturn<String, String>> filterMap;
/**
* 默认构造
*
* @param regex 插槽正则
*/
public StringInterpolator(String regex) {
this.pattern = Pattern.compile(regex);
}
@ -43,79 +40,114 @@ public class StringInterpolator {
/**
* 注入变量
*
* @param string 字符串
* @param argsMap 变量表
* @param template 字符串
* @param argsMap 变量表
* @return 插值结果
*/
public String inject(String string, Map<String, Object> argsMap) {
return pattern.matcher(string).replaceAll(result -> {
String group = result.group(1);
String key = group.trim();
String[] filters = null;
if (group.contains("|")) {
// 过滤器
String[] groups = group.split("\\|");
key = groups[0].trim();
filters = new String[groups.length - 1];
System.arraycopy(groups, 1, filters, 0, filters.length);
public String inject(String template, Map<String, Object> argsMap) {
if (TimiJava.isEmpty(template) || TimiJava.isEmpty(argsMap)) {
return template;
}
Matcher matcher = pattern.matcher(template);
StringBuilder result = new StringBuilder();
while (matcher.find()) {
String replacement = processReplacement(matcher.group(1), argsMap);
matcher.appendReplacement(result, Matcher.quoteReplacement(replacement));
}
matcher.appendTail(result);
return result.toString();
}
/** 处理单个替换项 */
private String processReplacement(String expression, Map<String, Object> argsMap) {
// 解析表达式:变量名和过滤器
ExpressionParts parts = parseExpression(expression);
// 获取变量值
Object value = getVariableValue(parts.variable, argsMap);
// 应用过滤器
value = applyFilters(value, parts.filters);
// 处理空值
return handleNullValue(value, parts.variable);
}
/** 解析表达式为变量名和过滤器数组 */
private ExpressionParts parseExpression(String expression) {
if (!expression.contains("|")) {
return new ExpressionParts(expression.trim(), new String[0]);
}
String[] parts = expression.split("\\|");
String variable = parts[0].trim();
String[] filters = new String[parts.length - 1];
for (int i = 1; i < parts.length; i++) {
filters[i - 1] = parts[i].trim();
}
return new ExpressionParts(variable, filters);
}
/** 获取变量值,支持嵌套属性 */
private Object getVariableValue(String variable, Map<String, Object> argsMap) {
Object value = argsMap.get(variable);
if (variable.contains(".")) {
value = getNestedPropertyValue(variable, argsMap);
}
return value;
}
/** 获取嵌套属性值 */
private Object getNestedPropertyValue(String deepKey, Map<String, Object> argsMap) {
String[] keyPath = deepKeyCache.computeIfAbsent(deepKey, k -> k.split("\\."));
try {
Object value = argsMap.get(keyPath[0]);
for (int i = 1; i < keyPath.length && value != null; i++) {
value = Ref.getFieldValue(value, keyPath[i], Object.class);
}
Object value = argsMap.get(key);
if (key.contains(".")) {
// 反射获取
try {
String[] deepKey = key.split("\\.");
value = argsMap.get(deepKey[0]);
for (int i = 1; i < deepKey.length; i++) {
value = Ref.getFieldValue(value, deepKey[i], Object.class);
}
} catch (IllegalAccessException e) {
throw new RuntimeException("ref field file: " + e.getMessage(), e);
}
return value;
} catch (IllegalAccessException e) {
throw new RuntimeException("ref field error: " + e.getMessage(), e);
}
}
/** 应用过滤器链 */
private Object applyFilters(Object value, String[] filters) {
if (TimiJava.isEmpty(filters) || TimiJava.isEmpty(filterMap) || value == null) {
return value;
}
String currentValue = String.valueOf(value);
for (String filterName : filters) {
CallbackArgReturn<String, String> filter = filterMap.get(filterName);
if (filter == null) {
throw new IllegalArgumentException("not found %s filter for".formatted(filterName));
}
if (TimiJava.isNotEmpty(filterMap) && TimiJava.isNotEmpty(filters)) {
// 过滤
for (int i = 0; i < filters.length; i++) {
CallbackArgReturn<String, String> filter = filterMap.get(filters[i].trim());
if (filter == null) {
throw new NullPointerException("not found %s filter for %s".formatted(filters[i], key));
}
value = filter.handler((String) value);
}
currentValue = filter.handler(currentValue);
}
return currentValue;
}
/** 处理空值情况 */
private String handleNullValue(Object value, String variable) {
if (value == null) {
if (!nullable) {
throw new NullPointerException("not found %s value".formatted(variable));
}
if (value == null) {
if (!nullable) {
throw new NullPointerException("null pointer exception for arg: " + key);
}
value = "";
}
return String.valueOf(value);
});
return "";
}
return String.valueOf(value);
}
public void putFilter(String name, CallbackArgReturn<String, String> callback) {
if (filterMap == null) {
filterMap = new HashMap<>();
}
filterMap.put(name, callback);
}
public void putAllFilter(Map<String, CallbackArgReturn<String, String>> filterMap) {
if (this.filterMap == null) {
this.filterMap = new HashMap<>();
}
this.filterMap.putAll(filterMap);
public void putAllFilter(Map<String, CallbackArgReturn<String, String>> filters) {
filterMap.putAll(filters);
}
public void removeFilter(String name) {
if (TimiJava.isNotEmpty(filterMap)) {
filterMap.remove(name);
}
filterMap.remove(name);
}
public void clearFilter() {
if (TimiJava.isNotEmpty(filterMap)) {
filterMap.clear();
}
filterMap.clear();
}
public void setNullable(boolean nullable) {
@ -125,4 +157,16 @@ public class StringInterpolator {
public boolean isNullable() {
return nullable;
}
/** 表达式部分内部类 */
private record ExpressionParts(String variable, String[] filters) {
}
public static StringInterpolator createDollarInterpolator() {
return new StringInterpolator(DOLLAR_OBJ);
}
public static StringInterpolator createSimpleInterpolator() {
return new StringInterpolator(SIMPLE_OBJ);
}
}

View File

@ -2,14 +2,12 @@ package com.imyeyu.utils;
import com.imyeyu.java.TimiJava;
import java.io.UnsupportedEncodingException;
import java.security.SecureRandom;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.UUID;
import java.util.regex.Pattern;
/**
* @author 夜雨
@ -20,63 +18,6 @@ public class Text {
/** 十六进制小写 */
public static char[] HEX_DIGITS_LOWER = "0123456789abcdef".toCharArray();
/** 十六进制大写 */
public static char[] HEX_DIGITS_UPPER = "0123456789ABCDEF".toCharArray();
/**
* 字节数据转 16 进制字符串
*
* @param bytes 字节数据
* @return 16 进制字符串
*/
public static String byteToHex(byte[] bytes) {
final int l = bytes.length;
final char[] c = new char[l << 1];
for (int i = 0, j = 0; i < l; i++) {
c[j++] = Text.HEX_DIGITS_LOWER[(0xF0 & bytes[i]) >>> 4];
c[j++] = Text.HEX_DIGITS_LOWER[0x0F & bytes[i]];
}
return new String(c);
}
/**
* 16 进制字符串转字节数据
*
* @param hex 16 进制字符串
* @return 字节数据
* @throws UnsupportedEncodingException 不支持的编码
*/
public static byte[] hexToByte(String hex) throws UnsupportedEncodingException {
final char[] c = hex.toCharArray();
final byte[] b = new byte[c.length >> 1];
final int len = c.length;
if ((len & 0x01) != 0) {
throw new UnsupportedEncodingException("Odd number of characters.");
}
final int outLen = len >> 1;
if (c.length < outLen) {
throw new UnsupportedEncodingException("Output array is not large enough to accommodate decoded data.");
}
for (int i = 0, j = 0; j < len; i++) {
int f = toDigit(c[j], j) << 4;
j++;
f = f | toDigit(c[j], j);
j++;
b[i] = (byte) (f & 0xFF);
}
return b;
}
private static int toDigit(final char ch, final int index) throws UnsupportedEncodingException {
final int digit = Character.digit(ch, 16);
if (digit == -1) {
throw new UnsupportedEncodingException("Illegal hexadecimal character " + ch + " at index " + index);
}
return digit;
}
/**
* 是否为半角字符
*
@ -449,4 +390,14 @@ public class Text {
}
return sb.toString();
}
/**
* 获取驼峰类名
*
* @param clazz 类
* @return 驼峰类名
*/
public static String camelCaseClassName(Class<?> clazz) {
return Character.toLowerCase(clazz.getSimpleName().charAt(0)) + clazz.getSimpleName().substring(1);
}
}

View File

@ -0,0 +1,18 @@
package test;
import com.imyeyu.utils.Encoder;
import com.imyeyu.utils.Encryptor;
import org.junit.jupiter.api.Test;
/**
* @author 夜雨
* @since 2025-12-28 11:44
*/
public class TestAES {
@Test
public void testGenerateAESKey() {
byte[] bytes = Encryptor.aesKey(256);
System.out.println(Encoder.hex(bytes));
}
}