diff --git a/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.eot b/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.eot index 70a6d7d5..552c6a39 100644 Binary files a/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.eot and b/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.eot differ diff --git a/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.ttf b/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.ttf index 913c9141..4ce12b72 100644 Binary files a/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.ttf and b/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.ttf differ diff --git a/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.woff b/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.woff index dcc9b1f8..9675bf0f 100644 Binary files a/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.woff and b/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.woff differ diff --git a/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.woff2 b/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.woff2 index 32c90d28..0aab7ce4 100644 Binary files a/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.woff2 and b/projects/Infrastructure/wwwroot/fonts/Framework7Icons-Regular.woff2 differ diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db index 22499a71..0af35c32 100644 Binary files a/projects/IoTCenter/iotcenter.db and b/projects/IoTCenter/iotcenter.db differ diff --git a/projects/IoTClient/Assets/Plugins/Android/AndroidManifest.xml b/projects/IoTClient/Assets/Plugins/Android/AndroidManifest.xml new file mode 100644 index 00000000..7ec58b73 --- /dev/null +++ b/projects/IoTClient/Assets/Plugins/Android/AndroidManifest.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/projects/IoTClient/Assets/Plugins/Android/AndroidManifest.xml.meta b/projects/IoTClient/Assets/Plugins/Android/AndroidManifest.xml.meta new file mode 100644 index 00000000..5749feda --- /dev/null +++ b/projects/IoTClient/Assets/Plugins/Android/AndroidManifest.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a112eeccd05606d4281925ce4bd355cd +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj index 9139d5c3..41857b7d 100644 --- a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj +++ b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj @@ -12,4 +12,23 @@ + + + + + + + + + + + + + + + + true + PreserveNewest + + \ No newline at end of file diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html index 93b016e6..326a0ea5 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html @@ -2,34 +2,8 @@ - + +
@@ -38,12 +12,15 @@ - +
  • +
    + link +
    @@ -88,7 +65,6 @@ }; }, mounted() { - this.$theme = 'ios'; this.$f7ready((f7) => { app = this.$f7; $.validator.unobtrusive.parse('form'); @@ -103,10 +79,8 @@ axios.post(url) .then(function (response) { console.log(response); - app.dialog.alert(response.data, '信息', function () { - localStorage.setItem('server', vm.server); - window.location.href = "login.html"; - }) + localStorage.setItem('server', vm.server); + window.location.href = "login.html"; }) .catch(function (error) { app.dialog.alert(error, '警告', function () { }) diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app - 复制.css b/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app - 复制.css new file mode 100644 index 00000000..f250c13e --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app - 复制.css @@ -0,0 +1,122 @@ +.field-validation-error, .field-validation-valid{ + color:red; + display:inline-block; + height:20px; + padding-right:1px; + font-size:small; +} +.row{ + text-align:center; +} +.block-strong .row .button { + margin: 5px auto 0 auto; +} +.text-align-center { + text-align: center; +} +.float-left{ + float:left; +} +.float-right{ + float:right; +} +.col{ + text-align:center; + padding-top: 5px; +} +img.shot { + max-width: 100%; + max-height: 100%; + width:100%; + height:auto; +} +img.shot.zoom { + width:auto; + max-width:none; + max-height: none; +} +.block .list{ + margin:0; +} + +.videoContainer{ + background-color:black; + text-align:center; + height:100%; +} + .videoContainer video { + max-height: 100%; + width: 100%; + margin:auto; + } + .videoContainer #ptz { + position:absolute; + text-align:center; + width:300px; + margin:auto; + left:0; + right:0; + bottom:0; + } + .videoContainer table { + margin: 0 auto; + } +.device-desktop.with-modal-dialog .page-content { + overflow: auto; +} +form{ + width:100%; +} +label.button input { + display: none; +} +input[type=range].ajax{ + width:100%; + height:34px; +} +input.ajax{ + margin:5px 0; +} +form.device label{ + display:inline-block; + height:34px; + line-height:34px; + vertical-align:middle; +} +video.video{ + width:100%; + height:100%; +} +/*html5 input rang style*/ +input[type=range] { + -webkit-appearance: none; +} + + input[type=range]::-webkit-slider-runnable-track { + width: 300px; + height: 5px; + background: #ddd; + border: none; + border-radius: 3px; + } + + input[type=range]::-webkit-slider-thumb { + -webkit-appearance: none; + border: none; + height: 16px; + width: 16px; + border-radius: 50%; + background-color:Highlight; + margin-top: -5px; + } + + input[type=range]:focus { + outline: none; + } + + input[type=range]:focus::-webkit-slider-runnable-track { + background: #ccc; + } +img.offline { + filter: grayscale(100%); +} \ No newline at end of file diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.woff.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app - 复制.css.meta similarity index 74% rename from projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.woff.meta rename to projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app - 复制.css.meta index 373463d7..462399aa 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.woff.meta +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app - 复制.css.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0d763f52cd8b3104498ef5c2b8f2739d +guid: 77eca10358aca764cb73c67bf474f405 DefaultImporter: externalObjects: {} userData: diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app.css b/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app.css index f250c13e..1d215876 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app.css +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app.css @@ -1,122 +1,12 @@ -.field-validation-error, .field-validation-valid{ - color:red; - display:inline-block; - height:20px; - padding-right:1px; - font-size:small; -} -.row{ - text-align:center; -} -.block-strong .row .button { - margin: 5px auto 0 auto; -} -.text-align-center { - text-align: center; -} -.float-left{ - float:left; -} -.float-right{ - float:right; -} -.col{ - text-align:center; - padding-top: 5px; -} -img.shot { - max-width: 100%; - max-height: 100%; - width:100%; - height:auto; -} -img.shot.zoom { - width:auto; - max-width:none; - max-height: none; -} -.block .list{ - margin:0; +.field-validation-valid, .field-validation-error { + height: 1em; + font-size: .8em; } -.videoContainer{ - background-color:black; - text-align:center; - height:100%; -} - .videoContainer video { - max-height: 100%; - width: 100%; - margin:auto; - } - .videoContainer #ptz { - position:absolute; - text-align:center; - width:300px; - margin:auto; - left:0; - right:0; - bottom:0; + .field-validation-error span { + color: red; } - .videoContainer table { - margin: 0 auto; - } -.device-desktop.with-modal-dialog .page-content { - overflow: auto; -} -form{ - width:100%; -} -label.button input { - display: none; -} -input[type=range].ajax{ - width:100%; - height:34px; -} -input.ajax{ - margin:5px 0; -} -form.device label{ - display:inline-block; - height:34px; - line-height:34px; - vertical-align:middle; -} -video.video{ - width:100%; - height:100%; -} -/*html5 input rang style*/ -input[type=range] { - -webkit-appearance: none; -} - input[type=range]::-webkit-slider-runnable-track { - width: 300px; - height: 5px; - background: #ddd; - border: none; - border-radius: 3px; - } - - input[type=range]::-webkit-slider-thumb { - -webkit-appearance: none; - border: none; - height: 16px; - width: 16px; - border-radius: 50%; - background-color:Highlight; - margin-top: -5px; - } - - input[type=range]:focus { - outline: none; - } - - input[type=range]:focus::-webkit-slider-runnable-track { - background: #ccc; - } -img.offline { - filter: grayscale(100%); -} \ No newline at end of file +.page { + /*background-color: white;*/ +} diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/framework7-icons.css b/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/framework7-icons.css index 8a9419df..15c539c4 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/framework7-icons.css +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/css/framework7-icons.css @@ -1,48 +1,16 @@ -/* Material Icons Font (for MD theme) */ -@font-face { - font-family: 'Material Icons'; - font-style: normal; - font-weight: 400; - src: url(../fonts/MaterialIcons-Regular.eot); /* For IE6-8 */ - src: local('Material Icons'), local('MaterialIcons-Regular'), url(../fonts/MaterialIcons-Regular.woff2) format('woff2'), url(../fonts/MaterialIcons-Regular.woff) format('woff'), url(../fonts/MaterialIcons-Regular.ttf) format('truetype'); -} - -.material-icons { - font-family: 'Material Icons'; - font-weight: normal; - font-style: normal; - font-size: 24px; /* Preferred icon size */ - display: inline-block; - line-height: 1; - text-transform: none; - letter-spacing: normal; - word-wrap: normal; - white-space: nowrap; - direction: ltr; - /* Support for all WebKit browsers. */ - -webkit-font-smoothing: antialiased; - /* Support for Safari and Chrome. */ - text-rendering: optimizeLegibility; - /* Support for Firefox. */ - -moz-osx-font-smoothing: grayscale; - /* Support for IE. */ - font-feature-settings: 'liga'; -} - -/* Framework7 Icons Font (for iOS theme) */ @font-face { font-family: 'Framework7 Icons'; font-style: normal; font-weight: 400; src: url("../fonts/Framework7Icons-Regular.eot"); - src: url("../fonts/Framework7Icons-Regular.woff2") format("woff2"), url("../fonts/Framework7Icons-Regular.woff") format("woff"), url("../fonts/Framework7Icons-Regular.ttf") format("truetype"); + src: local('Framework7 Icons'), local('Framework7Icons-Regular'), url("../fonts/Framework7Icons-Regular.woff2") format("woff2"), url("../fonts/Framework7Icons-Regular.woff") format("woff"), url("../fonts/Framework7Icons-Regular.ttf") format("truetype"); } -.f7-icons { +.f7-icons, .framework7-icons { font-family: 'Framework7 Icons'; font-weight: normal; font-style: normal; - font-size: 25px; + font-size: 28px; line-height: 1; letter-spacing: normal; text-transform: none; @@ -57,5 +25,4 @@ -moz-font-feature-settings: "liga=1"; -moz-font-feature-settings: "liga"; font-feature-settings: "liga"; - text-align: center; } diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.eot b/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.eot index 7f062bb7..552c6a39 100644 Binary files a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.eot and b/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.eot differ diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.ttf b/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.ttf index 4b2e712b..4ce12b72 100644 Binary files a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.ttf and b/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.ttf differ diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.woff b/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.woff index 87902a71..9675bf0f 100644 Binary files a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.woff and b/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.woff differ diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.woff2 b/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.woff2 index 0243f673..0aab7ce4 100644 Binary files a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.woff2 and b/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/Framework7Icons-Regular.woff2 differ diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.eot b/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.eot deleted file mode 100644 index 70508eba..00000000 Binary files a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.eot and /dev/null differ diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.ttf b/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.ttf deleted file mode 100644 index 7015564a..00000000 Binary files a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.ttf and /dev/null differ diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.woff b/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.woff deleted file mode 100644 index b648a3ee..00000000 Binary files a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.woff and /dev/null differ diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.woff2 b/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.woff2 deleted file mode 100644 index 9fa21125..00000000 Binary files a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.woff2 and /dev/null differ diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/empty.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/empty.png new file mode 100644 index 00000000..804ec706 Binary files /dev/null and b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/empty.png differ diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html index 26d9af79..95a105a7 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html @@ -2,55 +2,34 @@ + + +
    - + - - -
    -
      -
    • -
      - -
      -
      -
      用户名
      -
      - - -
      -
      -
      -
      • -
    • -
      - -
      -
      -
      密码
      -
      - - -
      -
      -
      -
      • -
    -
    -
    -

    - -

    -
    - + + menu + + + + house + 首页 + + + circle_grid_hex + 节点 + + + person + 我的 + +     @@ -73,15 +52,19 @@ routes: [], name: 'My App', id: 'com.myapp.test', + theme: 'ios', }, server: localStorage.getItem('server'), - username: localStorage.getItem('username') + token: localStorage.getItem('token') }; }, mounted() { if (!this.server) { location.href = "config.html"; } + if (!this.token) { + location.href = "login.html"; + } this.$f7ready((f7) => { app = this.$f7; $.validator.unobtrusive.parse('form'); diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.eot.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/flv.js/flv.min.js.meta similarity index 74% rename from projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.eot.meta rename to projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/flv.js/flv.min.js.meta index 0c44207e..44cd20e5 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.eot.meta +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/flv.js/flv.min.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 90794fb23413c6940850725841463fdf +guid: 1d51325f1d33f744fa3608e9b3eb5147 DefaultImporter: externalObjects: {} userData: diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/css.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/css.meta new file mode 100644 index 00000000..e95b3ee2 --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/css.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4ec06047070eb834b98d3f6142a54c5a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.woff2.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/css/framework7.bundle.min.css.meta similarity index 74% rename from projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.woff2.meta rename to projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/css/framework7.bundle.min.css.meta index 530adc14..751989bb 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.woff2.meta +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/css/framework7.bundle.min.css.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 042f5f5cf72380d449104d95e0a760cd +guid: c8ef7daafc523b64c9b283a91c28a910 DefaultImporter: externalObjects: {} userData: diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js.meta new file mode 100644 index 00000000..a5a0cfda --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ddbc5f7a20b285c4aa41e4e616a30d70 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.ttf.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js/framework7-vue.bundle.min.js.meta similarity index 74% rename from projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.ttf.meta rename to projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js/framework7-vue.bundle.min.js.meta index ef34da34..fc08d7e2 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/fonts/MaterialIcons-Regular.ttf.meta +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js/framework7-vue.bundle.min.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 56231a9acb55f24418268b067614ec51 +guid: 361f3fcc36923cc4390456f44a3bb6a1 DefaultImporter: externalObjects: {} userData: diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js/framework7.bundle.min.js.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js/framework7.bundle.min.js.meta new file mode 100644 index 00000000..d04c43d8 --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js/framework7.bundle.min.js.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d294e4f10a0afac478de9656de17d849 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/login.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/login.html index 26d9af79..65eec98e 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/login.html +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/login.html @@ -2,27 +2,26 @@ - + + +
    - + - + + menu +
    -
    +
      -
    • +
    • - + person
      -
      用户名
      @@ -30,14 +29,13 @@
      • -
    • +
    • - + lock
      -
      密码
      - +
      @@ -47,7 +45,7 @@

      - +

      • @@ -73,6 +71,7 @@ routes: [], name: 'My App', id: 'com.myapp.test', + theme: 'ios', }, server: localStorage.getItem('server'), username: localStorage.getItem('username') diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html new file mode 100644 index 00000000..2dd0cc91 --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html @@ -0,0 +1,100 @@ + + + + + + + + + +
      + + + + + + + + + + + \ No newline at end of file diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html.meta new file mode 100644 index 00000000..df5b43d2 --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bde51ed853c697741894a6bd08c3908d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html new file mode 100644 index 00000000..2a26c35e --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html @@ -0,0 +1,115 @@ + + + + + + + + + +
      + + + + + + + + + + + \ No newline at end of file diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html.meta new file mode 100644 index 00000000..ac38324f --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f83b15630f1250841a28f1f57fc6369e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db index f921735a..ca744329 100644 Binary files a/projects/IoTNode/iotnode.db and b/projects/IoTNode/iotnode.db differ diff --git a/projects/UserCenter/Controllers/AccountController.cs b/projects/UserCenter/Controllers/AccountController.cs index 7956e387..647ba162 100644 --- a/projects/UserCenter/Controllers/AccountController.cs +++ b/projects/UserCenter/Controllers/AccountController.cs @@ -125,6 +125,7 @@ namespace UserCenter.Controllers return Json(new { Name = this._cfg["Name"], + user.Avatar, user.UserName, user.NickName }); diff --git a/projects/UserCenter/wwwroot/upload/9e668187e964a2a7dccc7fb9f3870943cc616e5b183cd5b8be155e23f30598b8.png b/projects/UserCenter/wwwroot/upload/9e668187e964a2a7dccc7fb9f3870943cc616e5b183cd5b8be155e23f30598b8.png new file mode 100644 index 00000000..2c5239fb Binary files /dev/null and b/projects/UserCenter/wwwroot/upload/9e668187e964a2a7dccc7fb9f3870943cc616e5b183cd5b8be155e23f30598b8.png differ diff --git a/tools/nginx-1.16.0/conf/nginx.conf b/tools/nginx-1.16.0/conf/nginx.conf index b5b92c0c..fb681eb5 100644 --- a/tools/nginx-1.16.0/conf/nginx.conf +++ b/tools/nginx-1.16.0/conf/nginx.conf @@ -35,11 +35,11 @@ http { } location ^~ /UserCenter/ { - proxy_pass http://localhost:8000/; + proxy_pass http://localhost:8010/; } location ^~ /IoTCenter/ { - proxy_pass http://localhost:8001/; + proxy_pass http://localhost:8011/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade";