zuohuaijun 3 лет назад
Родитель
Сommit
9d77384a90

+ 5 - 5
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -20,15 +20,15 @@
 
   <ItemGroup>
     <PackageReference Include="Caching.CSRedis" Version="3.8.3" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.7.0" />
-    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="3.7.0" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.7.0" />
-    <PackageReference Include="Furion.Pure" Version="3.7.0" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.7.3" />
+    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="3.7.3" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.7.3" />
+    <PackageReference Include="Furion.Pure" Version="3.7.3" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.6" />
     <PackageReference Include="MySql.Data" Version="8.0.29" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.5" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.15.0" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.16.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.10.0" />
     <PackageReference Include="SqlSugarCore" Version="5.0.9.1" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.19" />

+ 35 - 1
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -3262,7 +3262,7 @@
             登录系统
             </summary>
             <param name="input"></param>
-            <remarks>用户名/密码:admin/123456</remarks>
+            <remarks>用户名/密码:vben/123456</remarks>
             <returns></returns>
         </member>
         <member name="M:Admin.NET.Core.Service.AuthService.GetUserInfo">
@@ -3363,6 +3363,16 @@
             个人简介
             </summary>
         </member>
+        <member name="P:Admin.NET.Core.Service.LoginUserInfoOutput.OrgId">
+            <summary>
+            机构Id
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.Service.LoginUserInfoOutput.OrgName">
+            <summary>
+            机构名称
+            </summary>
+        </member>
         <member name="P:Admin.NET.Core.Service.LoginUserInfoOutput.Roles">
             <summary>
             角色集合
@@ -4514,6 +4524,16 @@
             状态
             </summary>
         </member>
+        <member name="P:Admin.NET.Core.Service.QueryDictDataInput.Code">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.Service.QueryDictDataInput.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
         <member name="T:Admin.NET.Core.Service.PageDictTypeInput">
             <summary>
             字典类型分页
@@ -4656,6 +4676,13 @@
             <param name="code"></param>
             <returns></returns>
         </member>
+        <member name="M:Admin.NET.Core.Service.SysDictDataService.QueryDictDataDropdown(Admin.NET.Core.Service.QueryDictDataInput)">
+            <summary>
+            根据条件查询字典获取下拉框集合
+            </summary>
+            <param name="input">查询参数</param>
+            <returns></returns>
+        </member>
         <member name="T:Admin.NET.Core.Service.SysDictTypeService">
             <summary>
             系统字典类型服务
@@ -5261,6 +5288,13 @@
             系统机构服务
             </summary>
         </member>
+        <member name="M:Admin.NET.Core.Service.SysOrgService.GetUserOrgList(System.Int64)">
+            <summary>
+            获取用户拥有机构信息列表
+            </summary>
+            <param name="userId">用户id</param>
+            <returns></returns>
+        </member>
         <member name="M:Admin.NET.Core.Service.SysOrgService.GetOrgList(Admin.NET.Core.Service.OrgInput)">
             <summary>
             获取机构列表

+ 1 - 1
Admin.NET/Admin.NET.Core/Extension/ObjectExtension.cs

@@ -64,7 +64,7 @@ public static class ObjectExtension
         DataTable result = new();
         if (list.Count > 0)
         {
-            result.TableName = list[0].GetType().Name; // 表名赋值
+            // result.TableName = list[0].GetType().Name; // 表名赋值
             PropertyInfo[] propertys = list[0].GetType().GetProperties();
             foreach (PropertyInfo pi in propertys)
             {

+ 2 - 0
Admin.NET/Admin.NET.Web.Entry/appsettings.json

@@ -1,6 +1,8 @@
 {
   "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
 
+  "Urls": "https://*:5005",
+
   "Serilog": {
     "MinimumLevel": {
       "Default": "Information",