111

HiTeachCC.Model/HiTeachCC.Model.csproj

@@ -3,11 +3,9 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="TEAMModelOS.SDK" Version="1.0.6" />
   </ItemGroup>
-
   <ItemGroup>
     <Folder Include="Teach\Dtos\" />
   </ItemGroup>

HiTeachCC.Model/PowerPoint/Connector.cs

@@ -11,7 +11,7 @@ namespace HiTeachCC.Model.PowerPoint
         /// <summary>
         ///连接线 p:cxnSp
         /// </summary>
-        public string Type { get; set; }
+        public string CxnType { get; set; }
         public string HeadEnd { get; set; }
         public string TailEnd { get; set; }
         public Border border { get; set; }

HiTeachCC.Model/PowerPoint/Position.cs

@@ -7,27 +7,27 @@ namespace HiTeachCC.Model.PowerPoint
     public class Position
     {
         //旋转角度
-        public double Rot { get; set; }
+        public Int64 Rot { get; set; }
         //水平翻转
         public bool FlipH { get; set; }
         //垂直翻转
         public bool FlipV { get; set; }
         //x轴
-        public double X { get; set; }
+        public Int64 X { get; set; }
         //y轴
-        public double Y { get; set; }
+        public Int64 Y { get; set; }
         //宽度
-        public double Cx { get; set; }
+        public Int64 Cx { get; set; }
         //高度
-        public double Cy { get; set; }
+        public Int64 Cy { get; set; }
         //初始坐标x
-        public double ChX { get; set; }
+        public Int64 ChX { get; set; }
         //初始坐标Y
-        public double ChY { get; set; }
+        public Int64 ChY { get; set; }
         //拉伸宽度
-        public double ChcX { get; set; }
+        public Int64 ChCX { get; set; }
         //拉伸高度
-        public double ChCY { get; set; }
+        public Int64 ChCY { get; set; }
         //层级
         public int Index { get; set; }
     }

HiTeachCC.Model/PowerPoint/Shape.cs

