修改目录状态,优化增加的问题.

boot/platform/src/main/resources/application-local.yml

@@ -16,11 +16,11 @@ spring:
     username: farmer
     password: q1w2e3..
     pool:
-      max-idle-time: 10m
       max-size: 32
+      initial-size: 16
+      max-idle-time: 10m
       max-create-connection-time: 10s
       max-validation-time: 10s
-      max-acquire-time: 5s
       validation-query: "select version()"
   sql.init:
     mode: always

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "org.springframework.boot" version "3.2.0-RC1" apply false
+    id "org.springframework.boot" version "3.2.0-RC2" apply false
     id 'io.spring.dependency-management' version '1.1.3' apply false
 }
 

ui/web/src/app/app.component.ts

@@ -1,6 +1,6 @@
 import {Component, OnInit} from '@angular/core';
 import {LoadingService} from "./core/loading.service";
-import {Observable} from "rxjs";
+import {debounceTime, distinctUntilChanged, Observable, tap} from "rxjs";
 
 @Component({
   selector: 'app-root',
@@ -15,7 +15,12 @@ export class AppComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.loadingShow$ = this.loading.progress$;
+    this.loadingShow$ = this.loading.progress$
+      .pipe(
+        debounceTime(500),
+        distinctUntilChanged(),
+        tap((res) => console.log(`Loading show is: ${res}`))
+      );
   }
 
 }

ui/web/src/app/app.module.ts

@@ -4,9 +4,7 @@ import {AppComponent} from './app.component';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {ServiceWorkerModule} from '@angular/service-worker';
 import {TitleStrategy} from '@angular/router';
-import {HttpClientXsrfModule} from "@angular/common/http";
 import {SharedModule} from "./shared/shared.module";
-import {PagesModule} from "./pages/pages.module";
 import {PageTitleStrategy} from "./core/title-strategy.service";
 import {CoreModule} from "./core/core.module";
 import {AppRoutingModule} from "./app-routing.module";
@@ -21,14 +19,9 @@ import {AppRoutingModule} from "./app-routing.module";
       registrationStrategy: 'registerWhenStable:30000'
     }),
     BrowserAnimationsModule,
-    HttpClientXsrfModule.withOptions({
-      cookieName: 'XSRF-TOKEN',
-      headerName: 'X-XSRF-TOKEN'
-    }),
     AppRoutingModule,
     CoreModule,
-    SharedModule,
-    PagesModule
+    SharedModule
   ],
   providers: [
     {provide: APP_ID, useValue: 'serverApp'},

ui/web/src/app/core/core.module.ts

@@ -1,11 +1,15 @@
 import {NgModule, Optional, SkipSelf} from '@angular/core';
 import {httpInterceptorProviders} from "./http-interceptors";
-import {HttpClientModule} from "@angular/common/http";
+import {HttpClientModule, HttpClientXsrfModule} from "@angular/common/http";
 
 
 @NgModule({
   imports: [
-    HttpClientModule
+    HttpClientModule,
+    HttpClientXsrfModule.withOptions({
+      cookieName: 'XSRF-TOKEN',
+      headerName: 'X-XSRF-TOKEN'
+    })
   ],
   providers: [
     httpInterceptorProviders

ui/web/src/app/pages/index/index.component.ts

@@ -1,29 +1,29 @@
 import {Component, OnInit} from '@angular/core';
 import {MenusService} from "../../core/menus.service";
 import {Menu} from "../../core/interfaces/menu";
-import {Observable, of} from "rxjs";
+import {Observable} from "rxjs";
 
 @Component({
-    selector: 'app-welcome',
-    templateUrl: './index.component.html',
-    styleUrls: ['./index.component.scss']
+  selector: 'app-welcome',
+  templateUrl: './index.component.html',
+  styleUrls: ['./index.component.scss']
 })
 export class IndexComponent implements OnInit {
 
-    menus$: Observable<Menu[]> = of([]);
+  menus$: Observable<Menu[]> | undefined;
 
-    constructor(private menusService: MenusService) {
-    }
+  constructor(private menusService: MenusService) {
+  }
 
-    ngOnInit() {
-        this.initMenu();
-    }
+  ngOnInit() {
+    this.initMenu();
+  }
 
-    initMenu() {
-        let menuRequest: Menu = {
-            pcode: "0",
-            tenantCode: "0"
-        };
-        this.menus$ = this.menusService.getMenus(menuRequest);
-    }
+  initMenu() {
+    const menuRequest: Menu = {
+      pcode: "0",
+      tenantCode: "0"
+    };
+    this.menus$ = this.menusService.getMenus(menuRequest);
+  }
 }

ui/web/src/app/pages/pages-routing.module.ts

@@ -3,8 +3,8 @@ import {RouterModule, Routes} from '@angular/router';
 import {IndexComponent} from "./index/index.component";
 
 const routes: Routes = [
-  {path: 'index', component: IndexComponent, title: '欢迎主页'},
-  {path: '', pathMatch: 'full', redirectTo: '/index'}
+  {path: 'index', component: IndexComponent, title: '主页'},
+  {path: '', component: IndexComponent}
 ];
 
 @NgModule({

ui/web/src/app/pages/pages.module.ts

@@ -8,8 +8,8 @@ import {SharedModule} from "../shared/shared.module";
 
 @NgModule({
   imports: [
-    PagesRoutingModule,
-    SharedModule
+    SharedModule,
+    PagesRoutingModule
   ],
   declarations: [IndexComponent, PageNotFoundComponent],
   exports: [PageNotFoundComponent]

ui/web/src/app/pages/security/login/login.component.ts

@@ -2,7 +2,7 @@ import {Component, OnDestroy, OnInit} from '@angular/core';
 import {FormBuilder, FormControl, Validators} from "@angular/forms";
 import {Credentials, LoginService} from "./login.service";
 import {ActivatedRoute, Router} from "@angular/router";
-import {Subject, takeUntil} from "rxjs";
+import {delay, Subject, takeUntil} from "rxjs";
 
 @Component({
   selector: 'app-login',
@@ -43,7 +43,10 @@ export class LoginComponent implements OnInit, OnDestroy {
     } else {
       this.loginService.clearRememberMe();
     }
-    this.loginService.login(credentials).pipe(takeUntil(this._subject)).subscribe(() => {
+    this.loginService.login(credentials).pipe(
+      takeUntil(this._subject),
+      delay(2000)
+    ).subscribe(() => {
       this.router.navigate(['/index'], {relativeTo: this.route}).then();
     });
   }