diff --git a/broker/config/i18n/messages_en.properties b/broker/config/i18n/messages_en.properties
new file mode 100644
index 00000000..cd14274b
--- /dev/null
+++ b/broker/config/i18n/messages_en.properties
@@ -0,0 +1,2 @@
+Above_Greeting_Message=This's the greeting
+Friend_Can_Start_Chat=You're already friend, start chat now.
diff --git a/broker/config/i18n/messages_en_US.properties b/broker/config/i18n/messages_en_US.properties
index 91f0fffb..cd14274b 100644
--- a/broker/config/i18n/messages_en_US.properties
+++ b/broker/config/i18n/messages_en_US.properties
@@ -1,2 +1,2 @@
-greeting=This's the greeting
-name=You're already friend, start chat now.
+Above_Greeting_Message=This's the greeting
+Friend_Can_Start_Chat=You're already friend, start chat now.
diff --git a/broker/config/i18n/messages_zh.properties b/broker/config/i18n/messages_zh.properties
new file mode 100644
index 00000000..cc223829
--- /dev/null
+++ b/broker/config/i18n/messages_zh.properties
@@ -0,0 +1,2 @@
+Above_Greeting_Message=\u4ee5\u4e0a\u662f\u6253\u62db\u547c\u4fe1\u606f
+Friend_Can_Start_Chat=\u4f60\u4eec\u5df2\u7ecf\u6210\u4e3a\u597d\u53cb\u4e86\uff0c\u73b0\u5728\u53ef\u4ee5\u5f00\u59cb\u804a\u5929\u4e86
diff --git a/broker/src/main/java/win/liyufan/im/I18n.java b/broker/src/main/java/win/liyufan/im/I18n.java
index 539c5398..ee6db774 100644
--- a/broker/src/main/java/win/liyufan/im/I18n.java
+++ b/broker/src/main/java/win/liyufan/im/I18n.java
@@ -37,21 +37,26 @@ public class I18n {
             bundleMap.put(language, bundle);
         }
 
-        return bundle.getString(key);
+        try {
+            return bundle.getString(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "糟糕，字符串 " + key + " 没有找到";
     }
 
     public static void test() throws MalformedURLException {
 
         // 设置定制的语言国家代码
-        Locale locale1 = new Locale("zh_CN");
-        Locale locale2 = new Locale("en_US");
+        Locale locale1 = new Locale("zh");
+        Locale locale2 = new Locale("en");
         ResourceBundle rb = ResourceBundle.getBundle("messages", locale1, Loader);
 
 
 
         // 获得相应的key值
-        String greeting = rb.getString("greeting");
-        String userInfo = rb.getString("test");
+        String greeting = rb.getString("Above_Greeting_Message");
+        String userInfo = rb.getString("Friend_Can_Start_Chat");
 
         System.out.println(greeting);
         System.out.println(userInfo);
diff --git a/distribution/src/main/assembly/assembly.xml b/distribution/src/main/assembly/assembly.xml
index 72a7fb90..d1ed9f87 100755
--- a/distribution/src/main/assembly/assembly.xml
+++ b/distribution/src/main/assembly/assembly.xml
@@ -19,6 +19,11 @@
             <directory>../broker/migrate/h2/</directory>
             <outputDirectory>/migrate/h2</outputDirectory>
         </fileSet>
+
+        <fileSet>
+            <directory>../broker/config/i18n/</directory>
+            <outputDirectory>/config/i18n</outputDirectory>
+        </fileSet>
     </fileSets>
 
     <files>