@@ -6,7 +6,7 @@ namespace HiTeachCC.Model.PowerPoint
 {
      public class Shape : Item
     { 
-        public string Type;
+        public string ShapeType;
         public Paragraph Paragraph { get; set; }
         public Fill Fill { get; set; }
         public Border Border { get; set; }

HiTeachCC.Service/Core/Implement/LoginInfoService.cs

@@ -385,7 +385,7 @@ namespace HiTeachCC.Service.Core.Implement
             }
             else
             {
-                ClaimModel claimModel = JwtHelper.SerializeJWT(ticketInfo.Token);
+                ClaimModel claimModel = JwtHelper.SerializeJWT(authorizationCode);
                 var dateTime = DateTimeHelper.ConvertToTimeStamp10(DateTime.Now);
                 var expExt = claimModel.Claim.TryGetValue("exp", out var exp);
                 if (expExt == false || dateTime > long.Parse(exp.ToString()))

HiTeachCC.Service/HiTeachCC.Service.csproj

@@ -3,14 +3,11 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="TEAMModelOS.SDK" Version="1.0.6" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\HiTeachCC.Library\HiTeachCC.Library.csproj" />
     <ProjectReference Include="..\HiTeachCC.Model\HiTeachCC.Model.csproj" />
   </ItemGroup>
-
 </Project>

HiTeachCC.Service/PowerPoint/Implement/PowerPointService.cs

@@ -1,4 +1,5 @@
 using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Drawing;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Presentation;
 using HiTeachCC.Model.PowerPoint;
@@ -13,7 +14,7 @@ using Theme = DocumentFormat.OpenXml.Drawing.Theme;
 
 namespace HiTeachCC.Service.PowerPoint.Implement
 {
-    public class PowerPointService : BaseService,  IPowerPointService
+    public class PowerPointService : BaseService, IPowerPointService
     {
         const double inchpixel = 96.00, inchpt = 72.00, pxBase = 914400.00, ptBase = 12700;
         const double rotBase = 60000.00;
@@ -52,6 +53,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
                     int pageSize = 0;
                     var slideMasterParts = presentationPart.SlideMasterParts;
                     ColorMap colorMap = null;
+                    SlideMaster slideMaster = null; 
                     Theme theme = null;
                     foreach (var slideMasterPart in slideMasterParts)
                     {
@@ -59,10 +61,11 @@ namespace HiTeachCC.Service.PowerPoint.Implement
                         {
                             break;
                         }
+                        slideMaster = slideMasterPart.SlideMaster;
                         colorMap = slideMasterPart.SlideMaster.ColorMap;
                         theme = slideMasterPart.ThemePart.Theme;
                     }
-                    Dictionary<string,string> colors=   DoColorMap(colorMap, theme);
+                    Dictionary<string, string> colors = DoColorMap(colorMap, theme);
                     //获取PPT 一页大小
                     double x = presentation.SlideSize.Cx * inchpixel / pxBase;
                     double y = presentation.SlideSize.Cy * inchpixel / pxBase;
@@ -70,7 +73,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
                     if (presentation.SlideIdList != null)
                     {
 
-                      //  presentation.SlideIdList.OrderBy(x=>x.);
+                        //  presentation.SlideIdList.OrderBy(x=>x.);
                         // Get the title of each slide in the slide order.
                         // 获取的是几页PPT数量
                         foreach (var slideId in presentation.SlideIdList.Elements<SlideId>())
@@ -82,6 +85,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
                             //获取当前页 PPT 的所有元素
                             // slide.Items = GetSlideElement(slidePart, theme, colorMap);
                             //slide.Xml = slidePart.Slide.OuterXml;
+                            GetSlideElement(slidePart, colors);
                             slides.Add(slide);
                             pageSize++;
                         }
@@ -92,25 +96,43 @@ namespace HiTeachCC.Service.PowerPoint.Implement
                 return null;
             }
         }
-        public HiTeachCC.Model.PowerPoint.Slide GetSlideElement(SlidePart slidePart, Dictionary<string, string>  colors) {
+        public HiTeachCC.Model.PowerPoint.Slide GetSlideElement(SlidePart slidePart, Dictionary<string, string> colors)
+        {
+            //slidePart.SlideLayoutPart;
+
             var shapeTrees = from shap in slidePart.Slide.Descendants<ShapeTree>() select shap;
             if (shapeTrees.Count() > 0 && shapeTrees.First().ChildElements.Count > 0)
             {
                 OpenXmlElementList openXmlElements = shapeTrees.First().ChildElements;
+                TransformGroup transformGroup = shapeTrees.First().GroupShapeProperties.TransformGroup;
+                HiTeachCC.Model.PowerPoint.Position position = new
+                    HiTeachCC.Model.PowerPoint.Position();
+                position.Rot = transformGroup.Rotation == null ? 0 : transformGroup.Rotation.Value;
+                position.FlipH = transformGroup.HorizontalFlip == null ? false : transformGroup.HorizontalFlip.Value;
+                position.FlipV = transformGroup.VerticalFlip == null ? false : transformGroup.VerticalFlip.Value;
+                position.X = transformGroup.Offset.X == null ? 0 : transformGroup.Offset.X.Value;
+                position.Y = transformGroup.Offset.Y == null ? 0 : transformGroup.Offset.Y.Value;
+                position.Cx = transformGroup.Extents.Cx == null ? 0 : transformGroup.Extents.Cx.Value;
+                position.Cy = transformGroup.Extents.Cy == null ? 0 : transformGroup.Extents.Cy.Value;
+                position.ChX = transformGroup.ChildOffset.X == null ? 0 : transformGroup.ChildOffset.X.Value;
+                position.ChY = transformGroup.ChildOffset.Y == null ? 0 : transformGroup.ChildOffset.Y.Value;
+                position.ChCX = transformGroup.ChildExtents.Cx == null ? 0 : transformGroup.ChildExtents.Cx.Value;
+                position.ChCY = transformGroup.ChildExtents.Cy == null ? 0 : transformGroup.ChildExtents.Cy.Value;
                 int index = 0;
                 foreach (OpenXmlElement element in openXmlElements)
                 {
-                    ProcessNodesInSlide(element ,slidePart, colors, index);
+                    ProcessNodesInSlide(element, slidePart, colors, index);
                     index++;
                 }
             }
-            return null; 
+            return null;
         }
-        public string     ProcessNodesInSlide(OpenXmlElement element, SlidePart slidePart, Dictionary<string, string> colors, int  index ) {
+        public string ProcessNodesInSlide(OpenXmlElement element, SlidePart slidePart, Dictionary<string, string> colors, int index)
+        {
             if (element is DocumentFormat.OpenXml.Presentation.Shape sp)//p:sp
             {
                 //  pptElement = ShapeConvert(shape, theme, colorMap, index);
-                ProcessSpNode(sp, slidePart,colors,  index);
+                ProcessSpNode(sp, slidePart, colors, index);
             }
             else if (element is DocumentFormat.OpenXml.Presentation.Picture pic)//p:pic
             {
@@ -122,12 +144,12 @@ namespace HiTeachCC.Service.PowerPoint.Implement
                 ProcessMcNode(mc, slidePart, colors, index);
                 /// pptElement = AlternateContentConvert(content, theme, colorMap, slidePart, index);
             }
-            else if(element is DocumentFormat.OpenXml.Presentation.GraphicFrame graphicFrame)//p:graphicFrame
+            else if (element is DocumentFormat.OpenXml.Presentation.GraphicFrame graphicFrame)//p:graphicFrame
             {
                 ProcessGraphicFrameNode(graphicFrame, slidePart, colors, index);
                 /// pptElement = GraphicFrameConvert(graphicFrame, theme, colorMap, index);
             }
-            else  if (element is DocumentFormat.OpenXml.Presentation.GroupShape grpSp)//p:grpSp
+            else if (element is DocumentFormat.OpenXml.Presentation.GroupShape grpSp)//p:grpSp
             {
                 ProcessGrpSpNode(grpSp, slidePart, colors, index);
                 /// pptElement = GroupShapeConvert(groupShape, theme, colorMap, index);
@@ -137,44 +159,51 @@ namespace HiTeachCC.Service.PowerPoint.Implement
                 ProcessCxnSpNode(cxnSp, slidePart, colors, index);
                 ///  pptElement = ConnectionShapeConvert(connectionShape, theme, colorMap, index);
             }
-            return null; 
+            return null;
         }
-        public string ProcessSpNode(OpenXmlElement element, SlidePart slidePart, Dictionary<string, string> colors, int index) {
+        public string ProcessSpNode(DocumentFormat.OpenXml.Presentation.Shape element, SlidePart slidePart, Dictionary<string, string> colors, int index)
+        {
+            HiTeachCC.Model.PowerPoint.Shape shape = new HiTeachCC.Model.PowerPoint.Shape();
+            HiTeachCC.Model.PowerPoint.Position position = new HiTeachCC.Model.PowerPoint.Position();
+            //element.ShapeProperties
             return null;
         }
-        public string ProcessPicNode(OpenXmlElement element, SlidePart slidePart, Dictionary<string, string> colors, int index)
+        public string ProcessPicNode(DocumentFormat.OpenXml.Presentation.Picture element, SlidePart slidePart, Dictionary<string, string> colors, int index)
         {
             return null;
         }
-        public string ProcessMcNode(OpenXmlElement element, SlidePart slidePart, Dictionary<string, string> colors, int index)
+        public string ProcessMcNode(DocumentFormat.OpenXml.AlternateContent element, SlidePart slidePart, Dictionary<string, string> colors, int index)
         {
             return null;
         }
-        public string ProcessGraphicFrameNode(OpenXmlElement element, SlidePart slidePart, Dictionary<string, string> colors, int index)
+        public string ProcessGraphicFrameNode(DocumentFormat.OpenXml.Presentation.GraphicFrame element, SlidePart slidePart, Dictionary<string, string> colors, int index)
         {
             return null;
         }
-        public string ProcessGrpSpNode(OpenXmlElement element, SlidePart slidePart, Dictionary<string, string> colors, int index)
+        public string ProcessGrpSpNode(DocumentFormat.OpenXml.Presentation.GroupShape element, SlidePart slidePart, Dictionary<string, string> colors, int index)
         {
             var shapes = from shap in element.Descendants<DocumentFormat.OpenXml.Presentation.Shape>() select shap;
-            foreach (var shape in shapes) {
-               string s =  ProcessNodesInSlide(shape, slidePart, colors, index);
+            foreach (var shape in shapes)
+            {
+                string s = ProcessNodesInSlide(shape, slidePart, colors, index);
             }
             return null;
         }
-        public string ProcessCxnSpNode(OpenXmlElement element, SlidePart slidePart, Dictionary<string, string> colors, int index)
+        public string ProcessCxnSpNode(DocumentFormat.OpenXml.Presentation.ConnectionShape element, SlidePart slidePart, Dictionary<string, string> colors, int index)
         {
             return null;
         }
-        public Dictionary<string, string> DoColorMap(ColorMap colorMap , Theme theme) {
+        public Dictionary<string, string> DoColorMap(ColorMap colorMap, Theme theme)
+        {
             string[] colors = { "accent1", "accent2", "accent3", "accent4", "accent5", "accent6",
                                 "lt1", "lt2", "tx1", "tx2", "dk1","dk2","hlink","folHlink" };
             DocumentFormat.OpenXml.Drawing.ColorScheme colorScheme = theme.ThemeElements.ColorScheme;
             Dictionary<string, string> pairs = new Dictionary<string, string>();
-            foreach (var col in colors) {
+            foreach (var col in colors)
+            {
                 pairs.Add(col, PowerPointHelper.ColorForThemeClr(col, colorScheme, colorMap));
             }
-            return pairs; 
+            return pairs;
         }
     }
 }

HiTeachCC.sln

@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29020.237
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HiTeachCC", "HiTeachCC\HiTeachCC.csproj", "{069FD114-EE9D-45DB-BCBD-A385E61871C9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HiTeachCC", "HiTeachCC\HiTeachCC.csproj", "{9A106A61-9435-4A72-BF56-45635253F0C4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HiTeachCC.Service", "HiTeachCC.Service\HiTeachCC.Service.csproj", "{C295FAE9-E82B-4F53-872B-204DBF0AE96A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HiTeachCC.Library", "HiTeachCC.Library\HiTeachCC.Library.csproj", "{CD0D0C19-9760-4460-8C8D-3B97DAB92E2E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HiTeachCC.Model", "HiTeachCC.Model\HiTeachCC.Model.csproj", "{A9DB542B-40F4-4E60-BCC3-CAAF5FF2FB9A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HiTeachCC.Model", "HiTeachCC.Model\HiTeachCC.Model.csproj", "{DB4FB461-4E73-436D-87D0-5970BCE915DA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HiTeachCC.Library", "HiTeachCC.Library\HiTeachCC.Library.csproj", "{2A6F52BE-1A13-4F8B-8E8E-3735B5EF25FC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HiTeachCC.Service", "HiTeachCC.Service\HiTeachCC.Service.csproj", "{85F3A594-F50B-4D27-B988-5968ECE2890D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,22 +17,22 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{069FD114-EE9D-45DB-BCBD-A385E61871C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{069FD114-EE9D-45DB-BCBD-A385E61871C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{069FD114-EE9D-45DB-BCBD-A385E61871C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{069FD114-EE9D-45DB-BCBD-A385E61871C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C295FAE9-E82B-4F53-872B-204DBF0AE96A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C295FAE9-E82B-4F53-872B-204DBF0AE96A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C295FAE9-E82B-4F53-872B-204DBF0AE96A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C295FAE9-E82B-4F53-872B-204DBF0AE96A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9DB542B-40F4-4E60-BCC3-CAAF5FF2FB9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9DB542B-40F4-4E60-BCC3-CAAF5FF2FB9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9DB542B-40F4-4E60-BCC3-CAAF5FF2FB9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9DB542B-40F4-4E60-BCC3-CAAF5FF2FB9A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A6F52BE-1A13-4F8B-8E8E-3735B5EF25FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A6F52BE-1A13-4F8B-8E8E-3735B5EF25FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A6F52BE-1A13-4F8B-8E8E-3735B5EF25FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A6F52BE-1A13-4F8B-8E8E-3735B5EF25FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A106A61-9435-4A72-BF56-45635253F0C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A106A61-9435-4A72-BF56-45635253F0C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A106A61-9435-4A72-BF56-45635253F0C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A106A61-9435-4A72-BF56-45635253F0C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD0D0C19-9760-4460-8C8D-3B97DAB92E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD0D0C19-9760-4460-8C8D-3B97DAB92E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD0D0C19-9760-4460-8C8D-3B97DAB92E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD0D0C19-9760-4460-8C8D-3B97DAB92E2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB4FB461-4E73-436D-87D0-5970BCE915DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB4FB461-4E73-436D-87D0-5970BCE915DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB4FB461-4E73-436D-87D0-5970BCE915DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB4FB461-4E73-436D-87D0-5970BCE915DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85F3A594-F50B-4D27-B988-5968ECE2890D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85F3A594-F50B-4D27-B988-5968ECE2890D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85F3A594-F50B-4D27-B988-5968ECE2890D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85F3A594-F50B-4D27-B988-5968ECE2890D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

HiTeachCC/ClientApp/package-lock.json

@@ -1,3 +0,0 @@
-{
-  "lockfileVersion": 1
-}

HiTeachCC/HiTeachCC.csproj

@@ -3,75 +3,20 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <!-- Quasar start  -->
-    <SpaRoot>ClientApp\</SpaRoot>
-    <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
-    <!-- Quasar end  -->
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="wwwroot\FB9ugXCIjc.txt" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="TEAMModelOS.SDK" Version="1.0.6" />
   </ItemGroup>
-
-
   <ItemGroup>
     <ProjectReference Include="..\HiTeachCC.Service\HiTeachCC.Service.csproj" />
   </ItemGroup>
-
-
   <ItemGroup>
-    <Folder Include="ClientApp\" />
+    <ProjectReference Include="..\HiTeachCC.Service\HiTeachCC.Service.csproj" />
   </ItemGroup>
 
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="http://json.schemastore.org/bowerrc" /></VisualStudio></ProjectExtensions>
 
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties appsettings_1json__JsonSchema="" appsettings_1development_1json__JsonSchema="" />
-    </VisualStudio>
-  </ProjectExtensions>
-
-
-  <!-- Quasar start  -->
-  <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build">
-    <!-- Build Target:  Ensure Node.js is installed -->
-    <Exec Command="node --version" ContinueOnError="true">
-      <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
-    </Exec>
-    <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
-  </Target>
-
-  <Target Name="DebugEnsureNpm" AfterTargets="DebugEnsureNodeEnv">
-    <!-- Build Target:  Ensure Node.js is installed -->
-    <Exec Command="npm --version" ContinueOnError="true">
-      <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
-    </Exec>
-  </Target>
-
-  <Target Name="EnsureNodeModulesInstalled" BeforeTargets="Build" Inputs="package.json" Outputs="packages-lock.json">
-    <!-- Build Target: Restore NPM packages using npm -->
-    <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
-
-    <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
-  </Target>
-
-  <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
-    <!-- Build Target: Run webpack dist build -->
-    <Message Importance="high" Text="Running npm build..." />
-    <Exec WorkingDirectory="$(SpaRoot)" Command="npm run build" />
-
-    <!-- Include the newly-built files in the publish output -->
-    <ItemGroup>
-      <DistFiles Include="$(SpaRoot)dist\**" />
-      <ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
-        <RelativePath>%(DistFiles.Identity)</RelativePath>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </ResolvedFileToPublish>
-    </ItemGroup>
-  </Target>
-  <!-- Quasar end  -->
 </Project>

HiTeachCC/JwtRsaFile/private.pem

@@ -24,4 +24,4 @@ JRFmXEYlFNVRnWrq5U/1MfwXM4jgrDl28G/StdQMlyCMYY7JJqjpcOuphRIAszf9
 VGrhAoGBAOEsLNr0BUZncJRgPEr+v1mI89d53WlM13J1YOaw7xVdvAPbOPlUix3f
 /ZGka2N14K4Dt1NjpwpGfMrfZFAlWKIiF9HFaXmTFjK68JK9HFJfW01k6qfiltH1
 0vhPZ/VIj6wrkHB61tuu0J8VFdap2KAtop+9HyIRiVsOjxtrASHP
------END RSA PRIVATE KEY-----
+-----END RSA PRIVATE KEY-----1

HiTeachCC/Program.cs

@@ -13,12 +13,12 @@ namespace HiTeachCC
     public class Program
     {
         public static void Main(string[] args)
-        { 
+        {
             CreateWebHostBuilder(args).Build().Run();
         }
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-             WebHost.CreateDefaultBuilder(args)
+            WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>();
     }
 }

HiTeachCC/Properties/launchSettings.json

@@ -3,8 +3,8 @@
     "windowsAuthentication": false, 
     "anonymousAuthentication": true, 
     "iisExpress": {
-      "applicationUrl": "http://localhost:49253",
-      "sslPort": 44392
+      "applicationUrl": "http://localhost:50530",
+      "sslPort": 44335
     }
   },
   "profiles": {

HiTeachCC/Startup.cs

@@ -20,7 +20,6 @@ using TEAMModelOS.SDK.Extension.JwtAuth.Filters;
 using TEAMModelOS.SDK.Module.AzureBlob.Configuration;
 using TEAMModelOS.SDK.Module.AzureCosmosDB.Configuration;
 using TEAMModelOS.SDK.Module.AzureTable.Configuration;
-
 namespace HiTeachCC
 {
     public class Startup
@@ -28,11 +27,10 @@ namespace HiTeachCC
         public Startup(IConfiguration configuration, IHostingEnvironment env)
         {
             Configuration = configuration;
-
             var builder = new ConfigurationBuilder()
-               .SetBasePath(env.ContentRootPath)
-               .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-               .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);//增加环境配置文件，新建项目默认有
+              .SetBasePath(env.ContentRootPath)
+              .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+              .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);//增加环境配置文件，新建项目默认有
             this.Configuration = builder.Build();
             BaseConfigModel.SetBaseConfig(Configuration, env.ContentRootPath, env.WebRootPath);
         }
@@ -42,17 +40,12 @@ namespace HiTeachCC
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            //services.Configure<CookiePolicyOptions>(options =>
-            //{
-            //    // This lambda determines whether user consent for non-essential cookies is needed for a given request.
-            //    options.CheckConsentNeeded = context => true;
-            //    options.MinimumSameSitePolicy = SameSiteMode.None;
-            //});
-            // 配置跨域处理，允许所有来源
-            //services.AddCors(options =>
-            //   options.AddPolicy("any",
-            //       builder => builder.AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin().AllowCredentials()));
-
+            services.Configure<CookiePolicyOptions>(options =>
+            {
+                // This lambda determines whether user consent for non-essential cookies is needed for a given request.
+                options.CheckConsentNeeded = context => true;
+                options.MinimumSameSitePolicy = SameSiteMode.None;
+            });
             services.AddCors(options =>
             {
                 // CorsPolicy 是自訂的 Policy 名稱
@@ -66,20 +59,7 @@ namespace HiTeachCC
                           .AllowCredentials();
                 });
             });
-            services.AddMvc(options =>
-            {
-               // options.Filters.Add(new HiTeachCC.Controllers.AllowCorsAttribute());
-            }).SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
-            services.Configure<FormOptions>(x =>
-            {
-                x.ValueLengthLimit = int.MaxValue;
-                x.MultipartBodyLengthLimit = long.MaxValue; // In case of multipart
-                x.MultipartHeadersLengthLimit = int.MaxValue;
-            });
-            //services.AddMvc(options =>
-            //{
-            //    options.Filters.Add(new AllowCorsAttribute());
-            //});
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
             //Table配置
             //services.AddAzureTableStorage().AddConnection(Configuration.GetSection("Azure:Table").Get<AzureTableOptions>());
             //使用Blob配置
@@ -96,10 +76,6 @@ namespace HiTeachCC
             //HttpContextAccessor，并用来访问HttpContext。
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
             services.AddHttp();
-            services.AddSpaStaticFiles(configuration =>
-            {
-                configuration.RootPath = "ClientApp/dist";
-            });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -116,37 +92,17 @@ namespace HiTeachCC
                 app.UseHsts();
             }
             app.UseAuthentication();
-            app.UseMiddleware<JwtAuthorizationFilter>();
-            app.UseMiddleware<HttpGlobalExceptionInvoke>();
             app.UseHttpsRedirection();
+            app.UseMiddleware<HttpGlobalExceptionInvoke>();
             app.UseStaticFiles();
-            app.UseSpaStaticFiles();
-            //app.UseCookiePolicy();
-            //在Startup的Configure()中添加app.UseCors(); 保证其在app.UseMvc(); 之前
+            app.UseCookiePolicy();
             app.UseCors("CorsPolicy");
-            //app.UseMvc();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(
                     name: "default",
                     template: "{controller=Home}/{action=Index}/{id?}");
             });
-            app.UseSpa(spa =>
-            {
-                spa.Options.SourcePath = "ClientApp";
-                //if (env.IsDevelopment())
-                //{
-                //    spa.UseVueCli(npmScript: "serve", port: 8080); // optional port
-                //}
-            });
-            //app.UseCors(builder =>
-            //{
-            //    //builder.WithOrigins("http://localhost:5000", "http://127.0.0.1");
-            //    builder.AllowAnyOrigin();
-            //    builder.AllowAnyMethod();
-            //    builder.AllowAnyHeader();
-            //    builder.AllowCredentials();
-            //});
         }
     }
 }

HiTeachCC/wwwroot/FB9ugXCIjc.txt

@@ -1 +0,0 @@
-f627d56d49c4104246319a1c1be3b736

HiTeachCC/wwwroot/htmlpage.html

@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <script type="text/javascript">
-        function  getParamAsCH(paramName) {  //获取url传值
-                var paramValue = "";
-                var isFound = false;
-                if (
-                    window.location.search.indexOf("?") == 0 &&
-                    window.location.search.indexOf("=") > 1
-                ) {
-                    var arrSource = decodeURI(window.location.search)
-                        .substring(1, window.location.search.length)
-                        .split("&");
-                    var i = 0;
-                    while (i < arrSource.length && !isFound) {
-                        if (arrSource[i].indexOf("=") > 0) {
-                            if (
-                                arrSource[i].split("=")[0].toLowerCase() ==
-                                paramName.toLowerCase()
-                            ) {
-                                paramValue = arrSource[i].split("=")[1];
-                                isFound = true;
-                            }
-                        }
-                        i++;
-                    }
-                }
-                paramValue = unescape(paramValue);
-                return paramValue;
-        }
-        alert(getParamAsCH("code"));
-    </script>
-</head>
-<body>
-    <a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx24935f75b589bc17&redirect_uri=http://cdhabook.teammodel.cn/htmlpage.html&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect">微信登录</a>
-</body>
-</html>

HiTeachCC/wwwroot/index.html

@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>使用 jQuery validate 表单验证</title>
-    <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
-   
-</head>
-<body>
-    <form enctype='multipart/form-data' action="http://hiteachcc.chinacloudsites.cn/api/file/UploadDocument" method="post">
-        <input type="file" name='file'>
-        <input type="submit">
-    </form>
-</body>
-</html>
-
-<script>
-$(function(){
-    $.post("http://hiteachcc.chinacloudsites.cn/api/login/GetMiniAPPAccessToken",function(data,status){
-        console.log("Data: " + data + "nStatus: " + status);
-    });
-    });
-</script>