Skip to content

S
smallproject
Commit c0052902 by mahaisong
Options

fix:部署测试

parent 77da7bdf
Showing with 43 additions and 36 deletions
10.Paul需求-JSON贝格ES导入本地ES/MinderES/BeigeOracle_MinderES/App.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
...@@ -69,9 +69,8 @@ ...@@ -69,9 +69,8 @@
<DbProviderFactories> <DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" /> <remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" /> <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
<remove invariant="Oracle.ManagedDataAccess.Client"/> <remove invariant="Oracle.ManagedDataAccess.Client" />
<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342" />
type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
</DbProviderFactories> </DbProviderFactories>
......
10.Paul需求-JSON贝格ES导入本地ES/MinderES/BeigeOracle_MinderES/QuartzJobs/BeigeESJob.cs
using HJBeigeModel; using HJBeigeModel;
...@@ -21,7 +21,7 @@ namespace BeigeOracle_MinderES.QuartzJobs ...@@ -21,7 +21,7 @@ namespace BeigeOracle_MinderES.QuartzJobs
public class BeigeESJob : IJob public class BeigeESJob : IJob
{ {
private static string sync_name = "HuaJinNews_Beige"; private static string sync_name = "HuaJinNews_Beige";
private static Int32 Query_Count = 100; private static Int32 Query_Count = 500;
public void Execute(IJobExecutionContext context) public void Execute(IJobExecutionContext context)
{ {
...@@ -65,31 +65,31 @@ namespace BeigeOracle_MinderES.QuartzJobs ...@@ -65,31 +65,31 @@ namespace BeigeOracle_MinderES.QuartzJobs
IList<BeigeNews> BeigeNewsList = null; IList<BeigeNews> BeigeNewsList = null;
try try
{ {
if(conn.State!=ConnectionState.Open) if (conn.State != ConnectionState.Open)
conn.Open(); conn.Open();
OracleCommand cmd = conn.CreateCommand(); OracleCommand cmd = conn.CreateCommand();
//（接着上次的继续计算）从 Oracle 中抽取 TXT_NWS_BAS 的数据。 //（接着上次的继续计算）从 Oracle 中抽取 TXT_NWS_BAS 的数据。
//TXT_NWS_BAS 的ID主键是自增INT型，所以可以顺序抽取 //TXT_NWS_BAS 的ID主键是自增INT型，所以可以顺序抽取
//TXT_NWS_BAS.ID 是TXT_NWS_BAS_TXT.ORIG_ID ， 但是也可能没有ORIG_ID。 //TXT_NWS_BAS.ID 是TXT_NWS_BAS_TXT.ORIG_ID ， 但是也可能没有ORIG_ID。
string sqlstr = "SELECT tleft.ID AS ID, tleft.MED_NAME AS MED_NAME, tleft.PUB_DT AS PUB_DT, tleft.AUT AS AUT, tleft.TIT AS TIT , tleft.LNK_ADDR AS LNK_ADDR, tright.CONT_FMT AS CONT_FMT, tright.CONT AS CONT FROM ( SELECT * FROM ( SELECT t1.ID AS ID, t1.MED_NAME AS MED_NAME, t1.PUB_DT AS PUB_DT, t1.AUT AS AUT, t1.TIT AS TIT , t1.LNK_ADDR AS LNK_ADDR FROM BIGDATA_ADMIN.TXT_NWS_BAS t1 WHERE t1.ID > "+ lastId + " ORDER BY t1.ID ASC ) WHERE rownum <= "+ Query_Count + " ) tleft LEFT JOIN BIGDATA_ADMIN.TXT_NWS_BAS_TXT tright ON tleft.ID = tright.ORIG_ID"; string sqlstr = "SELECT tleft.ID AS ID, tleft.MED_NAME AS MED_NAME, tleft.PUB_DT AS PUB_DT, tleft.AUT AS AUT, tleft.TIT AS TIT , tleft.LNK_ADDR AS LNK_ADDR, tright.CONT_FMT AS CONT_FMT, tright.CONT AS CONT FROM ( SELECT * FROM ( SELECT t1.ID AS ID, t1.MED_NAME AS MED_NAME, t1.PUB_DT AS PUB_DT, t1.AUT AS AUT, t1.TIT AS TIT , t1.LNK_ADDR AS LNK_ADDR FROM BIGDATA_ADMIN.TXT_NWS_BAS t1 WHERE t1.ID > " + lastId + " ORDER BY t1.ID ASC ) WHERE rownum <= " + Query_Count + " ) tleft LEFT JOIN BIGDATA_ADMIN.TXT_NWS_BAS_TXT tright ON tleft.ID = tright.ORIG_ID";
cmd.CommandText = sqlstr; cmd.CommandText = sqlstr;
cmd.CommandType = CommandType.Text; cmd.CommandType = CommandType.Text;
//也会ONS未配置，但是会得到值。 //也会ONS未配置，但是会得到值。
OracleDataReader odr = cmd.ExecuteReader(); OracleDataReader odr = cmd.ExecuteReader();
BeigeNewsList = ReaderToListModel.ReaderToList<BeigeNews>(odr); BeigeNewsList = ReaderToListModel.ReaderToList<BeigeNews>(odr);
conn.Close(); conn.Close();
////linq速度提升。 ////linq速度提升。
//using (HJBeigeContext hjBeigeContext = new HJBeigeContext()) //using (HJBeigeContext hjBeigeContext = new HJBeigeContext())
//{ //{
// //优化linq // //优化linq
// var data = from o in hjBeigeContext.TXT_NWS_BAS // var data = from o in hjBeigeContext.TXT_NWS_BAS
......
10.Paul需求-JSON贝格ES导入本地ES/MinderES/BeigeOracle_MinderES/quartz_jobs.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
<!--begin-每5秒钟执行一次-BeigeESJob--> <!--begin-每天凌晨1点钟执行一次-BeigeESJob-->
<job> <job>
<name>Cycle_BeigeESJob</name> <name>Cycle_BeigeESJob</name>
<group>Test</group> <group>Test</group>
<description>每5秒钟执行一次-BeigeESJob</description> <description>每天凌晨1点钟执行一次-BeigeESJob</description>
<job-type>BeigeOracle_MinderES.QuartzJobs.BeigeESJob,BeigeOracle_MinderES</job-type> <job-type>BeigeOracle_MinderES.QuartzJobs.BeigeESJob,BeigeOracle_MinderES</job-type>
<durable>true</durable> <durable>true</durable>
<recover>false</recover> <recover>false</recover>
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
<job-name>Cycle_BeigeESJob</job-name> <job-name>Cycle_BeigeESJob</job-name>
<job-group>Test</job-group> <job-group>Test</job-group>
<start-time>2015-01-22T00:00:00+08:00</start-time> <start-time>2015-01-22T00:00:00+08:00</start-time>
<cron-expression>0 0/5 * * * ? </cron-expression> <cron-expression>0 0 1 * * ?</cron-expression>
</cron> </cron>
</trigger> </trigger>
<!--end-每5秒钟执行一次-BeigeESJob--> <!--end-每天凌晨1点钟执行一次-BeigeESJob-->
</schedule> </schedule>
</job-scheduling-data> </job-scheduling-data>
\ No newline at end of file
10.Paul需求-JSON贝格ES导入本地ES/MinderES/TaikorES_MinderES/App.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" /> <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.4.1.0" newVersion="3.4.1.0" /> <bindingRedirect oldVersion="0.0.0.0-3.4.1.0" newVersion="3.4.1.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<connectionStrings> <connectionStrings>
......
10.Paul需求-JSON贝格ES导入本地ES/MinderES/TaikorES_MinderES/Program.cs
using MinderESCommon; using MinderESCommon;
...@@ -38,8 +38,9 @@ namespace TaikorES_MinderES ...@@ -38,8 +38,9 @@ namespace TaikorES_MinderES
wstr = DateTimeTool.ConvertDataTimeToString(DateTime.Now) + "： 2.定时任务启动--------若要关闭本程序，请输入exit！"; wstr = DateTimeTool.ConvertDataTimeToString(DateTime.Now) + "： 2.定时任务启动--------若要关闭本程序，请输入exit！";
Console.WriteLine(wstr); Console.WriteLine(wstr);
LogService.WriteInfo(wstr); LogService.WriteInfo(wstr);
Console.WriteLine(DateTimeTool.ConvertDataTimeToString(DateTime.Now) + "： 2.1定时任务执行日志，请观察debug.log文件"); wstr = DateTimeTool.ConvertDataTimeToString(DateTime.Now) + "： 2.1定时任务执行日志，请观察debug.log文件";
Console.WriteLine(wstr);
LogService.WriteInfo(wstr);
} }
catch (Exception ex) catch (Exception ex)
...@@ -75,7 +76,8 @@ namespace TaikorES_MinderES ...@@ -75,7 +76,8 @@ namespace TaikorES_MinderES
} }
Console.WriteLine("3.程序关闭！"); Console.WriteLine("3.程序关闭--手工关闭！");
LogService.WriteInfo("3.程序关闭--手工关闭！");
} }
} }
......
10.Paul需求-JSON贝格ES导入本地ES/MinderES/TaikorES_MinderES/QuartzJobs/TaikorES.cs → 10.Paul需求-JSON贝格ES导入本地ES/MinderES/TaikorES_MinderES/QuartzJobs/TaikorESJob.cs
using HTCommon.Data; using HTCommon.Data;
...@@ -15,9 +15,9 @@ using System.Threading.Tasks; ...@@ -15,9 +15,9 @@ using System.Threading.Tasks;
namespace TaikorES_MinderES.QuartzJobs namespace TaikorES_MinderES.QuartzJobs
{ {
public class TaikorES : IJob public class TaikorESJob : IJob
{ {
static Int32 Query_Count = 100; static Int32 Query_Count = 500;
public void Execute(IJobExecutionContext context) public void Execute(IJobExecutionContext context)
{ {
int totalcount = 0; int totalcount = 0;
......
10.Paul需求-JSON贝格ES导入本地ES/MinderES/TaikorES_MinderES/TaikorES_MinderES.csproj
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<ItemGroup> <ItemGroup>
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="QuartzJobs\TaikorES.cs" /> <Compile Include="QuartzJobs\TaikorESJob.cs" />
<Compile Include="QuartzJobs\TestJob.cs" /> <Compile Include="QuartzJobs\TestJob.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
10.Paul需求-JSON贝格ES导入本地ES/MinderES/TaikorES_MinderES/quartz_jobs.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
<!--begin-每5秒钟执行一次-TaikorES--> <!--begin-每天凌晨1点执行一次-TaikorESJob-->
<job> <job>
<name>Cycle_TaikorES</name> <name>Cycle_TaikorESJob</name>
<group>Test</group> <group>Test</group>
<description>每5秒钟执行一次-TaikorES</description> <description>每天凌晨1点钟执行一次-TaikorESJob</description>
<job-type>TaikorES_MinderES.QuartzJobs.TaikorES,TaikorES_MinderES</job-type> <job-type>TaikorES_MinderES.QuartzJobs.TaikorESJob,TaikorES_MinderES</job-type>
<durable>true</durable> <durable>true</durable>
<recover>false</recover> <recover>false</recover>
</job> </job>
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
<cron> <cron>
<name>Cycle_TaikorESTrigger</name> <name>Cycle_TaikorESTrigger</name>
<group>Test</group> <group>Test</group>
<job-name>Cycle_TaikorES</job-name> <job-name>Cycle_TaikorESJob</job-name>
<job-group>Test</job-group> <job-group>Test</job-group>
<start-time>2015-01-22T00:00:00+08:00</start-time> <start-time>2015-01-22T00:00:00+08:00</start-time>
<cron-expression>0/5 * * * * ? </cron-expression> <cron-expression>0 0 1 * * ?</cron-expression>
</cron> </cron>
</trigger> </trigger>
<!--end-每5秒钟执行一次-TaikorES--> <!--end-每天凌晨1点执行一次-TaikorESJob-->
</schedule> </schedule>
</job-scheduling-data> </job-scheduling-data>
\ 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