优先使用json中导入的资源

src/main/java/com/neotel/smfcore/core/language/util/LanguageMsgService.java

@@ -340,7 +340,7 @@ public class LanguageMsgService {
                     String oldValue = oldMsg.getContent(lanType);
                     String oldValue = oldMsg.getContent(lanType);
                     String newValue = msg.getContent(lanType);
                     String newValue = msg.getContent(lanType);
                     if (ObjectUtil.isNotEmpty(newValue)) {
                     if (ObjectUtil.isNotEmpty(newValue)) {
-                        if (isNeedUpdate || ObjectUtil.isEmpty(oldValue)) {
+                        if (ObjectUtil.isEmpty(oldValue)||(isNeedUpdate &&(!newValue.equals(oldValue))) ) {
                             oldMsg.setContent(lanType, newValue);
                             oldMsg.setContent(lanType, newValue);
                             isUpdate = true;
                             isUpdate = true;
                             //内容默认更改为中文
                             //内容默认更改为中文

src/main/java/com/neotel/smfcore/core/language/util/MessageUtils.java

@@ -92,10 +92,10 @@ public class MessageUtils {
     private void initLanguageMsgList() {
     private void initLanguageMsgList() {
         msgMap = messageService.loadMsgMap();
         msgMap = messageService.loadMsgMap();
 
 
-        //自动导入JSON内容
-        messageService.autoImportJsonFile();
         //只新增不修改
         //只新增不修改
         messageService.autoImportResources();
         messageService.autoImportResources();
+        //自动导入JSON内容
+        messageService.autoImportJsonFile();
         if (msgMap.size() > 0) {
         if (msgMap.size() > 0) {
             return;
             return;
         }
         }