1

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config

@@ -16,17 +16,17 @@
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
-  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
   
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
   <!--金隅-->
-  <!--<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
+  <add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
+  <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <!--126西昌测试-->
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs

@@ -779,12 +779,17 @@ namespace Learun.Application.WorkFlow
                             if (!string.IsNullOrEmpty(schoolMasterId))
                             {
                                 var userEntity7 = userIBLL.GetEntityByUserId(schoolMasterId);
-                                list.Add(new NWFUserInfo()
+
+                                if (null != userEntity7)
                                 {
-                                    Id = userEntity7.F_UserId,
-                                    Account = userEntity7.F_Account,
-                                    Name = userEntity7.F_RealName
-                                });
+                                    list.Add(new NWFUserInfo()
+                                    {
+                                        Id = userEntity7.F_UserId,
+                                        Account = userEntity7.F_Account,
+                                        Name = userEntity7.F_RealName
+                                    });
+                                }
+
                             }
                             break;
                     }

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

@@ -31,11 +31,11 @@ namespace Learun.Util.Common
             }
         }
 
-        public T TimeoutCheckTwo<T>(int ms, Func<T> func)
+        public bool TimeoutCheckTwo<Boolean>(int ms, Func<Boolean> func)
         {
             var wait = new ManualResetEvent(false);
             bool RunOK = false;
-            var task = Task.Run<T>(() =>
+            var task = Task.Run<Boolean>(() =>
             {
                 var result = func.Invoke();
                 RunOK = true;
@@ -45,7 +45,7 @@ namespace Learun.Util.Common
             wait.WaitOne(ms);
             if (RunOK)
             {
-                return task.Result;
+                return task.Result.ToBool();
             }
             else
             {

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

@@ -52,16 +52,8 @@ namespace Quanjiang.DigitalScholl.WebLicense
             try
             {
 
-
-
-                //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 (!checkResult)
                 {
@@ -69,8 +61,6 @@ namespace Quanjiang.DigitalScholl.WebLicense
                     return ls;
                 }
 
-
-
                 machineid = GenerateMachineId();
                 //判断有无授权
                 string binpath = AppDomain.CurrentDomain.BaseDirectory;
@@ -137,6 +127,10 @@ namespace Quanjiang.DigitalScholl.WebLicense
             }
         }
 
+        /// <summary>
+        /// 网络授权判断
+        /// </summary>
+        /// <returns></returns>
         public static bool GetMAManagementInfo()
         {
             try