Visitar URL original
Java：Script Demo 单独依赖 org.openjdk.nashorn，升级 JDK 17，APIJSON 7.1.0, ap… · feiok/APIJSON-Demo@5597606 · GitHub
Skip to content

Commit 5597606

Browse files
TommyLemonTommyLemon
committed
Java：Script Demo 单独依赖 org.openjdk.nashorn，升级 JDK 17，APIJSON 7.1.0, apijson-framework 及自身 7.1.5
1 parent db85340 commit 5597606

6 files changed

Lines changed: 22 additions & 12 deletions

File tree

‎APIJSON-Java-Server/APIJSONDemo-Script/pom.xml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>apijson.demo</groupId>
66
<artifactId>apijson-demo-script</artifactId>
7-
<version>7.0.3</version>
7+
<version>7.1.5</version>
88

99
<name>APIJSONDemo-Druid</name>
1010
<description>Demo project for Testing APIJSON Server based on SpringBoot</description>
1111

1212
<properties>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
15-
<java.version>1.8</java.version>
15+
<java.version>17</java.version>
16+
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
17+
<maven.compiler.source>17</maven.compiler.source>
18+
<maven.compiler.target>17</maven.compiler.target>
1619
<graalvm.version>21.3.3.1</graalvm.version>
1720
<lombok.version>1.18.4</lombok.version>
1821
</properties>
@@ -22,12 +25,12 @@
2225
<dependency>
2326
<groupId>com.github.Tencent</groupId>
2427
<artifactId>APIJSON</artifactId>
25-
<version>7.0.3</version>
28+
<version>7.1.0</version>
2629
</dependency>
2730
<dependency>
2831
<groupId>com.github.APIJSON</groupId>
2932
<artifactId>apijson-framework</artifactId>
30-
<version>7.0.3</version>
33+
<version>7.1.5</version>
3134
</dependency>
3235

3336
<!-- 需要用的数据库 JDBC 驱动 -->
@@ -56,6 +59,12 @@
5659
<artifactId>druid</artifactId>
5760
<version>1.2.9</version>
5861
</dependency>
62+
63+
<dependency>
64+
<groupId>org.openjdk.nashorn</groupId>
65+
<artifactId>nashorn-core</artifactId>
66+
<version>15.4</version>
67+
</dependency>
5968
<dependency>
6069
<groupId>org.graalvm.js</groupId>
6170
<artifactId>js</artifactId>
@@ -87,8 +96,8 @@
8796
<artifactId>maven-compiler-plugin</artifactId>
8897
<version>3.8.1</version>
8998
<configuration>
90-
<source>1.8</source>
91-
<target>1.8</target>
99+
<source>17</source>
100+
<target>17</target>
92101
</configuration>
93102
</plugin>
94103
</plugins>

‎APIJSON-Java-Server/APIJSONDemo-Script/src/main/java/apijson/demo/DemoApplication.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import apijson.demo.script.GraalJavaScriptExecutor;
3131
import apijson.demo.script.LuaScriptExecutor;
3232
import apijson.demo.script.NashornScriptExecutor;
33-
import apijson.framework.APIJSONApplication;
34-
import apijson.framework.APIJSONCreator;
33+
import apijson.framework.javax.APIJSONApplication;
34+
import apijson.framework.javax.APIJSONCreator;
3535
import apijson.orm.SQLConfig;
3636
import apijson.orm.SQLExecutor;
3737
import apijson.orm.script.ScriptExecutor;

‎APIJSON-Java-Server/APIJSONDemo-Script/src/main/java/apijson/demo/DemoController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import apijson.RequestMethod;
3131
import apijson.StringUtil;
32-
import apijson.framework.APIJSONController;
32+
import apijson.framework.javax.APIJSONController;
3333
import apijson.orm.Parser;
3434

3535

‎APIJSON-Java-Server/APIJSONDemo-Script/src/main/java/apijson/demo/DemoSQLConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package apijson.demo;
1616

17-
import apijson.framework.APIJSONSQLConfig;
17+
import apijson.framework.javax.APIJSONSQLConfig;
1818

1919

2020
/**SQL 配置，这里不配置数据库账号密码等信息，改为使用 DemoDataSourceConfig 来配置

‎APIJSON-Java-Server/APIJSONDemo-Script/src/main/java/apijson/demo/DemoSQLExecutor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import javax.sql.DataSource;
2020

21-
import apijson.framework.APIJSONSQLExecutor;
21+
import apijson.framework.javax.APIJSONSQLExecutor;
2222
import apijson.orm.SQLConfig;
2323

2424

‎APIJSON-Java-Server/APIJSONDemo-Script/src/main/java/apijson/demo/script/NashornScriptExecutor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
import apijson.orm.AbstractFunctionParser;
99
import apijson.orm.script.JSR223ScriptExecutor;
1010
import apijson.orm.script.ScriptExecutor;
11-
import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
11+
// JDK 1.8~16 用 JDK 自带的，JDK 17+ 必须单独依赖 import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
12+
import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
1213

1314
public class NashornScriptExecutor extends JSR223ScriptExecutor {
1415
@SuppressWarnings("restriction")

0 commit comments

Comments
 (0)