1

Learun.Framework.Ultimate V7/Learun.Application.Mobile/_sgbak/Learun.Application.Mobile.jsproj.51038.2.2020-04-20.17-16-21.9995

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Android">
-      <Configuration>Debug</Configuration>
-      <Platform>Android</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|iOS">
-      <Configuration>Debug</Configuration>
-      <Platform>iOS</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Windows-x64">
-      <Configuration>Debug</Configuration>
-      <Platform>Windows-x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Windows-x86">
-      <Configuration>Debug</Configuration>
-      <Platform>Windows-x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Windows-ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>Windows-ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Android">
-      <Configuration>Release</Configuration>
-      <Platform>Android</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|iOS">
-      <Configuration>Release</Configuration>
-      <Platform>iOS</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Windows-x64">
-      <Configuration>Release</Configuration>
-      <Platform>Windows-x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Windows-x86">
-      <Configuration>Release</Configuration>
-      <Platform>Windows-x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Windows-ARM">
-      <Configuration>Release</Configuration>
-      <Platform>Windows-ARM</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>b9943e88-bf67-46ec-a4d8-d0c81d5846c4</ProjectGuid>
-    <SccProjectName>Learun.Application.Mobile</SccProjectName>
-    <SccProvider>SourceGear Vault Visual Studio 2005 Client:{1EA47954-8515-402d-82D9-B5C332120A8D}</SccProvider>
-    <SccAuxPath>http://123.57.209.16:8090/VaultService</SccAuxPath>
-    <SccLocalPath>1~a7250b02-76e9-4d74-aa27-f5cdf7719296</SccLocalPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectCapability Include="UseFileGlobs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TypeScriptCompileOnSaveEnabled>false</TypeScriptCompileOnSaveEnabled>
-    <TypeScriptToolsVersion>2.3</TypeScriptToolsVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\ApacheCordovaTools\vs-mda-targets\Microsoft.TypeScript.MDA.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\ApacheCordovaTools\vs-mda-targets\Microsoft.MDA.FileMirroring.targets" />
-  <PropertyGroup>
-    <ProjectUISubcaption>Tools for Apache Cordova</ProjectUISubcaption>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetPlatformIdentifier>MDD</TargetPlatformIdentifier>
-  </PropertyGroup>
-  <Target Name="EnsureBuildPrerequisites">
-    <!-- These errors will trigger if building from inside Visual Studio and requirements could not be determined -->
-    <Error Condition="$(MDAPropertiesEvaluated) == 'true' And $(NodeJsDir) == ''" Text="Path to NodeJs could not be determined. Please check that NodeJs has been installed." />
-    <!-- These errors will trigger if building from outside Visual Studio (e.g. command line) and environment variables have not been set -->
-    <Error Condition="$(MDAPropertiesEvaluated) == '' And $(NodeJsDir) == ''" Text="Path to NodeJs has not been specified. Please check that NodeJs has been installed and set the NodeJsDir environment variable before building." />
-    <!-- Sanity check that things exist in the specified places. These are more likely to fail if building outside Visual Studio and the required environment variables have not been set, or set incorrectly. -->
-    <Error Condition="!Exists('$(NodeJsDir)') Or !Exists('$(NodeJsDir)\node.exe')" Text="The specified NodeJs directory $(NodeJsDir) either does not exist, or does not contain node.exe. Please check that NodeJs has been installed, and set the NodeJsDir variable to the correct directory." />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties />
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <!-- Customize which folders are not shown by default -->
-    <ExcludedItems>bin;bld;platforms;node_modules;simulation;plugins</ExcludedItems>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="**\**" Exclude="**\platforms\**;**\bin\**;**\bld\**;**\node_modules\**;**\simulation\**;**\plugins\**;.gitignore;Learun.Application.Mobile.*" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Update=".vs\config\applicationhost.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Update="config.xml">
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{4a0dddb5-7a95-4fbf-97cc-616d07737a77}" />
-  </ItemGroup>
-</Project>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/_sgbak/Learun.Application.Mobile.jsproj.51038.2.2020-06-08.18-21-40.5401

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Android">
-      <Configuration>Debug</Configuration>
-      <Platform>Android</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|iOS">
-      <Configuration>Debug</Configuration>
-      <Platform>iOS</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Windows-x64">
-      <Configuration>Debug</Configuration>
-      <Platform>Windows-x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Windows-x86">
-      <Configuration>Debug</Configuration>
-      <Platform>Windows-x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Windows-ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>Windows-ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Android">
-      <Configuration>Release</Configuration>
-      <Platform>Android</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|iOS">
-      <Configuration>Release</Configuration>
-      <Platform>iOS</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Windows-x64">
-      <Configuration>Release</Configuration>
-      <Platform>Windows-x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Windows-x86">
-      <Configuration>Release</Configuration>
-      <Platform>Windows-x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Windows-ARM">
-      <Configuration>Release</Configuration>
-      <Platform>Windows-ARM</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>b9943e88-bf67-46ec-a4d8-d0c81d5846c4</ProjectGuid>
-    <SccProjectName>Learun.Application.Mobile</SccProjectName>
-    <SccProvider>SourceGear Vault Visual Studio 2005 Client:{1EA47954-8515-402d-82D9-B5C332120A8D}</SccProvider>
-    <SccAuxPath>http://123.57.209.16:8090/VaultService</SccAuxPath>
-    <SccLocalPath>1~a7250b02-76e9-4d74-aa27-f5cdf7719296</SccLocalPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectCapability Include="UseFileGlobs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TypeScriptCompileOnSaveEnabled>false</TypeScriptCompileOnSaveEnabled>
-    <TypeScriptToolsVersion>2.3</TypeScriptToolsVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\ApacheCordovaTools\vs-mda-targets\Microsoft.TypeScript.MDA.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\ApacheCordovaTools\vs-mda-targets\Microsoft.MDA.FileMirroring.targets" />
-  <PropertyGroup>
-    <ProjectUISubcaption>Tools for Apache Cordova</ProjectUISubcaption>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetPlatformIdentifier>MDD</TargetPlatformIdentifier>
-  </PropertyGroup>
-  <Target Name="EnsureBuildPrerequisites">
-    <!-- These errors will trigger if building from inside Visual Studio and requirements could not be determined -->
-    <Error Condition="$(MDAPropertiesEvaluated) == 'true' And $(NodeJsDir) == ''" Text="Path to NodeJs could not be determined. Please check that NodeJs has been installed." />
-    <!-- These errors will trigger if building from outside Visual Studio (e.g. command line) and environment variables have not been set -->
-    <Error Condition="$(MDAPropertiesEvaluated) == '' And $(NodeJsDir) == ''" Text="Path to NodeJs has not been specified. Please check that NodeJs has been installed and set the NodeJsDir environment variable before building." />
-    <!-- Sanity check that things exist in the specified places. These are more likely to fail if building outside Visual Studio and the required environment variables have not been set, or set incorrectly. -->
-    <Error Condition="!Exists('$(NodeJsDir)') Or !Exists('$(NodeJsDir)\node.exe')" Text="The specified NodeJs directory $(NodeJsDir) either does not exist, or does not contain node.exe. Please check that NodeJs has been installed, and set the NodeJsDir variable to the correct directory." />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties />
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <!-- Customize which folders are not shown by default -->
-    <ExcludedItems>bin;bld;platforms;node_modules;simulation;plugins</ExcludedItems>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="**\**" Exclude="**\platforms\**;**\bin\**;**\bld\**;**\node_modules\**;**\simulation\**;**\plugins\**;.gitignore;Learun.Application.Mobile.*" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Update=".vs\config\applicationhost.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Update="config.xml">
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{4a0dddb5-7a95-4fbf-97cc-616d07737a77}" />
-  </ItemGroup>
-</Project>

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -984,6 +984,7 @@
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveFile\IndexParty.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveFile\IndexDocument.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveFile\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveFile\SpecifyReceiverForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\FormParty.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\FormDocumentView.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\FormDocument.js" />
@@ -6808,6 +6809,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\LoanForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\OnsitePayForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\IssueForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveFile\SpecifyReceiverForm.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs

