fix(web): 优化代码

.gitignore

@@ -109,3 +109,4 @@ Icon
 Network Trash Folder
 Temporary Items
 .apdisk
+**/temp/

bin/build-cli.js

@@ -1,6 +1,6 @@
 import {cd, path} from 'zx'
 import {trim} from "licia";
-import {run_deploy_batch, run_deploy_root, run_package, run_upload_normal} from "./library.js";
+import {run_deploy_batch, run_deploy_root, run_package, run_upload} from "./library.js";
 
 // 切换目录
 cd(trim(path.dirname(import.meta.dirname)))
@@ -9,7 +9,7 @@ try {
     await run_deploy_root()
     await run_deploy_batch(['service-cli', 'service-cli/service-cli-core'])
     await run_package('service-cli/service-cli-runner')
-    await run_upload_normal('service-cli-runner', 'service-cli')
+    await run_upload('**/service-cli-runner-1.0.0-SNAPSHOT.jar')
 } catch (e) {
     console.error(e)
 }

bin/build-executor-manager.js

@@ -1,6 +1,6 @@
 import {cd, path} from 'zx'
 import {trim} from "licia";
-import {run_deploy_batch, run_deploy_root, run_package, run_upload_normal} from "./library.js";
+import {run_deploy_batch, run_deploy_root, run_package, run_upload} from "./library.js";
 
 // 切换目录
 cd(trim(path.dirname(import.meta.dirname)))
@@ -9,7 +9,7 @@ try {
     await run_deploy_root()
     await run_deploy_batch(['service-common', 'service-dependencies', 'service-configuration', 'service-forest', 'service-executor', 'service-executor/service-executor-core'])
     await run_package('service-executor/service-executor-manager')
-    await run_upload_normal('service-executor-manager', 'service-executor')
+    await run_upload('**/service-executor-manager-1.0.0-SNAPSHOT.jar')
 } catch (e) {
     console.error(e)
 }

bin/build-executor-task.js

@@ -1,6 +1,6 @@
 import {cd, path} from 'zx'
 import {trim} from "licia";
-import {run_deploy_batch, run_deploy_root, run_package, run_upload_normal} from "./library.js";
+import {run_deploy_batch, run_deploy_root, run_package, run_upload} from "./library.js";
 
 // 切换目录
 cd(trim(path.dirname(import.meta.dirname)))
@@ -9,7 +9,7 @@ try {
     await run_deploy_root()
     await run_deploy_batch(['service-common', 'service-dependencies', 'service-configuration', 'service-forest', 'service-executor', 'service-executor/service-executor-core'])
     await run_package('service-executor/service-executor-task')
-    await run_upload_normal('service-executor-task', 'service-executor')
+    await run_upload('**/service-executor-task-1.0.0-SNAPSHOT.jar')
 } catch (e) {
     console.error(e)
 }

bin/build-patch.js

@@ -1,6 +1,6 @@
 import {cd, path} from 'zx'
 import {trim} from "licia";
-import {run_deploy_batch, run_deploy_root, run_package, run_upload_normal} from "./library.js";
+import {run_deploy_batch, run_deploy_root, run_package, run_upload} from "./library.js";
 
 // 切换目录
 cd(trim(path.dirname(import.meta.dirname)))
@@ -9,7 +9,7 @@ try {
     await run_deploy_root()
     await run_deploy_batch(['service-common'])
     await run_package('utils/patch')
-    await run_upload_normal('**/patch-1.0.0-SNAPSHOT.jar')
+    await run_upload('**/patch-1.0.0-SNAPSHOT.jar')
 } catch (e) {
     console.error(e)
 }

bin/library.js

@@ -1,5 +1,6 @@
 import {$, fetch, fs, glob, os, path, spinner, syncProcessCwd, usePowerShell} from 'zx'
