Commit 3a68fdbe by guanzhenshan

解决数据中心因用户的部门信息缺失而无法登录的问题

parent 9173cc65
...@@ -12,28 +12,28 @@ namespace Bailun.DC.DailyLogisticSupplierTransaction ...@@ -12,28 +12,28 @@ namespace Bailun.DC.DailyLogisticSupplierTransaction
/// </summary> /// </summary>
/// <param name="args"></param> /// <param name="args"></param>
/// <returns></returns> /// <returns></returns>
static async Task Main(string[] args) //static async Task Main(string[] args)
{
Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{
services.AddHostedService<Services>();
});
await builder.RunConsoleAsync();
}
//static void Main(string[] args)
//{ //{
// var _services = new Services(); // Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
// var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
// var start = DateTime.Parse("2020-04-01");
// while (start.AddDays(1) < DateTime.Now)
// { // {
// Console.WriteLine(start); // services.AddHostedService<Services>();
// _services.Init(start); // });
// start = start.AddDays(1);
// } // await builder.RunConsoleAsync();
//} //}
static void Main(string[] args)
{
var _services = new Services();
var start = DateTime.Parse("2020-05-01");
while (start.AddDays(1) < DateTime.Now)
{
Console.WriteLine(start);
_services.Init(start);
start = start.AddDays(1);
}
}
} }
} }
...@@ -11,30 +11,30 @@ namespace Bailun.DC.DailyPlatformAccountBalance ...@@ -11,30 +11,30 @@ namespace Bailun.DC.DailyPlatformAccountBalance
/// </summary> /// </summary>
class Program class Program
{ {
static async Task Main(string[] args) //static async Task Main(string[] args)
{
Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{
services.AddHostedService<Services>();
});
await builder.RunConsoleAsync();
}
//static void Main(string[] args)
//{ //{
// var _services = new Services(); // Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
// var day = DateTime.Parse(DateTime.Now.AddDays(-8).ToShortDateString()); // var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
// while (day < DateTime.Now.AddDays(-1))
// { // {
// _services.Init(day); // services.AddHostedService<Services>();
// _services.SaveDaily(day); // });
// _services.UpdateBalanceSheet(day);
// day = day.AddDays(1);
// }
// await builder.RunConsoleAsync();
//} //}
static void Main(string[] args)
{
var _services = new Services();
var day = DateTime.Parse(DateTime.Now.AddDays(-8).ToShortDateString());
while (day < DateTime.Now.AddDays(-1))
{
_services.Init(day);
_services.SaveDaily(day);
_services.UpdateBalanceSheet(day);
day = day.AddDays(1);
}
}
} }
} }
...@@ -22,13 +22,15 @@ namespace Bailun.DC.DailyPurchaseSellStock ...@@ -22,13 +22,15 @@ namespace Bailun.DC.DailyPurchaseSellStock
{ {
var _services = new Services(); var _services = new Services();
var start = DateTime.Parse("2020-07-01"); var start = DateTime.Parse("2020-07-31");
while (start.AddDays(1) < DateTime.Now) _services.Init(start);
{
Console.WriteLine(start); //while (start.AddDays(1) < DateTime.Now)
_services.Init(start); //{
start = start.AddDays(1); // Console.WriteLine(start);
} // _services.Init(start);
// start = start.AddDays(1);
//}
} }
} }
......
...@@ -77,7 +77,7 @@ namespace Bailun.DC.Web.Controllers ...@@ -77,7 +77,7 @@ namespace Bailun.DC.Web.Controllers
public ActionResult Main() public ActionResult Main()
{ {
#if DEBUG #if DEBUG
var cookie = "Bearer%20eyJhbGciOiJSUzI1NiIsImtpZCI6ImU4YTdmNTVlZWIxNjliY2RlMTA2Njg2ZTFhMmVjZDUwIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTU0NzQ0MTgsImV4cCI6MTU5NTUxMDQxOCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi6buE5pmUIiwiYXV0aF90aW1lIjoxNTk1NDc0NDE4LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjI5MTk3NzEiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDE3ODUiLCJVc2VyQ29kZSI6IkJMNTU2NjgyNiIsIk9hVXNlcklkIjoiMzU1MyIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoxODcsXCJOYW1lXCI6XCLotKbliqHnu4RcIixcIkNvZGVcIjpcIkNXQ1dcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.ZqMEwMh3V0REoWCgiHY-_AbHsAwd8apbo5Gp_2-cC5gkr0CtMhbb6cm9jnpznFYEtKHehDKFMpdJcX9bVGb470syYwWcCC_qJ01hmt8G19XXw3Agj-XC0ZtJWjH3D-chml1pRYZ3S0faNN4AGniIuCgF9xYuwzTN0Pb20Dn_HJt2fvHHIbq7tMWpjmkbJ59BIzKoeCEq1G1l2vR1dI7HyvOnF852jLsn00rm_wOS8eQm_LLePNyMNsm-zPLLHCvcT1v6LVX7uzT1xAz6MmesrmJI51f9ewv-QgRJXtGVQpigRcVxQP3CMiVMr_41eAEPR99gg6CFV7Foa6WndlmcYA"; var cookie = "Bearer%20eyJhbGciOiJSUzI1NiIsImtpZCI6IjdhZDA5MjQ5ZDk0ZDgxN2VhNmI5ZThhMTc1MzlmNmY3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTcxMjYzMTgsImV4cCI6MTU5NzE2MjMxOCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk3MTI2MzE4LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsIkRlcGFydG1lbnQiOiIiLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.GrXCYKLlsbZzjw7h2H0FJR3TwD0VFbXCsAfeEDNiNzZEtLQ-oYBe0OdJXjepMTo-1sel7Qf33v8fU-MuRrH6MbmnM-I_ahCajNofr4c-NXLR9UKsLKTEV6ZBQ2nRhnfWbeQfWee7UrIUe8h1k3TNpwMs4XHCmwQEUh2PkmqyLIAHYZQhZ7nbD9AkczXph7v5F7_UUURRdL93z7jfG1WqOveDSBI4uXNCu6VyvA-Xrq0msHNZqiuQo1EhJ0cT3NdPqHn55H9zqa3B3yl3GolCD2ncsE3jjdmbVEJd8HATnnbmOcqR3_E9zX2TBFHr7ToJkmS7zy9i6GCovPEZcjV7GQ";
#else #else
//var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource"); //var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
var cookie = HttpContext.Request.Cookies["BailunToken"]; var cookie = HttpContext.Request.Cookies["BailunToken"];
...@@ -101,7 +101,7 @@ namespace Bailun.DC.Web.Controllers ...@@ -101,7 +101,7 @@ namespace Bailun.DC.Web.Controllers
userid = json["result"]["OaUserId"].ToInt32(); userid = json["result"]["OaUserId"].ToInt32();
isAllCompany = json["result"]["AllCompany"].ToStr().ToLower() == "false" ? 0 : 1; isAllCompany = json["result"]["AllCompany"].ToStr().ToLower() == "false" ? 0 : 1;
int.TryParse(json["result"]["Company"]["Id"].ToString(), out companyid); int.TryParse(json["result"]["Company"]["Id"].ToString(), out companyid);
if (json["result"]["Department"].ToString() != "null") if (json["result"]["Department"].ToString() != "null" && json["result"]["Department"].ToString()!="")
{ {
departmentname = json["result"]["Department"]["Name"].ToStr(); departmentname = json["result"]["Department"]["Name"].ToStr();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment