Bladeren bron

修改包名

mxd 5 jaren geleden
bovenliggende
commit
7ce4152514
65 gewijzigde bestanden met toevoegingen van 171 en 175 verwijderingen
  1. 6 6
      pom.xml
  2. 1 1
      src/main/java/org/ssssssss/magicapi/cache/DefaultSqlCache.java
  3. 2 2
      src/main/java/org/ssssssss/magicapi/cache/SqlCache.java
  4. 1 1
      src/main/java/org/ssssssss/magicapi/context/CookieContext.java
  5. 1 1
      src/main/java/org/ssssssss/magicapi/context/HeaderContext.java
  6. 3 3
      src/main/java/org/ssssssss/magicapi/context/RequestContext.java
  7. 1 1
      src/main/java/org/ssssssss/magicapi/context/SessionContext.java
  8. 2 2
      src/main/java/org/ssssssss/magicapi/dialect/DB2Dialect.java
  9. 2 2
      src/main/java/org/ssssssss/magicapi/dialect/Dialect.java
  10. 1 1
      src/main/java/org/ssssssss/magicapi/dialect/DialectUtils.java
  11. 2 2
      src/main/java/org/ssssssss/magicapi/dialect/MySQLDialect.java
  12. 2 2
      src/main/java/org/ssssssss/magicapi/dialect/OracleDialect.java
  13. 2 2
      src/main/java/org/ssssssss/magicapi/dialect/PostgreSQLDialect.java
  14. 2 2
      src/main/java/org/ssssssss/magicapi/dialect/SQLServerDialect.java
  15. 1 1
      src/main/java/org/ssssssss/magicapi/enums/SqlMode.java
  16. 1 1
      src/main/java/org/ssssssss/magicapi/exception/S8Exception.java
  17. 13 13
      src/main/java/org/ssssssss/magicapi/executor/RequestExecutor.java
  18. 14 14
      src/main/java/org/ssssssss/magicapi/executor/SqlExecutor.java
  19. 11 11
      src/main/java/org/ssssssss/magicapi/executor/StatementExecutor.java
  20. 1 1
      src/main/java/org/ssssssss/magicapi/expression/ExpressionEngine.java
  21. 3 3
      src/main/java/org/ssssssss/magicapi/expression/ExpressionError.java
  22. 4 4
      src/main/java/org/ssssssss/magicapi/expression/ExpressionTemplate.java
  23. 2 2
      src/main/java/org/ssssssss/magicapi/expression/ExpressionTemplateContext.java
  24. 1 1
      src/main/java/org/ssssssss/magicapi/expression/interpreter/AbstractReflection.java
  25. 8 8
      src/main/java/org/ssssssss/magicapi/expression/interpreter/AstInterpreter.java
  26. 1 1
      src/main/java/org/ssssssss/magicapi/expression/interpreter/JavaReflection.java
  27. 1 2
      src/main/java/org/ssssssss/magicapi/expression/parsing/ArrayLikeLambdaExecutor.java
  28. 8 11
      src/main/java/org/ssssssss/magicapi/expression/parsing/Ast.java
  29. 1 1
      src/main/java/org/ssssssss/magicapi/expression/parsing/CharacterStream.java
  30. 4 4
      src/main/java/org/ssssssss/magicapi/expression/parsing/Parser.java
  31. 1 1
      src/main/java/org/ssssssss/magicapi/expression/parsing/Span.java
  32. 1 1
      src/main/java/org/ssssssss/magicapi/expression/parsing/Token.java
  33. 2 2
      src/main/java/org/ssssssss/magicapi/expression/parsing/TokenStream.java
  34. 1 1
      src/main/java/org/ssssssss/magicapi/expression/parsing/TokenType.java
  35. 4 4
      src/main/java/org/ssssssss/magicapi/expression/parsing/Tokenizer.java
  36. 2 2
      src/main/java/org/ssssssss/magicapi/interceptor/RequestInterceptor.java
  37. 1 1
      src/main/java/org/ssssssss/magicapi/model/JsonBean.java
  38. 1 1
      src/main/java/org/ssssssss/magicapi/model/Page.java
  39. 1 1
      src/main/java/org/ssssssss/magicapi/model/PageResult.java
  40. 1 1
      src/main/java/org/ssssssss/magicapi/provider/KeyProvider.java
  41. 2 2
      src/main/java/org/ssssssss/magicapi/provider/PageProvider.java
  42. 3 3
      src/main/java/org/ssssssss/magicapi/provider/impl/DefaultPageProvider.java
  43. 2 2
      src/main/java/org/ssssssss/magicapi/provider/impl/UUIDKeyProvider.java
  44. 2 2
      src/main/java/org/ssssssss/magicapi/scripts/ForeachSqlNode.java
  45. 2 2
      src/main/java/org/ssssssss/magicapi/scripts/IfSqlNode.java
  46. 2 2
      src/main/java/org/ssssssss/magicapi/scripts/SqlNode.java
  47. 2 2
      src/main/java/org/ssssssss/magicapi/scripts/TextSqlNode.java
  48. 3 3
      src/main/java/org/ssssssss/magicapi/session/Configuration.java
  49. 2 2
      src/main/java/org/ssssssss/magicapi/session/DynamicDataSource.java
  50. 3 3
      src/main/java/org/ssssssss/magicapi/session/ExecuteSqlStatement.java
  51. 1 1
      src/main/java/org/ssssssss/magicapi/session/FunctionStatement.java
  52. 3 3
      src/main/java/org/ssssssss/magicapi/session/SqlStatement.java
  53. 2 2
      src/main/java/org/ssssssss/magicapi/session/Statement.java
  54. 1 1
      src/main/java/org/ssssssss/magicapi/session/ValidateStatement.java
  55. 1 1
      src/main/java/org/ssssssss/magicapi/session/XMLStatement.java
  56. 2 2
      src/main/java/org/ssssssss/magicapi/utils/Assert.java
  57. 1 1
      src/main/java/org/ssssssss/magicapi/utils/DomUtils.java
  58. 2 2
      src/main/java/org/ssssssss/magicapi/utils/MD5Utils.java
  59. 7 7
      src/main/java/org/ssssssss/magicapi/utils/S8XMLFileParser.java
  60. 3 3
      src/main/java/org/ssssssss/magicapi/utils/XmlFileLoader.java
  61. 1 1
      src/main/java/org/ssssssss/magicapi/validator/IValidator.java
  62. 2 2
      src/main/java/org/ssssssss/magicapi/validator/MaxLenValidator.java
  63. 2 2
      src/main/java/org/ssssssss/magicapi/validator/MinLenValidator.java
  64. 1 1
      src/main/java/org/ssssssss/magicapi/validator/NotNullValidator.java
  65. 2 2
      src/main/java/org/ssssssss/magicapi/validator/RegxValidator.java