@@ -32,12 +32,8 @@ namespace Learun.Application.WorkFlow
                 if (nwfTaskLogEntity != null)
                 {
                     entity.SpecifyReceiver = nwfTaskLogEntity.F_Des;
+                    asset.SaveEntity(entity.SFileId, entity);
                 }
-                else
-                {
-                    entity.SpecifyReceiver = "测试信息";
-                }
-                asset.SaveEntity(entity.SFileId, entity);
             }
             else
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Common/TimeOutCheckTool.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Learun.Util.Common
+{
+    public class TimeOutCheckTool
+    {
+        public T TimeoutCheck<T>(int ms, Func<T> func)
+        {
+            var wait = new ManualResetEvent(false);
+            bool RunOK = false;
+            var task = Task.Run<T>(() =>
+            {
+                var result = func.Invoke();
+                RunOK = true;
+                wait.Set();
+                return result;
+            });
+            wait.WaitOne(ms);
+            if (RunOK)
+            {
+                return task.Result;
+            }
+            else
+            {
+                return default(T);
+            }
+        }
+
+        public T TimeoutCheckTwo<T>(int ms, Func<T> func)
+        {
+            var wait = new ManualResetEvent(false);
+            bool RunOK = false;
+            var task = Task.Run<T>(() =>
+            {
+                var result = func.Invoke();
+                RunOK = true;
+                wait.Set();
+                return result;
+            });
+            wait.WaitOne(ms);
+            if (RunOK)
+            {
+                return task.Result;
+            }
+            else
+            {
+                return true;
+            }
+        }
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Common/Timeout.cs

@@ -19,7 +19,6 @@ namespace Learun.Util.Common
 
         public Timeout()
         {
-            //  初始状态为 停止
             this.mTimeoutObject = new ManualResetEvent(true);
         }
         ///<summary>
@@ -33,7 +32,7 @@ namespace Learun.Util.Common
                 return false;
             }
             this.mTimeoutObject.Reset();
-            this.mBoTimeout = true; //标记
+            this.mBoTimeout = true; 
             this.Do.BeginInvoke(DoAsyncCallBack, null);
             // 等待 信号Set
             if (!this.mTimeoutObject.WaitOne(timeSpan, false))

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Learun.Util.csproj

@@ -89,6 +89,7 @@
     <Compile Include="Attributes\EnumAttribute.cs" />
     <Compile Include="Common\CommonHelper.cs" />
     <Compile Include="Common\Timeout.cs" />
+    <Compile Include="Common\TimeOutCheckTool.cs" />
     <Compile Include="Config\Config.cs" />
     <Compile Include="DataBase\DataConvert.cs" />
     <Compile Include="DataBase\FieldTypeHepler.cs" />

Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json

@@ -119,7 +119,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxa68adccec10b45dd",
+        "appid" : "wxbc18c9bf92c86d28",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue

@@ -10,7 +10,9 @@
         </view>
 
         <!-- 首页 Logo -->
-        <view mode="aspectFit" class="logo"></view>
+        <view mode="aspectFit" class="logo">
+			<image src="~@/static/logo.png" mode="widthFix" class="logoImg"></image>
+		</view>
 
         <!-- 【仅生产环境】使用账号的原因，无此项则微信审核通不过 -->
         <!-- <view v-if="!DEV" class="intro">
@@ -236,7 +238,7 @@ page {
     margin-bottom: 40rpx;
 
     .logo {
-      background-image: url('~@/static/logo.png');
+      // background-image: url('~@/static/logo.png');
       background-size: contain;
       height: 120rpx;
       width: 120rpx;
@@ -244,7 +246,9 @@ page {
       display: inline-block;
       border-radius: 5px;
     }
-
+	.logoImg {
+		width: 100%;
+	}
     .main-title {
       display: block;
       margin: 20rpx 0;

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.WebLicense/LicenseChecker.cs

@@ -54,14 +54,16 @@ namespace Quanjiang.DigitalScholl.WebLicense
 
 
 
-                Timeout timeout = new Timeout();
-                timeout.Do = GetMAManagementInfo;
-                bool bo = timeout.DoWithTimeout(new TimeSpan(0, 0, 0, 2));
+                //Timeout timeout = new Timeout();
+                //timeout.Do = GetMAManagementInfo;
+                //bool bo = timeout.DoWithTimeout(new TimeSpan(0, 0, 0, 4));
 
+                TimeOutCheckTool tool = new TimeOutCheckTool();
+                var checkResult = tool.TimeoutCheckTwo(4000, () => GetMAManagementInfo());
 
 
                 //var maResult = GetMAManagementInfo();
-                if (!bo)
+                if (!checkResult)
                 {
                     ls.Message = "未授权";
                     return ls;