IoTDameon 1.0.0.20091601

Former-commit-id: 01de0e7ba2ca705393e35f25c3dded041c463042
Former-commit-id: 650d9f6112c4812c01d91d48292a1862fdba3c1d

labs/kafka/.gitignore

@@ -1,6 +1,2 @@
 .vscode
-be
+docker
-fe
-udf
-log
-data

labs/kafka/KafkaEFTest/Program.cs

@@ -1,6 +1,6 @@
 using Confluent.Kafka;
 using Microsoft.EntityFrameworkCore;
-using MySqlConnector;
+using MySql.Data.MySqlClient;
 using Newtonsoft.Json;
 using System;
 using System.Threading;
@@ -37,15 +37,19 @@ namespace KafkaEFTest
                                 try
                                 {
                                     var entity = new TestEntity();
+                                    var entity1 = new TestEntity();
                                     producer.InitTransactions(DefaultTimeout);
                                     producer.BeginTransaction();
                                     dbContext.Database.BeginTransaction();
                                     dbContext.Tests.Add(entity);
+                                    dbContext.Tests.Add(entity1);
                                     dbContext.SaveChanges();
                                     var dr = await producer.ProduceAsync(topic, new Message<string, string> { Key = "test_table", Value = JsonConvert.SerializeObject(entity) });
+                                    var dr1 = await producer.ProduceAsync(topic, new Message<string, string> { Key = "test_table", Value = JsonConvert.SerializeObject(entity1) });
                                     dbContext.Database.CommitTransaction();
                                     producer.CommitTransaction(DefaultTimeout);
                                     Console.WriteLine($"send message offset: '{dr.TopicPartitionOffset}' value: '{dr.Value}");
+                                    Console.WriteLine($"send message offset: '{dr1.TopicPartitionOffset}' value: '{dr1.Value}");
                                 }
                                 catch (Exception ex)//DbUpdateException//ProduceException<Null,string>
                                 {
@@ -61,7 +65,7 @@ namespace KafkaEFTest
                         }
                     }
 
-                    await Task.Delay(5000);
+                    await Task.Delay(20);
                 }
             });
             var conf = new ConsumerConfig
@@ -129,6 +133,7 @@ namespace KafkaEFTest
         //create database test;
         //CREATE USER 'usr' IDENTIFIED BY 'pwd';
         //GRANT ALL ON test TO usr;
+        //use test;
         //CREATE TABLE IF NOT EXISTS test
         //(
         //    `id`   VARCHAR(64),

labs/kafka/docker-compose.yml

@@ -45,11 +45,11 @@ services:
         environment:
             TZ: "Asia/Shanghai"
         volumes:
-            #- ./conf/fe.conf:/opt/fe/conf/fe.conf
+            #- ./docker/conf/fe.conf:/opt/fe/conf/fe.conf
-            - ./log/fe:/opt/fe/log
+            - ./docker/log/fe:/opt/fe/log
-            - ./data/fe/doris-meta:/opt/fe/doris-meta
+            - ./docker/data/fe/doris-meta:/opt/fe/doris-meta
-            #- ./conf/be.conf:/opt/be/conf/be.conf
+            #- ./docker/conf/be.conf:/opt/be/conf/be.conf
-            - ./data/be/storage:/opt/be/storage
+            - ./docker/data/be/storage:/opt/be/storage
         ports:
             - 8081:8081
             - 8030:8030

projects/IoTDameon/UpdateIoTNodeService.cs

@@ -78,7 +78,6 @@ namespace IoTDameon
             var root = Directory.GetParent(_env.ContentRootPath).FullName;
             var appPath = Path.Combine(root, appFolder);
             var name = $"{appFolder}.zip";
-            var backupPath = Path.Combine(root, $"{appFolder}_bk");
             var file = Path.Combine(root, name);
             string currentVersion;
             try
@@ -109,6 +108,7 @@ namespace IoTDameon
                 throw ex;
             }
             var doc = new XmlDocument();
+            doc.LoadXml(info);
             var lastVersion = doc.GetElementsByTagName("version")[0].InnerText.Trim();
             var lastCheckSum = doc.GetElementsByTagName("checksum")[0].InnerText.Trim();
             if (currentVersion != lastVersion)
@@ -165,6 +165,7 @@ namespace IoTDameon
                         }
                     }
                     //备份要更新的程序
+                    var backupPath = Path.Combine(root, $"{appFolder}_{currentVersion}_bk");
                     try
                     {
                         if (Directory.Exists(backupPath))

projects/IoTDameon/Version.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.20090101")]
+[assembly: AssemblyInformationalVersion("1.0.0.20091601")]

projects/IoTNode/Startup.cs

@@ -87,11 +87,8 @@ namespace IoTNode
                     {
                         context.Database.BeginTransaction();
                         context.Database.ExecuteSqlRaw(sql);
+                        context.Database.ExecuteSqlRaw($"update iot_Node set Version='{Path.GetFileNameWithoutExtension(item.Value)}'");
                         context.Database.CommitTransaction();
-                        using var cmd2 = context.Database.GetDbConnection().CreateCommand();
-                        context.Database.OpenConnection();
-                        cmd2.CommandText = $"update iot_Node set Version='{Path.GetFileNameWithoutExtension(item.Value)}'";
-                        cmd2.ExecuteNonQuery();
                     }
                     catch (Exception ex)
                     {

projects/IoTNode/Version.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.20090101")]
+[assembly: AssemblyInformationalVersion("1.0.0.20090102")]