dotnet/Doc/PublishFile/SersPublish/02 Gover.bat

@@ -1,4 +1,4 @@
-start http://localhost:6022/_gover_/index.html
+start http://localhost:4581/_gover_/index.html
  
 
 :begin

dotnet/Sers/Sers.Core/Sers.Core/SersLoader/SsModelBuilder.cs

@@ -20,7 +20,9 @@ namespace Sers.SersLoader
 
         #region SsModel
         public SsModel BuildSsModel_Return(MethodInfo methodInfo, Type returnType)
-        {     
+        {
+            var descType = methodInfo.ReturnParameter.GetCustomAttribute<SsTypeAttribute>()?.Value;
+            if (descType != null) returnType = descType;
 
             SsModel model = new SsModel();
 
@@ -92,8 +94,10 @@ namespace Sers.SersLoader
                     return args;
                 };
 
+                var argDescType = infos[0].GetCustomAttribute<SsTypeAttribute>()?.Value  ?? argType;
+
                 var modelEntitys = new List<SsModelEntity>();
-                var mEntity = CreateEntityByType(argType, modelEntitys);
+                var mEntity = CreateEntityByType(argDescType, modelEntitys);
 
                 model.models = modelEntitys;
 
@@ -166,7 +170,10 @@ namespace Sers.SersLoader
             for (var t = 0; t < infos.Length; t++)
             {
                 var info = infos[t];
-                SsModelProperty m = CreateModelProperty(info.ParameterType, info.GetCustomAttribute, refModels);
+
+                var argDescType = info.GetCustomAttribute<SsTypeAttribute>()?.Value ?? info.ParameterType;
+
+                SsModelProperty m = CreateModelProperty(argDescType, info.GetCustomAttribute, refModels);
                 if (String.IsNullOrWhiteSpace(m.name)) m.name = info.Name;
 
                 try

dotnet/StationDemo/NetcoreLoader/Did.NetcoreLoader.Demo/Controllers/ValuesController.cs

@@ -1,7 +1,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Vit.Core.Util.ComponentModel.Data;
+using Vit.Core.Util.ComponentModel.Model;
 
 namespace Did.NetcoreLoader.Demo.Controllers
 {
@@ -14,266 +18,424 @@ namespace Did.NetcoreLoader.Demo.Controllers
         #region (x.1)route
 
         /// <summary>
-        /// GET apidemo/Values
+        /// GET did_serslot/Values
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public object  Route0()
+        public object Route0([FromQuery]string a)
         {
             //var requestFeature = Request.HttpContext.Features.Get<IHttpRequestFeature>();             
-            return "GET apidemo/Values";
+            return "GET did_serslot/Values?a=" + a;
         }
 
 
         /// <summary>
-        /// GET apidemo/Values/route_x
+        /// GET did_serslot/Values/route_x
         /// </summary>
         /// <returns></returns>
-        [HttpGet("route1")]
-        [HttpGet("route2")]
-        [HttpGet("/apidemo/Values/route3")]
+        [HttpGet("101/route")]
+        [HttpGet("102/route")]
+        [HttpGet("/did_serslot/Values/103/route")]
         public object Route1()
-        {            
-            return new{
+        {
+            return new
+            {
                 Request.Path,
-                Method = Request.Method
+                Request.Method
             };
         }
 
 
         /// <summary>
-        /// GET apidemo/Values/route4
+        /// GET did_serslot/Values/route104
         /// </summary>
         /// <returns></returns>     
         [HttpGet("[action]")]
-        public object route4()
+        public object route104()
         {
             return new
             {
-                name= "GET apidemo/Values/route4",
+                name = "GET did_serslot/Values/route104",
                 Request.Path,
-                Method = Request.Method
+                Request.Method
             };
         }
         #endregion
 
 
-        #region (x.2) result
+        #region (x.2)Name和Desc
 
         /// <summary>
-        /// GET apidemo/Values/result1
+        /// 演示 如何使用Name 和 Description。
+        /// 函数注释和使用SsDescription是一样的效果。
         /// </summary>
         /// <returns></returns>
-        [HttpGet("result1")]
-        public object Result1()
+        [HttpGet("201/NameDesc")]
+        [SsName("NameDesc1")]
+        public ApiReturn NameDesc()
         {
-            return "GET apidemo/Values/result1";
+            return new ApiReturn();
         }
 
         /// <summary>
-        /// GET apidemo/Values/result2
+        /// 
         /// </summary>
         /// <returns></returns>
-        [HttpGet("result2")]
-        public ActionResult<string> Result2()
+        [HttpGet("202/NameDesc")]
+        [SsDescription("演示 如何使用Name 和 Description。\n函数注释和使用SsDescription是一样的效果。")]
+        public ApiReturn NameDesc2()
         {
-            return "GET apidemo/Values/result2";
+            return new ApiReturn();
         }
+        #endregion
+
+
 
+        #region (x.3) 参数
 
+        #region (x.x.1) 从route获取参数
         /// <summary>
-        /// GET apidemo/Values/result3
+        /// 从route获取参数
+        /// GET did_serslot/Values/301/arg/{id}/{id2}       
         /// </summary>
         /// <returns></returns>
-        [HttpGet("result3")]
-        public ActionResult<IEnumerable<string>> Result3()
+        [HttpGet("301/arg/{name}/{age}")]
+        public object Arg301(
+             [SsExample("lith"), SsDefaultValue("NoName"), SsDescription("姓名")]string name,
+             [SsExample("30"), SsDefaultValue("0"), SsDescription("年龄，请指定在16-50中间的整数")]int age)
         {
-            return new string[] { "GET apidemo/Values/result3", "" };
+            return new
+            {
+                Request.Path,
+                Request.Method,
+                request = new { name, age }
+            };
         }
+        #endregion
 
-
+        #region (x.x.2)从Query String获取参数
         /// <summary>
-        /// GET apidemo/Values/result4
+        /// 从Query String获取参数
+        /// GET did_serslot/Values/302/arg?name=lith&amp;age=30
         /// </summary>
         /// <returns></returns>
-        [HttpGet("result4")]
-        public async Task<string> Result4()
+        [HttpGet("302/arg")]
+        public object Arg302(
+             [FromQuery, SsExample("lith"), SsDescription("姓名")]string name,
+             [FromQuery, SsExample("30"), SsDescription("年龄，请指定在16-50中间的整数")]int age)
         {
-            await Task.Run(() => { Thread.Sleep(2000); });
+            return new
+            {
+                Request.Path,
+                Request.Method,
+                request = new { name, age }
+            };
+        }
+        #endregion
+
 
-            return "GET apidemo/Values/result4";
+        #region (x.x.3)从Body获取参数
+
+        /// <summary>
+        /// 从Body获取参数
+        /// POST did_serslot/Values/303/arg
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("303/arg")]
+        public object Arg3([FromBody, SsExample("\"lith\""), SsDescription("姓名,请以双引号开始和结束")]string name)
+        {
+            return new
+            {
+                Request.Path,
+                Request.Method,
+                request = new { name }
+            };
         }
+        #endregion
+
+        #region (x.x.4)从Body获取参数
 
         /// <summary>
-        /// GET apidemo/Values/result5
+        /// 从Body获取参数
+        /// POST did_serslot/Values/304/arg
         /// </summary>
         /// <returns></returns>
-        [HttpGet("result5")]
-        public async Task<ActionResult<string>> Result5()
+        [HttpPost("304/arg")]
+        public object Arg4([FromBody] ArgModel arg)
         {
-            await Task.Run(() => { Thread.Sleep(2000); });
+            return new
+            {
+                Request.Path,
+                Request.Method,
+                request = arg
+            };
+        }
 
-            return "GET apidemo/Values/result5";
+        public class ArgModel
+        {
+            /// <summary>
+            /// 姓名
+            /// </summary>
+            [SsExample("lith"), SsDefaultValue("NoName")]
+            [JsonProperty("arg")]
+            public string name { get; set; }
+            /// <summary>
+            /// 
+            /// </summary>
+            [SsExample("20"), SsDefaultValue("0"), SsDescription("年龄，请指定在16-50中间的整数")]
+            public int age;
         }
+
+
         #endregion
 
 
-        #region (x.3) HttpMethod
+        #region (x.x.5)从Form获取参数
 
         /// <summary>
-        /// GET apidemo/Values/method
+        /// 从Form获取参数
+        /// POST did_serslot/Values/304/arg
         /// </summary>
         /// <returns></returns>
-        [HttpGet("method")]
-        public string Method_Get()
+        [HttpPost("305/arg")]
+        public object Arg5([FromForm]ArgModel arg)
         {
-            return "GET apidemo/Values/method";
+            return new
+            {
+                Request.Path,
+                Request.Method,
+                request = arg
+            };
         }
+        #endregion
+
+
+
+        #endregion
 
+
+        #region (x.4) 返回值
+
+
+        #region (x.x.1)返回值注释
         /// <summary>
-        /// POST apidemo/Values/method
+        /// 
         /// </summary>
         /// <returns></returns>
-        [HttpPost("method")]
-        public string Method_Post()
+        [HttpGet("401/ret")]
+        [return: SsExample("test1"), SsDescription("返回test1")]
+        public string Return4()
         {
-            return "POST apidemo/Values/method";
+            return "test1";
         }
 
+
         /// <summary>
-        /// Put apidemo/Values/method
+        /// 
         /// </summary>
         /// <returns></returns>
-        [HttpPut("method")]
-        public string Method_Put()
+        [HttpGet("402/ret")]
+        [return: SsExample("5"), SsDescription("返回5")]
+        public int Return5()
         {
-            return "Put apidemo/Values/method";
+            return 5;
         }
 
         /// <summary>
-        /// Delete apidemo/Values/method
+        /// 
         /// </summary>
         /// <returns></returns>
-        [HttpDelete("method")]
-        public string Method_Delete()
+        [HttpGet("403/ret")]
+        [return: /*SsExample("{\"name\":\"张三\"}"),*/ SsDescription("返回模型数据")]
+        public ReturnData Return6()
+        {
+            return new ReturnData { name = "张三" };
+        }
+
+
+        /// <summary>
+        /// Return注释-FromType
+        /// </summary>
+        public class ReturnData
+        {
+
+            /// <summary>
+            /// 姓名
+            /// </summary>
+            [SsExample("lith"), SsDefaultValue("NoName")]
+            public string name { get; set; }
+        }
+
+
+        #endregion
+
+
+        #region (x.x.2)异步返回
+
+
+
+        /// <summary>
+        /// GET did_serslot/Values/201/result
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("420/result")]
+        public object Result1()
         {
-            return "Delete apidemo/Values/method";
+            return Request.Method + " " + Request.Path;
         }
 
         /// <summary>
-        /// Head apidemo/Values/method
+        /// GET did_serslot/Values/202/result
         /// </summary>
         /// <returns></returns>
-        [HttpHead("method")]
-        public string Method_Head()
+        [HttpGet("421/result")]
+        public ActionResult<string> Result2()
         {
-            return "Head apidemo/Values/method";
+            return Request.Method + " " + Request.Path;
         }
 
+
         /// <summary>
-        /// Options apidemo/Values/method
+        /// GET did_serslot/Values/203/result
         /// </summary>
         /// <returns></returns>
-        [HttpOptions("method")]
-        public string Method_Options()
+        [HttpGet("422/result")]
+        public ActionResult<IEnumerable<string>> Result3()
         {
-            return "Options apidemo/Values/method";
+            return new string[] { Request.Method + " " + Request.Path, "" };
         }
 
+
         /// <summary>
-        /// Patch apidemo/Values/method
+        /// GET did_serslot/Values/204/result
         /// </summary>
         /// <returns></returns>
-        [HttpPatch("method")]
-        public string Method_Patch()
+        [HttpGet("423/result")]
+        public async Task<string> Result4()
         {
-            return "Patch apidemo/Values/method";
+            await Task.Run(() => { Thread.Sleep(2000); });
+
+            return Request.Method + " " + Request.Path;
         }
 
+        /// <summary>
+        /// GET did_serslot/Values/205/result
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("424/result")]
+        public async Task<ActionResult<string>> Result5()
+        {
+            await Task.Run(() => { Thread.Sleep(2000); });
+
+            return Request.Method + " " + Request.Path;
+        }
+
+        #endregion
+
+
+        #endregion
+
 
+        #region (x.5)指定参数或返回值类型
         /// <summary>
-        /// get|post apidemo/Values/method2
+        /// 指定参数或返回值类型
         /// </summary>
         /// <returns></returns>
-        [Route("method2")]
-        [HttpGet,HttpPost]
-        public object Method2()
+        [HttpGet("500/type")]
+        [return: SsType(typeof(List<string>)), SsExample("[5,6]"), SsDescription("返回原值")]
+        public string Type(
+            [SsType(typeof(List<string>)), SsExample("[5,6]"), SsDescription("id数组")]string ids
+            )
         {
-            return new
-            {
-                Request.Path,
-                Method = Request.Method
-            };
+            return ids;
         }
         #endregion
 
 
-        #region (x.4) Arg
+        #region (x.6) HttpMethod
 
+        /// <summary>
+        /// GET did_serslot/Values/600/method
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("600/method")]
+        public string Method_Get()
+        {
+            return Request.Method + " " + Request.Path;
+        }
+
+        /// <summary>
+        /// POST did_serslot/Values/600/method
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("600/method")]
+        public string Method_Post()
+        {
+            return Request.Method + " " + Request.Path;
+        }
+
+        /// <summary>
+        /// Put did_serslot/Values/600/method
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut("600/method")]
+        public string Method_Put()
+        {
+            return Request.Method + " " + Request.Path;
+        }
 
         /// <summary>
