修正单元测试

entropy-cloud · Dec 24, 2023 · b3fe860 · b3fe860
1 parent 014fdb6
commit b3fe860
Show file tree

Hide file tree

Showing 6 changed files with 178 additions and 7 deletions.
diff --git a/.../resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json b/.../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/...sources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json b/...sources/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
@@ -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
@@ -1,5 +1,7 @@
 <c:unit xmlns:c="c" xmlns:xpl="xpl">
     <c:import from="io.nop.web.page.vue.VueTemplateHelper" />
+import { createElement as h} from 'react'
+import { NodeContext, registerFlowModel } from '@nop-chaos/nop-sdk'
 
     <c:for var="nodeModel" items="${codeGenModel.nodes}"><![CDATA[
 function NodeComponent_${nodeModel.name.$camelCase('-',false)}(){

diff --git a/nop-web/pom.xml b/nop-web/pom.xml
@@ -30,11 +30,6 @@
             <artifactId>nop-auth-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.github.entropy-cloud</groupId>
-            <artifactId>nop-js</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
             <artifactId>nop-autotest-junit</artifactId>

diff --git a/nop-wf/nop-wf-web/pom.xml b/nop-wf/nop-wf-web/pom.xml
@@ -35,6 +35,31 @@
             <version>2.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>io.github.entropy-cloud</groupId>
+            <artifactId>nop-js</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.graalvm.js</groupId>
+            <artifactId>js</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.github.entropy-cloud</groupId>
+            <artifactId>nop-autotest-junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
 </project>