-import {isEqual, trim} from "licia";
+import {isEqual, trim, fileSize} from "licia";
+import md5file from 'md5-file'
 
 syncProcessCwd(true)
 if (isEqual(os.platform(), 'win32')) {
@@ -39,7 +40,7 @@ export const run_deploy = async (project) => {
         `Deploying project ${project}`,
         () => $`mvn -pl ${project} clean deploy -D skipTests -s ${maven_setting}`
     )
-    console.log(`✅  Finish deploy ${project} (${millisecondToString(output['duration'])})`)
+    console.log(`✅  Finished deploy ${project} (${millisecondToString(output['duration'])})`)
 }
 
 export const run_deploy_root = async () => {
@@ -47,7 +48,7 @@ export const run_deploy_root = async () => {
         `Deploying root`,
         () => $`mvn clean deploy -N -D skipTests -s ${maven_setting}`
     )
-    console.log(`✅  Finish deploy root (${millisecondToString(output['duration'])})`)
+    console.log(`✅  Finished deploy root (${millisecondToString(output['duration'])})`)
 }
 
 export const run_deploy_batch = async (projects) => {
@@ -61,7 +62,7 @@ export const run_package = async (project, profile = 'b2b12') => {
         `Packaging project ${project}${isEqual(profile, 'b2b12') ? '' : ` ${profile}`}`,
         () => $`mvn -pl ${project} clean package -D skipTests -P ${profile} -s ${maven_setting}`
     )
-    console.log(`✅  Finish package ${project}${isEqual(profile, 'b2b12') ? '' : ` ${profile}`} (${millisecondToString(output['duration'])})`)
+    console.log(`✅  Finished package ${project}${isEqual(profile, 'b2b12') ? '' : ` ${profile}`} (${millisecondToString(output['duration'])})`)
 }
 
 export const run_package_batch = async (projects) => {
@@ -71,6 +72,7 @@ export const run_package_batch = async (projects) => {
 }
 
 const upload = async (file_path) => {
+    let start = new Date().getTime()
     let response = await spinner(
         `Uploading project ${file_path}`,
         () => fetch(`${upload_url}/file/upload/${path.basename(file_path)}`, {
@@ -87,7 +89,9 @@ const upload = async (file_path) => {
     if (!isEqual(response.status, 200)) {
         throw response
     }
-    console.log(`✅  Finish upload ${file_path}`)
+    console.log(`✅  Finished upload ${file_path} (${millisecondToString((new Date().getTime()) - start)})`)
+    console.log(`📘 Uploaded ${fileSize(fs.statSync(file_path).size)}`)
+    console.log(`📘 MD5 ${md5file.sync(file_path)}`)
     fs.rmSync(file_path)
 }
 

bin/package.json

@@ -9,6 +9,7 @@
     "fs-extra": "^11.3.0",
     "globby": "^14.1.0",
     "licia": "^1.48.0",
+    "md5-file": "^5.0.0",
     "minimist": "^1.2.8",
     "node-fetch-native": "^1.6.6",
     "which": "^5.0.0",

bin/pnpm-lock.yaml

@@ -26,6 +26,9 @@ importers:
       licia:
         specifier: ^1.48.0
         version: 1.48.0
+      md5-file:
+        specifier: ^5.0.0
+        version: 5.0.0
       minimist:
         specifier: ^1.2.8
         version: 1.2.8
@@ -129,6 +132,11 @@ packages:
   licia@1.48.0:
     resolution: {integrity: sha512-bBWiT5CSdEtwuAHiYTJ74yItCjIFdHi4xiFk6BRDfKa+sdCpkUHp69YKb5udNOJlHDzFjNjcMgNZ/+wQIHrB8A==}
 
+  md5-file@5.0.0:
+    resolution: {integrity: sha512-xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+
   merge2@1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
@@ -283,6 +291,8 @@ snapshots:
 
   licia@1.48.0: {}
 
+  md5-file@5.0.0: {}
+
   merge2@1.4.1: {}
 
   micromatch@4.0.8:

bin/test.js

@@ -0,0 +1,6 @@
+import {fs} from 'zx'
+
+let stats = fs.statSync('/Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-api');
+console.log(stats.ctime)
+console.log(stats.atime)
+console.log(stats.mtime)

service-ai/bin/package.json

@@ -9,6 +9,7 @@
     "fs-extra": "^11.3.0",
     "globby": "^14.1.0",
     "licia": "^1.48.0",
+    "md5-file": "^5.0.0",
     "minimist": "^1.2.8",
     "node-fetch-native": "^1.6.6",
     "which": "^5.0.0",

service-ai/bin/pnpm-lock.yaml

@@ -26,6 +26,9 @@ importers:
       licia:
         specifier: ^1.48.0
         version: 1.48.0
+      md5-file:
+        specifier: ^5.0.0
+        version: 5.0.0
       minimist:
         specifier: ^1.2.8
         version: 1.2.8
@@ -129,6 +132,11 @@ packages:
   licia@1.48.0:
     resolution: {integrity: sha512-bBWiT5CSdEtwuAHiYTJ74yItCjIFdHi4xiFk6BRDfKa+sdCpkUHp69YKb5udNOJlHDzFjNjcMgNZ/+wQIHrB8A==}
 
+  md5-file@5.0.0:
+    resolution: {integrity: sha512-xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+
   merge2@1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
@@ -283,6 +291,8 @@ snapshots:
 
   licia@1.48.0: {}
 
+  md5-file@5.0.0: {}
+
   merge2@1.4.1: {}
 
   micromatch@4.0.8:

service-ai/service-ai-core/src/main/java/com/lanyuanxiaoyao/service/ai/core/configuration/WebConfiguration.java

@@ -1,24 +0,0 @@
-package com.lanyuanxiaoyao.service.ai.core.configuration;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * web 配置
- *
- * @author lanyuanxiaoyao
- * @date 2023-04-21
- */
-@Configuration
-public class WebConfiguration implements WebMvcConfigurer {
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        // 避免跨域影响调试
-        registry.addMapping("/**")
-                .allowedOriginPatterns("*")
-                .allowCredentials(true)
-                .allowedMethods("*")
-                .maxAge(3600);
-    }
-}

service-ai/service-ai-core/src/main/java/com/lanyuanxiaoyao/service/configuration/SecurityConfig.java

@@ -12,9 +12,6 @@ import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.CorsConfigurationSource;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
 /**
  * @author lanyuanxiaoyao
@@ -29,23 +26,12 @@ public class SecurityConfig {
   public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
     return http.authorizeHttpRequests(registry -> registry.anyRequest().authenticated())
         .httpBasic(Customizer.withDefaults())
+        .cors(AbstractHttpConfigurer::disable)
         .csrf(AbstractHttpConfigurer::disable)
-        .cors(configurer -> configurer.configurationSource(corsConfigurationSource()))
         .formLogin(AbstractHttpConfigurer::disable)
         .build();
   }
 
-  private CorsConfigurationSource corsConfigurationSource() {
-    CorsConfiguration configuration = new CorsConfiguration();
-    configuration.setAllowCredentials(true);
-    configuration.addAllowedHeader("*");
-    configuration.addAllowedMethod("*");
-    configuration.addAllowedOriginPattern("*");
-    UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-    source.registerCorsConfiguration("/**", configuration);
-    return source;
-  }
-
   @Bean
   public InMemoryUserDetailsManager userDetailsService(SecurityProperties securityProperties) {
     UserDetails user = User.builder()

service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/SecurityConfig.java

@@ -21,7 +21,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
     private final SecurityProperties securityProperties;
 
-    @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
     public SecurityConfig(SecurityProperties securityProperties) {
         this.securityProperties = securityProperties;
     }
@@ -36,6 +35,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .and()
                 .csrf()
                 .disable()
+                .cors()
+                .disable()
                 .formLogin()
                 .disable();
     }

service-gateway/pom.xml

@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>com.lanyuanxiaoyao</groupId>
-            <artifactId>service-dependencies</artifactId>
+            <artifactId>service-configuration</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -22,10 +22,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.lanyuanxiaoyao</groupId>
-            <artifactId>service-configuration</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>

service-gateway/src/main/java/com/lanyuanxiaoyao/service/gateway/configuration/SecurityConfiguration.java

@@ -9,6 +9,9 @@ import org.springframework.security.core.userdetails.MapReactiveUserDetailsServi
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.web.server.SecurityWebFilterChain;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.reactive.CorsConfigurationSource;
+import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
 
 /**
  * web security
@@ -28,12 +31,26 @@ public class SecurityConfiguration {
                 .permitAll()
                 .and()
                 .httpBasic()
+                .disable()
+                .cors()
+                .configurationSource(corsConfigurationSource())
                 .and()
                 .csrf()
                 .disable()
                 .build();
     }
 
+    private CorsConfigurationSource corsConfigurationSource() {
+        CorsConfiguration configuration = new CorsConfiguration();
+        configuration.setAllowCredentials(true);
+        configuration.addAllowedHeader("*");
+        configuration.addAllowedMethod("*");
+        configuration.addAllowedOriginPattern("*");
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", configuration);
+        return source;
+    }
+
     @Bean
     public MapReactiveUserDetailsService userDetailsService(SecurityProperties securityProperties) {
         UserDetails user = User.builder()

service-gateway/src/main/java/com/lanyuanxiaoyao/service/gateway/configuration/WebConfiguration.java

@@ -1,5 +1,6 @@
 package com.lanyuanxiaoyao.service.gateway.configuration;
 
+import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.config.CorsRegistry;
 import org.springframework.web.reactive.config.WebFluxConfigurer;
@@ -10,6 +11,7 @@ import org.springframework.web.reactive.config.WebFluxConfigurer;
  * @author lanyuanxiaoyao
  * @date 2024-01-15
  */
+@Configuration
 public class WebConfiguration implements WebFluxConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {

service-web/client/src/pages/App.tsx

@@ -1,5 +1,5 @@
 import {ProLayout} from '@ant-design/pro-components'
-import React, {useEffect} from 'react'
+import React from 'react'
 import {Outlet, useLocation, useNavigate} from 'react-router'
 import {menus} from '../route.tsx'
 

service-web/src/main/java/com/lanyuanxiaoyao/service/web/configuration/WebConfiguration.java

@@ -1,24 +0,0 @@
-package com.lanyuanxiaoyao.service.web.configuration;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * web 配置
- *
- * @author lanyuanxiaoyao
- * @date 2023-04-21
- */
-@Configuration
-public class WebConfiguration implements WebMvcConfigurer {
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        // 避免跨域影响调试
-        registry.addMapping("/**")
-                .allowedOriginPatterns("*")
-                .allowCredentials(true)
-                .allowedMethods("*")
-                .maxAge(3600);
-    }
-}