Merge pull request 'v0.1.0' (#5) from dev into master

Reviewed-on: #5

.gitea/workflows/ci.yml

@@ -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

pom.xml

@@ -6,10 +6,11 @@
 
 	<groupId>com.imyeyu.lang</groupId>
 	<artifactId>timi-lang</artifactId>
-	<version>0.0.2</version>
+	<version>0.1.0</version>
 	<packaging>jar</packaging>
 
 	<properties>
+		<java.version>21</java.version>
 		<maven.test.skip>true</maven.test.skip>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
@@ -27,29 +28,43 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 				<version>3.3.1</version>
+			</plugin>
+			<plugin>
+				<groupId>org.projectlombok</groupId>
+				<artifactId>lombok-maven-plugin</artifactId>
+				<version>1.18.20.0</version>
+				<configuration>
+					<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+					<outputDirectory>${project.build.directory}/delombok</outputDirectory>
+					<addOutputDirectory>false</addOutputDirectory>
+					<encoding>UTF-8</encoding>
+				</configuration>
 				<executions>
 					<execution>
-						<id>attach-sources</id>
-						<phase>package</phase>
+						<phase>generate-sources</phase>
 						<goals>
-							<goal>jar-no-fork</goal>
+							<goal>delombok</goal>
 						</goals>
 					</execution>
 				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.projectlombok</groupId>
+						<artifactId>lombok</artifactId>
+						<version>1.18.36</version>
+					</dependency>
+				</dependencies>
 			</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>
+				<configuration>
+					<sourcepath>${project.build.directory}/delombok</sourcepath>
+					<encoding>UTF-8</encoding>
+					<charset>UTF-8</charset>
+					<docencoding>UTF-8</docencoding>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
@@ -78,7 +93,7 @@
 		<dependency>
 			<groupId>com.imyeyu.io</groupId>
 			<artifactId>timi-io</artifactId>
-			<version>0.0.2</version>
+			<version>0.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>

src/main/java/com/imyeyu/lang/FileMultilingualResolver.java

@@ -1,6 +1,6 @@
-package com.imyeyu.lang.multi;
+package com.imyeyu.lang;
 
-import com.imyeyu.java.bean.Language;
+import com.imyeyu.lang.bean.Language;
 import com.imyeyu.lang.mapper.AbstractLanguageMapper;
 import com.imyeyu.lang.mapper.FileLanguageMap;
 import com.imyeyu.lang.mapper.LanguageMap;
@@ -11,14 +11,17 @@ import com.imyeyu.lang.mapper.LanguageMap;
  * @author 夜雨
  * @version 2024-04-09 01:06
  */
-public class FileMultilingual extends Multilingual {
+public class FileMultilingualResolver extends MultilingualResolver {
+
+	public FileMultilingualResolver() {
+	}
 
 	/**
 	 * 构造并批量加载所有支持的语言文件
 	 *
 	 * @param path 文件路径模板，使用 %s 作为语言代码占位符，例如：lang/app_%s.lang
 	 */
-	public FileMultilingual(String path) {
+	public FileMultilingualResolver(String path) {
 		addAll(path);
 	}
 
@@ -33,16 +36,16 @@ public class FileMultilingual extends Multilingual {
 	 */
 	public void addAll(String path) {
 		Language.Enum[] values = Language.Enum.values();
-		for (int i = 0; i < values.length; i++) {
-			FileLanguageMap mapper = new FileLanguageMap(values[i]);
+		for (Language.Enum value : values) {
+			FileLanguageMap mapper = new FileLanguageMap(value);
 			mapper.load(path);
-			if (multilingualMap.containsKey(values[i])) {
-				AbstractLanguageMapper existMapper = multilingualMap.get(values[i]);
+			if (multilingualMap.containsKey(value)) {
+				AbstractLanguageMapper existMapper = multilingualMap.get(value);
 				if (existMapper instanceof LanguageMap map) {
 					map.union(mapper);
 				}
 			} else {
-				add(values[i], mapper);
+				add(value, mapper);
 			}
 		}
 	}

src/main/java/com/imyeyu/lang/MultilingualResolver.java

@@ -1,10 +1,11 @@
-package com.imyeyu.lang.multi;
+package com.imyeyu.lang;
 
 import com.imyeyu.java.bean.CallbackArg;
-import com.imyeyu.java.bean.Language;
-import com.imyeyu.java.bean.LanguageMapping;
 import com.imyeyu.java.ref.Ref;
+import com.imyeyu.lang.bean.Language;
+import com.imyeyu.lang.bean.LanguageMapping;
 import com.imyeyu.lang.mapper.AbstractLanguageMapper;
+import lombok.Getter;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -20,7 +21,7 @@ import java.util.Objects;
  *     say.msg=hello {0}
  *
  *     // 加载
- *     Multilingual lang = Multilingual.getInstance();
+ *     MultilingualResolver lang = MultilingualResolver.getInstance();
  *     lang.load(Language.zh_CN, "lang/timijava/%s.lang");
  *
  *     // 加载所有支持的映射文件
@@ -30,17 +31,17 @@ import java.util.Objects;
  *     lang.setActivated("zh_CN");
  *
  *     // 引用当前激活语言
- *     Multilingual.text("say.msg");
- *     Multilingual.text("say.msg", "timi-java");
+ *     MultilingualResolver.text("say.msg");
+ *     MultilingualResolver.text("say.msg", "timi-java");
  *
  *     // 动态引用
- *     Multilingual.map("en_US").text("say.msg");
+ *     MultilingualResolver.map("en_US").text("say.msg");
  * </pre>
  *
  * @author 夜雨
  * @version 2021-10-25 15:16
  */
-public class Multilingual implements LanguageMapping {
+public class MultilingualResolver implements LanguageMapping {
 
 	/** 多语言映射表，存储各语言对应的映射器 */
 	protected final Map<Language.Enum, AbstractLanguageMapper> multilingualMap;
@@ -49,6 +50,7 @@ public class Multilingual implements LanguageMapping {
 	protected final List<CallbackArg<Language.Enum>> updateActiveListeners;
 
 	/** 当前激活语言 */
+	@Getter
 	protected Language.Enum activated;
 
 	/** 是否启用调试模式 */
@@ -60,7 +62,7 @@ public class Multilingual implements LanguageMapping {
 	 * 根据系统默认 Locale 初始化激活语言，如果无法识别则默认为中文
 	 * </p>
 	 */
-	public Multilingual() {
+	public MultilingualResolver() {
 		multilingualMap = new HashMap<>();
 		updateActiveListeners = new ArrayList<>();
 
@@ -121,20 +123,11 @@ public class Multilingual implements LanguageMapping {
 		String[] localSp = activated.toString().split("_");
 		Locale.setDefault(new Locale(localSp[0], localSp[1]));
 
-		for (int i = 0; i < updateActiveListeners.size(); i++) {
-			updateActiveListeners.get(i).handler(activated);
+		for (CallbackArg<Language.Enum> updateActiveListener : updateActiveListeners) {
+			updateActiveListener.handler(activated);
 		}
 	}
 
-	/**
-	 * 获取当前激活的语言
-	 *
-	 * @return 当前激活语言
-	 */
-	public Language.Enum getActivated() {
-		return activated;
-	}
-
 	/**
 	 * 设置调试模式
 	 * <p>
@@ -206,19 +199,19 @@ public class Multilingual implements LanguageMapping {
 	 *     mapping=@test.msg
 	 *     no_mapping=\@test.msg
 	 *
-	 *     Multilingual.text("mapping");    // Hello world
-	 *     Multilingual.text("no_mapping"); // @test.msg
+	 *     MultilingualResolver.text("mapping");    // Hello world
+	 *     MultilingualResolver.text("no_mapping"); // @test.msg
 	 * </pre>
 	 *
 	 * @param key 键
 	 * @return 文本值
 	 */
 	@Override
-	public String text(String key) {
+	public String message(String key) {
 		if (multilingualMap.get(getActivated()) == null) {
 			return key;
 		}
-		return multilingualMap.get(getActivated()).text(key);
+		return multilingualMap.get(getActivated()).message(key);
 	}
 
 	/**
@@ -229,11 +222,11 @@ public class Multilingual implements LanguageMapping {
 	 * @return 获取结果
 	 */
 	@Override
-	public String text(String key, String def) {
+	public String message(String key, String def) {
 		if (multilingualMap.get(getActivated()) == null) {
 			return Objects.requireNonNullElse(def, key);
 		}
-		return multilingualMap.get(getActivated()).text(key, def);
+		return multilingualMap.get(getActivated()).message(key, def);
 	}
 
 	/**
@@ -244,10 +237,10 @@ public class Multilingual implements LanguageMapping {
 	 * @return 结果
 	 */
 	@Override
-	public String textArgs(String key, Map<String, Object> argsMap) {
+	public String message(String key, Map<String, Object> argsMap) {
 		if (multilingualMap.get(getActivated()) == null) {
 			return key;
 		}
-		return multilingualMap.get(getActivated()).textArgs(key, argsMap);
+		return multilingualMap.get(getActivated()).message(key, argsMap);
 	}
 }

src/main/java/com/imyeyu/lang/ResourcesMultilingualResolver.java

@@ -1,6 +1,6 @@
-package com.imyeyu.lang.multi;
+package com.imyeyu.lang;
 
-import com.imyeyu.java.bean.Language;
+import com.imyeyu.lang.bean.Language;
 import com.imyeyu.lang.mapper.AbstractLanguageMapper;
 import com.imyeyu.lang.mapper.LanguageMap;
 import com.imyeyu.lang.mapper.ResourcesLanguageMap;
@@ -14,14 +14,17 @@ import com.imyeyu.lang.mapper.ResourcesLanguageMap;
  * @author 夜雨
  * @version 2024-04-09 01:03
  */
-public class ResourcesMultilingual extends Multilingual {
+public class ResourcesMultilingualResolver extends MultilingualResolver {
+
+	public ResourcesMultilingualResolver() {
+	}
 
 	/**
 	 * 构造并批量加载所有支持的语言资源文件
 	 *
 	 * @param path 资源文件路径模板，使用 %s 作为语言代码占位符，例如：lang/app_%s.lang
 	 */
-	public ResourcesMultilingual(String path) {
+	public ResourcesMultilingualResolver(String path) {
 		addAll(path);
 	}
 
@@ -36,16 +39,16 @@ public class ResourcesMultilingual extends Multilingual {
 	 */
 	public void addAll(String path) {
 		Language.Enum[] values = Language.Enum.values();
-		for (int i = 0; i < values.length; i++) {
-			ResourcesLanguageMap mapper = new ResourcesLanguageMap(values[i]);
+		for (Language.Enum value : values) {
+			ResourcesLanguageMap mapper = new ResourcesLanguageMap(value);
 			mapper.load(path);
-			if (multilingualMap.containsKey(values[i])) {
-				AbstractLanguageMapper existMapper = multilingualMap.get(values[i]);
+			if (multilingualMap.containsKey(value)) {
+				AbstractLanguageMapper existMapper = multilingualMap.get(value);
 				if (existMapper instanceof LanguageMap map) {
 					map.union(mapper);
 				}
 			} else {
-				add(values[i], mapper);
+				add(value, mapper);
 			}
 		}
 	}

src/main/java/com/imyeyu/lang/bean/Language.java

@@ -0,0 +1,74 @@
+package com.imyeyu.lang.bean;
+
+import com.imyeyu.java.ref.Ref;
+import lombok.Data;
+
+/**
+ * 多语言
+ *
+ * @author 夜雨
+ * @since 2022-02-23 11:25
+ */
+@Data
+public class Language {
+
+	/**
+	 * 支持语言枚举
+	 *
+	 * @author 夜雨
+	 * @since 2025-12-05 14:31
+	 */
+	public enum Enum {
+
+		/** 英语 */
+		en_US,
+
+		/** 简中 */
+		zh_CN,
+
+		/** 繁中 */
+		zh_TW,
+
+		/** 日语 */
+		ja_JP,
+
+		/** 韩语 */
+		ko_KR,
+
+		/** 俄语 */
+		ru_RU,
+
+		/** 德语 */
+		de_DE;
+	}
+
+	protected String key;
+
+	protected String zhCN;
+
+	protected String zhTW;
+
+	protected String enUS;
+
+	protected String ruRU;
+
+	protected String koKR;
+
+	protected String jaJP;
+
+	protected String deDE;
+
+	/**
+	 * 获取指定语言值
+	 *
+	 * @param language 指定语言
+	 * @return 值
+	 */
+	public String getValue(Enum language) {
+		try {
+			return Ref.getFieldValue(this, language.toString().replace("_", ""), String.class);
+		} catch (IllegalAccessException e) {
+			throw new RuntimeException(e);
+		}
+	}
+}

src/main/java/com/imyeyu/lang/bean/LanguageMapping.java

@@ -0,0 +1,54 @@
+package com.imyeyu.lang.bean;
+
+import java.util.Map;
+
+/**
+ * 多语言映射接口
+ *
+ * @author 夜雨
+ * @since 2024-04-03 11:27
+ */
+public interface LanguageMapping {
+
+	/**
+	 * 添加映射
+	 *
+	 * @param key   键
+	 * @param value 值
+	 */
+	void add(String key, String value);
+
+	/**
+	 * 是否存在映射
+	 *
+	 * @param key 键
+	 * @return true 为存在
+	 */
+	boolean has(String key);
+
+	/**
+	 * 获取映射值
+	 *
+	 * @param key 键
+	 * @return 值
+	 */
+	String message(String key);
+
+	/**
+	 * 获取映射值，不存在时使用默认值
+	 *
+	 * @param key 键
+	 * @param def 默认值
+	 * @return 值
+	 */
+	String message(String key, String def);
+
+	/**
+	 * 获取映射值并插入参数
+	 *
+	 * @param key     键
+	 * @param argsMap 参数列表
+	 * @return 值
+	 */
+	String message(String key, Map<String, Object> argsMap);
+}

src/main/java/com/imyeyu/lang/bean/Multilingual.java

@@ -0,0 +1,21 @@
+package com.imyeyu.lang.bean;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 多语言数据契约
+ *
+ * @author 夜雨
+ * @since 2026-09-18 13:35
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Multilingual extends Language implements MultilingualValue {
+
+	/** 唯一标识 */
+	private String id;
+
+	/** 业务类型 */
+	private String bizType;
+}

src/main/java/com/imyeyu/lang/bean/MultilingualValue.java

@@ -0,0 +1,25 @@
+package com.imyeyu.lang.bean;
+
+/**
+ * 多语言值对象
+ *
+ * @author 夜雨
+ * @since 2026-09-18 13:35
+ */
+public interface MultilingualValue {
+
+	/**
+	 * 获取唯一标识
+	 *
+	 * @return 唯一标识
+	 */
+	String getId();
+
+	/**
+	 * 获取指定语言值
+	 *
+	 * @param language 指定语言
+	 * @return 语言值
+	 */
+	String getValue(Language.Enum language);
+}

src/main/java/com/imyeyu/lang/mapper/AbstractLanguageMapper.java

@@ -1,8 +1,10 @@
 package com.imyeyu.lang.mapper;
 
-import com.imyeyu.java.bean.Language;
-import com.imyeyu.java.bean.LanguageMapping;
+import com.imyeyu.lang.bean.Language;
+import com.imyeyu.lang.bean.LanguageMapping;
 import com.imyeyu.utils.StringInterpolator;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Map;
 
@@ -18,9 +20,11 @@ public abstract class AbstractLanguageMapper implements LanguageMapping {
 	protected final StringInterpolator INTERPOLATOR = StringInterpolator.createDollarInterpolator();
 
 	/** 当前映射器所属语言 */
+	@Getter
 	protected final Language.Enum language;
 
-	/** 是否启用调试模式，启用后将抛出异常而不是返回默认值 */
+	/** true 为启用调试模式 */
+	@Setter
 	protected boolean isDebugging = false;
 
 	/**
@@ -32,24 +36,6 @@ public abstract class AbstractLanguageMapper implements LanguageMapping {
 		this.language = language;
 	}
 
-	/**
-	 * 获取当前映射器所属语言
-	 *
-	 * @return 语言枚举
-	 */
-	public Language.Enum getLanguage() {
-		return language;
-	}
-
-	/**
-	 * 设置调试模式，调试模式下，找不到映射时将抛出异常而不是返回默认值
-	 *
-	 * @param debugging true 为启用调试模式
-	 */
-	public void setDebugging(boolean debugging) {
-		isDebugging = debugging;
-	}
-
 	/**
 	 * 获取文本
 	 *
@@ -58,8 +44,8 @@ public abstract class AbstractLanguageMapper implements LanguageMapping {
 	 * @return 获取结果
 	 */
 	@Override
-	public String text(String key, String def) {
-		String result = text(key);
+	public String message(String key, String def) {
+		String result = message(key);
 		return result.equals(key) ? def : result;
 	}
 
@@ -71,7 +57,7 @@ public abstract class AbstractLanguageMapper implements LanguageMapping {
 	 * @return 替换占位符后的文本
 	 */
 	@Override
-	public String textArgs(String key, Map<String, Object> args) {
-		return INTERPOLATOR.inject(text(key), args);
+	public String message(String key, Map<String, Object> args) {
+		return INTERPOLATOR.inject(message(key), args);
 	}
 }

src/main/java/com/imyeyu/lang/mapper/FileLanguageMap.java

@@ -1,7 +1,7 @@
 package com.imyeyu.lang.mapper;
 
 import com.imyeyu.io.IO;
-import com.imyeyu.java.bean.Language;
+import com.imyeyu.lang.bean.Language;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;

src/main/java/com/imyeyu/lang/mapper/LanguageMap.java

@@ -1,8 +1,7 @@
 package com.imyeyu.lang.mapper;
 
 import com.imyeyu.java.TimiJava;
-import com.imyeyu.java.bean.CallbackArgReturn;
-import com.imyeyu.java.bean.Language;
+import com.imyeyu.lang.bean.Language;
 import com.imyeyu.utils.Text;
 
 import java.util.HashMap;
@@ -27,7 +26,7 @@ public class LanguageMap extends AbstractLanguageMapper {
 	{
 		INTERPOLATOR.putFilter("lang", value -> {
 			if (value.startsWith("@")) {
-				value = text(value.substring(1));
+				value = message(value.substring(1));
 			}
 			return value;
 		});
@@ -84,20 +83,20 @@ public class LanguageMap extends AbstractLanguageMapper {
 	 *     mapping=@test.msg
 	 *     no_mapping=\@test.msg
 	 *
-	 *     Multilingual.text("mapping");    // Hello world
-	 *     Multilingual.text("no_mapping"); // @test.msg
+	 *     MultilingualResolver.text("mapping");    // Hello world
+	 *     MultilingualResolver.text("no_mapping"); // @test.msg
 	 * </pre>
 	 *
 	 * @param key 键
 	 * @return 文本值
 	 */
 	@Override
-	public String text(String key) {
+	public String message(String key) {
 		if (map.containsKey(key)) {
 			String result = map.get(key);
 			if (result.startsWith("@")) {
 				// 递归映射
-				return text(result.substring(1));
+				return message(result.substring(1));
 			} else {
 				if (result.startsWith("\\@")) {
 					return result.substring(1);
@@ -135,8 +134,8 @@ public class LanguageMap extends AbstractLanguageMapper {
 	 * @return 获取结果
 	 */
 	@Override
-	public String text(String key, String def) {
-		String result = text(key);
+	public String message(String key, String def) {
+		String result = message(key);
 		return key.equals(result) ? def : result;
 	}
 
@@ -148,7 +147,7 @@ public class LanguageMap extends AbstractLanguageMapper {
 	 * @return 结果
 	 */
 	@Override
-	public String textArgs(String key, Map<String, Object> argsMap) {
-		return INTERPOLATOR.inject(text(key), argsMap);
+	public String message(String key, Map<String, Object> argsMap) {
+		return INTERPOLATOR.inject(message(key), argsMap);
 	}
 }

src/main/java/com/imyeyu/lang/mapper/PropertiesLanguageMap.java

@@ -1,6 +1,6 @@
 package com.imyeyu.lang.mapper;
 
-import com.imyeyu.java.bean.Language;
+import com.imyeyu.lang.bean.Language;
 
 import java.util.HashMap;
 import java.util.Properties;

src/main/java/com/imyeyu/lang/mapper/ResourcesLanguageMap.java

@@ -1,7 +1,7 @@
 package com.imyeyu.lang.mapper;
 
 import com.imyeyu.io.IO;
-import com.imyeyu.java.bean.Language;
+import com.imyeyu.lang.bean.Language;
 
 import java.io.FileNotFoundException;
 import java.io.InputStream;

src/test/java/test/TestLang.java

@@ -1,6 +1,6 @@
 package test;
 
-import com.imyeyu.java.bean.Language;
+import com.imyeyu.lang.bean.Language;
 import com.imyeyu.lang.mapper.ResourcesLanguageMap;
 import org.junit.jupiter.api.Test;
 
@@ -16,6 +16,6 @@ public class TestLang {
 	public void testArgs() {
 		ResourcesLanguageMap map = new ResourcesLanguageMap(Language.Enum.zh_CN);
 		map.load("zh_CN.lang");
-		System.out.println(map.textArgs("test", Map.of("msg", "hello world")));
+		System.out.println(map.message("test", Map.of("msg", "hello world")));
 	}
 }