更改包名

hsweb-web-controller/src/main/java/org/hsweb/web/controller/GenericController.java

@@ -1,12 +1,12 @@
 package org.hsweb.web.controller;
 
 import com.alibaba.fastjson.JSON;
-import org.hsweb.web.authorize.annotation.Authorize;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.bean.po.GenericPo;
-import org.hsweb.web.exception.BusinessException;
-import org.hsweb.web.logger.annotation.AccessLogger;
-import org.hsweb.web.message.ResponseMessage;
+import org.hsweb.web.core.exception.BusinessException;
+import org.hsweb.web.core.logger.annotation.AccessLogger;
+import org.hsweb.web.core.message.ResponseMessage;
 import org.hsweb.web.service.GenericService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

hsweb-web-controller/src/main/java/org/hsweb/web/controller/MessageConverterConfiguration.java

@@ -1,6 +1,7 @@
 package org.hsweb.web.controller;
 
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import org.hsweb.web.core.message.FastJsonHttpMessageConverter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.HttpMessageConverter;

hsweb-web-core/src/main/java/org/hsweb/web/core/CoreAutoConfiguration.java

@@ -0,0 +1,12 @@
+package org.hsweb.web.core;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Created by zhouhao on 16-5-6.
+ */
+@Configuration
+@ComponentScan("org.hsweb.web.core")
+public class CoreAutoConfiguration {
+}

hsweb-web-core/src/main/java/org/hsweb/web/Install.java

