作者 陶保强

修改路由

... ... @@ -441,8 +441,8 @@ spring:
datasource:
driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/postgres}"
username: "${SPRING_DATASOURCE_USERNAME:postgres}"
password: "${SPRING_DATASOURCE_PASSWORD:postgres}"
username: "postgres"
password: "911221"
hikari:
maximumPoolSize: "${SPRING_DATASOURCE_MAXIMUM_POOL_SIZE:5}"
... ...
... ... @@ -71,8 +71,8 @@
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v12.16.1</nodeVersion>
<npmVersion>6.13.4</npmVersion>
<nodeVersion>v12.18.0</nodeVersion>
<npmVersion>6.14.4</npmVersion>
</configuration>
</execution>
<execution>
... ...
... ... @@ -25,10 +25,26 @@
"assets": [
"src/thingsboard.ico",
"src/assets",
{ "glob": "worker-html.js", "input": "./node_modules/ace-builds/src-min/", "output": "/" },
{ "glob": "worker-css.js", "input": "./node_modules/ace-builds/src-min/", "output": "/" },
{ "glob": "worker-json.js", "input": "./node_modules/ace-builds/src-min/", "output": "/" },
{ "glob": "worker-javascript.js", "input": "./node_modules/ace-builds/src-min/", "output": "/" }
{
"glob": "worker-html.js",
"input": "./node_modules/ace-builds/src-min/",
"output": "/"
},
{
"glob": "worker-css.js",
"input": "./node_modules/ace-builds/src-min/",
"output": "/"
},
{
"glob": "worker-json.js",
"input": "./node_modules/ace-builds/src-min/",
"output": "/"
},
{
"glob": "worker-javascript.js",
"input": "./node_modules/ace-builds/src-min/",
"output": "/"
}
],
"styles": [
"src/styles.scss",
... ... @@ -196,5 +212,8 @@
}
}
},
"defaultProject": "thingsboard"
"defaultProject": "thingsboard",
"cli": {
"analytics": "a0ca19d7-f3d7-47ff-b967-e9421b38cc28"
}
}
\ No newline at end of file
... ...
... ... @@ -5,6 +5,7 @@
"postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
"ng": "ng",
"start": "ng serve --host 0.0.0.0 --open",
"dev": "ng serve --host 0.0.0.0 --open",
"build": "ng build",
"build:prod": "ng build --prod --vendor-chunk",
"test": "ng test",
... ...
... ... @@ -184,12 +184,13 @@ export class MenuService {
path: '/ruleChains',
icon: 'settings_ethernet'
},
{
name: 'customer.customers',
type: 'link',
path: '/customers',
icon: 'supervisor_account'
},
// tao_bao_qiang
// {
// name: 'customer.customers',
// type: 'link',
// path: '/customers',
// icon: 'supervisor_account'
// },
{
name: 'asset.assets',
type: 'link',
... ...
... ... @@ -50,7 +50,7 @@ export class HomeComponent extends PageComponent implements AfterViewInit, OnIni
sidenavMode: 'over' | 'push' | 'side' = 'side';
sidenavOpened = true;
logo = require('../../../assets/logo_title_white.svg').default;
logo = require('../../../assets/logo_smail.png').default;
@ViewChild('sidenav')
sidenav: MatSidenav;
... ...
... ... @@ -39,7 +39,7 @@ import { DashboardModule } from '@modules/home/pages/dashboard/dashboard.module'
DeviceModule,
AssetModule,
EntityViewModule,
CustomerModule,
CustomerModule, // 不到如客户模块
RuleChainModule,
WidgetLibraryModule,
DashboardModule,
... ...
... ... @@ -23,7 +23,7 @@ import { Component } from '@angular/core';
})
export class LogoComponent {
logo = require('../../../assets/logo_title_white.svg').default;
logo = require('../../../assets/logo_smail.png').default;
gotoThingsboard(): void {
window.open('https://thingsboard.io', '_blank');
... ...