Commit 8aa08f24 authored by 吴春's avatar 吴春

1

parent a7e9cd76
...@@ -29,34 +29,19 @@ ...@@ -29,34 +29,19 @@
<!--画途邮箱基础信息结束--> <!--画途邮箱基础信息结束-->
</appSettings> </appSettings>
<connectionStrings> <connectionStrings>
<add name="DefaultConnection" providerName="MySql.Data.MySqlClient" connectionString="server=192.168.5.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8; Convert Zero Datetime=true; " /> <add name="DefaultConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_user;CharSet=utf8;Convert Zero Datetime=true;" />
<!--allow zero datetime=true;Convert Zero Datetime=true;--> <!--allow zero datetime=true;Convert Zero Datetime=true;-->
<add name="DMCConnection" providerName="MySql.Data.MySqlClient" connectionString="server=192.168.5.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_dmc;CharSet=utf8; Convert Zero Datetime=true;" />
<!--日志数据库-->
<add name="LogConnection" providerName="MySql.Data.MySqlClient" connectionString="server=192.168.5.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_log;CharSet=utf8; Convert Zero Datetime=true;" />
<!--财务数据库-->
<add name="FinanceConnection" providerName="MySql.Data.MySqlClient" connectionString="server=192.168.5.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true;" />
<!--销售数据库-->
<add name="SellConnection" providerName="MySql.Data.MySqlClient" connectionString="server=192.168.5.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_sell;CharSet=utf8; Convert Zero Datetime=true;" />
<!--统计数据库-->
<add name="DataStatisticsConnection" providerName="MySql.Data.MySqlClient" connectionString="server=192.168.5.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8; Convert Zero Datetime=true;" />
<!--爬虫数据库-->
<add name="SpiderConnection" providerName="MySql.Data.MySqlClient" connectionString="server=192.168.5.214;port=3306;user id=reborn;password=Reborn@2018;database=spider;CharSet=utf8; Convert Zero Datetime=true;" />
<!--视频数据库-->
<add name="VideoConnection" providerName="MySql.Data.MySqlClient" connectionString="server=192.168.5.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_video;CharSet=utf8; Convert Zero Datetime=true;" />
<!--<add name="DefaultConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_user;CharSet=utf8;Convert Zero Datetime=true;" />
--><!--allow zero datetime=true;Convert Zero Datetime=true;--><!--
<add name="DMCConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_dmc;CharSet=utf8;Convert Zero Datetime=true;" /> <add name="DMCConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_dmc;CharSet=utf8;Convert Zero Datetime=true;" />
--><!--日志数据库--><!-- <!--日志数据库-->
<add name="LogConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_log;CharSet=utf8;Convert Zero Datetime=true;" /> <add name="LogConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_log;CharSet=utf8;Convert Zero Datetime=true;" />
--><!--销售数据库--><!-- <!--销售数据库-->
<add name="SellConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_sell;CharSet=utf8;Convert Zero Datetime=true;" /> <add name="SellConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_sell;CharSet=utf8;Convert Zero Datetime=true;" />
--><!--财务数据库--><!-- <!--财务数据库-->
<add name="FinanceConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_finance;CharSet=utf8;Convert Zero Datetime=true;" /> <add name="FinanceConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_finance;CharSet=utf8;Convert Zero Datetime=true;" />
--><!--国内票务--><!-- <!--国内票务-->
<add name="DomesticConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_domestic_ticket;CharSet=utf8;Convert Zero Datetime=true;" /> <add name="DomesticConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_domestic_ticket;CharSet=utf8;Convert Zero Datetime=true;" />
--><!--统计数据库--> <!--统计数据库-->
<!--<add name="DataStatisticsConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_datastatistics;CharSet=utf8; Convert Zero Datetime=true;" />--> <add name="DataStatisticsConnection" providerName="MySql.Data.MySqlClient" connectionString="server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;port=3306;user id=reborn;password=Reborn@2018;database=uat_reborn_datastatistics;CharSet=utf8; Convert Zero Datetime=true;" />
</connectionStrings> </connectionStrings>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
......
...@@ -134,7 +134,7 @@ LEFT JOIN rb_ticketcoupons as b on a.CouponsId=b.ID where FinalPriceTips>0 and ...@@ -134,7 +134,7 @@ LEFT JOIN rb_ticketcoupons as b on a.CouponsId=b.ID where FinalPriceTips>0 and
//单机票订单 //单机票订单
StringBuilder builderCRMTicketOrder = new StringBuilder(); StringBuilder builderCRMTicketOrder = new StringBuilder();
builderCRMTicketOrder.AppendFormat($@"SELECT A.GroupId,A.GuestCount,A.DepartTime,A.EnterID,A.FinalPriceTips from reborn_sell.RB_Ticket_Order as A builderCRMTicketOrder.AppendFormat($@"SELECT A.GroupId,A.GuestCount,A.DepartTime,A.EnterID,A.FinalPriceTips from {(Config.IsOnline ? "uat_reborn_sell" : "reborn_sell")}.RB_Ticket_Order as A
where FinalPriceTips>0 and a.DepartTime>NOW() and a.GroupId in({groupId}) and a.OrderStatus <>2 and a.Money <> (a.IncomeMoney + a.TaxMoney+a.PlatformMoney - a.BackMoney)"); where FinalPriceTips>0 and a.DepartTime>NOW() and a.GroupId in({groupId}) and a.OrderStatus <>2 and a.Money <> (a.IncomeMoney + a.TaxMoney+a.PlatformMoney - a.BackMoney)");
var cRMTicket_OrderList = cRMTicket_OrderRepository.Get<RB_CRMTicket_Order_Extend>(builderCRMTicketOrder.ToString()).ToList(); var cRMTicket_OrderList = cRMTicket_OrderRepository.Get<RB_CRMTicket_Order_Extend>(builderCRMTicketOrder.ToString()).ToList();
#endregion #endregion
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
// //
// serviceInstaller1 // serviceInstaller1
// //
this.serviceInstaller1.Description = "RebornTimerService定时器服务"; this.serviceInstaller1.Description = "RebornTimerHuaTuService定时器服务";
this.serviceInstaller1.ServiceName = "RebornTimerServer"; this.serviceInstaller1.ServiceName = "RebornTimerHuaTuServer";
this.serviceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic; this.serviceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic;
// //
// ProjectInstaller // ProjectInstaller
......
...@@ -106,5 +106,11 @@ ...@@ -106,5 +106,11 @@
<ItemGroup> <ItemGroup>
<None Include="App.config" /> <None Include="App.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\REBORN.HuaTuQUART\REBORN.HuaTuQUART.csproj">
<Project>{ff7660d5-90ca-4239-9e8b-5a23f34dbaf1}</Project>
<Name>REBORN.HuaTuQUART</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
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