-        /// GET apidemo/Values/arg1/{id}/{id2}
+        /// Delete did_serslot/Values/600/method
         /// </summary>
         /// <returns></returns>
-        [HttpGet("arg1/{id}/{id2}")]
-        public object Arg1(string id,string id2)
+        [HttpDelete("600/method")]
+        public string Method_Delete()
         {
-            return new {
-                route= "GET apidemo/Values/arg1/{id}/{id2}",
-                arg = new { id,id2 }
-            }; 
+            return Request.Method + " " + Request.Path;
         }
 
         ///// <summary>
-        ///// GET apidemo/Values/arg2/arg2?id={id}
+        ///// Head did_serslot/Values/600/method
         ///// </summary>
         ///// <returns></returns>
-        //[HttpGet("arg2?id={id}")]
-        //public object Arg2(string id)
+        //[HttpHead("600/method")]
+        //public string Method_Head()
         //{
-        //    return new
-        //    {
-        //        route = "GET apidemo/Values/arg2/arg2?id={id}",
-        //        arg = new { id }
-        //    };
+        //    return Request.Method + " " + Request.Path;
         //}
 
-
         /// <summary>
-        /// POST apidemo/Values/arg3
+        /// Options did_serslot/Values/600/method
         /// </summary>
         /// <returns></returns>
