diff --git a/boot/platform/build.gradle b/boot/platform/build.gradle
index 75df72d1..b64c46cb 100644
--- a/boot/platform/build.gradle
+++ b/boot/platform/build.gradle
@@ -20,8 +20,6 @@ tasks.named("bootBuildImage") {
tags = ["${dockerPrefix}/${rootProject.name}-${project.name}:latest"]
imageName.set("${dockerPrefix}/${rootProject.name}-${project.name}:${project.version}")
environment = [
- "HTTP_PROXY" : "http://127.0.0.1:65324",
- "HTTPS_PROXY" : "http://127.0.0.1:65324",
"BP_JVM_VERSION" : "21",
"BP_JVM_VERSION_TYPE": "jre",
"BPE_DELIM_JAVA_TOOL_OPTIONS" : " ",
@@ -55,11 +53,12 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-security")
implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
- implementation("org.springframework.session:spring-session-data-redis")
implementation("org.springframework.boot:spring-boot-starter-actuator")
implementation("org.springframework.boot:spring-boot-starter-webflux")
implementation("org.springframework.boot:spring-boot-starter-validation")
+
+ implementation("org.springframework.session:spring-session-data-redis")
implementation("org.springframework.boot:spring-boot-starter-data-redis-reactive")
implementation("org.springframework.boot:spring-boot-starter-log4j2")
diff --git a/ui/angular.json b/ui/angular.json
index 39706840..d29b1249 100644
--- a/ui/angular.json
+++ b/ui/angular.json
@@ -83,21 +83,21 @@
"styles": [
{
"input": "bootstrap/dist/css/bootstrap.css",
- "bundleName": "bootstrap-module"
+ "bundleName": "bootstrap"
},
{
"input": "bootstrap-icons/font/bootstrap-icons.css",
- "bundleName": "icons-module"
+ "bundleName": "icons"
},
{
"input": "projects/web/src/styles.scss",
- "bundleName": "main-module"
+ "bundleName": "main"
}
],
"scripts": [
{
"input": "bootstrap/dist/js/bootstrap.bundle.js",
- "bundleName": "bootstrap-module"
+ "bundleName": "bootstrap"
}
],
"server": "projects/web/src/main.server.ts",
diff --git a/ui/package.json b/ui/package.json
index 5327f9fd..6281663b 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -3,7 +3,7 @@
"version": "0.0.0",
"scripts": {
"ng": "ng",
- "start": "ng lint --fix && ng serve",
+ "start": "ng serve",
"build": "ng lint --fix && ng build",
"watch": "ng build --watch --configuration development",
"test": "ng test",
diff --git a/ui/projects/web/src/app/app.component.ts b/ui/projects/web/src/app/app.component.ts
index 2e07d01e..d0e105d8 100644
--- a/ui/projects/web/src/app/app.component.ts
+++ b/ui/projects/web/src/app/app.component.ts
@@ -4,7 +4,7 @@ import {AsyncPipe} from '@angular/common';
import {NzBackTopModule} from 'ng-zorro-antd/back-top';
import {NzSpinModule} from 'ng-zorro-antd/spin';
import {debounceTime, distinctUntilChanged, tap} from 'rxjs';
-import {LoadingService} from '../core/loading.service';
+import {LoadingService} from './loading.service';
import {toSignal} from '@angular/core/rxjs-interop';
@Component({
diff --git a/ui/projects/web/src/app/app.config.ts b/ui/projects/web/src/app/app.config.ts
index 76d8a2e7..24299950 100644
--- a/ui/projects/web/src/app/app.config.ts
+++ b/ui/projects/web/src/app/app.config.ts
@@ -2,7 +2,7 @@ import {ApplicationConfig, importProvidersFrom, provideExperimentalZonelessChang
import {provideRouter, TitleStrategy} from '@angular/router';
import {routes} from './app.routes';
-import {PageTitleStrategy} from '../core/title-strategy.service';
+import {PageTitleStrategy} from './title-strategy.service';
import {provideNzConfig} from 'ng-zorro-antd/core/config';
import {ngZorroConfig} from '../shared/shared-zorro.module';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
@@ -14,7 +14,7 @@ import {
withInterceptorsFromDi,
withXsrfConfiguration,
} from '@angular/common/http';
-import {authTokenInterceptor, defaultInterceptor,} from '../core/http.Interceptor';
+import {authTokenInterceptor, defaultInterceptor,} from './http.Interceptor';
export const appConfig: ApplicationConfig = {
providers: [
diff --git a/ui/projects/web/src/app/app.routes.ts b/ui/projects/web/src/app/app.routes.ts
index a43e8b0f..c0fa7ce8 100644
--- a/ui/projects/web/src/app/app.routes.ts
+++ b/ui/projects/web/src/app/app.routes.ts
@@ -1,5 +1,5 @@
import {Routes} from '@angular/router';
-import {PageNotFoundComponent} from '../pages/page-not-found/page-not-found.component';
+import {NotFoundComponent} from './not-found.component';
export const routes: Routes = [
{
@@ -13,5 +13,5 @@ export const routes: Routes = [
import('../core/security/security.module').then(m => m.SecurityModule),
},
{path: '', pathMatch: 'full', redirectTo: 'auth'},
- {path: '**', component: PageNotFoundComponent},
+ {path: '**', component: NotFoundComponent},
];
diff --git a/ui/projects/web/src/core/http.Interceptor.ts b/ui/projects/web/src/app/http.Interceptor.ts
similarity index 98%
rename from ui/projects/web/src/core/http.Interceptor.ts
rename to ui/projects/web/src/app/http.Interceptor.ts
index 20828293..5ed97291 100644
--- a/ui/projects/web/src/core/http.Interceptor.ts
+++ b/ui/projects/web/src/app/http.Interceptor.ts
@@ -1,7 +1,7 @@
import {inject} from '@angular/core';
import {HttpEvent, HttpHandlerFn, HttpRequest} from '@angular/common/http';
import {catchError, finalize, Observable, throwError, timeout} from 'rxjs';
-import {AuthService} from './auth.service';
+import {AuthService} from '../core/auth.service';
import {LoadingService} from './loading.service';
import {MessageService} from '../shared/message.service';
import {Router} from '@angular/router';
diff --git a/ui/projects/web/src/core/loading.service.ts b/ui/projects/web/src/app/loading.service.ts
similarity index 100%
rename from ui/projects/web/src/core/loading.service.ts
rename to ui/projects/web/src/app/loading.service.ts
diff --git a/ui/projects/web/src/app/not-found.component.ts b/ui/projects/web/src/app/not-found.component.ts
new file mode 100644
index 00000000..165d987b
--- /dev/null
+++ b/ui/projects/web/src/app/not-found.component.ts
@@ -0,0 +1,26 @@
+import {Component} from '@angular/core';
+import {NzResultModule} from 'ng-zorro-antd/result';
+
+@Component({
+ selector: 'app-not-found',
+ standalone: true,
+ imports: [NzResultModule],
+ template: `
+
+
+
+ `,
+ styles: `
+ :host {
+ min-height: 100%;
+ min-width: 100%;
+ }
+ `,
+})
+export class NotFoundComponent {
+}
diff --git a/ui/projects/web/src/core/title-strategy.service.ts b/ui/projects/web/src/app/title-strategy.service.ts
similarity index 100%
rename from ui/projects/web/src/core/title-strategy.service.ts
rename to ui/projects/web/src/app/title-strategy.service.ts
diff --git a/ui/projects/web/src/pages/page-not-found/page-not-found.component.html b/ui/projects/web/src/pages/page-not-found/page-not-found.component.html
deleted file mode 100644
index 846cfd15..00000000
--- a/ui/projects/web/src/pages/page-not-found/page-not-found.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
diff --git a/ui/projects/web/src/pages/page-not-found/page-not-found.component.scss b/ui/projects/web/src/pages/page-not-found/page-not-found.component.scss
deleted file mode 100644
index 46e6e8b1..00000000
--- a/ui/projects/web/src/pages/page-not-found/page-not-found.component.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-:host {
- min-height: 100%;
- min-width: 100%;
-}
diff --git a/ui/projects/web/src/pages/page-not-found/page-not-found.component.ts b/ui/projects/web/src/pages/page-not-found/page-not-found.component.ts
deleted file mode 100644
index e03282fc..00000000
--- a/ui/projects/web/src/pages/page-not-found/page-not-found.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'app-page-not-found',
- templateUrl: './page-not-found.component.html',
- styleUrls: ['./page-not-found.component.scss'],
-})
-export class PageNotFoundComponent {
-}
diff --git a/ui/projects/web/src/pages/pages.module.ts b/ui/projects/web/src/pages/pages.module.ts
index 581acc47..d9d9389e 100644
--- a/ui/projects/web/src/pages/pages.module.ts
+++ b/ui/projects/web/src/pages/pages.module.ts
@@ -3,7 +3,6 @@ import {NgModule, Optional, SkipSelf} from '@angular/core';
import {PagesRoutingModule} from './pages.routes';
import {IndexComponent} from './home/index/index.component';
-import {PageNotFoundComponent} from './page-not-found/page-not-found.component';
import {HomeComponent} from './home/home.component';
import {SharedModule} from '../shared/shared.module';
import {NzLayoutModule} from 'ng-zorro-antd/layout';
@@ -18,8 +17,8 @@ import {NzSliderModule} from 'ng-zorro-antd/slider';
SharedModule,
PagesRoutingModule,
],
- declarations: [IndexComponent, PageNotFoundComponent, HomeComponent],
- exports: [PageNotFoundComponent],
+ declarations: [IndexComponent, HomeComponent],
+ exports: [],
})
export class PagesModule {
constructor(@Optional() @SkipSelf() parentModule?: PagesModule) {