@@ -1,4 +1,4 @@
-package org.hsweb.web;
+package org.hsweb.web.core;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -65,13 +65,19 @@ public class Install {
                 firstInstall = true;
             }
             if (firstInstall) {
+                String username = properties.getUsername();
                 Reader reader = FileUtils.getResourceAsReader("system/install/sql/" + dbType + "/install.sql");
                 BufferedReader bufferedReader = new BufferedReader(reader);
                 List<String> sqlList = new ArrayList<>();
                 SqlAppender tmp = new SqlAppender();
                 bufferedReader.lines().forEach((line) -> {
                     if (line.startsWith("--")) return;
-                    tmp.add(line);
+                    line = line.replace("${jdbc.username}", username);
+                    //去除sql中的;
+                    if (line.endsWith(";"))
+                        tmp.add(line.substring(0, line.length() - 1));
+                    else
+                        tmp.add(line);
                     tmp.add("\n");
                     if (line.endsWith(";")) {
                         sqlList.add(tmp.toString());
@@ -82,7 +88,7 @@ public class Install {
                     try {
                         sqlExecutor.exec(new CommonSql(sql));
                     } catch (Exception e) {
-                        logger.warn("install sql fail", e.getMessage());
+                        logger.warn("install sql fail", e);
                     }
                 });
             }

hsweb-web-core/src/main/java/org/hsweb/web/authorize/AuthorizeValidator.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.authorize;
+package org.hsweb.web.core.authorize;
 
 import org.hsweb.web.bean.po.user.User;
 

hsweb-web-core/src/main/java/org/hsweb/web/authorize/ExpressionScopeBean.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.authorize;
+package org.hsweb.web.core.authorize;
 
 /**
  * 表达式作用域bean。实现该接口。可在权限注解的表达式中调用

hsweb-web-core/src/main/java/org/hsweb/web/authorize/annotation/Authorize.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.authorize.annotation;
+package org.hsweb.web.core.authorize.annotation;
 
 
 import java.lang.annotation.*;

hsweb-web-core/src/main/java/org/hsweb/web/authorize/validator/SimpleAuthorizeValidator.java

@@ -1,17 +1,15 @@
-package org.hsweb.web.authorize.validator;
+package org.hsweb.web.core.authorize.validator;
 
-import org.hsweb.web.authorize.AuthorizeValidator;
-import org.hsweb.web.authorize.AuthorizeValidatorConfig;
-import org.hsweb.web.authorize.ExpressionScopeBean;
-import org.hsweb.web.authorize.annotation.Authorize;
+import org.hsweb.web.core.authorize.AuthorizeValidator;
+import org.hsweb.web.core.authorize.AuthorizeValidatorConfig;
+import org.hsweb.web.core.authorize.ExpressionScopeBean;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.po.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.webbuilder.utils.common.StringUtils;
 import org.webbuilder.utils.script.engine.DynamicScriptEngine;
 import org.webbuilder.utils.script.engine.DynamicScriptEngineFactory;
 
-import javax.annotation.PostConstruct;
 import java.util.*;
 
 /**

hsweb-web-core/src/main/java/org/hsweb/web/exception/AuthorizeException.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.exception;
+package org.hsweb.web.core.exception;
 
 /**
  * Created by 浩 on 2015-12-23 0023.

hsweb-web-core/src/main/java/org/hsweb/web/exception/BusinessException.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.exception;
+package org.hsweb.web.core.exception;
 
 /**
  * 业务异常，用于抛出给前端提示错误信息

hsweb-web-core/src/main/java/org/hsweb/web/exception/ExceptionHandler.java

@@ -1,6 +1,6 @@
-package org.hsweb.web.exception;
+package org.hsweb.web.core.exception;
 
-import org.hsweb.web.message.ResponseMessage;
+import org.hsweb.web.core.message.ResponseMessage;
 
 public interface ExceptionHandler {
 

hsweb-web-core/src/main/java/org/hsweb/web/exception/ExceptionHandlerConfiguration.java

@@ -1,13 +1,12 @@
-package org.hsweb.web.exception;
+package org.hsweb.web.core.exception;
 
-import org.hsweb.web.message.ResponseMessage;
+import org.hsweb.web.core.message.ResponseMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.web.DefaultErrorAttributes;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.Order;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.servlet.ModelAndView;
@@ -16,8 +15,6 @@ import org.webbuilder.utils.common.ClassUtils;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 

hsweb-web-core/src/main/java/org/hsweb/web/exception/NotFoundException.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.exception;
+package org.hsweb.web.core.exception;
 
 /**
  * Created by zhouhao on 16-4-29.

hsweb-web-core/src/main/java/org/hsweb/web/logger/AccessLoggerPersisting.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.logger;
+package org.hsweb.web.core.logger;
 
 import org.hsweb.web.bean.po.logger.LoggerInfo;
 

hsweb-web-core/src/main/java/org/hsweb/web/logger/AopAccessLoggerResolver.java

@@ -1,11 +1,11 @@
-package org.hsweb.web.logger;
+package org.hsweb.web.core.logger;
 
 import com.alibaba.fastjson.JSON;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.hsweb.web.bean.po.logger.LoggerInfo;
-import org.hsweb.web.logger.annotation.AccessLogger;
-import org.hsweb.web.utils.WebUtil;
+import org.hsweb.web.core.logger.annotation.AccessLogger;
+import org.hsweb.web.core.utils.WebUtil;
 import org.webbuilder.utils.common.ClassUtils;
 import org.webbuilder.utils.common.MD5;
 

hsweb-web-core/src/main/java/org/hsweb/web/core/logger/Slf4jAccessLoggerPersisting.java

@@ -0,0 +1,27 @@
+package org.hsweb.web.core.logger;
+
+import com.alibaba.fastjson.JSON;
+import org.hsweb.web.bean.po.logger.LoggerInfo;
+import org.hsweb.web.core.message.FastJsonHttpMessageConverter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by zhouhao on 16-4-28.
+ */
+@Component
+public class Slf4jAccessLoggerPersisting implements AccessLoggerPersisting {
+    protected Logger logger = LoggerFactory.getLogger(this.getClass());
+    @Autowired(required = false)
+    private FastJsonHttpMessageConverter fastJsonHttpMessageConverter;
+
+    @Override
+    public void save(LoggerInfo loggerInfo) {
+        if (fastJsonHttpMessageConverter == null)
+            logger.info(JSON.toJSONString(fastJsonHttpMessageConverter));
+        else
+            logger.info(fastJsonHttpMessageConverter.converter(loggerInfo));
+    }
+}

hsweb-web-core/src/main/java/org/hsweb/web/logger/annotation/AccessLogger.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.logger.annotation;
+package org.hsweb.web.core.logger.annotation;
 
 import java.lang.annotation.*;
 

hsweb-web-controller/src/main/java/org/hsweb/web/controller/FastJsonHttpMessageConverter.java

@@ -1,10 +1,9 @@
-package org.hsweb.web.controller;
+package org.hsweb.web.core.message;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyPreFilter;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.serializer.SimplePropertyPreFilter;
-import org.hsweb.web.message.ResponseMessage;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;

hsweb-web-core/src/main/java/org/hsweb/web/message/ResponseMessage.java

@@ -1,13 +1,8 @@
-package org.hsweb.web.message;
+package org.hsweb.web.core.message;
 
 import com.alibaba.fastjson.JSON;
-import org.hsweb.web.exception.AuthorizeException;
-import org.hsweb.web.exception.BusinessException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.webbuilder.utils.common.DateTimeUtils;
 
-import javax.validation.ValidationException;
 import java.io.Serializable;
 import java.util.*;
 

hsweb-web-core/src/main/java/org/hsweb/web/utils/AccessUtils.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.utils;
+package org.hsweb.web.core.utils;
 
 import java.util.HashMap;
 import java.util.Map;

hsweb-web-core/src/main/java/org/hsweb/web/utils/RandomUtil.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.utils;
+package org.hsweb.web.core.utils;
 
 import java.util.Random;
 import java.util.UUID;

hsweb-web-core/src/main/java/org/hsweb/web/utils/WebUtil.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.utils;
+package org.hsweb.web.core.utils;
 
 import org.hsweb.web.bean.po.user.User;
 import org.springframework.web.context.request.RequestContextHolder;

hsweb-web-core/src/main/java/org/hsweb/web/logger/Slf4jAccessLoggerPersisting.java

@@ -1,20 +0,0 @@
-package org.hsweb.web.logger;
-
-import com.alibaba.fastjson.JSON;
-import org.hsweb.web.bean.po.logger.LoggerInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by zhouhao on 16-4-28.
- */
-@Component
-public class Slf4jAccessLoggerPersisting implements AccessLoggerPersisting {
-    protected Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public void save(LoggerInfo loggerInfo) {
-        logger.info(JSON.toJSONString(loggerInfo));
-    }
-}

hsweb-web-core/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.hsweb.web.core.CoreAutoConfiguration