Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogoImgController.cs

@@ -121,6 +121,12 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
                         case "applogo":
                             var byteapplogo = System.IO.File.ReadAllBytes(Path.Combine(rootPath, midPath, "applogo.png"));
                             return File(byteapplogo, "image/jpeg");
+                        case "headbg":
+                            var byteheadbg = System.IO.File.ReadAllBytes(Path.Combine(rootPath, midPath, "headbg.png"));
+                            return File(byteheadbg, "image/jpeg");
+                        case "data":
+                            var bytedata = System.IO.File.ReadAllBytes(Path.Combine(rootPath, midPath, "data.png"));
+                            return File(bytedata, "image/jpeg");
                     }
                 }
             }

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

@@ -2188,6 +2188,8 @@
     <Content Include="Content\images\Login\user4.png" />
     <Content Include="Content\images\Login\user5.png" />
     <Content Include="Content\images\Login\verCode.png" />
+    <Content Include="Content\images\logo\data.png" />
+    <Content Include="Content\images\logo\headbg.png" />
     <Content Include="Content\images\OnlineRegistrate\bj1.png" />
     <Content Include="Content\images\OnlineRegistrate\error.png" />
     <Content Include="Content\images\OnlineRegistrate\ewm_03.png" />

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

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <connectionStrings>
 	<!--本机-->
-	<!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" 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=.;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=NewCollegeMIS_塔里木;User ID=sa;Password=123456" 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="paikeDbString" connectionString="Data Source=8.141.155.183;Port=23306;Database=cspaikenew;User ID=root;Password=QJKJ@bjqj@123;" providerName="MySql.Data.MySqlClient" />
 	<!--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" />
@@ -35,8 +36,8 @@
   <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@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="paikeDbString" connectionString="Data Source=8.141.155.183;Port=23306;Database=cspaikenew;User ID=root;Password=QJKJ@bjqj@123;" providerName="MySql.Data.MySqlClient" />
+	<add name="paikeDbString" connectionString="Data Source=8.141.155.183;Port=23306;Database=cspaikenew;User ID=root;Password=QJKJ@bjqj@123;" providerName="MySql.Data.MySqlClient" />-->
 </connectionStrings>

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

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <connectionStrings>
+  <!--本机-->
+  <add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=NewCollegeMIS_塔里木;User ID=sa;Password=123456" 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="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
+
   <!--<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" />-->
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
@@ -19,8 +25,8 @@
   <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" 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="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
+	<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />-->
 </connectionStrings>