+ 6 - 6
pom.xml

@@ -10,15 +10,15 @@
         <relativePath/>
     </parent>
     <groupId>org.ssssssss</groupId>
-    <artifactId>ssssssss-core</artifactId>
+    <artifactId>magic-api</artifactId>
     <version>0.1.1</version>
     <packaging>jar</packaging>
-    <name>ssssssss-core</name>
+    <name>magic-api</name>
     <description>auto generate http api based on xml</description>
     <licenses>
         <license>
             <name>The MIT License (MIT)</name>
-            <url>https://github.com/javamxd/ssssssss/blob/master/LICENSE</url>
+            <url>https://github.com/ssssssss-team/magic-api/blob/master/LICENSE</url>
         </license>
     </licenses>
     <developers>
@@ -28,9 +28,9 @@
         </developer>
     </developers>
     <scm>
-        <url>https://gitee.com/jmxd/ssssssss</url>
-        <connection>scm:git:https://gitee.com/jmxd/ssssssss.git</connection>
-        <developerConnection>scm:git:https://gitee.com/jmxd/ssssssss.git</developerConnection>
+        <url>https://gitee.com/ssssssss-team/magic-api</url>
+        <connection>scm:git:https://gitee.com/ssssssss-team/magic-api.git</connection>
+        <developerConnection>scm:git:https://gitee.com/ssssssss-team/magic-api.git</developerConnection>
     </scm>
     <dependencies>
         <dependency>

+ 1 - 1
src/main/java/org/ssssssss/cache/DefaultSqlCache.java → src/main/java/org/ssssssss/magicapi/cache/DefaultSqlCache.java

@@ -1,4 +1,4 @@
-package org.ssssssss.cache;
+package org.ssssssss.magicapi.cache;
 
 import java.util.Iterator;
 import java.util.LinkedHashMap;

+ 2 - 2
src/main/java/org/ssssssss/cache/SqlCache.java → src/main/java/org/ssssssss/magicapi/cache/SqlCache.java

@@ -1,6 +1,6 @@
-package org.ssssssss.cache;
+package org.ssssssss.magicapi.cache;
 
-import org.ssssssss.utils.MD5Utils;
+import org.ssssssss.magicapi.utils.MD5Utils;
 
 import java.util.Arrays;
 

+ 1 - 1
src/main/java/org/ssssssss/context/CookieContext.java → src/main/java/org/ssssssss/magicapi/context/CookieContext.java

@@ -1,4 +1,4 @@
-package org.ssssssss.context;
+package org.ssssssss.magicapi.context;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;

+ 1 - 1
src/main/java/org/ssssssss/context/HeaderContext.java → src/main/java/org/ssssssss/magicapi/context/HeaderContext.java

@@ -1,4 +1,4 @@
-package org.ssssssss.context;
+package org.ssssssss.magicapi.context;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;

+ 3 - 3
src/main/java/org/ssssssss/context/RequestContext.java → src/main/java/org/ssssssss/magicapi/context/RequestContext.java

@@ -1,11 +1,11 @@
-package org.ssssssss.context;
+package org.ssssssss.magicapi.context;
 
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.servlet.HandlerMapping;
-import org.ssssssss.expression.ExpressionEngine;
-import org.ssssssss.session.Statement;
+import org.ssssssss.magicapi.expression.ExpressionEngine;
+import org.ssssssss.magicapi.session.Statement;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;

+ 1 - 1
src/main/java/org/ssssssss/context/SessionContext.java → src/main/java/org/ssssssss/magicapi/context/SessionContext.java

@@ -1,4 +1,4 @@
-package org.ssssssss.context;
+package org.ssssssss.magicapi.context;
 
 import javax.servlet.http.HttpSession;
 import java.util.HashMap;

+ 2 - 2
src/main/java/org/ssssssss/dialect/DB2Dialect.java → src/main/java/org/ssssssss/magicapi/dialect/DB2Dialect.java

@@ -1,6 +1,6 @@
-package org.ssssssss.dialect;
+package org.ssssssss.magicapi.dialect;
 
