Skip to content

升级 APIJSON, apijson-framework 8.1.6，自身 1.1.6，getSQLConfig 新增 namespace, datalog 的个参数 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TommyLemon merged 1 commit into from
Apr 18, 2026
Merged

升级 APIJSON, apijson-framework 8.1.6，自身 1.1.6，getSQLConfig 新增 namespace, datalog 的个参数 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>apijson.jackson</groupId>
<artifactId>apijson-jackson</artifactId>
<version>1.1.5</version>
<version>1.1.6</version>
<packaging>jar</packaging>

<name>apijson-jackson</name>
Expand Down Expand Up @@ -39,17 +39,17 @@
<dependency>
<groupId>com.github.Tencent</groupId>
<artifactId>APIJSON</artifactId>
<version>8.1.5</version>
<version>8.1.6</version>
</dependency>
<dependency>
<groupId>com.github.APIJSON</groupId>
<artifactId>apijson-framework</artifactId>
<version>8.1.5</version>
<version>8.1.6</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.20.0</version>
<version>2.21.2</version>
</dependency>
</dependencies>

Expand Down
10 changes: 6 additions & 4 deletions src/main/java/apijson/jackson/APIJSONSQLConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package apijson.jackson;

import apijson.RequestMethod;
import apijson.framework.APIJSONApplication;
import apijson.jackson.javax.APIJSONApplication;
import apijson.orm.AbstractSQLConfig;
import apijson.orm.Join;
import apijson.orm.SQLConfig;
Expand Down Expand Up @@ -72,18 +72,20 @@ public static <T> SQLConfig<T, Map<String, Object>, List<Object>> newSQLConfig2(
RequestMethod method, String table, String alias
, Map<String, Object> request, List<Join<T, Map<String, Object>, List<Object>>> joinList, boolean isProcedure
) throws Exception {
return newSQLConfig(method, table, alias, request, joinList, isProcedure, new SimpleCallback<T>() {});
return newSQLConfig(method, table, alias, request, joinList, isProcedure, (SimpleCallback<T>) SIMPLE_CALLBACK);
}

public static class SimpleCallback<T> extends AbstractSQLConfig.SimpleCallback<T, Map<String, Object>, List<Object>> {

@Override
public SQLConfig<T, Map<String, Object>, List<Object>> getSQLConfig(RequestMethod method, String database, String schema
, String datasource, String table) {
public SQLConfig<T, Map<String, Object>, List<Object>> getSQLConfig(RequestMethod method, String database
, String datasource, String namespace, String catalog, String schema, String table) {
SQLConfig<T, Map<String, Object>, List<Object>> config = APIJSONApplication.createSQLConfig();
config.setMethod(method);
config.setDatabase(database);
config.setDatasource(datasource);
config.setNamespace(namespace);
config.setCatalog(catalog);
config.setSchema(schema);
config.setTable(table);
return config;
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/apijson/jackson/javax/APIJSONSQLConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,20 @@ public APIJSONSQLConfig(RequestMethod method, int count, int page) {
public static <T> SQLConfig<T, Map<String, Object>, List<Object>> newSQLConfig(
RequestMethod method, String table, String alias
, LinkedHashMap<String, Object> request, List<Join<T, Map<String, Object>, List<Object>>> joinList, boolean isProcedure) throws Exception {
return newSQLConfig(method, table, alias, request, joinList, isProcedure, new SimpleCallback<T>() {});
return newSQLConfig(method, table, alias, request, joinList, isProcedure, (SimpleCallback<T>) SIMPLE_CALLBACK);
}

public static class SimpleCallback<T> extends AbstractSQLConfig.SimpleCallback<T, Map<String, Object>, List<Object>> {

@Override
public SQLConfig<T, Map<String, Object>, List<Object>> getSQLConfig(RequestMethod method, String database, String schema
, String datasource, String table) {
public SQLConfig<T, Map<String, Object>, List<Object>> getSQLConfig(RequestMethod method, String database
, String datasource, String namespace, String catalog, String schema, String table) {
SQLConfig<T, Map<String, Object>, List<Object>> config = APIJSONApplication.createSQLConfig();
config.setMethod(method);
config.setDatabase(database);
config.setDatasource(datasource);
config.setNamespace(namespace);
config.setCatalog(catalog);
config.setSchema(schema);
config.setTable(table);
return config;
Expand Down