bjquanjiang
/
DigitalScholl
1
0
Derivar 0
Código Questões 0 Pedidos de integração 0 Lançamentos 0 Wiki Trabalho
Ver a proveniência

Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

新疆警官学校中职
dyy há 2 anos
ascendente
4e192d0810 516150d991
cometimento
cfc2aaf423
2 ficheiros alterados com 16 adições e 16 eliminações
Visualização em 2 colunas
Opções das diferenças
Mostrar estatísticas Descarregar ficheiro patch Descarregar ficheiro diff
  1. +12
    -12
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js
  2. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config

+ 12
- 12
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js Ver ficheiro

@@ -176,28 +176,28 @@
success: function (res) {
if (res.code == 200) {
if (source == "noLogin") {
//window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
window.location.href = "/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 = "/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 = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=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 = 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";
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 = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
//window.location.href = "/Home/Index";
}
//window.location.href = "/Home/Index";
}


+ 4
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config Ver ficheiro

@@ -20,10 +20,10 @@
<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="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=139.196.217.128;Database=cypaike;User ID=root;Password=123456;" providerName="MySql.Data.MySqlClient" /><!--金隅-->
<add name="BaseDb" connectionString="Server=39.97.168.125;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=39.97.168.125;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=39.97.168.125;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="paikeDbString" connectionString="Data Source=39.97.168.125;Database=cypaike;User ID=root;Password=123456;" providerName="MySql.Data.MySqlClient" /><!--金隅-->
<!--<add name="BaseDb" connectionString="Server=192.168.100.224;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=192.168.100.224;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=192.168.100.224;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->


Escrever Pré-visualizar
Carregando…
Cancelar
Guardar