文件调整

ams/djy.Model/DJY/ApiFromDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Common;
-namespace djy.Paas.Model
+namespace djy.Model
 {
     /// <summary>
     /// 统一用于接收前端功能查询条件

ams/djy.Model/DJY/DJyUserAuthorityDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace djy.Paas.Model
+namespace djy.Model
 {
     /// <summary>
     /// 大简云用户权限

ams/djy.Model/DJY/DataBase.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Common;
 using FreeSql.DataAnnotations;
-namespace djy.Paas.Model
+namespace djy.Model
 {/// <summary>
  /// 基础基类
  /// </summary>

ams/djy.Model/DJY/DjyDictDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Common;
-namespace djy.Paas.Model
+namespace djy.Model
 {/// <summary>
 /// 常用标准的数据字典配置模型
 /// </summary>

ams/djy.Model/DJY/EnumUser.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Common;
-namespace djy.Paas.Model
+namespace djy.Model
 {
     /// <summary>
     /// 

ams/djy.Model/DJY/FileListDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace djy.Paas.Model
+namespace djy.Model
 {
     /// <summary>
     /// 文件列表Dto

ams/djy.Model/DJY/ModuleServerDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Common;
-namespace djy.Paas.Model
+namespace djy.Model
 {
     /// <summary>
     /// 用于三方请求服务的

ams/djy.Model/DJY/UserAuthorityDto.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace djy_AmsApi
+namespace djy.Model
 {
     /// <summary>
     /// 权限Dto

ams/djy.Model/DJY/tb_JobLogs.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace djy.Paas.Model
+namespace djy.Model
 {
     /// <summary>
     ///Job请求日志

ams/djy.Model/DJY/tb_OpenModuleServer.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using FreeSql.DataAnnotations;
-namespace djy.Paas.Model
+namespace djy.Model
 {
     /// <summary>
     /// 开放的业务请求记录

ams/djy.Model/DJY/tb_PyaList.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using FreeSql.DataAnnotations;
-namespace djy.Paas.Model
+namespace djy.Model
 {
     /// <summary>
     /// 支付

ams/djy.Model/DJY/tb_sys_Dictionary.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using Common;
 using FreeSql.DataAnnotations;
-namespace djy.Paas.Model
+namespace djy.Model
 {
     /// <summary>
     /// 数据字典

ams/djy.Model/DJY/tb_sys_DictionaryDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace djy.Paas.Model
+namespace djy.Model
 {
     /// <summary>
     /// 数据字典表Dto

ams/djy.Model/DJY/tb_sys_Logs.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using FreeSql.DataAnnotations;
-namespace djy.Paas.Model
+namespace djy.Model
 {/// <summary>
  /// 日志表
  /// </summary>

ams/djy.Model/DJY/tb_sys_MenuList.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace djy.Paas.Model
+namespace djy.Model
 {
     /// <summary>
     /// 模块目录链接

ams/djy.Model/djy.Model.csproj

@@ -24,21 +24,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Remove="djydb\tb_BaoguanAliActionList.cs" />
-    <Compile Remove="djydb\tb_BaoguanContainer.cs" />
-    <Compile Remove="djydb\tb_BaoguanDecList.cs" />
-    <Compile Remove="djydb\tb_BaoguanOrderClient.cs" />
-    <Compile Remove="djydb\tb_BaoguanOrderCompanyPushMsg.cs" />
-    <Compile Remove="djydb\tb_BaoGuanOrderList.cs" />
-    <Compile Remove="djydb\tb_ChangeShip.cs" />
-    <Compile Remove="djydb\Tb_Demo.cs" />
-    <Compile Remove="djydb\tb_ShipRouteList.cs" />
-    <Compile Remove="djydb\tb_ShipSchedule.cs" />
-    <Compile Remove="djydb\tb_txxp_BillOrderList.cs" />
-    <Compile Remove="djydb\tb_txxp_BillPrintLogs.cs" />
-    <Compile Remove="djydb\tb_vgm_SendBoxInfo.cs" />
-    <Compile Remove="djydb\tb_vgm_vgmOrderList.cs" />
-    <Compile Remove="djydb\tb_WorkbenchList.cs" />
+    <Compile Remove="DJY\tb_BaoguanAliActionList.cs" />
+    <Compile Remove="DJY\tb_BaoguanContainer.cs" />
+    <Compile Remove="DJY\tb_BaoguanDecList.cs" />
+    <Compile Remove="DJY\tb_BaoguanOrderClient.cs" />
+    <Compile Remove="DJY\tb_BaoguanOrderCompanyPushMsg.cs" />
+    <Compile Remove="DJY\tb_BaoGuanOrderList.cs" />
+    <Compile Remove="DJY\tb_ChangeShip.cs" />
+    <Compile Remove="DJY\Tb_Demo.cs" />
+    <Compile Remove="DJY\tb_ShipRouteList.cs" />
+    <Compile Remove="DJY\tb_ShipSchedule.cs" />
+    <Compile Remove="DJY\tb_txxp_BillOrderList.cs" />
+    <Compile Remove="DJY\tb_txxp_BillPrintLogs.cs" />
+    <Compile Remove="DJY\tb_vgm_SendBoxInfo.cs" />
+    <Compile Remove="DJY\tb_vgm_vgmOrderList.cs" />
+    <Compile Remove="DJY\tb_WorkbenchList.cs" />
   </ItemGroup>
 
   <ItemGroup>

ams/djy.Paas.IService/Djy/IDjyUserService.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using Common;
 using djy.Model;
-using djy.Paas.Model;
 namespace djy.Paas.IService
 {
     /// <summary>

ams/djy.Paas.IService/Djy/IToolsService.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using djy.Paas.Model;
 using Common;
 using djy.Model;
 namespace djy.Paas.IService

ams/djy.Paas.IService/Djy/IsBase.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 using Common;
-using djy.Paas.Model;
 using System.Linq.Expressions;
+using djy.Model;
+
 namespace djy.Paas.IService
 {
     /// <summary>

ams/djy.paas.Service/Djy/AutoMapperConfig.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
 using djy.Model;
-using djy.Paas.Model;
 namespace djy.Service
 {/// <summary>
 /// automapper自动映射配置

ams/djy.paas.Service/Djy/DbContext.cs

@@ -1,5 +1,4 @@
-using djy.Paas.Model;
-using FreeRedis;
+using FreeRedis;
 using FreeRedis.Internal;
 using FreeSql;
 using System;

ams/djy.paas.Service/Djy/DjyUserService.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using djy.Model;
-using djy.Paas.Model;
 using djy.Paas.IService;
 using Common;
 namespace djy.Service

ams/djy.paas.Service/Djy/ServBase.cs

@@ -13,7 +13,6 @@ using DotNetCore.CAP;
 using System.Text.Json;
 using System.Linq.Expressions;
 using System.Reflection;
-using djy.Paas.Model;
 
 namespace djy.Service
 {

ams/djyweb_djyPaasApi/Controllers/ApiBase.cs

@@ -7,10 +7,10 @@ using Common;
 using System.Reflection;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
-using djy.Paas.Model;
 using djy.Paas.IService;
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
+using djy.Model;
 
 namespace djy_AmsApi.Controllers
 {

ams/djyweb_djyPaasApi/djy_AmsApi.csproj

@@ -10,6 +10,13 @@
     <DocumentationFile>bin\Debug\net5.0\djyweb_djyPaasApi.xml</DocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Model\**" />
+    <Content Remove="Model\**" />
+    <EmbeddedResource Remove="Model\**" />
+    <None Remove="Model\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
     <PackageReference Include="iTextSharp.LGPLv2.Core" Version="1.7.5" />