-        [HttpPost("arg3")]
-        public object Arg3([FromBody] string arg1)
+        [HttpOptions("600/method")]
+        public string Method_Options()
         {
-            return new
-            {
-                route = "POST apidemo/Values/arg3",
-                arg = new { arg1 }
-            };
+            return Request.Method + " " + Request.Path;
         }
 
+        /// <summary>
+        /// Patch did_serslot/Values/600/method
+        /// </summary>
+        /// <returns></returns>
+        [HttpPatch("600/method")]
+        public string Method_Patch()
+        {
+            return Request.Method + " " + Request.Path;
+        }
 
 
         /// <summary>
-        /// POST apidemo/Values/arg4
+        /// get|post did_serslot/Values/601/method
         /// </summary>
         /// <returns></returns>
-        [HttpPost("arg4")]
-        public object Arg4([FromBody] Arg4Model arg)
+        [Route("601/method")]
+        [HttpGet, HttpPost]
+        public string Method2()
         {
-            return new
-            {
-                route = "POST apidemo/Values/arg4",
-                arg = arg
-            };
+            return Request.Method + " " + Request.Path;
         }
-        public class Arg4Model {
-            public string arg1 { get; set; }
-            public string arg2 { get; set; }
-        };
         #endregion
 
-
     }
 }

