Skip to content

Commit fd3b8fc

Browse files
TommyLemonTommyLemon
authored
Merge pull request #41 from APIJSON/master
merge master to main
2 parents 7911352 + a90ed55 commit fd3b8fc

11 files changed

Lines changed: 58 additions & 31 deletions

File tree

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.boot</groupId>
77
<artifactId>apijson-boot-multi-datasource</artifactId>
8-
<version>8.3.0</version>
8+
<version>8.3.2</version>
99
<packaging>jar</packaging>
1010

1111
<name>APIJSONBoot-MultiDataSource</name>
@@ -26,10 +26,10 @@
2626
<dependency>
2727
<groupId>com.alibaba.fastjson2</groupId>
2828
<artifactId>fastjson2</artifactId>
29-
<version>2.0.64</version>
29+
<version>2.0.65</version>
3030
</dependency>
3131

32-
<!-- apijson-framework 需要用的依赖库，6.0.0 以上 -->
32+
<!-- apijson-framework 需要用的依赖库，5.0.0 以上 -->
3333
<dependency>
3434
<groupId>jakarta.servlet</groupId>
3535
<artifactId>jakarta.servlet-api</artifactId>
@@ -40,17 +40,17 @@
4040
<dependency>
4141
<groupId>com.github.TommyLemon</groupId>
4242
<artifactId>unitauto-java</artifactId>
43-
<version>3.0.5</version>
43+
<version>3.1.0</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>com.github.TommyLemon</groupId>
4747
<artifactId>unitauto-jar</artifactId>
48-
<version>3.0.5</version>
48+
<version>3.1.0</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>io.github.classgraph</groupId>
5252
<artifactId>classgraph</artifactId>
53-
<version>4.8.146</version>
53+
<version>4.8.196</version>
5454
</dependency>
5555
<!-- 单元测试：可使用 libs 目录的 unitauto-java.jar 和 unitauto-jar.jar 来替代，两种方式二选一 >>>>>>>>> -->
5656

@@ -59,26 +59,42 @@
5959
<dependency>
6060
<groupId>com.github.Tencent</groupId>
6161
<artifactId>APIJSON</artifactId>
62-
<version>8.3.0</version>
62+
<version>8.3.2</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>com.github.APIJSON</groupId>
6666
<artifactId>apijson-framework</artifactId>
67-
<version>8.3.0</version>
67+
<version>8.3.2</version>
6868
</dependency>
6969
<!-- fastjson2, jackson, gson 等 JSON 库插件选其中一个即可 <<<<<<<<<<<<<<< -->
7070
<dependency>
7171
<groupId>com.github.APIJSON</groupId>
7272
<artifactId>apijson-fastjson2</artifactId>
73-
<version>1.3.0</version>
73+
<version>1.3.3</version>
7474
</dependency>
7575
<!-- <dependency>-->
7676
<!-- <groupId>com.github.APIJSON</groupId>-->
7777
<!-- <artifactId>apijson-jackson</artifactId>-->
78-
<!-- <version>1.3.0</version>-->
78+
<!-- <version>1.3.2</version>-->
7979
<!-- </dependency>-->
8080
<!-- fastjson2, jackson, gson 等 JSON 库插件选其中一个即可 >>>>>>>>>>>>>>> -->
8181

82+
<!-- <dependency>-->
83+
<!-- <groupId>org.openjdk.nashorn</groupId>-->
84+
<!-- <artifactId>nashorn-core</artifactId>-->
85+
<!-- <version>15.7</version>-->
86+
<!-- </dependency>-->
87+
<!-- <dependency>-->
88+
<!-- <groupId>org.graalvm.js</groupId>-->
89+
<!-- <artifactId>js</artifactId>-->
90+
<!-- <version>23.0.1</version>-->
91+
<!-- </dependency>-->
92+
<!-- <dependency>-->
93+
<!-- <groupId>org.graalvm.js</groupId>-->
94+
<!-- <artifactId>js-scriptengine</artifactId>-->
95+
<!-- <version>23.0.1</version>-->
96+
<!-- </dependency>-->
97+
8298
<dependency>
8399
<groupId>org.apache.commons</groupId>
84100
<artifactId>commons-text</artifactId>

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoApplication.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import apijson.fastjson2.APIJSONCreator;
2020
import apijson.fastjson2.APIJSONVerifier;
2121
import apijson.fastjson2.APIJSONSQLConfig;
22+
import apijson.orm.AbstractFunctionParser;
2223
import apijson.orm.AbstractParser;
2324
import apijson.orm.AbstractVerifier;
2425
import com.alibaba.fastjson.JSONObject;
@@ -85,12 +86,15 @@ public static void main(String[] args) throws Exception {
8586
e.printStackTrace();
8687
}
8788

