1

gx_api/GxPress/Service/GxPress.Service.Implement/Note/NoteService.cs

@@ -185,14 +185,14 @@ namespace GxPress.Service.Implement.Note
                     var firstContent = string.Empty;
                     foreach (var jsonData in contentJsonData)
                     {
-                        if (jsonData.TypeValue == OldTextEditorTypeConst.Text.GetHashCode() && forCount == 1)
+                        if (jsonData.TypeValue == AllTypeConst.Text.GetHashCode() && forCount == 1)
                             //文本
                             firstContent = jsonData.Text;
-                        else if (jsonData.TypeValue == OldTextEditorTypeConst.Text.GetHashCode() && forCount > 1)
+                        else if (jsonData.TypeValue == AllTypeConst.Text.GetHashCode() && forCount > 1)
                             //文本
                             continue;
                         //图片
-                        else if (jsonData.TypeValue == OldTextEditorTypeConst.Image.GetHashCode() && FileData.Count == 0)
+                        else if (jsonData.TypeValue == AllTypeConst.Image.GetHashCode() && FileData.Count == 0)
                         {
                             if (imgData.Count > 9)
                                 break;
@@ -210,7 +210,7 @@ namespace GxPress.Service.Implement.Note
                     if (imgData.Count > 0) { item.DataType = 2; item.Data = imgData; }
                     else if (FileData.Count > 0) { item.DataType = 3; item.Data = FileData; }
                     else item.DataType = 1;
-                    var contType = new List<int> { OldTextEditorTypeConst.Text.GetHashCode(), OldTextEditorTypeConst.Image.GetHashCode() };
+                    var contType = new List<int> { AllTypeConst.Text.GetHashCode(), AllTypeConst.Image.GetHashCode() };
                     item.FileCount = contentJsonData.Count(n => !contType.Contains(n.Type));
                 }
                 if (item.Data == null || item.Data.Count == 0)
@@ -602,14 +602,14 @@ namespace GxPress.Service.Implement.Note
                     var firstContent = string.Empty;
                     foreach (var jsonData in contentJsonData)
                     {
-                        if (jsonData.TypeValue == OldTextEditorTypeConst.Text.GetHashCode() && forCount == 1)
+                        if (jsonData.TypeValue == AllTypeConst.Text.GetHashCode() && forCount == 1)
                             //文本
                             firstContent = jsonData.Text;
-                        else if (jsonData.TypeValue == OldTextEditorTypeConst.Text.GetHashCode() && forCount > 1)
+                        else if (jsonData.TypeValue == AllTypeConst.Text.GetHashCode() && forCount > 1)
                             //文本
                             continue;
                         //图片
-                        else if (jsonData.TypeValue == OldTextEditorTypeConst.Image.GetHashCode() && FileData.Count == 0)
+                        else if (jsonData.TypeValue == AllTypeConst.Image.GetHashCode() && FileData.Count == 0)
                         {
                             if (imgData.Count > 9)
                                 break;
@@ -627,7 +627,7 @@ namespace GxPress.Service.Implement.Note
                     if (imgData.Count > 0) { item.DataType = 2; item.Data = imgData; }
                     else if (FileData.Count > 0) { item.DataType = 3; item.Data = FileData; }
                     else item.DataType = 1;
-                    var contType = new List<int> { OldTextEditorTypeConst.Text.GetHashCode(), OldTextEditorTypeConst.Image.GetHashCode() };
+                    var contType = new List<int> { AllTypeConst.Text.GetHashCode(), AllTypeConst.Image.GetHashCode() };
                     item.FileCount = contentJsonData.Count(n => !contType.Contains(n.Type));
                 }
                 if (item.Data == null || item.Data.Count == 0)

gx_api/GxPress/Service/GxPress.Service.Implement/Topic/TopicService.cs

@@ -153,7 +153,7 @@ namespace GxPress.Service.Implement.Topic
                     if (imgData.Count > 0) { item.DataType = 2; item.Data = imgData; }
                     else if (FileData.Count > 0) { item.DataType = 3; item.Data = FileData; }
                     else item.DataType = 1;
-                    var contType = new List<int> { OldTextEditorTypeConst.Text.GetHashCode(), OldTextEditorTypeConst.Image.GetHashCode() };
+                    var contType = new List<int> { AllTypeConst.Text.GetHashCode(), AllTypeConst.Image.GetHashCode() };
                     item.FileCount = contentJsonData.Count(n => !contType.Contains(n.Type));
                 }
                 if (item.Data == null || item.Data.Count == 0)
@@ -191,14 +191,14 @@ namespace GxPress.Service.Implement.Topic
                     var firstContent = string.Empty;
                     foreach (var jsonData in contentJsonData)
                     {
-                        if (jsonData.Type == OldTextEditorTypeConst.Text.GetHashCode() && forCount == 1)
+                        if (jsonData.Type == AllTypeConst.Text.GetHashCode() && forCount == 1)
                             //文本
                             firstContent = jsonData.Text;
-                        else if (jsonData.Type == OldTextEditorTypeConst.Text.GetHashCode() && forCount > 1)
+                        else if (jsonData.Type == AllTypeConst.Text.GetHashCode() && forCount > 1)
                             //文本
                             continue;
                         //图片
-                        else if (jsonData.Type == OldTextEditorTypeConst.Image.GetHashCode() && FileData.Count == 0)
+                        else if (jsonData.Type == AllTypeConst.Image.GetHashCode() && FileData.Count == 0)
                         {
                             if (imgData.Count > 9)
                                 break;
@@ -216,7 +216,7 @@ namespace GxPress.Service.Implement.Topic
                     if (imgData.Count > 0) { item.DataType = 2; item.Data = imgData; }
                     else if (FileData.Count > 0) { item.DataType = 3; item.Data = FileData; }
                     else item.DataType = 1;
-                    var contType = new List<int> { OldTextEditorTypeConst.Text.GetHashCode(), OldTextEditorTypeConst.Image.GetHashCode() };
+                    var contType = new List<int> { AllTypeConst.Text.GetHashCode(), AllTypeConst.Image.GetHashCode() };
                     item.FileCount = contentJsonData.Count(n => !contType.Contains(n.Type));
                 }
                 if (item.Data == null || item.Data.Count == 0)
@@ -259,14 +259,14 @@ namespace GxPress.Service.Implement.Topic
                     var firstContent = string.Empty;
                     foreach (var jsonData in contentJsonData)
                     {
-                        if (jsonData.TypeValue == OldTextEditorTypeConst.Text.GetHashCode() && forCount == 1)
+                        if (jsonData.TypeValue ==AllTypeConst.Text.GetHashCode() && forCount == 1)
                             //文本
                             firstContent = jsonData.Text;
-                        else if (jsonData.TypeValue == OldTextEditorTypeConst.Text.GetHashCode() && forCount > 1)
+                        else if (jsonData.TypeValue == AllTypeConst.Text.GetHashCode() && forCount > 1)
                             //文本
                             continue;
                         //图片
-                        else if (jsonData.TypeValue == OldTextEditorTypeConst.Image.GetHashCode() && FileData.Count == 0)
+                        else if (jsonData.TypeValue == AllTypeConst.Image.GetHashCode() && FileData.Count == 0)
                         {
                             if (imgData.Count > 9)
                                 break;
@@ -496,14 +496,14 @@ namespace GxPress.Service.Implement.Topic
                     var firstContent = string.Empty;
                     foreach (var jsonData in contentJsonData)
                     {
-                        if (jsonData.TypeValue == OldTextEditorTypeConst.Text.GetHashCode() && forCount == 1)
+                        if (jsonData.TypeValue == AllTypeConst.Text.GetHashCode() && forCount == 1)
                             //文本
                             firstContent = jsonData.Text;
-                        else if (jsonData.TypeValue == OldTextEditorTypeConst.Text.GetHashCode() && forCount > 1)
+                        else if (jsonData.TypeValue == AllTypeConst.Text.GetHashCode() && forCount > 1)
                             //文本
                             continue;
                         //图片
-                        else if (jsonData.TypeValue == OldTextEditorTypeConst.Image.GetHashCode() && FileData.Count == 0)
+                        else if (jsonData.TypeValue == AllTypeConst.Image.GetHashCode() && FileData.Count == 0)
                         {
                             if (imgData.Count > 9)
                                 break;
@@ -521,7 +521,7 @@ namespace GxPress.Service.Implement.Topic
                     if (imgData.Count > 0) { item.DataType = 2; item.Data = imgData; }
                     else if (FileData.Count > 0) { item.DataType = 3; item.Data = FileData; }
                     else item.DataType = 1;
-                    var contType = new List<int> { OldTextEditorTypeConst.Text.GetHashCode(), OldTextEditorTypeConst.Image.GetHashCode() };
+                    var contType = new List<int> { AllTypeConst.Text.GetHashCode(), AllTypeConst.Image.GetHashCode() };
                     item.FileCount = contentJsonData.Count(n => !contType.Contains(n.Type));
                 }
                 if (item.Data == null || item.Data.Count == 0)