1.修复redis的stop-writes-on-bgsave-error配置错误的问题

2.修复智能门锁Desktop前端组件的api调用错误
3.更新xamarin程序包
4.更新doris测试程序,添加数据包


Former-commit-id: d7633e2077c9b44bee7cf524e67510e98c054ed5
Former-commit-id: 177595617de2769e41582f8d1c1a71a673524c0a
TSXN
wanggang 5 years ago
parent 242a126e75
commit 1b64e3ccdb

Binary file not shown.

@ -1,5 +1,7 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using MySql.Data.MySqlClient;
using System; using System;
using System.Diagnostics;
namespace DorisTest namespace DorisTest
{ {
@ -30,11 +32,33 @@ namespace DorisTest
// "replication_num" = "1" // "replication_num" = "1"
//); //);
//insert into test values (0,"user1",20); //insert into test values (0,"user1",20);
using var cmd = db.Database.GetDbConnection().CreateCommand(); using (var conn = new MySqlConnection("Server=localhost;Port=9030;Database=test;Uid=root;Allow User Variables=True;"))
db.Database.OpenConnection(); {
cmd.CommandText = $"select count(*) from test;"; conn.Open();
var result = cmd.ExecuteScalar(); using (var cmd = conn.CreateCommand())
Console.WriteLine(result.ToString()); {
var watch = new Stopwatch();
watch.Start();
for (int i = 427383; i < 10000000; i++)
{
cmd.CommandText += $"insert into pv_bitmap values({i + 1},'{GetChar()}{GetChar()}{GetChar()}',to_bitmap({new Random((int)DateTime.UtcNow.Ticks).Next(1, 100)}));";
if (i % 100 == 0 || i == 10000000 - 1)
{
cmd.ExecuteNonQuery();
watch.Stop();
Console.WriteLine(watch.ElapsedMilliseconds + ":" + i.ToString());
watch = new Stopwatch();
watch.Start();
cmd.CommandText = "";
}
}
}
}
}
private static char GetChar()
{
return (char)new Random((int)DateTime.UtcNow.Ticks).Next(97, 122);
} }
} }
} }

@ -1,4 +1,4 @@
<template> <template>
<div class="card" style="box-sizing:border-box;height:150px;margin:10px;"> <div class="card" style="box-sizing:border-box;height:150px;margin:10px;">
<div class="card-header"> <div class="card-header">
{{device.displayName}} {{device.displayName}}
@ -28,13 +28,13 @@
open: function () { open: function () {
var password = prompt("请输入密码开锁", ''); var password = prompt("请输入密码开锁", '');
if (password && password !== '') { if (password && password !== '') {
execApi(this.device.number, '/Door/Open', 'password=' + password); this.execApi(this.device.number, '/Door/Open', 'password=' + password);
} }
}, },
close: function () { close: function () {
var password = prompt("请输入密码关锁", ''); var password = prompt("请输入密码关锁", '');
if (password && password !== '') { if (password && password !== '') {
execApi(this.device.number, '/Door/Close', 'password=' + password); this.execApi(this.device.number, '/Door/Close', 'password=' + password);
} }
} }
} }

@ -1,7 +1,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Android.App; using Android.App;
using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
@ -28,4 +27,5 @@ using Android.App;
// Add some common permissions, these can be removed if not needed // Add some common permissions, these can be removed if not needed
[assembly: Application(UsesCleartextTraffic = true)] [assembly: Application(UsesCleartextTraffic = true)]
[assembly: UsesPermission(Android.Manifest.Permission.Internet)] [assembly: UsesPermission(Android.Manifest.Permission.Internet)]
[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)] [assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
[assembly: AssemblyInformationalVersion("1.0.2")]

File diff suppressed because it is too large Load Diff

@ -63,7 +63,7 @@
<Reference Include="System.Numerics.Vectors" /> <Reference Include="System.Numerics.Vectors" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" /> <PackageReference Include="Xamarin.Forms" Version="4.8.0.1364" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -34,3 +34,5 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.1")]

@ -62,6 +62,7 @@
<CodesignKey>iPhone Distribution</CodesignKey> <CodesignKey>iPhone Distribution</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<BuildIpa>false</BuildIpa> <BuildIpa>false</BuildIpa>
<MtouchLink>None</MtouchLink>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' "> <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
<AppExtensionDebugBundleId /> <AppExtensionDebugBundleId />
@ -128,7 +129,7 @@
<Reference Include="System.Numerics.Vectors" /> <Reference Include="System.Numerics.Vectors" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" /> <PackageReference Include="Xamarin.Forms" Version="4.8.0.1364" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

@ -17,7 +17,7 @@ namespace XamarinApp
this.option.Source = ImageSource.FromResource($"{this.GetType().Assembly.GetName().Name}.Images.options.png"); this.option.Source = ImageSource.FromResource($"{this.GetType().Assembly.GetName().Name}.Images.options.png");
if (!Application.Current.Properties.ContainsKey(baseUrlKey)) if (!Application.Current.Properties.ContainsKey(baseUrlKey))
{ {
Application.Current.Properties[baseUrlKey] = "http://49.4.92.112"; Application.Current.Properties[baseUrlKey] = "http://iot.edusoa.com/";
} }
this._baseUrl = Application.Current.Properties[baseUrlKey] as string; this._baseUrl = Application.Current.Properties[baseUrlKey] as string;
this.webView.Source = this._baseUrl; this.webView.Source = this._baseUrl;

@ -11,7 +11,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" /> <PackageReference Include="Xamarin.Forms" Version="4.8.0.1364" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

@ -318,7 +318,7 @@ save 60 10000
# and persistence, you may want to disable this feature so that Redis will # and persistence, you may want to disable this feature so that Redis will
# continue to work as usual even if there are problems with disk, # continue to work as usual even if there are problems with disk,
# permissions, and so forth. # permissions, and so forth.
stop-writes-on-bgsave-error yes stop-writes-on-bgsave-error no
# Compress string objects using LZF when dump .rdb databases? # Compress string objects using LZF when dump .rdb databases?
# For default that's set to 'yes' as it's almost always a win. # For default that's set to 'yes' as it's almost always a win.

Loading…
Cancel
Save