89+
com.alibaba.fastjson2.JSON.configReaderDateFormat("yyyy-MM-dd HH:mm:ss");
90+
8891
// FIXME 不要开放给项目组后端之外的任何人使用 UnitAuto（强制登录鉴权）！！！如果不需要单元测试则移除相关代码或 unitauto.Log.DEBUG = false;
8992
// 上线生产环境前改为 false，可不输出 APIJSONORM 的日志 以及 SQLException 的原始(敏感)信息
9093
//unitauto.Log.DEBUG = true;
9194
Log.DEBUG = true; // 是否开启调试模式（打印详细日志、返回详细调试信息等）
9295
AbstractParser.IS_PRINT_BIG_LOG = true; // 是否打印大日志
9396
APIJSONVerifier.ENABLE_APIJSON_ROUTER = true; // apijson-framework 已集成字段插件 apijson-router，是否开启 接口路由 模式，支持简单接口转为 APIJSON JSON
97+
//AbstractFunctionParser.ENABLE_SCRIPT_FUNCTION = true; // 是否启用脚本形式的远程函数
9498
//APIJSONParser.IS_START_FROM_1 = true; // 分页页码是否从 1 开始，true - 从 1 开始；false - 从 0 开始
9599
APIJSONSQLConfig.ENABLE_COLUMN_CONFIG = false; // apijson-framework 已集成字段插件 apijson-column，支持 !key 反选字段 和 字段名映射
96100
APIJSONApplication.init();

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ public JSONObject headVerify(int type, String phone, String email, String code)
717717
}
718718

