diff --git a/.gitignore b/.gitignore index ac8b1412..3a988933 100644 --- a/.gitignore +++ b/.gitignore @@ -2,29 +2,31 @@ #.gitignore *.class */bin/* -bin/* -/bin /*/*/bin/* -/.gradle/* + +/.metadata # Log file *.log *.log.* */logs/* /log +/log/* */jdk/* */.settings/* -/.settings + */org/apache/mybatis/jpa/* +/build/* */build/* -build/* -/build /*/*/build/*/* /*/build/*/* + */META-INF/MANIFEST.MF /*/*/.gitignore /*/.gitignore + /.gradle/ +/.gradle/* \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/messages/message.properties b/maxkey-web-maxkey/src/main/resources/messages/message.properties index 4acd72e6..5dceaeda 100644 --- a/maxkey-web-maxkey/src/main/resources/messages/message.properties +++ b/maxkey-web-maxkey/src/main/resources/messages/message.properties @@ -1,5 +1,5 @@ global.application=MaxKey\u5E94\u7528\u5B89\u5168\u7CFB\u7EDF -global.change.language=\u8BED\u97F3\u9009\u62E9 +global.change.language=\u8BED\u8A00\u9009\u62E9 global.change.language.en=English global.change.language.zh=\u4E2D\u6587 global.text.welcome=\u6B22\u8FCE\u60A8 diff --git a/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties b/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties index 4acd72e6..5dceaeda 100644 --- a/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties +++ b/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties @@ -1,5 +1,5 @@ global.application=MaxKey\u5E94\u7528\u5B89\u5168\u7CFB\u7EDF -global.change.language=\u8BED\u97F3\u9009\u62E9 +global.change.language=\u8BED\u8A00\u9009\u62E9 global.change.language.en=English global.change.language.zh=\u4E2D\u6587 global.text.welcome=\u6B22\u8FCE\u60A8