Former-commit-id: 8fb4f36cd698e099f34ee381d03f4103c1a46f37
TangShanKaiPing
wanggang 6 years ago
parent c1882499ce
commit 07e314b0c8

@ -11,7 +11,10 @@ namespace Infrastructure.Data
{
public class EfDbContext : DbContext
{
public static readonly ILoggerFactory MyLoggerFactory = LoggerFactory.Create(builder => { builder.AddConsole(); });
public static readonly ILoggerFactory MyLoggerFactory = LoggerFactory.Create(builder =>
{
//builder.AddConsole();
});
public EfDbContext(DbContextOptions options) : base(options)
{

@ -16,8 +16,6 @@
<PackageReference Include="JWT" Version="5.3.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.1.0" />
<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.0.0-rc1.final" />

@ -44,6 +44,7 @@ namespace Infrastructure.Web
private readonly bool _useMiniProfiler;
private string _connectionString;
private bool _useSqlite;
private readonly string _origins = "AllowAllHeaders";
public BaseStartup(IConfiguration configuration, IWebHostEnvironment env)
{
@ -55,11 +56,7 @@ namespace Infrastructure.Web
public virtual void ConfigureServices(IServiceCollection services)
{
services.AddSingleton(_cfg as IConfigurationRoot);
if (this._useMiniProfiler)
{
services.AddMiniProfiler(o => o.RouteBasePath = "/profiler").AddEntityFramework();
}
services.AddCors(options => options.AddPolicy("CorsPolicy",
services.AddCors(options => options.AddPolicy(_origins,
builder =>
{
builder.SetIsOriginAllowed(o => true)
@ -216,18 +213,14 @@ namespace Infrastructure.Web
app.UseExceptionHandler("/Error");
app.UseStatusCodePagesWithReExecute("/Error");
}
if (this._useMiniProfiler)
{
app.UseMiniProfiler();
}
app.UseStaticFiles();
app.UseRouting();
app.UseCors(_origins);
var localizationOption = app.ApplicationServices.GetService<IOptions<RequestLocalizationOptions>>();
app.UseRequestLocalization(localizationOption.Value);
app.UseSession();
this.UseAuthentication(app);
this.UseSwagger(app);
app.UseCors("CorsPolicy");
this.UseScheduler(app);
app.UseEndpoints(endpoints =>
{

@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Newtonsoft.Json;
using Microsoft.Extensions.Hosting;
using System;
using System.Collections.Generic;
using System.IO;
@ -23,6 +23,7 @@ namespace IoTCenter.Controllers
[Device]
public class AppController : Controller
{
private readonly IHostEnvironment _env;
private readonly IConfiguration _configuration;
private readonly IJwtHelper _jwtHelper;
private readonly IRepository<Category> _categoryRepo;
@ -35,7 +36,9 @@ namespace IoTCenter.Controllers
private readonly IRepository<LiveRecord> _liveRecordRepo;
private readonly IHubContext<IoTCenterHub> _hub;
public AppController(IConfiguration configuration,
public AppController(
IHostEnvironment env,
IConfiguration configuration,
IJwtHelper jwtHelper,
IRepository<Category> categoryRepo,
IRepository<Product> productRepo,
@ -47,6 +50,7 @@ namespace IoTCenter.Controllers
IRepository<LiveRecord> liveRecordRepo,
IHubContext<IoTCenterHub> hub)
{
this._env = env;
this._configuration = configuration;
this._jwtHelper = jwtHelper;
this._categoryRepo = categoryRepo;
@ -114,6 +118,12 @@ namespace IoTCenter.Controllers
return Json(model);
}
public IActionResult GetTemplate(string template)
{
return Content(System.IO.File.ReadAllText(Path.Combine(this._env.ContentRootPath, "wwwroot", template)));
}
//
public IActionResult GetSceneList(string token)
{
var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString();

@ -5,6 +5,5 @@
"System": "Information",
"Microsoft": "Warning"
}
},
"UseMiniProfiler": false
}
}

@ -6,7 +6,6 @@
"Microsoft": "Warning"
}
},
"UseMiniProfiler": false,
"ConnectionStrings": {
"database.mysql.connection": "Server=127.0.0.1;Port=3306;Database=iotcenter;Uid=root;Pwd=root;",
"database.sqlite.connection": "Data Source=iotcenter.db"

Binary file not shown.

@ -0,0 +1 @@
//复制移动端node.html的template节点内容到此作为修改的基础

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 312c27f5d95ac3b43a5743a8f9429113
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 894e429dfa5e1b249896a9ae637fc67b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 932b2ebc2bdf493478f3277c9c6214f0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -22,98 +22,100 @@
<div id="app">
<f7-app :params="$root.f7params">
<f7-view main>
<f7-page>
<f7-page page-content="false">
<f7-navbar :title="model?model.Name:'节点'">
<a href="nodes.html" slot="nav-left" class="link external"><i class="icon icon-back"></i></a>
</f7-navbar>
<template v-if="model">
<template v-if="HasDevices('摄像头')">
<div class="card">
<div class="card-header">
<div class="item-input-wrap input-dropdown-wrap" style="width:100%;">
<select class="input-with-value" id="camera" @change="CameraSelected" style="width:100%;">
<option v-for="c in GetDevices('摄像头')" :value="c.Number">{{c.DisplayName||c.Name}}</option>
</select>
<div class="page-content" id="template">
<template v-if="model">
<template v-if="HasDevices('摄像头')">
<div class="card">
<div class="card-header">
<div class="item-input-wrap input-dropdown-wrap" style="width:100%;">
<select class="input-with-value" id="camera" @change="CameraSelected" style="width:100%;">
<option v-for="c in GetDevices('摄像头')" :value="c.Number">{{c.DisplayName||c.Name}}</option>
</select>
</div>
</div>
</div>
<div class="card-content">
<div style="width:100%;height:186px;margin:0;padding:0;background:#000;text-align:center;">
<video id="video" class="video" controls autoplay muted style="width:100%;max-width:100%;height:100%;" v-on:volumechange="VolumeChange($event)"></video>
<div class="card-content">
<div style="width:100%;height:186px;margin:0;padding:0;background:#000;text-align:center;">
<video id="video" class="video" controls autoplay muted style="width:100%;max-width:100%;height:100%;" v-on:volumechange="VolumeChange($event)"></video>
</div>
</div>
</div>
</div>
<div class="card" id="ptz">
<div class="card-header with-border">云台</div>
<div class="card-content" style="height:178px;text-align:center;">
<table class="ptz" style="margin:0 auto;">
<tr>
<td></td>
<td></td>
<td><img class="ajax camera Up" :src="server+'/IoTCenter/images/up.png'" /></td>
<td></td>
<td></td>
</tr>
<tr>
<td><img class="ajax camera Zoomin" :src="server+'/IoTCenter/images/zoomin.png'" /></td>
<td><img class="ajax camera Left" :src="server+'/IoTCenter/images/left.png'" /></td>
<td><img class="ajax camera Stop" :src="server+'/IoTCenter/images/stop.png'" /></td>
<td><img class="ajax camera Right" :src="server+'/IoTCenter/images/right.png'" /></td>
<td><img class="ajax camera Zoomout" :src="server+'/IoTCenter/images/zoomout.png'" /></td>
</tr>
<tr>
<td></td>
<td></td>
<td><img class="ajax camera Down" :src="server+'/IoTCenter/images/down.png'" /></td>
<td></td>
<td></td>
</tr>
</table>
<div class="card" id="ptz">
<div class="card-header with-border">云台</div>
<div class="card-content" style="height:178px;text-align:center;">
<table class="ptz" style="margin:0 auto;">
<tr>
<td></td>
<td></td>
<td><img class="ajax camera Up" :src="server+'/IoTCenter/images/up.png'" /></td>
<td></td>
<td></td>
</tr>
<tr>
<td><img class="ajax camera Zoomin" :src="server+'/IoTCenter/images/zoomin.png'" /></td>
<td><img class="ajax camera Left" :src="server+'/IoTCenter/images/left.png'" /></td>
<td><img class="ajax camera Stop" :src="server+'/IoTCenter/images/stop.png'" /></td>
<td><img class="ajax camera Right" :src="server+'/IoTCenter/images/right.png'" /></td>
<td><img class="ajax camera Zoomout" :src="server+'/IoTCenter/images/zoomout.png'" /></td>
</tr>
<tr>
<td></td>
<td></td>
<td><img class="ajax camera Down" :src="server+'/IoTCenter/images/down.png'" /></td>
<td></td>
<td></td>
</tr>
</table>
</div>
</div>
</div>
</template>
<template v-for="device in GetDevices('色暖灯')">
<div class="row">
<div class="col-md-12">
<div class="box box-solid btns">
<div class="box-header with-border">
<h3 class="box-title"><img :src="server+'/IoTCenter/images/light2.png'" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
<div class="box-tools pull-right">
<img v-if="GetDataValue(device.Number,'状态')=='开'" @click="CallApi(device.Number,'/WarmLight/Off')" :src="server+'/IoTCenter/images/on.png'" />
<img v-if="GetDataValue(device.Number,'状态')=='关'" @click="CallApi(device.Number,'/WarmLight/On')" :src="server+'/IoTCenter/images/off.png'" />
</div>
</div>
<div class="box-body" style="height:178px;">
<form method="get" action="/App/ExecApi">
<input type="hidden" name="Number" :value="device.Number" />
<input type="hidden" name="Method" value="/WarmLight/SetBrightness" />
<div class="row">
<div class="col-md-2 col-xs-4">
<span class="label1">亮度</span>
</div>
<div class="col-md-10 col-xs-8">
<input @change="AjaxSubmit($event,device.Number,'亮度')" type="range" min="0" step="1" max="255" name="Brightness" :value="GetDataValue(device.Number,'亮度')" />
</div>
</template>
<template v-for="device in GetDevices('色暖灯')">
<div class="row">
<div class="col-md-12">
<div class="box box-solid btns">
<div class="box-header with-border">
<h3 class="box-title"><img :src="server+'/IoTCenter/images/light2.png'" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
<div class="box-tools pull-right">
<img v-if="GetDataValue(device.Number,'状态')=='开'" @click="CallApi(device.Number,'/WarmLight/Off')" :src="server+'/IoTCenter/images/on.png'" />
<img v-if="GetDataValue(device.Number,'状态')=='关'" @click="CallApi(device.Number,'/WarmLight/On')" :src="server+'/IoTCenter/images/off.png'" />
</div>
</form>
<form method="get" action="/App/ExecApi">
<input type="hidden" name="Number" :value="device.Number" />
<input type="hidden" name="Method" value="/WarmLight/SetColor" />
<input type="hidden" name="Saturation" :value="GetDataValue(device.Number,'饱和度')" />
<div class="row">
<div class="col-md-2 col-xs-4">
<span class="label1">色调</span>
</div>
<div class="box-body" style="height:178px;">
<form method="get" action="/App/ExecApi">
<input type="hidden" name="Number" :value="device.Number" />
<input type="hidden" name="Method" value="/WarmLight/SetBrightness" />
<div class="row">
<div class="col-md-2 col-xs-4">
<span class="label1">亮度</span>
</div>
<div class="col-md-10 col-xs-8">
<input @change="AjaxSubmit($event,device.Number,'亮度')" type="range" min="0" step="1" max="255" name="Brightness" :value="GetDataValue(device.Number,'亮度')" />
</div>
</div>
<div class="col-md-10 col-xs-8">
<input @change="AjaxSubmit($event,device.Number,'色调')" type="range" min="0" step="1" max="255" name="Hue" :value="GetDataValue(device.Number,'色调')" />
</form>
<form method="get" action="/App/ExecApi">
<input type="hidden" name="Number" :value="device.Number" />
<input type="hidden" name="Method" value="/WarmLight/SetColor" />
<input type="hidden" name="Saturation" :value="GetDataValue(device.Number,'饱和度')" />
<div class="row">
<div class="col-md-2 col-xs-4">
<span class="label1">色调</span>
</div>
<div class="col-md-10 col-xs-8">
<input @change="AjaxSubmit($event,device.Number,'色调')" type="range" min="0" step="1" max="255" name="Hue" :value="GetDataValue(device.Number,'色调')" />
</div>
</div>
</div>
</form>
</form>
</div>
</div>
</div>
</div>
</div>
</template>
</template>
</template>
</div>
</f7-page>
</f7-view>
</f7-app>
@ -129,6 +131,132 @@
<script type="text/javascript" src="lib/framework7/js/framework7.bundle.min.js"></script>
<script type="text/javascript" src="lib/framework7/js/framework7-vue.bundle.min.js"></script>
<script type="text/javascript" src="lib/flv.js/flv.min.js"></script>
<script>
var server = localStorage.getItem('server');
var token = localStorage.getItem('token');
var data;
function loadData() {
var url = server + '/IoTCenter/App/GetNode';
var formData = new FormData();
formData.append('number', new URI().search(true).number);
formData.append('token', token);
axios.post(url, formData)
.then(function (response) {
console.log(response);
data = response.data;
if (data.Template) {
loadTemplate();
}
else {
init();
}
})
.catch(function (error) {
alert(error, '警告', function () { })
});
}
function loadTemplate() {
var url = server + '/IoTCenter/App/GetTemplate?template=' + data.Template;
axios.post(url, { crossDomain: true })
.then(function (response) {
var html = response.data;
$(html).each(function (i, n) {
if (n.tagName === 'STYLE') {
$('head').append(n);
}
});
$('#template').html(html);
init();
})
.catch(function (error) {
alert(error, '警告', function () { })
});
}
function init() {
vm = new Vue({
el: '#app',
data() {
return {
f7params: {
routes: [],
name: 'My App',
id: 'com.myapp.test',
theme: 'ios',
},
server: localStorage.getItem('server'),
token: localStorage.getItem('token'),
model: null
};
},
mounted() {
if (!this.server) {
location.href = "config.html";
}
if (!this.token) {
location.href = "login.html";
}
this.$f7ready((f7) => {
app = this.$f7;
});
this.load();
connect();
},
methods: {
load: function () {
var url = this.server + '/IoTCenter/App/GetNode';
var data = new FormData();
data.append('number', new URI().search(true).number);
data.append('token', this.token);
axios.post(url, data)
.then(function (response) {
console.log(response);
var data = response.data;
vm.model = data;
Vue.nextTick(function () {
UpdateCamera();
});
})
.catch(function (error) {
app.dialog.alert(error, '警告', function () { })
});
},
HasDevices(name) {
return Enumerable
.from(vm.model.Devices)
.any(function (o) { return o.Name === name });
},
GetDevices(name) {
return Enumerable.from(vm.model.Devices)
.where(function (o) { return o.Name == name; })
.toArray();
},
GetDataValue(number, name) {
var device = Enumerable.from(vm.model.Devices)
.where(function (o) { return o.Number === number; })
.firstOrDefault();
if (device != null) {
var data = Enumerable.from(device.Data)
.where(function (o) { return o.Name == name })
.firstOrDefault();
if (data != null) {
return data.Value;
}
}
return null;
},
CameraSelected() {
console.log('camera selected:' + new Date());
UpdateCamera();
},
VolumeChange(e) {
muted = e.target.muted;
volume = e.target.volume;
}
}
});
}
</script>
<script>
var flvPlayer;
var timer;
@ -319,87 +447,8 @@
<script type="text/javascript">
Framework7.use(Framework7Vue);
var app;
var vm = new Vue({
el: '#app',
data() {
return {
f7params: {
routes: [],
name: 'My App',
id: 'com.myapp.test',
theme: 'ios',
},
server: localStorage.getItem('server'),
token: localStorage.getItem('token'),
model: null
};
},
mounted() {
if (!this.server) {
location.href = "config.html";
}
if (!this.token) {
location.href = "login.html";
}
this.$f7ready((f7) => {
app = this.$f7;
});
this.load();
connect();
},
methods: {
load: function () {
var url = this.server + '/IoTCenter/App/GetNode';
var data = new FormData();
data.append('number', new URI().search(true).number);
data.append('token', this.token);
axios.post(url, data)
.then(function (response) {
console.log(response);
var data = response.data;
vm.model = data;
Vue.nextTick(function () {
UpdateCamera();
});
})
.catch(function (error) {
app.dialog.alert(error, '警告', function () { })
});
},
HasDevices(name) {
return Enumerable
.from(vm.model.Devices)
.any(function (o) { return o.Name === name });
},
GetDevices(name) {
return Enumerable.from(vm.model.Devices)
.where(function (o) { return o.Name == name; })
.toArray();
},
GetDataValue(number, name) {
var device = Enumerable.from(vm.model.Devices)
.where(function (o) { return o.Number === number; })
.firstOrDefault();
if (device != null) {
var data = Enumerable.from(device.Data)
.where(function (o) { return o.Name == name })
.firstOrDefault();
if (data != null) {
return data.Value;
}
}
return null;
},
CameraSelected() {
console.log('camera selected:' + new Date());
UpdateCamera();
},
VolumeChange(e) {
muted = e.target.muted;
volume = e.target.volume;
}
}
})
var vm;
loadData();
</script>
</body>
</html>

@ -5,6 +5,5 @@
"System": "Information",
"Microsoft": "Warning"
}
},
"UseMiniProfiler": false
}
}

Binary file not shown.

@ -5,6 +5,5 @@
"System": "Information",
"Microsoft": "Information"
}
},
"UseMiniProfiler": true
}
}

@ -5,7 +5,6 @@
"Default": "Warning"
}
},
"UseMiniProfiler": false,
"ConnectionStrings": {
"database.mysql.connection": "Server=127.0.0.1;Port=3306;Database=studycenter;Uid=root;Pwd=root;",
"database.sqlite.connection": "Data Source=studycenter.db"

@ -5,6 +5,5 @@
"System": "Information",
"Microsoft": "Information"
}
},
"UseMiniProfiler": true
}
}

@ -5,7 +5,6 @@
"Default": "Warning"
}
},
"UseMiniProfiler": false,
"ConnectionStrings": {
"database.mysql.connection": "Server=127.0.0.1;Port=3306;Database=usercenter;Uid=root;Pwd=root;",
"database.sqlite.connection": "Data Source=usercenter.db"

Loading…
Cancel
Save