diff --git a/gradle.properties b/gradle.properties index 80e4ae90..e107bb5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ version=0.0.1-SNAPSHOT org.gradle.parallel=true org.gradle.caching=true org.gradle.daemon=true -org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx2048M +org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M dusername=alexbob dpassword=dckr_pat_wvKMRljAECuiaY7riNJ5RVOMM-M demail=5199840@qq.com diff --git a/ui/web/proxy.conf.json b/ui/web/proxy.conf.json index ca40c9a2..d4df3d01 100644 --- a/ui/web/proxy.conf.json +++ b/ui/web/proxy.conf.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://192.168.1.2:18080", + "target": "http://127.0.0.1:8080", "secure": false, "pathRewrite": { "^/api": "" diff --git a/ui/web/src/app/app-routing.module.ts b/ui/web/src/app/app-routing.module.ts index 1b92a29e..5a71a90f 100644 --- a/ui/web/src/app/app-routing.module.ts +++ b/ui/web/src/app/app-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes, TitleStrategy} from '@angular/router'; -import {PageNotFoundComponent} from "./shared/page-not-found/page-not-found.component"; +import {PageNotFoundComponent} from "./pages/page-not-found/page-not-found.component"; import {PageTitleStrategy} from "./shared/page-title-strategy.service"; const routes: Routes = [ diff --git a/ui/web/src/app/app.component.ts b/ui/web/src/app/app.component.ts index e3cb1d42..bb07038f 100644 --- a/ui/web/src/app/app.component.ts +++ b/ui/web/src/app/app.component.ts @@ -9,10 +9,8 @@ import {Component, OnInit} from '@angular/core'; styleUrls: ['./app.component.scss'] }) export class AppComponent implements OnInit { - page: number = 0; ngOnInit(): void { - this.page = 1; } } diff --git a/ui/web/src/app/app.module.ts b/ui/web/src/app/app.module.ts index 95a7970d..2861cc35 100644 --- a/ui/web/src/app/app.module.ts +++ b/ui/web/src/app/app.module.ts @@ -8,10 +8,12 @@ import {RouterModule} from '@angular/router'; import {httpInterceptorProviders} from "./http-interceptors"; import {HttpClientXsrfModule} from "@angular/common/http"; import {SharedModule} from "./shared/shared.module"; +import {PageNotFoundComponent} from "./pages/page-not-found/page-not-found.component"; @NgModule({ declarations: [ - AppComponent + AppComponent, + PageNotFoundComponent ], imports: [ ServiceWorkerModule.register('ngsw-worker.js', { diff --git a/ui/web/src/app/shared/page-not-found/page-not-found.component.html b/ui/web/src/app/pages/page-not-found/page-not-found.component.html similarity index 100% rename from ui/web/src/app/shared/page-not-found/page-not-found.component.html rename to ui/web/src/app/pages/page-not-found/page-not-found.component.html diff --git a/ui/web/src/app/shared/page-not-found/page-not-found.component.scss b/ui/web/src/app/pages/page-not-found/page-not-found.component.scss similarity index 100% rename from ui/web/src/app/shared/page-not-found/page-not-found.component.scss rename to ui/web/src/app/pages/page-not-found/page-not-found.component.scss diff --git a/ui/web/src/app/shared/page-not-found/page-not-found.component.ts b/ui/web/src/app/pages/page-not-found/page-not-found.component.ts similarity index 63% rename from ui/web/src/app/shared/page-not-found/page-not-found.component.ts rename to ui/web/src/app/pages/page-not-found/page-not-found.component.ts index d70fae10..7cf7e6e8 100644 --- a/ui/web/src/app/shared/page-not-found/page-not-found.component.ts +++ b/ui/web/src/app/pages/page-not-found/page-not-found.component.ts @@ -1,5 +1,4 @@ import {Component} from '@angular/core'; -import {LayoutService} from "../layout.service"; @Component({ selector: 'app-page-not-found', @@ -7,7 +6,6 @@ import {LayoutService} from "../layout.service"; styleUrls: ['./page-not-found.component.scss'] }) export class PageNotFoundComponent { - constructor(private layoutService: LayoutService) { - layoutService.isHide(true); + constructor() { } } diff --git a/ui/web/src/app/security/login/login.component.html b/ui/web/src/app/security/login/login.component.html index d8ca1243..0c0f7893 100644 --- a/ui/web/src/app/security/login/login.component.html +++ b/ui/web/src/app/security/login/login.component.html @@ -15,10 +15,9 @@