719719
//验证码过期
720-
long time = BaseModel.getTimeMillis(verify.getDate());
720+
long time = BaseModel.toTimeMillis(verify.getDate());
721721
long now = System.currentTimeMillis();
722722
if (now > 60*1000 + time) {
723723
new DemoParser(DELETE, false).parseResponse(
@@ -2487,7 +2487,7 @@ public String execute(@RequestBody String request, HttpSession session) {
24872487
}
24882488

24892489
sqlRest = sqlRest.substring(isEq ? 1 : "IN(".length()).trim();
2490-
int endInd = isEq && ! sqlRest.startsWith("'") ? -1 : sqlRest.indexOf(isEq ? "'" : ")", 1);
2490+
int endInd = -1; // isEq && ! sqlRest.startsWith("'") ? -1 : sqlRest.indexOf(isEq ? "'" : ")", 1);
24912491
if (isEq && ! sqlRest.startsWith("'")) {
24922492
for (int i = 0; i < sqlRest.length(); i++) {
24932493
char c = sqlRest.charAt(i);

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/FileController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ public ResponseEntity<Object> downloadCVReport(@PathVariable(name = "id") String
424424
headers.setContentLength(body.length());
425425
}
426426

427-
String renderStr = demoController.sendRequest(session, HttpMethod.POST, "http://localhost:3003/cv/render", body, headers);
427+
String renderStr = demoController.sendRequest(session, HttpMethod.POST, "http://localhost:3003/cv/render", body, null, headers);
428428
renderStr = StringUtil.trim(renderStr);
429429
if (renderStr.length() > 100) {
430430
File renderFile = new File(fileUploadRootDir + nfn);

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoFunctionParser.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ public class DemoFunctionParser extends APIJSONFunctionParser<Long> {
4444
public static final String TAG = "DemoFunctionParser";
4545

4646
static {
47-
SCRIPT_EXECUTOR_MAP.put("js", new JavaScriptExecutor<Long, JSONObject, JSONArray>());
47+
//SCRIPT_EXECUTOR_MAP.put("js", new JavaScriptExecutor<Long, JSONObject, JSONArray>());
48+
//SCRIPT_EXECUTOR_MAP.put("graaljs", new JavaScriptExecutor<Long, JSONObject, JSONArray>());
49+
//SCRIPT_EXECUTOR_MAP.put("nashorn", new JavaScriptExecutor<Long, JSONObject, JSONArray>());
4850
}
4951

5052
public DemoFunctionParser() {

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoParser.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public DemoParser setNeedVerify(boolean needVerify) {
6666
// return true;
6767
// }
6868

69-
private int maxQueryCount = 100;
69+
private int maxQueryCount = 200;
7070
// 可重写来设置最大查询数量
7171
@Override
7272
public int getMaxQueryCount() {
@@ -83,10 +83,10 @@ public int getMaxObjectCount() {
8383
return getMaxUpdateCount();
8484
}
8585

86-
//@Override
87-
//public int getMaxSQLCount() {
88-
// return getMaxUpdateCount();
89-
//}
86+
@Override
87+
public int getMaxSQLCount() {
88+
return 500;// getMaxUpdateCount();
89+
}
9090

9191
@Override
9292
public JSONObject parseResponse(JSONObject request) {

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoSQLConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public String getUserIdKey(String database, String datasource, String namespace,
210210
@Override
211211
public String gainDBVersion() {
212212
if (isMySQL()) {
213-
// return "5.7.22"; //TODO 改成你自己的 MySQL 或 PostgreSQL 数据库版本号 //MYSQL 8 和 7 使用的 JDBC 配置不一样
213+
//return "5.7.22"; //TODO 改成你自己的 MySQL 或 PostgreSQL 数据库版本号 //MYSQL 8 和 7 使用的 JDBC 配置不一样
214214
return "8.0.11"; //TODO 改成你自己的 MySQL 或 PostgreSQL 数据库版本号 //MYSQL 8 和 7 使用的 JDBC 配置不一样
215215
}
216216
if (isPostgreSQL()) {

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/model/Privacy.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import apijson.MethodAccess;
2424
import apijson.framework.BaseModel;
2525

26+
import java.util.Date;
27+
2628
/**
2729
* TODO 漏洞：如果GETS允许CONTACT，则CONTACT能看到自己的余额，tag可以不是Privacy-circle。
2830
* 所以需要在Request表中增加role字段。或者干脆这里GETS只允许OWNER, ADMIN，需要用其它角色查时走独立接口。
@@ -35,8 +37,8 @@
3537
GETS = {OWNER, ADMIN},
3638
POST = {UNKNOWN, ADMIN},
3739
DELETE = {ADMIN}
38-
)
39-
public class Privacy extends BaseModel {
40+
)
41+
public class Privacy extends BaseModel<Long, Date> {
4042
private static final long serialVersionUID = 1L;
4143

4244
public static final int PASSWORD_TYPE_LOGIN = 0;

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/model/User.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import static apijson.orm.AbstractVerifier.ADMIN;
1818
import static apijson.orm.AbstractVerifier.UNKNOWN;
1919

20+
import java.util.Date;
2021
import java.util.List;
2122

2223
import apijson.MethodAccess;
@@ -29,8 +30,8 @@
2930
@MethodAccess(
3031
POST = {UNKNOWN, ADMIN},
3132
DELETE = {ADMIN}
32-
)
33-
public class User extends BaseModel implements Visitor<Long> {
33+
)
34+
public class User extends BaseModel<Long, Date> implements Visitor<Long> {
3435
private static final long serialVersionUID = 1L;
3536

3637
public static final int SEX_MAIL = 0;

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/model/Verify.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import apijson.MethodAccess;
2525
import apijson.framework.BaseModel;
2626

27+
import java.util.Date;
28+
2729
/**验证码
2830
* @author Lemon
2931
*/
@@ -35,8 +37,8 @@
3537
POST = {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN},
3638
PUT = {ADMIN},
3739
DELETE = {ADMIN}
38-
)
39-
public class Verify extends BaseModel {
40+
)
41+
public class Verify extends BaseModel<Long, Date> {
4042
private static final long serialVersionUID = 1L;
4143

4244
public static final int TYPE_LOGIN = 0; //登录

0 commit comments

Comments
 (0)