登录去旧版跳转；

初始化数据库方法优化

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js

@@ -179,25 +179,25 @@
                             //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
                             window.location.href = "/SSOSystem/Index";
                         } else if (source == "NoLogin") {
-                            window.location.href = "SSOSystem/DragModelOne";
                             //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                            window.location.href = "/SSOSystem/DragModelOne";
                         } else {
                             if (res.data.pwd == true) {
                                 if (res.data.pwdtip == true) {
-                                    window.location.href = "/Home/Index?pwdpwdtip=true";
                                     //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+                                    window.location.href = "/Home/Index?pwdpwdtip=true";
                                 } else {
                                     //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
-                                    window.location.href = "/Home/Index?pwd=true";
+                                    window.location.href ="/Home/Index?pwd=true";
                                 }
                             }
                             else {
                                 if (res.data.pwdtip == true) {
-                                    window.location.href = "/Home/Index?pwdtip=true";
                                     //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+                                    window.location.href ="/Home/Index?pwdtip=true";
                                 } else {
-                                    window.location.href = "/Home/Index";
                                     //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                                    window.location.href =  "/Home/Index";
                                 }
                                 //window.location.href = "/Home/Index";
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive/Index.js

@@ -162,12 +162,31 @@
                 success: function (res) {
                     if (res.code == 200) {
                         if (source == "noLogin") {
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            window.location.href = "/SSOSystem/Index";
                         } else if (source == "NoLogin") {
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                            //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                            window.location.href = "/SSOSystem/DragModelOne";
                         } else {
-
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                            if (res.data.pwd == true) {
+                                if (res.data.pwdtip == true) {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+                                    window.location.href = "/Home/Index?pwdpwdtip=true";
+                                } else {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+                                    window.location.href = "/Home/Index?pwd=true";
+                                }
+                            }
+                            else {
+                                if (res.data.pwdtip == true) {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+                                    window.location.href = "/Home/Index?pwdtip=true";
+                                } else {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                                    window.location.href = "/Home/Index";
+                                }
+                                //window.location.href = "/Home/Index";
+                            }
                         }
                     }
                     else if (res.code == 400) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour/Index.js

@@ -163,12 +163,31 @@
                 success: function (res) {
                     if (res.code == 200) {
                         if (source == "noLogin") {
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            window.location.href = "/SSOSystem/Index";
                         } else if (source == "NoLogin") {
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                            //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                            window.location.href = "/SSOSystem/DragModelOne";
                         } else {
-
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                            if (res.data.pwd == true) {
+                                if (res.data.pwdtip == true) {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+                                    window.location.href = "/Home/Index?pwdpwdtip=true";
+                                } else {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+                                    window.location.href = "/Home/Index?pwd=true";
+                                }
+                            }
+                            else {
+                                if (res.data.pwdtip == true) {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+                                    window.location.href = "/Home/Index?pwdtip=true";
+                                } else {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                                    window.location.href = "/Home/Index";
+                                }
+                                //window.location.href = "/Home/Index";
+                            }
                         }
                     }
                     else if (res.code == 400) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageOne/Index.js

@@ -163,12 +163,31 @@
                 success: function (res) {
                     if (res.code == 200) {
                         if (source == "noLogin") {
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            window.location.href = "/SSOSystem/Index";
                         } else if (source == "NoLogin") {
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
-                        }  else {
-
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                            //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                            window.location.href = "/SSOSystem/DragModelOne";
+                        } else {
+                            if (res.data.pwd == true) {
+                                if (res.data.pwdtip == true) {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+                                    window.location.href = "/Home/Index?pwdpwdtip=true";
+                                } else {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+                                    window.location.href = "/Home/Index?pwd=true";
+                                }
+                            }
+                            else {
+                                if (res.data.pwdtip == true) {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+                                    window.location.href = "/Home/Index?pwdtip=true";
+                                } else {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                                    window.location.href = "/Home/Index";
+                                }
+                                //window.location.href = "/Home/Index";
+                            }
                         }
                     }
                     else if (res.code == 400) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix/Index.js

@@ -163,12 +163,30 @@
                     if (res.code == 200) {
                         if (source == "noLogin") {
                             //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            window.location.href = "/SSOSystem/Index";
                         } else if (source == "NoLogin") {
-                            window.location.href = "/Home/Index";
                             //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                            window.location.href = "/SSOSystem/DragModelOne";
                         } else {
-                            window.location.href = "/Home/Index";
-                            //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                            if (res.data.pwd == true) {
+                                if (res.data.pwdtip == true) {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+                                    window.location.href = "/Home/Index?pwdpwdtip=true";
+                                } else {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+                                    window.location.href = "/Home/Index?pwd=true";
+                                }
+                            }
+                            else {
+                                if (res.data.pwdtip == true) {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+                                    window.location.href = "/Home/Index?pwdtip=true";
+                                } else {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                                    window.location.href = "/Home/Index";
+                                }
+                                //window.location.href = "/Home/Index";
+                            }
                         }
                     }
                     else if (res.code == 400) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree/Index.js

@@ -163,12 +163,31 @@
                 success: function (res) {
                     if (res.code == 200) {
                         if (source == "noLogin") {
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            window.location.href = "/SSOSystem/Index";
                         } else if (source == "NoLogin") {
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                            //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                            window.location.href = "/SSOSystem/DragModelOne";
                         } else {
-
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                            if (res.data.pwd == true) {
+                                if (res.data.pwdtip == true) {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+                                    window.location.href = "/Home/Index?pwdpwdtip=true";
+                                } else {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+                                    window.location.href = "/Home/Index?pwd=true";
+                                }
+                            }
+                            else {
+                                if (res.data.pwdtip == true) {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+                                    window.location.href = "/Home/Index?pwdtip=true";
+                                } else {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                                    window.location.href = "/Home/Index";
+                                }
+                                //window.location.href = "/Home/Index";
+                            }
                         }
                     }
                     else if (res.code == 400) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo/Index.js

@@ -161,14 +161,32 @@
                 dataType: "json",
                 success: function (res) {
                     if (res.code == 200) {
-                        lrPage.logining(false);
                         if (source == "noLogin") {
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            window.location.href = "/SSOSystem/Index";
                         } else if (source == "NoLogin") {
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                            //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                            window.location.href = "/SSOSystem/DragModelOne";
                         } else {
-
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                            if (res.data.pwd == true) {
+                                if (res.data.pwdtip == true) {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+                                    window.location.href = "/Home/Index?pwdpwdtip=true";
+                                } else {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+                                    window.location.href = "/Home/Index?pwd=true";
+                                }
+                            }
+                            else {
+                                if (res.data.pwdtip == true) {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+                                    window.location.href = "/Home/Index?pwdtip=true";
+                                } else {
+                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                                    window.location.href = "/Home/Index";
+                                }
+                                //window.location.href = "/Home/Index";
+                            }
                         }
                     }
                     else if (res.code == 400) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DatabaseInit/DatabaseInitService.cs

@@ -45,9 +45,9 @@ namespace Learun.Application.Base.SystemModule
                 }
 
                 //备份数据库
-                string backupSql1 = "backup database " + databaseName1 + " to disk='" + filePath1 + "' with format";
+                string backupSql1 = "backup database " + databaseName1 + " to disk='" + filePath1 + "' with format;";
                 this.BaseRepository("BaseDb").ExecuteAsyncBySql(backupSql1);
-                string backupSql2 = "backup database " + databaseName2 + " to disk='" + filePath2 + "' with format";
+                string backupSql2 = "backup database " + databaseName2 + " to disk='" + filePath2 + "' with format;";
                 this.BaseRepository("CollegeMIS").ExecuteAsyncBySql(backupSql2);
 
                 //清除业务数据
@@ -56,7 +56,7 @@ namespace Learun.Application.Base.SystemModule
                     var strSql1 = new StringBuilder();
                     strSql1.Append("declare @trun_name varchar(50) ");
                     strSql1.Append("declare name_cursor cursor for ");
-                    strSql1.Append("select 'truncate table ' + name from sysobjects where xtype='U' and name <> 'LR_Base_User' and name <> 'LR_Base_Role' and name<>'LR_App_Function' and name<>'LR_Base_Authorize' and name<>'LR_Base_DatabaseLink' ");
+                    strSql1.Append("select 'truncate table ' + name+';' from sysobjects where xtype='U' and name <> 'LR_Base_User' and name <> 'LR_Base_Role' and name<>'LR_App_Function' and name<>'LR_Base_Authorize' and name<>'LR_Base_DatabaseLink' ");
                     strSql1.Append(" and name<>'LR_Base_DataCondition' and name<>'LR_Base_DataItem' and name<>'LR_Base_DataItemDetail' and name<>'LR_Base_DataRelation' and name<>'LR_Base_DataSource'  ");
                     strSql1.Append(" and name<>'LR_Base_DbField' and name<>'LR_Base_Interface' and name<>'LR_Base_Logo' and name<>'LR_Base_Module' and name<>'LR_Base_ModuleButton' and name<>'LR_Base_ModuleColumn' ");
                     strSql1.Append(" and name<>'LR_Base_ModuleForm' and name<>'LR_Base_UserRelation' and name<>'LR_DT_Chart' and name<>'LR_DT_List' and name<>'LR_DT_Target' and name<>'LR_Excel_Export' and name<>'LR_Excel_Import' ");
@@ -80,7 +80,7 @@ namespace Learun.Application.Base.SystemModule
                     var strSql1 = new StringBuilder();
                     strSql1.Append("declare @trun_name varchar(50) ");
                     strSql1.Append("declare name_cursor cursor for ");
-                    strSql1.Append("select 'delete from ' + name from sysobjects where xtype='U' and name<>'DIC_AREA' and name<>'DIC_CITY' and name<>'DIC_PROVINCE' and name<>'BCdNationality' and name<>'BCdFamilyOrigin' and name<>'BCdPartyFace' and name<>'BCdSubjectSpecies' and name<>'BCdForeignLanguage' and name<>'BCdTitleOfTechPost' and name<>'BCdDegree' and name<>'BCdCultureDegree' and name<>'BCdOverseasChinese' and name<>'BCdHealthStatus' and name<>'BCdAbnormityMoveReason' and name<>'BCdAbnormitySort' and name<>'BCdEncourgeLevel' and name<>'BCdEncourgeSort' and name<>'BCdMatriculateSort' and name<>'BCdPlanForm' and name<>'BCdPunish' and name<>'BCdTestMode' and name<>'BCdTestStuSort'  ");
+                    strSql1.Append("select 'delete from ' + name+';' from sysobjects where xtype='U' and name<>'DIC_AREA' and name<>'DIC_CITY' and name<>'DIC_PROVINCE' and name<>'BCdNationality' and name<>'BCdFamilyOrigin' and name<>'BCdPartyFace' and name<>'BCdSubjectSpecies' and name<>'BCdForeignLanguage' and name<>'BCdTitleOfTechPost' and name<>'BCdDegree' and name<>'BCdCultureDegree' and name<>'BCdOverseasChinese' and name<>'BCdHealthStatus' and name<>'BCdAbnormityMoveReason' and name<>'BCdAbnormitySort' and name<>'BCdEncourgeLevel' and name<>'BCdEncourgeSort' and name<>'BCdMatriculateSort' and name<>'BCdPlanForm' and name<>'BCdPunish' and name<>'BCdTestMode' and name<>'BCdTestStuSort'  ");
                     strSql1.Append("open name_cursor ");
                     strSql1.Append("fetch next from name_cursor into @trun_name ");
                     strSql1.Append("while @@FETCH_STATUS = 0 ");