Skip to content

Commit

Permalink
Merge branch 'master' of http://git.newlifex.com/NewLife/NewLife.Cube …
Browse files Browse the repository at this point in the history 
…into NewLifeX-master
  • Loading branch information
@xxred
xxred committed Feb 11, 2019
2 parents 005f311 + a1a8e23 commit b3e6642
Show file tree
Hide file tree
Showing 22 changed files with 139 additions and 218 deletions.
17 changes: 4 additions & 13 deletions CubeDemoNC/Areas/School/SchoolArea.cs
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Threading.Tasks;
using NewLife.Cube;

namespace WebTest.Areas.School
{
[DisplayName("教务系统")]
public class SchoolArea : AreaBaseX
public class SchoolArea : AreaBase
{
public static string AreaName => nameof(SchoolArea).TrimEnd("Area");
public SchoolArea() : base(AreaName)
{
}
public SchoolArea() : base(nameof(SchoolArea).TrimEnd("Area")) { }

static SchoolArea()
{
RegisterArea<SchoolArea>();
}
static SchoolArea() => RegisterArea<SchoolArea>();
}
}
}
120 changes: 46 additions & 74 deletions DLL/NewLife.Core.XML
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,6 @@
<name>NewLife.Core</name>
</assembly>
<members>
<member name="T:NewLife.Agent.AgentService">
<summary>代理服务例子。自定义服务程序可参照该类实现。</summary>
</member>
<member name="M:NewLife.Agent.AgentService.#ctor">
<summary>实例化一个代理服务</summary>
</member>
<member name="M:NewLife.Agent.AgentService.StartWork(System.String)">
<summary>开始工作</summary>
<param name="reason"></param>
</member>
<member name="M:NewLife.Agent.AgentService.StopWork(System.String)">
<summary>停止服务</summary>
<param name="reason"></param>
</member>
<member name="T:NewLife.Agent.AgentServiceBase`1">
<typeparam name="TService">服务类型</typeparam>
</member>
Expand Down Expand Up @@ -910,9 +896,10 @@
<member name="P:NewLife.Caching.Redis.Pool">
<summary>连接池</summary>
</member>
<member name="M:NewLife.Caching.Redis.Execute``1(System.Func{NewLife.Caching.RedisClient,``0},System.Boolean)">
<member name="M:NewLife.Caching.Redis.Execute``1(System.String,System.Func{NewLife.Caching.RedisClient,``0},System.Boolean)">
<summary>执行命令</summary>
<typeparam name="TResult">返回类型</typeparam>
<param name="key">命令key，用于选择集群节点</param>
<param name="func">回调函数</param>
<param name="write">是否写入操作</param>
<returns></returns>
Expand Down Expand Up @@ -2166,7 +2153,7 @@
<summary>获取封包的数据流形式</summary>
<returns></returns>
</member>
<member name="M:NewLife.Data.Packet.WriteTo(System.IO.Stream)">
<member name="M:NewLife.Data.Packet.CopyTo(System.IO.Stream)">
<summary>把封包写入到数据流</summary>
<param name="stream"></param>
</member>
Expand Down Expand Up @@ -2530,7 +2517,7 @@
<summary>状态码</summary>
</member>
<member name="P:NewLife.Http.TinyHttpClient.Timeout">
<summary>超时时间。默认15000ms</summary>
<summary>超时时间。默认15s</summary>
</member>
<member name="P:NewLife.Http.TinyHttpClient.Headers">
<summary>头部集合</summary>
Expand All @@ -2539,15 +2526,27 @@
<summary>销毁</summary>
<param name="disposing"></param>
</member>
<member name="M:NewLife.Http.TinyHttpClient.SendDataAsync(NewLife.Net.NetUri,NewLife.Data.Packet)">
<member name="M:NewLife.Http.TinyHttpClient.SendDataAsync(System.Uri,NewLife.Data.Packet)">
<summary>异步请求</summary>
<param name="remote"></param>
<param name="uri"></param>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:NewLife.Http.TinyHttpClient.SendAsync(System.String,System.Byte[])">
<member name="M:NewLife.Http.TinyHttpClient.SendAsync(System.Uri,System.Byte[])">
<summary>异步发出请求，并接收响应</summary>
<param name="url"></param>
<param name="uri"></param>
<param name="data"></param>
<returns></returns>
</member>
<member name="M:NewLife.Http.TinyHttpClient.SendData(System.Uri,NewLife.Data.Packet)">
<summary>同步请求</summary>
<param name="uri"></param>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:NewLife.Http.TinyHttpClient.Send(System.Uri,System.Byte[])">
<summary>异步发出请求，并接收响应</summary>
<param name="uri"></param>
<param name="data"></param>
<returns></returns>
</member>
Expand All @@ -2562,11 +2561,21 @@
<param name="rs"></param>
<returns></returns>
</member>
<member name="M:NewLife.Http.TinyHttpClient.GetAsync(System.String)">
<member name="M:NewLife.Http.TinyHttpClient.GetPool(System.String)">
<summary>根据主机获取对象池</summary>
<param name="host"></param>
<returns></returns>
</member>
<member name="M:NewLife.Http.TinyHttpClient.GetStringAsync(System.String)">
<summary>异步获取</summary>
<param name="url">地址</param>
<returns></returns>
</member>
<member name="M:NewLife.Http.TinyHttpClient.GetString(System.String)">
<summary>同步获取</summary>
<param name="url"></param>
<returns></returns>
</member>
<member name="T:NewLife.IO.CsvFile">
<summary>Csv文件</summary>
<remarks>
Expand Down Expand Up @@ -2782,25 +2791,6 @@
<param name="fileName"></param>
<param name="reloadTime"></param>
</member>
<member name="T:NewLife.Json.JsonConfigTest">
<summary>
测试Json配置文件功能
</summary>
</member>
<member name="M:NewLife.Json.JsonConfigTest.Start">
<summary>
开始测试
</summary>
</member>
<member name="P:NewLife.Json.TestJsonConfig.Title">
<summary>标题</summary>
</member>
<member name="P:NewLife.Json.TestJsonConfig.Width">
<summary>宽度</summary>
</member>
<member name="P:NewLife.Json.TestJsonConfig.Height">
<summary>高度</summary>
</member>
<member name="T:NewLife.Log.ActionLog">
<summary>依托于动作的日志类</summary>
</member>
Expand Down Expand Up @@ -6849,12 +6839,6 @@
<member name="P:NewLife.Remoting.ApiServer.StatPeriod">
<summary>显示统计信息的周期。默认600秒，0表示不显示统计信息</summary>
</member>
<member name="T:NewLife.Remoting.ApiTest">
<summary>Rpc测试</summary>
</member>
<member name="M:NewLife.Remoting.ApiTest.Main">
<summary>测试主函数</summary>
</member>
<member name="T:NewLife.Remoting.ApiController">
<summary>API控制器</summary>
</member>
Expand Down Expand Up @@ -7943,12 +7927,6 @@
<param name="value"></param>
<returns></returns>
</member>
<member name="T:NewLife.Serialization.BinaryTest">
<summary>Binary测试</summary>
</member>
<member name="M:NewLife.Serialization.BinaryTest.Start">
<summary>开始测试</summary>
</member>
<member name="T:NewLife.Serialization.IMemberAccessor">
<summary>成员序列化访问器。接口实现者可以在这里完全自定义序列化行为</summary>
</member>
Expand Down Expand Up @@ -8477,12 +8455,6 @@
<param name="value"></param>
<returns></returns>
</member>
<member name="T:NewLife.Serialization.JsonTest">
<summary>Json测试</summary>
</member>
<member name="M:NewLife.Serialization.JsonTest.Start">
<summary>开始测试</summary>
</member>
<member name="T:NewLife.Serialization.JsonWriter">
<summary>Json写入器</summary>
</member>
Expand Down Expand Up @@ -8974,9 +8946,6 @@
<param name="result"></param>
<returns></returns>
</member>
<member name="M:NewLife.Reflection.DynamicXml.Test">
<summary>测试</summary>
</member>
<member name="T:NewLife.Reflection.IReflect">
<summary>反射接口</summary>
<remarks>该接口仅用于扩展，不建议外部使用</remarks>
Expand Down Expand Up @@ -9963,9 +9932,6 @@
<member name="F:NewLife.Security.Crc16.CrcTable">
<summary>CRC16表</summary>
</member>
<member name="F:NewLife.Security.Crc16.crc">
<summary>校验值</summary>
</member>
<member name="P:NewLife.Security.Crc16.Value">
<summary>校验值</summary>
</member>
Expand All @@ -9980,15 +9946,10 @@
</member>
<member name="M:NewLife.Security.Crc16.Update(System.Byte[],System.Int32,System.Int32)">
<summary>添加字节数组进行校验 CRC16-CCITT x16+x12+x5+1 1021 ISO HDLC, ITU X.25, V.34/V.41/V.42, PPP-FCS</summary>
<param name = "buffer">
The buffer which contains the data
</param>
<param name = "offset">
The offset in the buffer where the data starts
</param>
<param name = "count">
The number of data bytes to update the CRC with.
</param>
<remarks>字符串123456789的Crc16是31C3</remarks>
<param name = "buffer">数据缓冲区</param>
<param name = "offset">偏移量</param>
<param name = "count">字节个数</param>
</member>
<member name="M:NewLife.Security.Crc16.Update(System.IO.Stream,System.Int64)">
<summary>添加数据流进行校验 CRC-16 x16+x15+x2+1 8005 IBM SDLC</summary>
Expand Down Expand Up @@ -10041,6 +10002,17 @@
<param name="rgbSignature"></param>
<returns></returns>
</member>
<member name="M:NewLife.Security.DSAHelper.FromXmlStringX(System.Security.Cryptography.DSACryptoServiceProvider,System.String)">
<summary>从Xml加载DSA密钥</summary>
<param name="rsa"></param>
<param name="xmlString"></param>
</member>
<member name="M:NewLife.Security.DSAHelper.ToXmlStringX(System.Security.Cryptography.DSACryptoServiceProvider,System.Boolean)">
<summary>保存DSA密钥到Xml</summary>
<param name="rsa"></param>
<param name="includePrivateParameters"></param>
<returns></returns>
</member>
<member name="T:NewLife.Security.Rand">
<summary>随机数</summary>
</member>
Expand Down
Binary file modified DLL/NewLife.Core.dll
View file
Binary file not shown.
Binary file modified DLL/NewLife.Core.pdb
View file
Binary file not shown.
Binary file modified DLL/XCode.dll
View file
Binary file not shown.
Binary file modified DLL/XCode.pdb
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions DLL/XCode.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4001,6 +4001,9 @@
<member name="P:XCode.EntityExtend.Expire">
<summary>过期时间。单位是秒</summary>
</member>
<member name="P:XCode.EntityExtend.Keys">
<summary>键集合</summary>
</member>
<member name="M:XCode.EntityExtend.#ctor">
<summary>实例化一个不区分键大小写的实体扩展</summary>
</member>
Expand Down
Binary file modified DLL20/NewLife.Core.dll
View file
Binary file not shown.
Binary file modified DLL20/NewLife.Core.pdb
View file
Binary file not shown.
Loading

0 comments on commit b3e6642

Please sign in to comment.