dotnet/StationDemo/SersLoader/Did.SersLoader.Demo/Controllers/Demo/SampleController.cs

@@ -357,6 +357,23 @@ namespace Did.SersLoader.Demo.Controllers.Demo
         #endregion
 
 
+        #region (x.4-2)指定参数或返回值类型
+        /// <summary>
+        /// 指定参数或返回值类型
+        /// </summary>
+        /// <returns></returns>
+        [SsRoute("409/type")]
+        [return: SsType(typeof(List<int>)), SsExample("[5,6]"), SsDescription("返回原值")]
+        public string Type(
+            [SsType(typeof(List<string>)), SsExample("[5,6]"), SsDescription("id数组")]string ids
+            )
+        {
+            return ids;
+        }
+        #endregion
+
+
+
         #region (x.5) Rpc
 
         /// <summary>

dotnet/StationDemo/Serslot/Did.Serslot.Demo/Controllers/ValuesController.cs

@@ -189,6 +189,28 @@ namespace Did.Serslot.Demo.Controllers
 
         #endregion
 
+
+        #region (x.x.5)从Form获取参数
+
+        /// <summary>
+        /// 从Form获取参数
+        /// POST did_serslot/Values/304/arg
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("305/arg")]
+        public object Arg5([FromForm]ArgModel arg)
+        {
+            return new
+            {
+                Request.Path,
+                Request.Method,
+                request = arg
+            };
+        }
+        #endregion
+
+
+
         #endregion
 
 
