mirrors/APIJSON
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Server：重命名 APIJSONORM 的包名 apijson.server 为 apijson.orm

Browse Source
This commit is contained in:
TommyLemon 2020-03-07 23:31:01 +08:00
parent 541933869d
commit 143cd08cdf
70 changed files with 169 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
APIJSON-Java-Server/APIJSONBoot/apijson-boot.iml
View File

@ -1,66 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.58" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.4.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.1.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.4.1.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.1.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.3.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.json:json:20140107" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.5" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.11" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.postgresql:postgresql:42.2.5" level="project" />
<orderEntry type="library" name="Maven: net.sourceforge.jtds:jtds:1.3.1" level="project" />
</component>
</module>

12
APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/boot/DemoApplication.java
View File

@ -31,12 +31,12 @@ import apijson.Log;
import apijson.StringUtil;
import apijson.framework.APIJSONApplication;
import apijson.framework.APIJSONCreator;
import apijson.server.FunctionParser;
import apijson.server.Parser;
import apijson.server.SQLConfig;
import apijson.server.SQLExecutor;
import apijson.server.Structure;
import apijson.server.Verifier;
import apijson.orm.FunctionParser;
import apijson.orm.Parser;
import apijson.orm.SQLConfig;
import apijson.orm.SQLExecutor;
import apijson.orm.Structure;
import apijson.orm.Verifier;
/**SpringBootApplication

10
APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/boot/DemoController.java
View File

@ -75,11 +75,11 @@ import apijson.boot.model.Verify;
import apijson.framework.APIJSONController;
import apijson.framework.BaseModel;
import apijson.framework.StructureUtil;
import apijson.server.JSONRequest;
import apijson.server.exception.ConditionErrorException;
import apijson.server.exception.ConflictException;
import apijson.server.exception.NotExistException;
import apijson.server.exception.OutOfRangeException;
import apijson.orm.JSONRequest;
import apijson.orm.exception.ConditionErrorException;
import apijson.orm.exception.ConflictException;
import apijson.orm.exception.NotExistException;
import apijson.orm.exception.OutOfRangeException;
/**request controller

2
APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/boot/DemoFunctionParser.java
View File

@ -29,7 +29,7 @@ import apijson.RequestMethod;
import apijson.RequestRole;
import apijson.StringUtil;
import apijson.framework.APIJSONFunctionParser;
import apijson.server.JSONRequest;
import apijson.orm.JSONRequest;
/**可远程调用的函数类

8
APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/boot/DemoObjectParser.java
View File

@ -22,10 +22,10 @@ import javax.validation.constraints.NotNull;
import com.alibaba.fastjson.JSONObject;
import apijson.RequestMethod;
import apijson.server.AbstractObjectParser;
import apijson.server.AbstractParser;
import apijson.server.Join;
import apijson.server.SQLConfig;
import apijson.orm.AbstractObjectParser;
import apijson.orm.AbstractParser;
import apijson.orm.Join;
import apijson.orm.SQLConfig;
/**简化Parser，getObject和getArray(getArrayConfig)都能用

2
APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/boot/DemoSQLConfig.java
View File

@ -21,7 +21,7 @@ import static apijson.framework.APIJSONConstant.USER_ID;
import apijson.RequestMethod;
import apijson.framework.APIJSONSQLConfig;
import apijson.server.AbstractSQLConfig;
import apijson.orm.AbstractSQLConfig;
/**SQL配置

2
APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/boot/DemoVerifier.java
View File

@ -16,7 +16,7 @@ package apijson.boot;
import apijson.framework.APIJSONVerifier;
import apijson.server.SQLConfig;
import apijson.orm.SQLConfig;
/**权限验证器

2
APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/boot/model/User.java
View File

@ -21,7 +21,7 @@ import java.util.List;
import apijson.MethodAccess;
import apijson.framework.BaseModel;
import apijson.server.Visitor;
import apijson.orm.Visitor;
/**用户开放信息
* @author Lemon

17
APIJSON-Java-Server/APIJSONBoot/src/test/java/zuo/biao/apijson/server/ApplicationTests.java
View File

@ -1,17 +0,0 @@
package zuo.biao.apijson.server;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class ApplicationTests {
@Test
public void contextLoads() {
//TODO Test Case，包括GitHub README介绍和简版demo
}
}

2
APIJSON-Java-Server/APIJSONBootTest/src/main/java/apijson/boot/test/DemoApplication.java
View File

@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration;
import apijson.framework.APIJSONApplication;
import apijson.framework.APIJSONCreator;
import apijson.server.SQLConfig;
import apijson.orm.SQLConfig;
/**SpringBootApplication

2
APIJSON-Java-Server/APIJSONBootTest/src/main/java/apijson/boot/test/DemoController.java
View File

@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
import apijson.RequestMethod;
import apijson.StringUtil;
import apijson.framework.APIJSONController;
import apijson.server.Parser;
import apijson.orm.Parser;
@RestController

4
APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONApplication.java
View File

@ -15,8 +15,8 @@ limitations under the License.*/
package apijson.framework;
import apijson.NotNull;
import apijson.server.ParserCreator;
import apijson.server.SQLCreator;
import apijson.orm.ParserCreator;
import apijson.orm.SQLCreator;
/**SpringBootApplication

32
APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONConstant.java
View File

@ -1,22 +1,22 @@
package apijson.framework;
import apijson.JSONResponse;
import apijson.server.JSONRequest;
import apijson.server.Visitor;
import apijson.server.model.Access;
import apijson.server.model.Column;
import apijson.server.model.Document;
import apijson.server.model.ExtendedProperty;
import apijson.server.model.Function;
import apijson.server.model.PgAttribute;
import apijson.server.model.PgClass;
import apijson.server.model.Request;
import apijson.server.model.Response;
import apijson.server.model.SysColumn;
import apijson.server.model.SysTable;
import apijson.server.model.Table;
import apijson.server.model.Test;
import apijson.server.model.TestRecord;
import apijson.orm.JSONRequest;
import apijson.orm.Visitor;
import apijson.orm.model.Access;
import apijson.orm.model.Column;
import apijson.orm.model.Document;
import apijson.orm.model.ExtendedProperty;
import apijson.orm.model.Function;
import apijson.orm.model.PgAttribute;
import apijson.orm.model.PgClass;
import apijson.orm.model.Request;
import apijson.orm.model.Response;
import apijson.orm.model.SysColumn;
import apijson.orm.model.SysTable;
import apijson.orm.model.Table;
import apijson.orm.model.Test;
import apijson.orm.model.TestRecord;
public class APIJSONConstant {

4
APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONController.java
View File

@ -40,8 +40,8 @@ import apijson.Log;
import apijson.NotNull;
import apijson.RequestMethod;
import apijson.StringUtil;
import apijson.server.Parser;
import apijson.server.Visitor;
import apijson.orm.Parser;
import apijson.orm.Visitor;
/**request controller

16
APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONCreator.java
View File

@ -1,13 +1,13 @@
package apijson.framework;
import apijson.server.FunctionParser;
import apijson.server.Parser;
import apijson.server.ParserCreator;
import apijson.server.SQLConfig;
import apijson.server.SQLCreator;
import apijson.server.SQLExecutor;
import apijson.server.Verifier;
import apijson.server.VerifierCreator;
import apijson.orm.FunctionParser;
import apijson.orm.Parser;
import apijson.orm.ParserCreator;
import apijson.orm.SQLConfig;
import apijson.orm.SQLCreator;
import apijson.orm.SQLExecutor;
import apijson.orm.Verifier;
import apijson.orm.VerifierCreator;
/**APIJSON相关创建器
* @author Lemon

6
APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONFunctionParser.java
View File

@ -33,9 +33,9 @@ import apijson.NotNull;
import apijson.RequestMethod;
import apijson.RequestRole;
import apijson.StringUtil;
import apijson.server.AbstractFunctionParser;
import apijson.server.JSONRequest;
import apijson.server.ParserCreator;
import apijson.orm.AbstractFunctionParser;
import apijson.orm.JSONRequest;
import apijson.orm.ParserCreator;
/**可远程调用的函数类

8
APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONObjectParser.java
View File

@ -22,10 +22,10 @@ import com.alibaba.fastjson.JSONObject;
import apijson.NotNull;
import apijson.RequestMethod;
import apijson.server.AbstractObjectParser;
import apijson.server.AbstractParser;
import apijson.server.Join;
import apijson.server.SQLConfig;
import apijson.orm.AbstractObjectParser;
import apijson.orm.AbstractParser;
import apijson.orm.Join;
import apijson.orm.SQLConfig;
/**简化Parser，getObject和getArray(getArrayConfig)都能用

12
APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONParser.java
View File

@ -26,12 +26,12 @@ import javax.servlet.http.HttpSession;
import com.alibaba.fastjson.JSONObject;
import apijson.RequestMethod;
import apijson.server.AbstractParser;
import apijson.server.FunctionParser;
import apijson.server.Parser;
import apijson.server.SQLConfig;
import apijson.server.SQLExecutor;
import apijson.server.Verifier;
import apijson.orm.AbstractParser;
import apijson.orm.FunctionParser;
import apijson.orm.Parser;
import apijson.orm.SQLConfig;
import apijson.orm.SQLExecutor;
import apijson.orm.Verifier;
/**请求解析器

6
APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONSQLConfig.java
View File

@ -24,9 +24,9 @@ import java.util.List;
import com.alibaba.fastjson.JSONObject;
import apijson.RequestMethod;
import apijson.server.AbstractSQLConfig;
import apijson.server.Join;
import apijson.server.SQLConfig;
import apijson.orm.AbstractSQLConfig;
import apijson.orm.Join;
import apijson.orm.SQLConfig;
/**SQL配置

4
APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONSQLExecutor.java
View File

@ -27,8 +27,8 @@ import com.alibaba.fastjson.JSONObject;
import apijson.JSON;
import apijson.Log;
import apijson.NotNull;
import apijson.server.AbstractSQLExecutor;
import apijson.server.SQLConfig;
import apijson.orm.AbstractSQLExecutor;
import apijson.orm.SQLConfig;
/**executor for query(read) or update(write) MySQL database

8
APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONVerifier.java
View File

@ -34,10 +34,10 @@ import apijson.NotNull;
import apijson.RequestMethod;
import apijson.RequestRole;
import apijson.StringUtil;
import apijson.server.AbstractVerifier;
import apijson.server.JSONRequest;
import apijson.server.ParserCreator;
import apijson.server.Visitor;
import apijson.orm.AbstractVerifier;
import apijson.orm.JSONRequest;
import apijson.orm.ParserCreator;
import apijson.orm.Visitor;
/**权限验证器

8
APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/StructureUtil.java
View File

@ -26,10 +26,10 @@ import apijson.JSONResponse;
import apijson.Log;
import apijson.RequestMethod;
import apijson.StringUtil;
import apijson.server.JSONRequest;
import apijson.server.ParserCreator;
import apijson.server.SQLCreator;
import apijson.server.Structure;
import apijson.orm.JSONRequest;
import apijson.orm.ParserCreator;
import apijson.orm.SQLCreator;
import apijson.orm.Structure;
/**请求结构校验

2
APIJSON-Java-Server/APIJSONORM/pom.xml
View File

@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>apijson.server</groupId>
<groupId>apijson.orm</groupId>
<artifactId>apijson-orm</artifactId>
<version>4.0.0</version>
<packaging>jar</packaging>

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/AbstractFunctionParser.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;

12
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/AbstractObjectParser.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
View File

@ -12,14 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import static apijson.JSONObject.KEY_COMBINE;
import static apijson.JSONObject.KEY_DROP;
import static apijson.JSONObject.KEY_TRY;
import static apijson.RequestMethod.POST;
import static apijson.RequestMethod.PUT;
import static apijson.server.SQLConfig.TYPE_ITEM;
import static apijson.orm.SQLConfig.TYPE_ITEM;
import java.rmi.ServerException;
import java.util.ArrayList;
@ -42,9 +42,9 @@ import apijson.Log;
import apijson.NotNull;
import apijson.RequestMethod;
import apijson.StringUtil;
import apijson.server.AbstractFunctionParser.FunctionBean;
import apijson.server.exception.ConflictException;
import apijson.server.exception.NotExistException;
import apijson.orm.AbstractFunctionParser.FunctionBean;
import apijson.orm.exception.ConflictException;
import apijson.orm.exception.NotExistException;
/**简化Parser，getObject和getArray(getArrayConfig)都能用
@ -99,7 +99,7 @@ public abstract class AbstractObjectParser implements ObjectParser {
this.joinList = arrayConfig == null ? null : arrayConfig.getJoinList();
this.path = AbstractParser.getAbsPath(parentPath, name);
apijson.server.Entry<String, String> entry = Pair.parseEntry(name, true);
apijson.orm.Entry<String, String> entry = Pair.parseEntry(name, true);
this.table = entry.getKey();
this.alias = entry.getValue();
this.isTable = apijson.JSONObject.isTableKey(table);

14
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/AbstractParser.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import static apijson.JSONObject.KEY_EXPLAIN;
import static apijson.RequestMethod.GET;
@ -43,11 +43,11 @@ import apijson.NotNull;
import apijson.RequestMethod;
import apijson.RequestRole;
import apijson.StringUtil;
import apijson.server.exception.ConditionErrorException;
import apijson.server.exception.ConflictException;
import apijson.server.exception.NotExistException;
import apijson.server.exception.NotLoggedInException;
import apijson.server.exception.OutOfRangeException;
import apijson.orm.exception.ConditionErrorException;
import apijson.orm.exception.ConflictException;
import apijson.orm.exception.NotExistException;
import apijson.orm.exception.NotLoggedInException;
import apijson.orm.exception.OutOfRangeException;
/**parser for parsing request to JSONObject
* @author Lemon
@ -990,7 +990,7 @@ public abstract class AbstractParser<T> implements Parser<T>, ParserCreator<T>,
index = path.indexOf("/");
String tableKey = index < 0 ? null : path.substring(0, index); //User:owner
apijson.server.Entry<String, String> entry = Pair.parseEntry(tableKey, true);
apijson.orm.Entry<String, String> entry = Pair.parseEntry(tableKey, true);
String table = entry.getKey(); //User
String alias = entry.getValue(); //owner
String key = StringUtil.isEmpty(table, true) ? null : path.substring(index + 1);//id@

18
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/AbstractSQLConfig.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import static apijson.JSONObject.KEY_CACHE;
import static apijson.JSONObject.KEY_COLUMN;
@ -62,14 +62,14 @@ import apijson.RequestMethod;
import apijson.RequestRole;
import apijson.SQL;
import apijson.StringUtil;
import apijson.server.exception.NotExistException;
import apijson.server.model.Column;
import apijson.server.model.ExtendedProperty;
import apijson.server.model.PgAttribute;
import apijson.server.model.PgClass;
import apijson.server.model.SysColumn;
import apijson.server.model.SysTable;
import apijson.server.model.Table;
import apijson.orm.exception.NotExistException;
import apijson.orm.model.Column;
import apijson.orm.model.ExtendedProperty;
import apijson.orm.model.PgAttribute;
import apijson.orm.model.PgClass;
import apijson.orm.model.SysColumn;
import apijson.orm.model.SysTable;
import apijson.orm.model.Table;
/**config sql for JSON Request
* @author Lemon

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/AbstractSQLExecutor.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import java.io.BufferedReader;
import java.sql.Blob;

34
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/AbstractVerifier.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import static apijson.RequestMethod.DELETE;
import static apijson.RequestMethod.GET;
@ -41,22 +41,22 @@ import apijson.NotNull;
import apijson.RequestMethod;
import apijson.RequestRole;
import apijson.StringUtil;
import apijson.server.exception.ConflictException;
import apijson.server.exception.NotLoggedInException;
import apijson.server.model.Access;
import apijson.server.model.Column;
import apijson.server.model.Document;
import apijson.server.model.ExtendedProperty;
import apijson.server.model.Function;
import apijson.server.model.PgAttribute;
import apijson.server.model.PgClass;
import apijson.server.model.Request;
import apijson.server.model.Response;
import apijson.server.model.SysColumn;
import apijson.server.model.SysTable;
import apijson.server.model.Table;
import apijson.server.model.Test;
import apijson.server.model.TestRecord;
import apijson.orm.exception.ConflictException;
import apijson.orm.exception.NotLoggedInException;
import apijson.orm.model.Access;
import apijson.orm.model.Column;
import apijson.orm.model.Document;
import apijson.orm.model.ExtendedProperty;
import apijson.orm.model.Function;
import apijson.orm.model.PgAttribute;
import apijson.orm.model.PgClass;
import apijson.orm.model.Request;
import apijson.orm.model.Response;
import apijson.orm.model.SysColumn;
import apijson.orm.model.SysTable;
import apijson.orm.model.Table;
import apijson.orm.model.Test;
import apijson.orm.model.TestRecord;
/**权限验证
* @author Lemon

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/Entry.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Entry.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
/**自定义Entry
* *java.util.Map.Entry是interface，new Entry(...)不好用，其它的Entry也不好用

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/FunctionParser.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/FunctionParser.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import com.alibaba.fastjson.JSONObject;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/JSONRequest.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/JSONRequest.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import java.util.Map;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/Join.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Join.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import com.alibaba.fastjson.JSONObject;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/Logic.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Logic.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import apijson.StringUtil;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/ObjectParser.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/ObjectParser.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import java.util.List;
import java.util.Map;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/OnParseCallback.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/OnParseCallback.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/Operation.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Operation.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
/**对请求JSON的操作
* @author Lemon

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/Pair.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Pair.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import java.util.Collection;
import java.util.HashMap;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/Parser.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Parser.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import java.sql.SQLException;
import java.sql.Savepoint;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/ParserCreator.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/ParserCreator.java
View File

@ -1,4 +1,4 @@
package apijson.server;
package apijson.orm;
import apijson.NotNull;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/SQLConfig.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import java.util.List;
import java.util.Map;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/SQLCreator.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/SQLCreator.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import apijson.NotNull;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/SQLExecutor.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/SQLExecutor.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import java.sql.Connection;
import java.sql.ResultSet;

24
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/Structure.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Structure.java
View File

@ -12,19 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import static apijson.JSONObject.KEY_ID;
import static apijson.JSONObject.KEY_USER_ID;
import static apijson.server.Operation.DISALLOW;
import static apijson.server.Operation.INSERT;
import static apijson.server.Operation.NECESSARY;
import static apijson.server.Operation.REMOVE;
import static apijson.server.Operation.REPLACE;
import static apijson.server.Operation.TYPE;
import static apijson.server.Operation.UNIQUE;
import static apijson.server.Operation.UPDATE;
import static apijson.server.Operation.VERIFY;
import static apijson.orm.Operation.DISALLOW;
import static apijson.orm.Operation.INSERT;
import static apijson.orm.Operation.NECESSARY;
import static apijson.orm.Operation.REMOVE;
import static apijson.orm.Operation.REPLACE;
import static apijson.orm.Operation.TYPE;
import static apijson.orm.Operation.UNIQUE;
import static apijson.orm.Operation.UPDATE;
import static apijson.orm.Operation.VERIFY;
import java.net.URL;
import java.time.LocalDate;
@ -53,8 +53,8 @@ import apijson.Log;
import apijson.NotNull;
import apijson.RequestMethod;
import apijson.StringUtil;
import apijson.server.exception.ConflictException;
import apijson.server.model.Test;
import apijson.orm.exception.ConflictException;
import apijson.orm.model.Test;
/**结构类
* 增删改查: OPERATION(ADD,REPLACE,PUT,REMOVE) OPERATION:{key0:value0, key1:value1 ...}

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/Subquery.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Subquery.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.annotation.JSONField;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/Verifier.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Verifier.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import apijson.NotNull;
import apijson.RequestMethod;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/VerifierCreator.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/VerifierCreator.java
View File

@ -1,4 +1,4 @@
package apijson.server;
package apijson.orm;
import apijson.NotNull;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/Visitor.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Visitor.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server;
package apijson.orm;
import java.util.List;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/exception/ConditionErrorException.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/exception/ConditionErrorException.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.exception;
package apijson.orm.exception;
/**条件错误
* @author Lemon

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/exception/ConflictException.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/exception/ConflictException.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.exception;
package apijson.orm.exception;
/**冲突
* @author Lemon

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/exception/NotExistException.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/exception/NotExistException.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.exception;
package apijson.orm.exception;
/**不存在，可接受，内部吃掉
* @author Lemon

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/exception/NotLoggedInException.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/exception/NotLoggedInException.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.exception;
package apijson.orm.exception;
/**未登录
* @author Lemon

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/exception/OutOfRangeException.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/exception/OutOfRangeException.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.exception;
package apijson.orm.exception;
/**超出范围
* @author Lemon

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/exception/package-info.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/exception/package-info.java
View File

@ -19,4 +19,4 @@ limitations under the License.*/
* @author Lemon
*
*/
package apijson.server.exception;
package apijson.orm.exception;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/Access.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/Access.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import apijson.MethodAccess;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/Column.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/Column.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import apijson.MethodAccess;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/Document.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/Document.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import static apijson.RequestRole.ADMIN;
import static apijson.RequestRole.LOGIN;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/ExtendedProperty.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/ExtendedProperty.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import apijson.MethodAccess;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/Function.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/Function.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import apijson.MethodAccess;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/PgAttribute.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/PgAttribute.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import apijson.MethodAccess;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/PgClass.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/PgClass.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import apijson.MethodAccess;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/Request.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/Request.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import apijson.MethodAccess;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/Response.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/Response.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import apijson.MethodAccess;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/SysColumn.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/SysColumn.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import apijson.MethodAccess;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/SysTable.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/SysTable.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import apijson.MethodAccess;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/Table.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/Table.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import apijson.MethodAccess;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/Test.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/Test.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import apijson.MethodAccess;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/TestRecord.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/TestRecord.java
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.*/
package apijson.server.model;
package apijson.orm.model;
import static apijson.RequestRole.ADMIN;
import static apijson.RequestRole.LOGIN;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/model/package-info.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/model/package-info.java
View File

@ -5,4 +5,4 @@
* @author Lemon
*
*/
package apijson.server.model;
package apijson.orm.model;

2
APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/server/package-info.java → APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/package-info.java
View File

@ -19,4 +19,4 @@ limitations under the License.*/
* @author Lemon
*
*/
package apijson.server;
package apijson.orm;