调整包名以及日志

src/main/java/org/ssssssss/magicapi/dialect/DialectUtils.java

@@ -32,7 +32,7 @@ public class DialectUtils {
             } else if (fromUrl.startsWith("jdbc:db2:")) {
                 dialect = new DB2Dialect();
             } else {
-                logger.warn(String.format("ssssssss在%s中无法获取dialect", fromUrl));
+                logger.warn(String.format("magic-api在%s中无法获取dialect", fromUrl));
             }
             dialectMap.put(fromUrl, dialect);
         }

src/main/java/org/ssssssss/magicapi/exception/MagicAPIException.java

@@ -0,0 +1,12 @@
+package org.ssssssss.magicapi.exception;
+
+public class MagicAPIException extends RuntimeException{
+
+    public MagicAPIException(String message) {
+        super(message);
+    }
+
+    public MagicAPIException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/main/java/org/ssssssss/magicapi/exception/S8Exception.java

@@ -1,12 +0,0 @@
-package org.ssssssss.magicapi.exception;
-
-public class S8Exception extends RuntimeException{
-
-    public S8Exception(String message) {
-        super(message);
-    }
-
-    public S8Exception(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

src/main/java/org/ssssssss/magicapi/executor/RequestExecutor.java

@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.ssssssss.magicapi.context.RequestContext;
-import org.ssssssss.magicapi.exception.S8Exception;
+import org.ssssssss.magicapi.exception.MagicAPIException;
 import org.ssssssss.magicapi.expression.ExpressionEngine;
 import org.ssssssss.magicapi.interceptor.RequestInterceptor;
 import org.ssssssss.magicapi.model.JsonBean;
@@ -110,7 +110,7 @@ public class RequestExecutor {
             return value;
         } catch (Exception e) {
             if (configuration.isThrowException()) {
-                throw new S8Exception("ssssssss执行出错", e);
+                throw new MagicAPIException("magic-api执行出错", e);
             }
             logger.error("系统出现错误", e);
             return new JsonBean<>(-1, e.getMessage());

src/main/java/org/ssssssss/magicapi/executor/SqlExecutor.java

@@ -15,7 +15,7 @@ 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.exception.MagicAPIException;
 import org.ssssssss.magicapi.provider.KeyProvider;
 import org.ssssssss.magicapi.scripts.SqlNode;
 import org.ssssssss.magicapi.session.DynamicDataSource;
@@ -148,7 +148,7 @@ public class SqlExecutor {
             }
             value = collection != null && collection.size() >= 1 ? collection.iterator().next() : null;
         } else {
-            throw new S8Exception("暂时不支持[" + mode + "]模式");
+            throw new MagicAPIException("暂时不支持[" + mode + "]模式");
         }
         // 判断是否使用了缓存
         if (sqlCacheKey != null && value != null) {

src/main/java/org/ssssssss/magicapi/session/Configuration.java

@@ -17,7 +17,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 /**
- * S8配置类
+ * MagicAPi配置类
  */
 public class Configuration implements InitializingBean {
 

src/main/java/org/ssssssss/magicapi/utils/Assert.java

@@ -1,7 +1,7 @@
 package org.ssssssss.magicapi.utils;
 
 import org.apache.commons.lang3.StringUtils;
-import org.ssssssss.magicapi.exception.S8Exception;
+import org.ssssssss.magicapi.exception.MagicAPIException;
 
 public class Assert {
 
@@ -10,7 +10,7 @@ public class Assert {
      */
     public static void isNotNull(Object value, String message) {
         if (value == null) {
-            throw new S8Exception(message);
+            throw new MagicAPIException(message);
         }
     }
 
@@ -19,7 +19,7 @@ public class Assert {
      */
     public static void isTrue(boolean value, String message) {
         if (!value) {
-            throw new S8Exception(message);
+            throw new MagicAPIException(message);
         }
     }
 
@@ -29,7 +29,7 @@ public class Assert {
      */
     public static void isNotBlank(String value, String message) {
         if (StringUtils.isBlank(value)) {
-            throw new S8Exception(message);
+            throw new MagicAPIException(message);
         }
     }
 

src/main/java/org/ssssssss/magicapi/utils/MD5Utils.java

@@ -1,6 +1,6 @@
 package org.ssssssss.magicapi.utils;
 
-import org.ssssssss.magicapi.exception.S8Exception;
+import org.ssssssss.magicapi.exception.MagicAPIException;
 
 import java.security.MessageDigest;
 
@@ -29,7 +29,7 @@ public class MD5Utils {
             }
             return new String(chars);
         } catch (Exception e) {
-            throw new S8Exception("md5 encrypt error",e);
+            throw new MagicAPIException("md5 encrypt error",e);
         }
     }
 }

src/main/java/org/ssssssss/magicapi/utils/S8XMLFileParser.java → src/main/java/org/ssssssss/magicapi/utils/MagicAPIXMLFileParser.java

@@ -32,9 +32,9 @@ import java.util.Map;
 /**
  * xml文件解析
  */
-public class S8XMLFileParser {
+public class MagicAPIXMLFileParser {
 
-    private static Logger logger = LoggerFactory.getLogger(S8XMLFileParser.class);
+    private static Logger logger = LoggerFactory.getLogger(MagicAPIXMLFileParser.class);
 
     private static final List<String> TAG_NAMES = Arrays.asList("select-list", "select-one", "insert", "update", "delete");
 
@@ -58,7 +58,7 @@ public class S8XMLFileParser {
             // 解析functionStatement
             statement.addStatement(parseFunctionStatement(statement, document.getElementsByTagName("function")));
         } catch (SAXException | IOException | ParserConfigurationException e) {
-            logger.error("解析S8XML文件[{}]出错", resource.getDescription(), e);
+            logger.error("解析magic-api XML文件[{}]出错", resource.getDescription(), e);
         }
         return statement;
     }

src/main/java/org/ssssssss/magicapi/utils/XmlFileLoader.java

@@ -52,7 +52,7 @@ public class XmlFileLoader implements Runnable {
                     fileMap.put(resource.getDescription(), modifiedTime);
                     // 判断是否更新
                     if (lastModified == null || lastModified < modifiedTime) {
-                        XMLStatement xmlStatement = S8XMLFileParser.parse(resource);
+                        XMLStatement xmlStatement = MagicAPIXMLFileParser.parse(resource);
                         if (xmlStatement != null) {
                             // 注册HTTP接口
                             xmlStatement.getStatements().forEach(configuration::addStatement);