xf 2 роки тому
батько
коміт
5b3800123f

+ 0 - 9
src/Hotline.Api/appsettings.Development.json

@@ -56,15 +56,6 @@
   "Cors": {
     "Origins": [ "http://localhost:8888", "http://admin.hotline.fw.com", "http://hotline.fw.com" ]
   },
-  "WorkTimeSettings": {
-    "MorningBegin": "08:00",
-    "MorningEnd": "12:00",
-    "AfterBegin": "15:00",
-    "AfterEnd": "21:00",
-    "WorkDay": [ 1, 2, 3, 4, 5, 0, 6 ],
-    "WorkCategory": "08da9b9f-a35d-4ade-8ea7-55e8abbcdefd",
-    "RestCategory": "08daa5f5-ac7a-4ced-8295-1c78baa15f9e"
-  },
   "IdentityConfiguration": {
     "Password": {
       "RequiredLength": 8,

+ 0 - 9
src/Hotline.Api/appsettings.json

@@ -72,15 +72,6 @@
   "Cors": {
     "Origins": [ "http://localhost:8888", "http://admin.hotline.fw.com", "http://hotline.fw.com" ]
   },
-  //"WorkTimeSettings": {
-  //  "MorningBegin": "08:00",
-  //  "MorningEnd": "12:00",
-  //  "AfterBegin": "15:00",
-  //  "AfterEnd": "21:00",
-  //  "WorkDay": [ 1, 2, 3, 4, 5, 0, 6 ],
-  //  "WorkCategory": "08da9b9f-a35d-4ade-8ea7-55e8abbcdefd",
-  //  "RestCategory": "08daa5f5-ac7a-4ced-8295-1c78baa15f9e"
-  //},
   "Exceptionless": {
     "InUse": false,
     "ServerUrl": "http://log.fw.com",

+ 4 - 0
src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -45,6 +45,10 @@ namespace Hotline.Application.Mappers
             config.ForType<WorkflowStep, WorkflowStep>()
                 .Ignore(d => d.Id);
 
+            config.ForType<WorkflowStep, WorkflowTrace>()
+                .Ignore(d => d.Id)
+                .Map(d => d.StepId, s => s.Id);
+
             config.ForType<WorkflowSupplement, WorkflowSupplementDto>()
                 .IgnoreIf((s, d) => s.Creator == null, d => d.Creator);
 

+ 0 - 35
src/Hotline/FileStorage/File.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using XF.Domain.Repository;
-
-namespace Hotline.FileStorage
-{
-    public class File //: FullStateEntity
-    {
-        public EFileSType FileSType { get; set; }
-
-        public string Name { get; set; }
-
-        public string Extention { get; set; }
-
-        public string FullName { get; set; }
-
-        /// <summary>
-        /// 相对路劲
-        /// </summary>
-        public string Path { get; set; }
-
-        public string FullPath { get; set; }
-
-        public string Size { get; set; }
-    }
-
-    public enum EFileSType
-    {
-        Image = 0,
-
-    }
-}

+ 4 - 0
src/Hotline/Hotline.csproj

@@ -22,4 +22,8 @@
     <ProjectReference Include="..\XF.Domain.Repository\XF.Domain.Repository.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="FileStorage\" />
+  </ItemGroup>
+
 </Project>