-import org.ssssssss.context.RequestContext;
+import org.ssssssss.magicapi.context.RequestContext;
 
 public class DB2Dialect implements Dialect {
     @Override

+ 2 - 2
src/main/java/org/ssssssss/dialect/Dialect.java → src/main/java/org/ssssssss/magicapi/dialect/Dialect.java

@@ -1,6 +1,6 @@
-package org.ssssssss.dialect;
+package org.ssssssss.magicapi.dialect;
 
-import org.ssssssss.context.RequestContext;
+import org.ssssssss.magicapi.context.RequestContext;
 
 public interface Dialect {
 

+ 1 - 1
src/main/java/org/ssssssss/dialect/DialectUtils.java → src/main/java/org/ssssssss/magicapi/dialect/DialectUtils.java

@@ -1,4 +1,4 @@
-package org.ssssssss.dialect;
+package org.ssssssss.magicapi.dialect;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 2 - 2
src/main/java/org/ssssssss/dialect/MySQLDialect.java → src/main/java/org/ssssssss/magicapi/dialect/MySQLDialect.java

@@ -1,6 +1,6 @@
-package org.ssssssss.dialect;
+package org.ssssssss.magicapi.dialect;
 
-import org.ssssssss.context.RequestContext;
+import org.ssssssss.magicapi.context.RequestContext;
 
 public class MySQLDialect implements Dialect {
 

+ 2 - 2
src/main/java/org/ssssssss/dialect/OracleDialect.java → src/main/java/org/ssssssss/magicapi/dialect/OracleDialect.java

@@ -1,6 +1,6 @@
-package org.ssssssss.dialect;
+package org.ssssssss.magicapi.dialect;
 
-import org.ssssssss.context.RequestContext;
+import org.ssssssss.magicapi.context.RequestContext;
 
 public class OracleDialect implements Dialect {
 

+ 2 - 2
src/main/java/org/ssssssss/dialect/PostgreSQLDialect.java → src/main/java/org/ssssssss/magicapi/dialect/PostgreSQLDialect.java

@@ -1,6 +1,6 @@
-package org.ssssssss.dialect;
+package org.ssssssss.magicapi.dialect;
 
-import org.ssssssss.context.RequestContext;
+import org.ssssssss.magicapi.context.RequestContext;
 
 public class PostgreSQLDialect implements Dialect {
     @Override

+ 2 - 2
src/main/java/org/ssssssss/dialect/SQLServerDialect.java → src/main/java/org/ssssssss/magicapi/dialect/SQLServerDialect.java

@@ -1,6 +1,6 @@
-package org.ssssssss.dialect;
+package org.ssssssss.magicapi.dialect;
 
-import org.ssssssss.context.RequestContext;
+import org.ssssssss.magicapi.context.RequestContext;
 
 public class SQLServerDialect implements Dialect {
     @Override

+ 1 - 1
src/main/java/org/ssssssss/enums/SqlMode.java → src/main/java/org/ssssssss/magicapi/enums/SqlMode.java

@@ -1,4 +1,4 @@
-package org.ssssssss.enums;
+package org.ssssssss.magicapi.enums;
 
 public enum SqlMode {
     SELECT_LIST,SELECT_ONE,UPDATE,INSERT,DELETE,INSERT_WITH_PK

+ 1 - 1
src/main/java/org/ssssssss/exception/S8Exception.java → src/main/java/org/ssssssss/magicapi/exception/S8Exception.java

@@ -1,4 +1,4 @@
-package org.ssssssss.exception;
+package org.ssssssss.magicapi.exception;
 
 public class S8Exception extends RuntimeException{
 

+ 13 - 13
src/main/java/org/ssssssss/executor/RequestExecutor.java → src/main/java/org/ssssssss/magicapi/executor/RequestExecutor.java

@@ -1,4 +1,4 @@
-package org.ssssssss.executor;
+package org.ssssssss.magicapi.executor;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -6,18 +6,18 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.ssssssss.context.RequestContext;
-import org.ssssssss.exception.S8Exception;
-import org.ssssssss.expression.ExpressionEngine;
-import org.ssssssss.interceptor.RequestInterceptor;
-import org.ssssssss.model.JsonBean;
-import org.ssssssss.session.Configuration;
-import org.ssssssss.session.Statement;
-import org.ssssssss.session.ValidateStatement;
-import org.ssssssss.session.XMLStatement;
-import org.ssssssss.utils.Assert;
-import org.ssssssss.utils.DomUtils;
-import org.ssssssss.validator.IValidator;
+import org.ssssssss.magicapi.context.RequestContext;
+import org.ssssssss.magicapi.exception.S8Exception;
+import org.ssssssss.magicapi.expression.ExpressionEngine;
+import org.ssssssss.magicapi.interceptor.RequestInterceptor;
+import org.ssssssss.magicapi.model.JsonBean;
+import org.ssssssss.magicapi.session.Configuration;
+import org.ssssssss.magicapi.session.Statement;
+import org.ssssssss.magicapi.session.ValidateStatement;
+import org.ssssssss.magicapi.session.XMLStatement;
+import org.ssssssss.magicapi.utils.Assert;
+import org.ssssssss.magicapi.utils.DomUtils;
+import org.ssssssss.magicapi.validator.IValidator;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 

+ 14 - 14
src/main/java/org/ssssssss/executor/SqlExecutor.java → src/main/java/org/ssssssss/magicapi/executor/SqlExecutor.java

@@ -1,4 +1,4 @@
-package org.ssssssss.executor;
+package org.ssssssss.magicapi.executor;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -10,19 +10,19 @@ import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.JdbcUtils;
 import org.springframework.jdbc.support.KeyHolder;
-import org.ssssssss.cache.SqlCache;
-import org.ssssssss.context.RequestContext;
-import org.ssssssss.dialect.Dialect;
-import org.ssssssss.dialect.DialectUtils;
-import org.ssssssss.enums.SqlMode;
-import org.ssssssss.exception.S8Exception;
-import org.ssssssss.provider.KeyProvider;
-import org.ssssssss.scripts.SqlNode;
-import org.ssssssss.session.DynamicDataSource;
-import org.ssssssss.session.ExecuteSqlStatement;
-import org.ssssssss.session.SqlStatement;
-import org.ssssssss.utils.Assert;
-import org.ssssssss.utils.DomUtils;
+import org.ssssssss.magicapi.cache.SqlCache;
+import org.ssssssss.magicapi.context.RequestContext;
+import org.ssssssss.magicapi.dialect.Dialect;
+import org.ssssssss.magicapi.dialect.DialectUtils;
+import org.ssssssss.magicapi.enums.SqlMode;
+import org.ssssssss.magicapi.exception.S8Exception;
+import org.ssssssss.magicapi.provider.KeyProvider;
+import org.ssssssss.magicapi.scripts.SqlNode;
+import org.ssssssss.magicapi.session.DynamicDataSource;
+import org.ssssssss.magicapi.session.ExecuteSqlStatement;
+import org.ssssssss.magicapi.session.SqlStatement;
+import org.ssssssss.magicapi.utils.Assert;
+import org.ssssssss.magicapi.utils.DomUtils;
 import org.w3c.dom.Node;
 
 import java.sql.*;

+ 11 - 11
src/main/java/org/ssssssss/executor/StatementExecutor.java → src/main/java/org/ssssssss/magicapi/executor/StatementExecutor.java

@@ -1,20 +1,20 @@
-package org.ssssssss.executor;
+package org.ssssssss.magicapi.executor;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
-import org.ssssssss.context.RequestContext;
-import org.ssssssss.dialect.Dialect;
-import org.ssssssss.enums.SqlMode;
-import org.ssssssss.expression.interpreter.AbstractReflection;
-import org.ssssssss.model.Page;
-import org.ssssssss.model.PageResult;
-import org.ssssssss.provider.PageProvider;
-import org.ssssssss.session.*;
-import org.ssssssss.utils.Assert;
-import org.ssssssss.utils.DomUtils;
+import org.ssssssss.magicapi.context.RequestContext;
+import org.ssssssss.magicapi.dialect.Dialect;
+import org.ssssssss.magicapi.enums.SqlMode;
+import org.ssssssss.magicapi.expression.interpreter.AbstractReflection;
+import org.ssssssss.magicapi.model.Page;
+import org.ssssssss.magicapi.model.PageResult;
+import org.ssssssss.magicapi.provider.PageProvider;
+import org.ssssssss.magicapi.session.*;
+import org.ssssssss.magicapi.utils.Assert;
+import org.ssssssss.magicapi.utils.DomUtils;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 

+ 1 - 1
src/main/java/org/ssssssss/expression/ExpressionEngine.java → src/main/java/org/ssssssss/magicapi/expression/ExpressionEngine.java

@@ -1,4 +1,4 @@
-package org.ssssssss.expression;
+package org.ssssssss.magicapi.expression;
 
 import java.util.ArrayList;
 import java.util.HashMap;

+ 3 - 3
src/main/java/org/ssssssss/expression/ExpressionError.java → src/main/java/org/ssssssss/magicapi/expression/ExpressionError.java

@@ -1,8 +1,8 @@
 
-package org.ssssssss.expression;
+package org.ssssssss.magicapi.expression;
 
-import org.ssssssss.expression.parsing.Span;
-import org.ssssssss.expression.parsing.TokenStream;
+import org.ssssssss.magicapi.expression.parsing.Span;
+import org.ssssssss.magicapi.expression.parsing.TokenStream;
 
 /** All errors reported by the library go through the static functions of this class. */
 public class ExpressionError {

+ 4 - 4
src/main/java/org/ssssssss/expression/ExpressionTemplate.java → src/main/java/org/ssssssss/magicapi/expression/ExpressionTemplate.java

@@ -1,9 +1,9 @@
 
-package org.ssssssss.expression;
+package org.ssssssss.magicapi.expression;
 
-import org.ssssssss.expression.interpreter.AstInterpreter;
-import org.ssssssss.expression.parsing.Ast;
-import org.ssssssss.expression.parsing.Parser;
+import org.ssssssss.magicapi.expression.interpreter.AstInterpreter;
+import org.ssssssss.magicapi.expression.parsing.Ast;
+import org.ssssssss.magicapi.expression.parsing.Parser;
 
 import java.io.OutputStream;
 import java.util.List;

+ 2 - 2
src/main/java/org/ssssssss/expression/ExpressionTemplateContext.java → src/main/java/org/ssssssss/magicapi/expression/ExpressionTemplateContext.java

@@ -1,7 +1,7 @@
 
-package org.ssssssss.expression;
+package org.ssssssss.magicapi.expression;
 
-import org.ssssssss.expression.interpreter.AstInterpreter;
+import org.ssssssss.magicapi.expression.interpreter.AstInterpreter;
 
 import java.util.*;
 

+ 1 - 1
src/main/java/org/ssssssss/expression/interpreter/AbstractReflection.java → src/main/java/org/ssssssss/magicapi/expression/interpreter/AbstractReflection.java

@@ -1,5 +1,5 @@
 
-package org.ssssssss.expression.interpreter;
+package org.ssssssss.magicapi.expression.interpreter;
 
 /** Used by {@link AstInterpreter} to access fields and methods of objects. This is a singleton class used by all
  * {@link AstInterpreter} instances. Replace the default implementation via {@link #setInstance(AbstractReflection)}. The implementation

+ 8 - 8
src/main/java/org/ssssssss/expression/interpreter/AstInterpreter.java → src/main/java/org/ssssssss/magicapi/expression/interpreter/AstInterpreter.java

@@ -1,13 +1,13 @@
 
-package org.ssssssss.expression.interpreter;
+package org.ssssssss.magicapi.expression.interpreter;
 
-import org.ssssssss.expression.ExpressionError;
-import org.ssssssss.expression.ExpressionError.TemplateException;
-import org.ssssssss.expression.ExpressionTemplate;
-import org.ssssssss.expression.ExpressionTemplateContext;
-import org.ssssssss.expression.parsing.Ast;
-import org.ssssssss.expression.parsing.Ast.Node;
-import org.ssssssss.expression.parsing.Ast.Text;
+import org.ssssssss.magicapi.expression.ExpressionError;
+import org.ssssssss.magicapi.expression.ExpressionError.TemplateException;
+import org.ssssssss.magicapi.expression.ExpressionTemplate;
+import org.ssssssss.magicapi.expression.ExpressionTemplateContext;
+import org.ssssssss.magicapi.expression.parsing.Ast;
+import org.ssssssss.magicapi.expression.parsing.Ast.Node;
+import org.ssssssss.magicapi.expression.parsing.Ast.Text;
 
 import java.io.IOException;
 import java.util.List;

+ 1 - 1
src/main/java/org/ssssssss/expression/interpreter/JavaReflection.java → src/main/java/org/ssssssss/magicapi/expression/interpreter/JavaReflection.java

@@ -1,5 +1,5 @@
 
-package org.ssssssss.expression.interpreter;
+package org.ssssssss.magicapi.expression.interpreter;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

+ 1 - 2
src/main/java/org/ssssssss/expression/parsing/ArrayLikeLambdaExecutor.java → src/main/java/org/ssssssss/magicapi/expression/parsing/ArrayLikeLambdaExecutor.java

@@ -1,10 +1,9 @@
-package org.ssssssss.expression.parsing;
+package org.ssssssss.magicapi.expression.parsing;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 import java.util.*;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.stream.IntStream;
 
 public class ArrayLikeLambdaExecutor {

+ 8 - 11
src/main/java/org/ssssssss/expression/parsing/Ast.java → src/main/java/org/ssssssss/magicapi/expression/parsing/Ast.java

@@ -1,15 +1,15 @@
 
-package org.ssssssss.expression.parsing;
+package org.ssssssss.magicapi.expression.parsing;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.ssssssss.expression.ExpressionError;
-import org.ssssssss.expression.ExpressionError.TemplateException;
-import org.ssssssss.expression.ExpressionTemplate;
-import org.ssssssss.expression.ExpressionTemplateContext;
-import org.ssssssss.expression.interpreter.AbstractReflection;
-import org.ssssssss.expression.interpreter.AstInterpreter;
-import org.ssssssss.expression.interpreter.JavaReflection;
+import org.ssssssss.magicapi.expression.ExpressionError;
+import org.ssssssss.magicapi.expression.ExpressionError.TemplateException;
+import org.ssssssss.magicapi.expression.ExpressionTemplate;
+import org.ssssssss.magicapi.expression.ExpressionTemplateContext;
+import org.ssssssss.magicapi.expression.interpreter.AbstractReflection;
+import org.ssssssss.magicapi.expression.interpreter.AstInterpreter;
+import org.ssssssss.magicapi.expression.interpreter.JavaReflection;
 
 import javax.xml.transform.Source;
 import java.io.IOException;
@@ -17,9 +17,6 @@ import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 
 /** Templates are parsed into an abstract syntax tree (AST) nodes by a Parser. This class contains all AST node types. */

+ 1 - 1
src/main/java/org/ssssssss/expression/parsing/CharacterStream.java → src/main/java/org/ssssssss/magicapi/expression/parsing/CharacterStream.java

@@ -1,5 +1,5 @@
 
-package org.ssssssss.expression.parsing;
+package org.ssssssss.magicapi.expression.parsing;
 
 import javax.xml.transform.Source;
 

+ 4 - 4
src/main/java/org/ssssssss/expression/parsing/Parser.java → src/main/java/org/ssssssss/magicapi/expression/parsing/Parser.java

@@ -1,9 +1,9 @@
-package org.ssssssss.expression.parsing;
+package org.ssssssss.magicapi.expression.parsing;
 
 
-import org.ssssssss.expression.ExpressionError;
-import org.ssssssss.expression.ExpressionTemplate;
-import org.ssssssss.expression.parsing.Ast.*;
+import org.ssssssss.magicapi.expression.ExpressionError;
+import org.ssssssss.magicapi.expression.ExpressionTemplate;
+import org.ssssssss.magicapi.expression.parsing.Ast.*;
 
 import javax.xml.transform.Source;
 import java.util.ArrayList;

+ 1 - 1
src/main/java/org/ssssssss/expression/parsing/Span.java → src/main/java/org/ssssssss/magicapi/expression/parsing/Span.java

@@ -1,5 +1,5 @@
 
-package org.ssssssss.expression.parsing;
+package org.ssssssss.magicapi.expression.parsing;
 
 /** A span within a source string denoted by start and end index, with the latter being exclusive. */
 public class Span {

+ 1 - 1
src/main/java/org/ssssssss/expression/parsing/Token.java → src/main/java/org/ssssssss/magicapi/expression/parsing/Token.java

@@ -1,5 +1,5 @@
 
-package org.ssssssss.expression.parsing;
+package org.ssssssss.magicapi.expression.parsing;
 
 /** A token produced by the {@link Tokenizer}. */
 public class Token {

+ 2 - 2
src/main/java/org/ssssssss/expression/parsing/TokenStream.java → src/main/java/org/ssssssss/magicapi/expression/parsing/TokenStream.java

@@ -1,7 +1,7 @@
 
-package org.ssssssss.expression.parsing;
+package org.ssssssss.magicapi.expression.parsing;
 
-import org.ssssssss.expression.ExpressionError;
+import org.ssssssss.magicapi.expression.ExpressionError;
 
 import javax.xml.transform.Source;
 import java.util.List;

+ 1 - 1
src/main/java/org/ssssssss/expression/parsing/TokenType.java → src/main/java/org/ssssssss/magicapi/expression/parsing/TokenType.java

@@ -1,5 +1,5 @@
 
-package org.ssssssss.expression.parsing;
+package org.ssssssss.magicapi.expression.parsing;
 
 import java.util.Arrays;
 import java.util.Comparator;

+ 4 - 4
src/main/java/org/ssssssss/expression/parsing/Tokenizer.java → src/main/java/org/ssssssss/magicapi/expression/parsing/Tokenizer.java

@@ -1,9 +1,9 @@
 
-package org.ssssssss.expression.parsing;
+package org.ssssssss.magicapi.expression.parsing;
 
-import org.ssssssss.expression.ExpressionError;
-import org.ssssssss.expression.ExpressionError.StringLiteralException;
-import org.ssssssss.expression.ExpressionError.TemplateException;
+import org.ssssssss.magicapi.expression.ExpressionError;
+import org.ssssssss.magicapi.expression.ExpressionError.StringLiteralException;
+import org.ssssssss.magicapi.expression.ExpressionError.TemplateException;
 
 import java.util.ArrayList;
 import java.util.List;

+ 2 - 2
src/main/java/org/ssssssss/interceptor/RequestInterceptor.java → src/main/java/org/ssssssss/magicapi/interceptor/RequestInterceptor.java

@@ -1,6 +1,6 @@
-package org.ssssssss.interceptor;
+package org.ssssssss.magicapi.interceptor;
 
-import org.ssssssss.context.RequestContext;
+import org.ssssssss.magicapi.context.RequestContext;
 
 /**
  * 请求拦截器

+ 1 - 1
src/main/java/org/ssssssss/model/JsonBean.java → src/main/java/org/ssssssss/magicapi/model/JsonBean.java

@@ -1,4 +1,4 @@
-package org.ssssssss.model;
+package org.ssssssss.magicapi.model;
 
 /**
  * 统一返回值对象

+ 1 - 1
src/main/java/org/ssssssss/model/Page.java → src/main/java/org/ssssssss/magicapi/model/Page.java

@@ -1,4 +1,4 @@
-package org.ssssssss.model;
+package org.ssssssss.magicapi.model;
 
 /**
  * 分页对象

+ 1 - 1
src/main/java/org/ssssssss/model/PageResult.java → src/main/java/org/ssssssss/magicapi/model/PageResult.java

@@ -1,4 +1,4 @@
-package org.ssssssss.model;
+package org.ssssssss.magicapi.model;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/org/ssssssss/provider/KeyProvider.java → src/main/java/org/ssssssss/magicapi/provider/KeyProvider.java

@@ -1,4 +1,4 @@
-package org.ssssssss.provider;
+package org.ssssssss.magicapi.provider;
 
 public interface KeyProvider {
 

+ 2 - 2
src/main/java/org/ssssssss/provider/PageProvider.java → src/main/java/org/ssssssss/magicapi/provider/PageProvider.java

@@ -1,6 +1,6 @@
-package org.ssssssss.provider;
+package org.ssssssss.magicapi.provider;
 
-import org.ssssssss.model.Page;
+import org.ssssssss.magicapi.model.Page;
 
 import javax.servlet.http.HttpServletRequest;
 

+ 3 - 3
src/main/java/org/ssssssss/provider/impl/DefaultPageProvider.java → src/main/java/org/ssssssss/magicapi/provider/impl/DefaultPageProvider.java

@@ -1,8 +1,8 @@
-package org.ssssssss.provider.impl;
+package org.ssssssss.magicapi.provider.impl;
 
 import org.apache.commons.lang3.math.NumberUtils;
-import org.ssssssss.model.Page;
-import org.ssssssss.provider.PageProvider;
+import org.ssssssss.magicapi.model.Page;
+import org.ssssssss.magicapi.provider.PageProvider;
 
 import javax.servlet.http.HttpServletRequest;
 

+ 2 - 2
src/main/java/org/ssssssss/provider/impl/UUIDKeyProvider.java → src/main/java/org/ssssssss/magicapi/provider/impl/UUIDKeyProvider.java

@@ -1,6 +1,6 @@
-package org.ssssssss.provider.impl;
+package org.ssssssss.magicapi.provider.impl;
 
-import org.ssssssss.provider.KeyProvider;
+import org.ssssssss.magicapi.provider.KeyProvider;
 
 import java.util.UUID;
 

+ 2 - 2
src/main/java/org/ssssssss/scripts/ForeachSqlNode.java → src/main/java/org/ssssssss/magicapi/scripts/ForeachSqlNode.java

@@ -1,7 +1,7 @@
-package org.ssssssss.scripts;
+package org.ssssssss.magicapi.scripts;
 
 import org.apache.commons.lang3.StringUtils;
-import org.ssssssss.context.RequestContext;
+import org.ssssssss.magicapi.context.RequestContext;
 
 import java.lang.reflect.Array;
 import java.util.Collection;

+ 2 - 2
src/main/java/org/ssssssss/scripts/IfSqlNode.java → src/main/java/org/ssssssss/magicapi/scripts/IfSqlNode.java

@@ -1,6 +1,6 @@
-package org.ssssssss.scripts;
+package org.ssssssss.magicapi.scripts;
 
-import org.ssssssss.context.RequestContext;
+import org.ssssssss.magicapi.context.RequestContext;
 
 import java.util.Objects;
 

+ 2 - 2
src/main/java/org/ssssssss/scripts/SqlNode.java → src/main/java/org/ssssssss/magicapi/scripts/SqlNode.java

@@ -1,7 +1,7 @@
-package org.ssssssss.scripts;
+package org.ssssssss.magicapi.scripts;
 
 import org.apache.commons.lang3.StringUtils;
-import org.ssssssss.context.RequestContext;
+import org.ssssssss.magicapi.context.RequestContext;
 
 import java.util.ArrayList;
 import java.util.List;

+ 2 - 2
src/main/java/org/ssssssss/scripts/TextSqlNode.java → src/main/java/org/ssssssss/magicapi/scripts/TextSqlNode.java

@@ -1,7 +1,7 @@
-package org.ssssssss.scripts;
+package org.ssssssss.magicapi.scripts;
 
 import org.apache.commons.lang3.StringUtils;
-import org.ssssssss.context.RequestContext;
+import org.ssssssss.magicapi.context.RequestContext;
 
 import java.util.List;
 import java.util.Objects;

+ 3 - 3
src/main/java/org/ssssssss/session/Configuration.java → src/main/java/org/ssssssss/magicapi/session/Configuration.java

@@ -1,4 +1,4 @@
-package org.ssssssss.session;
+package org.ssssssss.magicapi.session;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -7,8 +7,8 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
-import org.ssssssss.utils.Assert;
-import org.ssssssss.utils.XmlFileLoader;
+import org.ssssssss.magicapi.utils.Assert;
+import org.ssssssss.magicapi.utils.XmlFileLoader;
 
 import java.lang.reflect.Method;
 import java.util.Map;

+ 2 - 2
src/main/java/org/ssssssss/session/DynamicDataSource.java → src/main/java/org/ssssssss/magicapi/session/DynamicDataSource.java

@@ -1,9 +1,9 @@
-package org.ssssssss.session;
+package org.ssssssss.magicapi.session;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.ssssssss.utils.Assert;
+import org.ssssssss.magicapi.utils.Assert;
 
 import javax.sql.DataSource;
 import java.util.HashMap;

+ 3 - 3
src/main/java/org/ssssssss/session/ExecuteSqlStatement.java → src/main/java/org/ssssssss/magicapi/session/ExecuteSqlStatement.java

@@ -1,7 +1,7 @@
-package org.ssssssss.session;
+package org.ssssssss.magicapi.session;
 
-import org.ssssssss.enums.SqlMode;
-import org.ssssssss.scripts.SqlNode;
+import org.ssssssss.magicapi.enums.SqlMode;
+import org.ssssssss.magicapi.scripts.SqlNode;
 import org.w3c.dom.Node;
 
 public class ExecuteSqlStatement {

+ 1 - 1
src/main/java/org/ssssssss/session/FunctionStatement.java → src/main/java/org/ssssssss/magicapi/session/FunctionStatement.java

@@ -1,4 +1,4 @@
-package org.ssssssss.session;
+package org.ssssssss.magicapi.session;
 
 import org.w3c.dom.NodeList;
 

+ 3 - 3
src/main/java/org/ssssssss/session/SqlStatement.java → src/main/java/org/ssssssss/magicapi/session/SqlStatement.java

@@ -1,7 +1,7 @@
-package org.ssssssss.session;
+package org.ssssssss.magicapi.session;
 
-import org.ssssssss.enums.SqlMode;
-import org.ssssssss.scripts.SqlNode;
+import org.ssssssss.magicapi.enums.SqlMode;
+import org.ssssssss.magicapi.scripts.SqlNode;
 import org.w3c.dom.Node;
 
 import java.util.List;

+ 2 - 2
src/main/java/org/ssssssss/session/Statement.java → src/main/java/org/ssssssss/magicapi/session/Statement.java

@@ -1,6 +1,6 @@
-package org.ssssssss.session;
+package org.ssssssss.magicapi.session;
 
-import org.ssssssss.utils.DomUtils;
+import org.ssssssss.magicapi.utils.DomUtils;
 import org.w3c.dom.Node;
 
 import java.util.ArrayList;

+ 1 - 1
src/main/java/org/ssssssss/session/ValidateStatement.java → src/main/java/org/ssssssss/magicapi/session/ValidateStatement.java

@@ -1,4 +1,4 @@
-package org.ssssssss.session;
+package org.ssssssss.magicapi.session;
 
 import org.w3c.dom.NodeList;
 

+ 1 - 1
src/main/java/org/ssssssss/session/XMLStatement.java → src/main/java/org/ssssssss/magicapi/session/XMLStatement.java

@@ -1,4 +1,4 @@
-package org.ssssssss.session;
+package org.ssssssss.magicapi.session;
 
 import java.util.ArrayList;
 import java.util.HashMap;

+ 2 - 2
src/main/java/org/ssssssss/utils/Assert.java → src/main/java/org/ssssssss/magicapi/utils/Assert.java

@@ -1,7 +1,7 @@
-package org.ssssssss.utils;
+package org.ssssssss.magicapi.utils;
 
 import org.apache.commons.lang3.StringUtils;
-import org.ssssssss.exception.S8Exception;
+import org.ssssssss.magicapi.exception.S8Exception;
 
 public class Assert {
 

+ 1 - 1
src/main/java/org/ssssssss/utils/DomUtils.java → src/main/java/org/ssssssss/magicapi/utils/DomUtils.java

@@ -1,4 +1,4 @@
-package org.ssssssss.utils;
+package org.ssssssss.magicapi.utils;
 
 import org.w3c.dom.Node;
 

+ 2 - 2
src/main/java/org/ssssssss/utils/MD5Utils.java → src/main/java/org/ssssssss/magicapi/utils/MD5Utils.java

@@ -1,6 +1,6 @@
-package org.ssssssss.utils;
+package org.ssssssss.magicapi.utils;
 
-import org.ssssssss.exception.S8Exception;
+import org.ssssssss.magicapi.exception.S8Exception;
 
 import java.security.MessageDigest;
 

+ 7 - 7
src/main/java/org/ssssssss/utils/S8XMLFileParser.java → src/main/java/org/ssssssss/magicapi/utils/S8XMLFileParser.java

@@ -1,16 +1,16 @@
-package org.ssssssss.utils;
+package org.ssssssss.magicapi.utils;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
-import org.ssssssss.enums.SqlMode;
-import org.ssssssss.scripts.ForeachSqlNode;
-import org.ssssssss.scripts.IfSqlNode;
-import org.ssssssss.scripts.SqlNode;
-import org.ssssssss.scripts.TextSqlNode;
-import org.ssssssss.session.*;
+import org.ssssssss.magicapi.enums.SqlMode;
+import org.ssssssss.magicapi.scripts.ForeachSqlNode;
+import org.ssssssss.magicapi.scripts.IfSqlNode;
+import org.ssssssss.magicapi.scripts.SqlNode;
+import org.ssssssss.magicapi.scripts.TextSqlNode;
+import org.ssssssss.magicapi.session.*;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;

+ 3 - 3
src/main/java/org/ssssssss/utils/XmlFileLoader.java → src/main/java/org/ssssssss/magicapi/utils/XmlFileLoader.java

@@ -1,12 +1,12 @@
-package org.ssssssss.utils;
+package org.ssssssss.magicapi.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
-import org.ssssssss.session.Configuration;
-import org.ssssssss.session.XMLStatement;
+import org.ssssssss.magicapi.session.Configuration;
+import org.ssssssss.magicapi.session.XMLStatement;
 
 import java.util.HashMap;
 import java.util.Map;

+ 1 - 1
src/main/java/org/ssssssss/validator/IValidator.java → src/main/java/org/ssssssss/magicapi/validator/IValidator.java

@@ -1,4 +1,4 @@
-package org.ssssssss.validator;
+package org.ssssssss.magicapi.validator;
 
 import org.w3c.dom.Node;
 

+ 2 - 2
src/main/java/org/ssssssss/validator/MaxLenValidator.java → src/main/java/org/ssssssss/magicapi/validator/MaxLenValidator.java

@@ -1,7 +1,7 @@
-package org.ssssssss.validator;
+package org.ssssssss.magicapi.validator;
 
 import org.apache.commons.lang3.math.NumberUtils;
-import org.ssssssss.utils.DomUtils;
+import org.ssssssss.magicapi.utils.DomUtils;
 import org.w3c.dom.Node;
 
 public class MaxLenValidator implements IValidator {

+ 2 - 2
src/main/java/org/ssssssss/validator/MinLenValidator.java → src/main/java/org/ssssssss/magicapi/validator/MinLenValidator.java

@@ -1,7 +1,7 @@
-package org.ssssssss.validator;
+package org.ssssssss.magicapi.validator;
 
 import org.apache.commons.lang3.math.NumberUtils;
-import org.ssssssss.utils.DomUtils;
+import org.ssssssss.magicapi.utils.DomUtils;
 import org.w3c.dom.Node;
 
 public class MinLenValidator implements IValidator {

+ 1 - 1
src/main/java/org/ssssssss/validator/NotNullValidator.java → src/main/java/org/ssssssss/magicapi/validator/NotNullValidator.java

@@ -1,4 +1,4 @@
-package org.ssssssss.validator;
+package org.ssssssss.magicapi.validator;
 
 import org.w3c.dom.Node;
 

+ 2 - 2
src/main/java/org/ssssssss/validator/RegxValidator.java → src/main/java/org/ssssssss/magicapi/validator/RegxValidator.java

@@ -1,7 +1,7 @@
-package org.ssssssss.validator;
+package org.ssssssss.magicapi.validator;
 
 import org.apache.commons.lang3.StringUtils;
-import org.ssssssss.utils.DomUtils;
+import org.ssssssss.magicapi.utils.DomUtils;
 import org.w3c.dom.Node;
 
 import java.util.regex.Pattern;