From b3fe8600a67f43db13568e6756fe19662fbb1bd0 Mon Sep 17 00:00:00 2001 From: canonical Date: Sun, 24 Dec 2023 08:52:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nop-cli-core/reflect-config.json | 7 + .../nop-spring-demo/reflect-config.json | 138 +++++++++++++++++- .../src/main/resources/nop-vfs-index.txt | 8 +- .../nop/web/xlib/ofd-gen/impl_GenerateJs.xpl | 2 + nop-web/pom.xml | 5 - nop-wf/nop-wf-web/pom.xml | 25 ++++ 6 files changed, 178 insertions(+), 7 deletions(-) diff --git a/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json b/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json index 913f20255..feceb66ca 100644 --- a/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json +++ b/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json @@ -4618,6 +4618,13 @@ "io.nop.api.core.util.progress.IProgressListener" ] }, + { + "name": "dumpResource", + "parameterTypes": [ + "io.nop.core.resource.IResource", + "java.lang.String" + ] + }, { "name": "filePostfixFilter", "parameterTypes": [ diff --git a/nop-demo/nop-spring-demo/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json b/nop-demo/nop-spring-demo/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json index 8de367dec..27605045c 100644 --- a/nop-demo/nop-spring-demo/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json +++ b/nop-demo/nop-spring-demo/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json @@ -640,6 +640,11 @@ "allowWrite": false, "name": "EMPTY_STRING_ARRAY" }, + { + "allowUnsafeAccess": false, + "allowWrite": false, + "name": "ENCODED_PARAM_SELECTION" + }, { "allowUnsafeAccess": false, "allowWrite": false, @@ -5812,6 +5817,10 @@ "name": "getLogoutUrl", "parameterTypes": [] }, + { + "name": "getOauthCallbackPath", + "parameterTypes": [] + }, { "name": "getPublicPaths", "parameterTypes": [] @@ -5820,6 +5829,10 @@ "name": "getRememberMeCookie", "parameterTypes": [] }, + { + "name": "getServicePaths", + "parameterTypes": [] + }, { "name": "isDefaultPublic", "parameterTypes": [] @@ -5834,6 +5847,16 @@ "name": "isRememberMeEnabled", "parameterTypes": [] }, + { + "name": "isServicePath", + "parameterTypes": [ + "java.lang.String" + ] + }, + { + "name": "isServicePublic", + "parameterTypes": [] + }, { "name": "setAuthCookie", "parameterTypes": [ @@ -5864,6 +5887,12 @@ "java.lang.String" ] }, + { + "name": "setOauthCallbackPath", + "parameterTypes": [ + "java.lang.String" + ] + }, { "name": "setPublicPaths", "parameterTypes": [ @@ -5881,6 +5910,18 @@ "parameterTypes": [ "boolean" ] + }, + { + "name": "setServicePaths", + "parameterTypes": [ + "java.util.List" + ] + }, + { + "name": "setServicePublic", + "parameterTypes": [ + "boolean" + ] } ], "name": "io.nop.auth.core.filter.AuthFilterConfig", @@ -5944,6 +5985,13 @@ "io.nop.auth.core.login.AuthToken" ] }, + { + "name": "getUserContextAsync", + "parameterTypes": [ + "io.nop.auth.core.login.AuthToken", + "io.nop.http.api.server.IHttpServerContext" + ] + }, { "name": "handlePublicPath", "parameterTypes": [ @@ -5991,6 +6039,12 @@ "io.nop.http.api.server.IHttpServerContext" ] }, + { + "name": "newSysUserContext", + "parameterTypes": [ + "io.nop.http.api.server.IHttpServerContext" + ] + }, { "name": "order", "parameterTypes": [] @@ -6001,12 +6055,36 @@ "io.nop.http.api.server.IHttpServerContext" ] }, + { + "name": "processOAuthCode", + "parameterTypes": [ + "io.nop.http.api.server.IHttpServerContext", + "boolean", + "java.util.function.Supplier" + ] + }, { "name": "responseNotLogin", "parameterTypes": [ "io.nop.http.api.server.IHttpServerContext" ] }, + { + "name": "responseNotLogin", + "parameterTypes": [ + "io.nop.http.api.server.IHttpServerContext", + "boolean" + ] + }, + { + "name": "responseNotLogin", + "parameterTypes": [ + "io.nop.http.api.server.IHttpServerContext", + "boolean", + "java.lang.String", + "java.lang.String" + ] + }, { "name": "responseNotLogin", "parameterTypes": [ @@ -6026,6 +6104,14 @@ "parameterTypes": [ "io.nop.auth.core.login.ILoginService" ] + }, + { + "name": "writeJsonResponse", + "parameterTypes": [ + "io.nop.http.api.server.IHttpServerContext", + "java.lang.String", + "java.lang.String" + ] } ], "name": "io.nop.auth.core.filter.AuthHttpServerFilter", @@ -6153,6 +6239,13 @@ "io.nop.auth.core.login.AuthToken" ] }, + { + "name": "getUserContextAsync", + "parameterTypes": [ + "io.nop.auth.core.login.AuthToken", + "java.util.Map" + ] + }, { "name": "getUserInfo", "parameterTypes": [ @@ -6338,6 +6431,13 @@ "io.nop.auth.core.login.AuthToken" ] }, + { + "name": "getUserContextAsync", + "parameterTypes": [ + "io.nop.auth.core.login.AuthToken", + "java.util.Map" + ] + }, { "name": "getUserInfo", "parameterTypes": [ @@ -45134,7 +45234,13 @@ "allDeclaredMethods": true, "allPublicConstructors": true, "allPublicMethods": true, - "fields": [], + "fields": [ + { + "allowUnsafeAccess": false, + "allowWrite": false, + "name": "LOG" + } + ], "methods": [ { "name": "apply", @@ -45156,6 +45262,22 @@ { "name": "init", "parameterTypes": [] + }, + { + "name": "loadModuleJs", + "parameterTypes": [ + "java.lang.String" + ] + }, + { + "name": "setSystemJsTransformer", + "parameterTypes": [ + "io.nop.commons.functional.IAsyncFunctionService" + ] + }, + { + "name": "systemJsEmptyFile", + "parameterTypes": [] } ], "name": "io.nop.web.page.ModuleJsLoader", @@ -45334,6 +45456,16 @@ "allowUnsafeAccess": false, "allowWrite": false, "name": "LOG" + }, + { + "allowUnsafeAccess": false, + "allowWrite": true, + "name": "autoLoadXjs" + }, + { + "allowUnsafeAccess": false, + "allowWrite": true, + "name": "jsLoader" } ], "methods": [ @@ -45370,6 +45502,10 @@ "name": "init", "parameterTypes": [] }, + { + "name": "loadAllXjs", + "parameterTypes": [] + }, { "name": "registerJs", "parameterTypes": [] diff --git a/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt b/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt index d7af943fb..a828d05f6 100644 --- a/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt +++ b/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt @@ -201,6 +201,7 @@ /nop/autoconfig/nop-auth-core.beans /nop/autoconfig/nop-biz.beans /nop/autoconfig/nop-dao.beans +/nop/autoconfig/nop-gateway.beans /nop/autoconfig/nop-http-client-jdk.beans /nop/autoconfig/nop-orm.beans /nop/autoconfig/nop-report.beans @@ -216,6 +217,7 @@ /nop/core/registry/api.register-model.xml /nop/core/registry/dialect.register-model.xml /nop/core/registry/dict.register-model.xml +/nop/core/registry/gateway.register-model.xml /nop/core/registry/imp.register-model.xml /nop/core/registry/orm.register-model.xml /nop/core/registry/validator.register-model.xml @@ -261,13 +263,13 @@ /nop/file/beans/app-file-spring.beans.xml /nop/file/orm/_app.orm.xml /nop/file/orm/app.orm.xml +/nop/gateway/beans/gateway-defaults.beans.xml /nop/graphql/base.graphql /nop/graphql/default.graphql /nop/graphql/imp/api.imp.xml /nop/graphql/imp/template.api.xlsx /nop/graphql/introspection.graphql /nop/http/beans/http-client-jdk.beans.xml -/nop/js/libs/nop-server-tool.mjs /nop/orm/beans/orm-defaults.beans.xml /nop/orm/imp/orm.imp.xml /nop/orm/imp/template.orm.xlsx @@ -614,6 +616,10 @@ /nop/web/beans/web-defaults.beans.xml /nop/web/xlib/api-web.xlib /nop/web/xlib/control.xlib +/nop/web/xlib/ofd-gen.xlib +/nop/web/xlib/ofd-gen/impl_GenerateForm.xpl +/nop/web/xlib/ofd-gen/impl_GenerateJs.xpl +/nop/web/xlib/ofd-gen/impl_GenerateSchema.xpl /nop/web/xlib/std.xlib /nop/web/xlib/std/impl_GenValidator.xpl /nop/web/xlib/view-gen.xlib diff --git a/nop-web-page/src/main/resources/_vfs/nop/web/xlib/ofd-gen/impl_GenerateJs.xpl b/nop-web-page/src/main/resources/_vfs/nop/web/xlib/ofd-gen/impl_GenerateJs.xpl index 33817fae2..25788f015 100644 --- a/nop-web-page/src/main/resources/_vfs/nop/web/xlib/ofd-gen/impl_GenerateJs.xpl +++ b/nop-web-page/src/main/resources/_vfs/nop/web/xlib/ofd-gen/impl_GenerateJs.xpl @@ -1,5 +1,7 @@ +import { createElement as h} from 'react' +import { NodeContext, registerFlowModel } from '@nop-chaos/nop-sdk' nop-auth-api - - io.github.entropy-cloud - nop-js - - io.github.entropy-cloud nop-autotest-junit diff --git a/nop-wf/nop-wf-web/pom.xml b/nop-wf/nop-wf-web/pom.xml index 0899d4a28..269249f85 100644 --- a/nop-wf/nop-wf-web/pom.xml +++ b/nop-wf/nop-wf-web/pom.xml @@ -35,6 +35,31 @@ 2.0.0-SNAPSHOT test + + + io.github.entropy-cloud + nop-js + test + + + + org.graalvm.js + js + test + + + + io.github.entropy-cloud + nop-autotest-junit + test + + + + org.junit.jupiter + junit-jupiter + test + + \ No newline at end of file