From af7b16f7aa39d650555df7bec45003c9f82096af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=9F=B3=E5=A4=B4?= Date: Thu, 28 Nov 2024 15:19:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=B1=A0Put=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=96=B0=E7=9A=84Return?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- XCode/Cache/EntityCache.cs | 2 +- XCode/Cache/SingleEntityCache.cs | 2 +- XCode/Common/SqlBuilder.cs | 2 +- XCode/DataAccessLayer/Common/DbBase.cs | 2 +- XCode/DataAccessLayer/DAL.cs | 2 +- XCode/DataAccessLayer/DAL_DbOperate.cs | 4 ++-- XCode/DataAccessLayer/DAL_Mapper.cs | 8 ++++---- XCode/DataAccessLayer/InsertBuilder.cs | 4 ++-- .../MetaData/DbMetaData_Negative.cs | 2 +- XCode/DataAccessLayer/Model/IModelResolver.cs | 6 +++--- XCode/DataAccessLayer/SelectBuilder.cs | 2 +- XCode/Entity/Entity.cs | 8 ++++---- XCode/Entity/IEntityPersistence.cs | 16 ++++++++-------- XCode/Membership/LogProvider.cs | 2 +- ...7\345\205\270\345\217\202\346\225\260.Biz.cs" | 4 ++-- .../Membership/\350\217\234\345\215\225.Biz.cs" | 2 +- .../Membership/\350\247\222\350\211\262.Biz.cs" | 2 +- XCode/Model/Expression.cs | 2 +- XCode/Model/WhereExpression.cs | 2 +- XCode/Tree/EntityTree.cs | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) diff --git a/XCode/Cache/EntityCache.cs b/XCode/Cache/EntityCache.cs index 814d0e01e..e7f9837c5 100644 --- a/XCode/Cache/EntityCache.cs +++ b/XCode/Cache/EntityCache.cs @@ -326,7 +326,7 @@ public void ShowStatics() if (Success > 0) sb.AppendFormat("，命中{0,11:n0}（{1,6:P02}）", Success, (Double)Success / Total); sb.AppendFormat("\t[{0}]", typeof(TEntity).FullName); - XTrace.WriteLine(sb.Put(true)); + XTrace.WriteLine(sb.Return(true)); } } #endregion diff --git a/XCode/Cache/SingleEntityCache.cs b/XCode/Cache/SingleEntityCache.cs index 505d30381..1c3c176ab 100644 --- a/XCode/Cache/SingleEntityCache.cs +++ b/XCode/Cache/SingleEntityCache.cs @@ -248,7 +248,7 @@ public void ShowStatics() if (Success > 0) sb.AppendFormat("，命中{0,11:n0}（{1,6:P02}）", Success, (Double)Success / Total); sb.AppendFormat("\t[{0}]", typeof(TEntity).FullName); - XTrace.WriteLine(sb.Put(true)); + XTrace.WriteLine(sb.Return(true)); } } #endregion diff --git a/XCode/Common/SqlBuilder.cs b/XCode/Common/SqlBuilder.cs index cfee7f588..eb765b8b7 100644 --- a/XCode/Common/SqlBuilder.cs +++ b/XCode/Common/SqlBuilder.cs @@ -77,7 +77,7 @@ public static class SqlBuilder if (item.Value) sb.Append(" Desc"); } - return sb.Put(true); + return sb.Return(true); } /// 获取排序子句 diff --git a/XCode/DataAccessLayer/Common/DbBase.cs b/XCode/DataAccessLayer/Common/DbBase.cs index 2c587a981..769a73281 100755 --- a/XCode/DataAccessLayer/Common/DbBase.cs +++ b/XCode/DataAccessLayer/Common/DbBase.cs @@ -796,7 +796,7 @@ private static String ChangeUnderline(String name) sb.Append(ch); } - return sb.Put(true); + return sb.Return(true); } /// 格式化数据为SQL数据 diff --git a/XCode/DataAccessLayer/DAL.cs b/XCode/DataAccessLayer/DAL.cs index 82daf0433..808046746 100644 --- a/XCode/DataAccessLayer/DAL.cs +++ b/XCode/DataAccessLayer/DAL.cs @@ -840,7 +840,7 @@ private void FixIndexName(IDataTable table) sb.Append(item); } - di.Name = sb.Put(true); + di.Name = sb.Return(true); } } } diff --git a/XCode/DataAccessLayer/DAL_DbOperate.cs b/XCode/DataAccessLayer/DAL_DbOperate.cs index f729215ec..115eb5190 100644 --- a/XCode/DataAccessLayer/DAL_DbOperate.cs +++ b/XCode/DataAccessLayer/DAL_DbOperate.cs @@ -340,7 +340,7 @@ private TResult QueryWrap(T1 k1, T2 k2, T3 k3, Func(key, out var value)) return value!; } @@ -503,7 +503,7 @@ private async Task QueryAsyncWrap(T1 k1, T2 k2, T3 Append(sb, k1); Append(sb, k2); Append(sb, k3); - key = sb.Put(true); + key = sb.Return(true); if (cache.TryGetValue(key, out var value)) return value!; } diff --git a/XCode/DataAccessLayer/DAL_Mapper.cs b/XCode/DataAccessLayer/DAL_Mapper.cs index 724b1d488..cb0f30c27 100755 --- a/XCode/DataAccessLayer/DAL_Mapper.cs +++ b/XCode/DataAccessLayer/DAL_Mapper.cs @@ -371,7 +371,7 @@ public Int32 Update(Object data, Object where, String? tableName = null) } } - var sql = sb.Put(true); + var sql = sb.Return(true); return ExecuteWrap(sql, "", dps.ToArray(), (ss, s, t, p) => ss.Execute(s, CommandType.Text, p), nameof(Update)); } @@ -474,7 +474,7 @@ private String GetUpdateSql(IDataTable table, IDataColumn[] columns, ICollection } sb.Length -= " And ".Length; - return sb.Put(true); + return sb.Return(true); } /// 删除数据 @@ -512,7 +512,7 @@ public Int32 Delete(String tableName, Object where) } } - return (sb.Put(true), dps); + return (sb.Return(true), dps); } /// 插入数据 @@ -590,7 +590,7 @@ public Task UpdateAsync(Object data, Object where, String? tableName = nu sb.AppendFormat("{0}={1}", pi.Name, p.ParameterName); } - var sql = sb.Put(true); + var sql = sb.Return(true); return ExecuteAsyncWrap(sql, "", dps.ToArray(), (ss, s, t, p) => ss.ExecuteAsync(s, CommandType.Text, p), nameof(UpdateAsync)); } diff --git a/XCode/DataAccessLayer/InsertBuilder.cs b/XCode/DataAccessLayer/InsertBuilder.cs index c32cf8f8c..77e3cb8e2 100644 --- a/XCode/DataAccessLayer/InsertBuilder.cs +++ b/XCode/DataAccessLayer/InsertBuilder.cs @@ -68,8 +68,8 @@ public class InsertBuilder sbValues.Append(database.FormatValue(field, value)); } - var ns = sbNames.Put(true); - var vs = sbValues.Put(true); + var ns = sbNames.Return(true); + var vs = sbValues.Return(true); if (ns.IsNullOrEmpty()) return null; if (dps.Count > 0) Parameters = dps.ToArray(); diff --git a/XCode/DataAccessLayer/MetaData/DbMetaData_Negative.cs b/XCode/DataAccessLayer/MetaData/DbMetaData_Negative.cs index d4fa363ec..6eba8a8d8 100644 --- a/XCode/DataAccessLayer/MetaData/DbMetaData_Negative.cs +++ b/XCode/DataAccessLayer/MetaData/DbMetaData_Negative.cs @@ -1035,7 +1035,7 @@ public virtual String CreateIndexSQL(IDataIndex index) var dcs = index.Table.GetColumns(index.Columns); sb.AppendFormat(" On {0} ({1})", FormatName(index.Table), dcs.Join(",", FormatName)); - return sb.Put(true); + return sb.Return(true); } public virtual String DropIndexSQL(IDataIndex index) => $"Drop Index {index.Name} On {FormatName(index.Table)}"; diff --git a/XCode/DataAccessLayer/Model/IModelResolver.cs b/XCode/DataAccessLayer/Model/IModelResolver.cs index addddc01d..03ef66af3 100755 --- a/XCode/DataAccessLayer/Model/IModelResolver.cs +++ b/XCode/DataAccessLayer/Model/IModelResolver.cs @@ -99,7 +99,7 @@ public virtual String GetName(String name) sb.Append(item); } } - name = sb.Put(true); + name = sb.Return(true); } if (name.Length > 2 && (name == name.ToUpper() || name == name.ToLower())) { @@ -156,7 +156,7 @@ private static String ChangeUnderline(String name) sb.Append(ch); } - return sb.Put(true); + return sb.Return(true); } /// 根据字段名等信息计算索引的名称 @@ -184,7 +184,7 @@ public virtual String GetName(IDataIndex di) sb.Append('_'); sb.Append(di.Columns[i]); } - return sb.Put(true); + return sb.Return(true); } /// 获取显示名，如果描述不存在，则使用名称，否则使用描述前面部分，句号（中英文皆可）、换行分隔 diff --git a/XCode/DataAccessLayer/SelectBuilder.cs b/XCode/DataAccessLayer/SelectBuilder.cs index d29efdc20..9df0e9198 100644 --- a/XCode/DataAccessLayer/SelectBuilder.cs +++ b/XCode/DataAccessLayer/SelectBuilder.cs @@ -154,7 +154,7 @@ public override String ToString() if (!OrderBy.IsNullOrEmpty()) sb.Append(" Order By " + OrderBy); if (!Limit.IsNullOrEmpty()) sb.Append(Limit.EnsureStart(" ")); - return sb.Put(true); + return sb.Return(true); } /// 获取记录数的语句 diff --git a/XCode/Entity/Entity.cs b/XCode/Entity/Entity.cs index 72022e9b5..253452c95 100644 --- a/XCode/Entity/Entity.cs +++ b/XCode/Entity/Entity.cs @@ -489,7 +489,7 @@ public virtual void CheckExist(Boolean isNew, params String[] names) if (name.IsNullOrEmpty()) name = typeof(TEntity).Name; sb.AppendFormat(" 的{0}已存在！", name); - throw new ArgumentOutOfRangeException(String.Join(",", names), this[names[0]], sb.Put(true)); + throw new ArgumentOutOfRangeException(String.Join(",", names), this[names[0]], sb.Return(true)); } } @@ -921,7 +921,7 @@ public static IList FindAll(Expression? where, String? order, String? s sb.AppendFormat("{0} {1}", fn, od); } - order2 = sb.Put(true).Replace("★", ","); + order2 = sb.Return(true).Replace("★", ","); } #endregion @@ -1244,7 +1244,7 @@ public static async Task> FindAllAsync(Expression where, String? sb.AppendFormat("{0} {1}", fn, od); } - order2 = sb.Put(true).Replace("★", ","); + order2 = sb.Return(true).Replace("★", ","); } #endregion @@ -1979,7 +1979,7 @@ public override String ToString() if (Meta.FieldNames.Contains(dc.Name)) sb.Append(this[dc.Name]); } - var vs = sb.Put(true); + var vs = sb.Return(true); if (columns.Length > 1) return $"[{vs}]"; else diff --git a/XCode/Entity/IEntityPersistence.cs b/XCode/Entity/IEntityPersistence.cs index 80a321216..aeecd3733 100644 --- a/XCode/Entity/IEntityPersistence.cs +++ b/XCode/Entity/IEntityPersistence.cs @@ -373,8 +373,8 @@ public virtual Int32 Insert(IEntitySession session, String[] names, Object[] val //sbv.Append(SqlDataFormat(values[i], fs[names[i]])); sbv.Append(db.FormatValue(column, values[i])); } - var sn = sbn.Put(true); - var sv = sbv.Put(true); + var sn = sbn.Return(true); + var sv = sbv.Return(true); return session.Execute($"Insert Into {session.FormatedTableName}({sn}) values({sv})"); } @@ -476,7 +476,7 @@ private String Join(IEntitySession session, String[] names, Object[] values, Str sb.Append(db.FormatValue(column, values[i])); } - return sb.Put(true); + return sb.Return(true); } #endregion @@ -609,8 +609,8 @@ private String Join(IEntitySession session, String[] names, Object[] values, Str sbValues.Append(db.FormatValue(fi.Field, value)); } - var ns = sbNames.Put(true); - var vs = sbValues.Put(true); + var ns = sbNames.Return(true); + var vs = sbValues.Return(true); if (ns.IsNullOrEmpty()) return null; if (dps.Count > 0) parameters = dps.ToArray(); @@ -720,7 +720,7 @@ Boolean CheckIdentity(IDatabase db, FieldItem fi, Object? value, StringBuilder s // 重置累加数据 if (dfs != null && dfs.Count > 0) entity.Addition?.Reset(dfs); - var str = sb.Put(true); + var str = sb.Return(true); if (str.IsNullOrEmpty()) return null; // Where条件里面的参数化 @@ -925,8 +925,8 @@ public virtual WhereExpression GetPrimaryCondition(IEntity entity) sbValues.Separate(", ").Append(db.FormatParameterName(fi.Name)); } - var ns = sbNames.Put(true); - var vs = sbValues.Put(true); + var ns = sbNames.Return(true); + var vs = sbValues.Return(true); if (ns.IsNullOrEmpty()) return null; return $"Insert Into {session.FormatedTableName}({ns}) Values({vs})"; diff --git a/XCode/Membership/LogProvider.cs b/XCode/Membership/LogProvider.cs index 1336f7d2a..adc6f7c25 100644 --- a/XCode/Membership/LogProvider.cs +++ b/XCode/Membership/LogProvider.cs @@ -234,7 +234,7 @@ public void WriteLog(String action, IEntity entity, String? error = null) var category = fact.Table.DataTable.DisplayName; if (category.IsNullOrEmpty()) category = type.GetDisplayName() ?? type.GetDescription() ?? type.Name; - var log = CreateLog(category, action, error.IsNullOrEmpty(), sb.Put(true), userid, name); + var log = CreateLog(category, action, error.IsNullOrEmpty(), sb.Return(true), userid, name); log.LinkID = linkId; log.SaveAsync(); diff --git "a/XCode/Membership/\345\255\227\345\205\270\345\217\202\346\225\260.Biz.cs" "b/XCode/Membership/\345\255\227\345\205\270\345\217\202\346\225\260.Biz.cs" index 30864fd93..2ce20a5f6 100644 --- "a/XCode/Membership/\345\255\227\345\205\270\345\217\202\346\225\260.Biz.cs" +++ "b/XCode/Membership/\345\255\227\345\205\270\345\217\202\346\225\260.Biz.cs" @@ -275,7 +275,7 @@ public void SetList(IList list) if (sb.Length > 0) sb.Append(','); sb.Append(item); } - SetValueInternal(sb.Put(true)); + SetValueInternal(sb.Return(true)); } /// 设置名值对 @@ -290,7 +290,7 @@ public void SetHash(IDictionary dic) if (sb.Length > 0) sb.Append(','); sb.AppendFormat("{0}={1}", item.Key, item.Value); } - SetValueInternal(sb.Put(true)); + SetValueInternal(sb.Return(true)); } #endregion } \ No newline at end of file diff --git "a/XCode/Membership/\350\217\234\345\215\225.Biz.cs" "b/XCode/Membership/\350\217\234\345\215\225.Biz.cs" index b05b02cd4..fc70bc76a 100644 --- "a/XCode/Membership/\350\217\234\345\215\225.Biz.cs" +++ "b/XCode/Membership/\350\217\234\345\215\225.Biz.cs" @@ -299,7 +299,7 @@ private void SavePermission() if (sb.Length > 0) sb.Append(','); sb.AppendFormat("{0}#{1}", item.Key, item.Value); } - SetItem(__.Permission, sb.Put(true)); + SetItem(__.Permission, sb.Return(true)); } #endregion diff --git "a/XCode/Membership/\350\247\222\350\211\262.Biz.cs" "b/XCode/Membership/\350\247\222\350\211\262.Biz.cs" index b109e6ac5..ff02901d6 100644 --- "a/XCode/Membership/\350\247\222\350\211\262.Biz.cs" +++ "b/XCode/Membership/\350\247\222\350\211\262.Biz.cs" @@ -349,7 +349,7 @@ private void SavePermission() if (sb.Length > 0) sb.Append(','); sb.AppendFormat("{0}#{1}", item.Key, (Int32)item.Value); } - SetItem(__.Permission, sb.Put(true)); + SetItem(__.Permission, sb.Return(true)); } /// 当前角色拥有的资源 diff --git a/XCode/Model/Expression.cs b/XCode/Model/Expression.cs index 727de713a..ddbe9f676 100644 --- a/XCode/Model/Expression.cs +++ b/XCode/Model/Expression.cs @@ -45,7 +45,7 @@ public String GetString(IDatabase? db, IDictionary? ps) var sb = Pool.StringBuilder.Get(); GetString(db, sb, ps); - return sb.Put(true); + return sb.Return(true); } /// 获取字符串 diff --git a/XCode/Model/WhereExpression.cs b/XCode/Model/WhereExpression.cs index d27242611..fd20c2755 100644 --- a/XCode/Model/WhereExpression.cs +++ b/XCode/Model/WhereExpression.cs @@ -84,7 +84,7 @@ public override void GetString(IDatabase? db, StringBuilder builder, IDictionary } } - builder.Append(sb.Put(true)); + builder.Append(sb.Return(true)); } private void GetString(IDatabase? db, StringBuilder builder, IDictionary ps, Expression exp) diff --git a/XCode/Tree/EntityTree.cs b/XCode/Tree/EntityTree.cs index feb847ea7..feaa33a8f 100644 --- a/XCode/Tree/EntityTree.cs +++ b/XCode/Tree/EntityTree.cs @@ -455,7 +455,7 @@ public Boolean Contains(TKey key) sb.Append(item[namekey]); } } - return sb.Put(true); + return sb.Return(true); } /// 删除子级到本级的关系。导出数据前可以先删除关系，以减少导出的大小