@@ -314,73 +336,89 @@ namespace Did.Serslot.Demo.Controllers
         #endregion
 
 
-        #region (x.5) HttpMethod
+        #region (x.5)指定参数或返回值类型
+        /// <summary>
+        /// 指定参数或返回值类型
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("500/type")]
+        [return: SsType(typeof(List<string>)),SsExample("[5,6]"), SsDescription("返回原值")]
+        public string Type(
+            [SsType(typeof(List<string>)), SsExample("[5,6]"), SsDescription("id数组")]string ids
+            )
+        {
+            return ids;
+        }
+        #endregion
+
+
+        #region (x.6) HttpMethod
 
         /// <summary>
-        /// GET did_serslot/Values/500/method
+        /// GET did_serslot/Values/600/method
         /// </summary>
         /// <returns></returns>
-        [HttpGet("500/method")]
+        [HttpGet("600/method")]
         public string Method_Get()
         {
             return Request.Method + " " + Request.Path;
         }
 
         /// <summary>
-        /// POST did_serslot/Values/500/method
+        /// POST did_serslot/Values/600/method
         /// </summary>
         /// <returns></returns>
-        [HttpPost("500/method")]
+        [HttpPost("600/method")]
         public string Method_Post()
         {
             return Request.Method + " " + Request.Path;
         }
 
         /// <summary>
-        /// Put did_serslot/Values/500/method
+        /// Put did_serslot/Values/600/method
         /// </summary>
         /// <returns></returns>
-        [HttpPut("500/method")]
+        [HttpPut("600/method")]
         public string Method_Put()
         {
             return Request.Method + " " + Request.Path;
         }
 
         /// <summary>
-        /// Delete did_serslot/Values/500/method
+        /// Delete did_serslot/Values/600/method
         /// </summary>
         /// <returns></returns>
-        [HttpDelete("500/method")]
+        [HttpDelete("600/method")]
         public string Method_Delete()
         {
             return Request.Method + " " + Request.Path;
         }
 
         ///// <summary>
-        ///// Head did_serslot/Values/500/method
+        ///// Head did_serslot/Values/600/method
         ///// </summary>
         ///// <returns></returns>
-        //[HttpHead("500/method")]
+        //[HttpHead("600/method")]
         //public string Method_Head()
         //{
         //    return Request.Method + " " + Request.Path;
         //}
 
         /// <summary>
-        /// Options did_serslot/Values/500/method
+        /// Options did_serslot/Values/600/method
         /// </summary>
         /// <returns></returns>
-        [HttpOptions("500/method")]
+        [HttpOptions("600/method")]
         public string Method_Options()
         {
             return Request.Method + " " + Request.Path;
         }
 
         /// <summary>
-        /// Patch did_serslot/Values/500/method
+        /// Patch did_serslot/Values/600/method
         /// </summary>
         /// <returns></returns>
-        [HttpPatch("500/method")]
+        [HttpPatch("600/method")]
         public string Method_Patch()
         {
             return Request.Method + " " + Request.Path;
@@ -388,10 +426,10 @@ namespace Did.Serslot.Demo.Controllers
 
 
         /// <summary>
-        /// get|post did_serslot/Values/501/method
+        /// get|post did_serslot/Values/601/method
         /// </summary>
         /// <returns></returns>
-        [Route("501/method")]
+        [Route("601/method")]
         [HttpGet, HttpPost]
         public string Method2()
         {
@@ -399,8 +437,5 @@ namespace Did.Serslot.Demo.Controllers
         }
         #endregion
 
-
-
-
     }
 }

dotnet/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Model/SsTypeAttribute.cs

@@ -0,0 +1,21 @@
+using System;
+
+namespace Vit.Core.Util.ComponentModel.Model
+{
+    /// <summary>
+    /// 指定类型
+    /// </summary>
+    [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
+    public class SsTypeAttribute : System.Attribute
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public Type Value { get; set; }
+       
+        public SsTypeAttribute(Type Value = null)
+        {
+            this.Value = Value;
+        }
+    }
+}