Merge pull request #2 from springstack/develop

Develop
devlive-community · Nov 15, 2019 · 966fa6f · 966fa6f
2 parents fef2ac4 + c75e428
commit 966fa6f
Show file tree

Hide file tree

Showing 636 changed files with 1,401 additions and 737 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ bootstack is a open source privilege management platform
 |:---:|---|
 |Java|1.8+|
 |Jwt|-|
-|SpringBoot|1.5.x|
+|SpringBoot|2.1.x|
 |Spring Security|-|
 |Spring Security Oauth2|-|
 |Spring Data JPA|-|
@@ -26,22 +26,17 @@ bootstack is a open source privilege management platform
 
 ---
 
-- [Internal](https://gitqub.com/SpringStack/bootstack.git)
 - [GitHub](https://github.com/springstack/bootstack.git)
 - [Gitee](https://gitee.com/Spring-Stack/bootstack.git)
 
 ### Wiki
 
 ---
 
-- [Wiki](http://wiki.ttxit.com/display/bootstack)
-
 ### Issues
 
 ---
 
-- [JIRA](http://jira.ttxit.com/projects/BOOTSTACK)
-
 ### Contact us
 
 ---

diff --git a/bootstack-aop/pom.xml → aop/pom.xml b/bootstack-aop/pom.xml → aop/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>incubator-bootstack</artifactId>
         <groupId>com.bootstack</groupId>
-        <version>1.0.4</version>
+        <version>1.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -35,7 +35,11 @@
         </dependency>
         <dependency>
             <groupId>com.bootstack</groupId>
-            <artifactId>bootstack-service</artifactId>
+            <artifactId>bootstack-storage-mysql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.bootstack</groupId>
+            <artifactId>bootstack-storage-mongodb</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/...ootstack/aop/log/ControllerLogAspect.java → ...ootstack/aop/log/ControllerLogAspect.java b/...ootstack/aop/log/ControllerLogAspect.java → ...ootstack/aop/log/ControllerLogAspect.java
@@ -17,15 +17,17 @@
  */
 package com.bootstack.aop.log;
 
-import com.bootstack.model.system.interfaces.SystemInterfaceModel;
-import com.bootstack.model.system.log.SystemLogModel;
-import com.bootstack.model.system.log.SystemLogTypeModel;
-import com.bootstack.model.system.method.SystemMethodModel;
-import com.bootstack.model.user.UserModel;
-import com.bootstack.service.system.interfaces.SystemInterfaceService;
-import com.bootstack.service.system.log.SystemLogService;
-import com.bootstack.service.system.method.SystemMethodService;
-import com.bootstack.service.user.UserService;
+import com.bootstack.storage.mongodb.model.system.SystemLogToMongoDbModel;
+import com.bootstack.storage.mongodb.service.system.log.SystemLogToMongoDbService;
+import com.bootstack.storage.mysql.model.system.interfaces.SystemInterfaceModel;
+import com.bootstack.storage.mysql.model.system.log.SystemLogModel;
+import com.bootstack.storage.mysql.model.system.log.SystemLogTypeModel;
+import com.bootstack.storage.mysql.model.system.method.SystemMethodModel;
+import com.bootstack.storage.mysql.model.user.UserModel;
+import com.bootstack.storage.mysql.service.system.interfaces.SystemInterfaceService;
+import com.bootstack.storage.mysql.service.system.log.SystemLogService;
+import com.bootstack.storage.mysql.service.system.method.SystemMethodService;
+import com.bootstack.storage.mysql.service.user.UserService;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -64,6 +66,9 @@ public class ControllerLogAspect {
     @Autowired
     private SystemMethodService systemMethodService;
 
+    @Autowired
+    private SystemLogToMongoDbService systemLogToMongoDbService;
+
     @Pointcut("execution(* com.bootstack.core.controller..*.*(..))")
     private void controller() {
     }
@@ -88,18 +93,29 @@ public void doBefore(JoinPoint joinPoint) throws Throwable {
                 }
             }
         }
-        SystemLogModel log = new SystemLogModel();
-        log.setUrl(request.getServletPath());
-        log.setArgs(Arrays.toString(joinPoint.getArgs()));
-        log.setClazz(joinPoint.getSignature().getDeclaringTypeName());
-        log.setClassMethod(joinPoint.getSignature().getName());
-        log.setMethod(request.getMethod());
-        log.setRemoteIp(request.getRemoteAddr());
-        SystemLogTypeModel logType = new SystemLogTypeModel();
-        logType.setId(4L);
-        log.setType(logType);
-        log.setUser(user);
-        this.systemLogService.insertModel(log);
+//        SystemLogModel log = new SystemLogModel();
+//        log.setUrl(request.getServletPath());
+//        log.setArgs(Arrays.toString(joinPoint.getArgs()));
+//        log.setClazz(joinPoint.getSignature().getDeclaringTypeName());
+//        log.setClassMethod(joinPoint.getSignature().getName());
+//        log.setMethod(request.getMethod());
+//        log.setRemoteIp(request.getRemoteAddr());
+//        SystemLogTypeModel logType = new SystemLogTypeModel();
+//        logType.setId(4L);
+//        log.setType(logType);
+//        log.setUser(user);
+//        this.systemLogService.insertModel(log);
+        // 存储日志信息到Mongo中
+        SystemLogToMongoDbModel logToMongoDbModel = new SystemLogToMongoDbModel();
+        logToMongoDbModel.setUrl(request.getServletPath());
+        logToMongoDbModel.setArgs(Arrays.toString(joinPoint.getArgs()));
+        logToMongoDbModel.setClazz(joinPoint.getSignature().getDeclaringTypeName());
+        logToMongoDbModel.setClassMethod(joinPoint.getSignature().getName());
+        logToMongoDbModel.setMethod(request.getMethod());
+        logToMongoDbModel.setRemoteIp(request.getRemoteAddr());
+        logToMongoDbModel.setUserId(user.getId());
+        logToMongoDbModel.setUserName(user.getName());
+        this.systemLogToMongoDbService.insertModel(logToMongoDbModel);
     }
 
     @AfterReturning(returning = "response", pointcut = "controller()")

diff --git a/...a/com/bootstack/aop/log/package-info.java → ...a/com/bootstack/aop/log/package-info.java b/...a/com/bootstack/aop/log/package-info.java → ...a/com/bootstack/aop/log/package-info.java
diff --git a/.../java/com/bootstack/aop/package-info.java → .../java/com/bootstack/aop/package-info.java b/.../java/com/bootstack/aop/package-info.java → .../java/com/bootstack/aop/package-info.java
diff --git a/...ootstack/aop/validation/package-info.java → ...ootstack/aop/validation/package-info.java b/...ootstack/aop/validation/package-info.java → ...ootstack/aop/validation/package-info.java
diff --git a/...quiredParamPathAndQueryAopValidation.java → ...quiredParamPathAndQueryAopValidation.java b/...quiredParamPathAndQueryAopValidation.java → ...quiredParamPathAndQueryAopValidation.java
diff --git a/...dParamPathAndQueryAopValidationAspet.java → ...dParamPathAndQueryAopValidationAspet.java b/...dParamPathAndQueryAopValidationAspet.java → ...dParamPathAndQueryAopValidationAspet.java
@@ -19,9 +19,8 @@
 
 import com.bootstack.common.enums.SystemMessageEnums;
 import com.bootstack.common.enums.UserMessageEnums;
-import com.bootstack.model.user.UserModel;
-import com.bootstack.service.user.UserService;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.bootstack.storage.mysql.model.user.UserModel;
+import com.bootstack.storage.mysql.service.user.UserService;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -84,4 +83,4 @@ public void paramValidation(JoinPoint point, UserRequiredParamPathAndQueryAopVal
         }
     }
 
-}
+}
diff --git a/...ack/aop/validation/user/package-info.java → ...ack/aop/validation/user/package-info.java b/...ack/aop/validation/user/package-info.java → ...ack/aop/validation/user/package-info.java
diff --git a/bootstack-core/src/main/java/com/bootstack/core/config/datasource/package-info.java b/bootstack-core/src/main/java/com/bootstack/core/config/datasource/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/common/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/common/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/icon/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/icon/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/overview/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/overview/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/page/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/page/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/system/interfaces/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/system/interfaces/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/system/log/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/system/log/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/system/menu/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/system/menu/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/system/method/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/system/method/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/system/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/system/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/system/role/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/system/role/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/table/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/table/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/tree/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/tree/package-info.java
diff --git a/bootstack-model/src/main/java/com/bootstack/model/user/package-info.java b/bootstack-model/src/main/java/com/bootstack/model/user/package-info.java
diff --git a/bootstack-repository/src/main/java/com/bootstack/repository/icon/package-info.java b/bootstack-repository/src/main/java/com/bootstack/repository/icon/package-info.java
diff --git a/bootstack-repository/src/main/java/com/bootstack/repository/package-info.java b/bootstack-repository/src/main/java/com/bootstack/repository/package-info.java
diff --git a/...ack-repository/src/main/java/com/bootstack/repository/system/interfaces/package-info.java b/...ack-repository/src/main/java/com/bootstack/repository/system/interfaces/package-info.java
diff --git a/bootstack-repository/src/main/java/com/bootstack/repository/system/log/package-info.java b/bootstack-repository/src/main/java/com/bootstack/repository/system/log/package-info.java
diff --git a/bootstack-repository/src/main/java/com/bootstack/repository/system/menu/package-info.java b/bootstack-repository/src/main/java/com/bootstack/repository/system/menu/package-info.java
diff --git a/bootstack-repository/src/main/java/com/bootstack/repository/system/method/package-info.java b/bootstack-repository/src/main/java/com/bootstack/repository/system/method/package-info.java
diff --git a/bootstack-repository/src/main/java/com/bootstack/repository/system/package-info.java b/bootstack-repository/src/main/java/com/bootstack/repository/system/package-info.java
diff --git a/bootstack-repository/src/main/java/com/bootstack/repository/system/role/package-info.java b/bootstack-repository/src/main/java/com/bootstack/repository/system/role/package-info.java
diff --git a/bootstack-repository/src/main/java/com/bootstack/repository/table/package-info.java b/bootstack-repository/src/main/java/com/bootstack/repository/table/package-info.java
diff --git a/bootstack-repository/src/main/java/com/bootstack/repository/user/package-info.java b/bootstack-repository/src/main/java/com/bootstack/repository/user/package-info.java
diff --git a/bootstack-service/pom.xml b/bootstack-service/pom.xml
diff --git a/bootstack-service/src/main/java/com/bootstack/service/icon/impl/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/icon/impl/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/icon/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/icon/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/json/impl/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/json/impl/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/json/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/json/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/overview/impl/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/overview/impl/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/overview/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/overview/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/system/impl/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/system/impl/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/system/interfaces/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/system/interfaces/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/system/log/impl/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/system/log/impl/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/system/log/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/system/log/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/system/menu/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/system/menu/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/system/method/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/system/method/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/system/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/system/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/system/role/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/system/role/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/table/impl/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/table/impl/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/table/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/table/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/user/impl/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/user/impl/package-info.java
diff --git a/bootstack-service/src/main/java/com/bootstack/service/user/package-info.java b/bootstack-service/src/main/java/com/bootstack/service/user/package-info.java
diff --git a/bootstack-cache/pom.xml → cache/pom.xml b/bootstack-cache/pom.xml → cache/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>incubator-bootstack</artifactId>
         <groupId>com.bootstack</groupId>
-        <version>1.0.4</version>
+        <version>1.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/.../main/java/com/bootstack/cache/Cache.java → .../main/java/com/bootstack/cache/Cache.java b/.../main/java/com/bootstack/cache/Cache.java → .../main/java/com/bootstack/cache/Cache.java
diff --git a/...va/com/bootstack/cache/CacheListener.java → ...va/com/bootstack/cache/CacheListener.java b/...va/com/bootstack/cache/CacheListener.java → ...va/com/bootstack/cache/CacheListener.java
diff --git a/...ava/com/bootstack/cache/CacheManager.java → ...ava/com/bootstack/cache/CacheManager.java b/...ava/com/bootstack/cache/CacheManager.java → ...ava/com/bootstack/cache/CacheManager.java
diff --git a/...com/bootstack/cache/CacheManagerImpl.java → ...com/bootstack/cache/CacheManagerImpl.java b/...com/bootstack/cache/CacheManagerImpl.java → ...com/bootstack/cache/CacheManagerImpl.java
diff --git a/...ava/com/bootstack/cache/package-info.java → ...ava/com/bootstack/cache/package-info.java b/...ava/com/bootstack/cache/package-info.java → ...ava/com/bootstack/cache/package-info.java
diff --git a/bootstack-common/pom.xml → common/pom.xml b/bootstack-common/pom.xml → common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>incubator-bootstack</artifactId>
         <groupId>com.bootstack</groupId>
-        <version>1.0.4</version>
+        <version>1.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/.../com/bootstack/common/date/DateUtils.java → .../com/bootstack/common/date/DateUtils.java b/.../com/bootstack/common/date/DateUtils.java → .../com/bootstack/common/date/DateUtils.java
diff --git a/...m/bootstack/common/date/package-info.java → ...m/bootstack/common/date/package-info.java b/...m/bootstack/common/date/package-info.java → ...m/bootstack/common/date/package-info.java
diff --git a/...common/encryption/EncryptionShaUtils.java → ...common/encryption/EncryptionShaUtils.java b/...common/encryption/EncryptionShaUtils.java → ...common/encryption/EncryptionShaUtils.java
diff --git a/...stack/common/encryption/package-info.java → ...stack/common/encryption/package-info.java b/...stack/common/encryption/package-info.java → ...stack/common/encryption/package-info.java
diff --git a/...tack/common/enums/SystemMessageEnums.java → ...tack/common/enums/SystemMessageEnums.java b/...tack/common/enums/SystemMessageEnums.java → ...tack/common/enums/SystemMessageEnums.java
diff --git a/...tstack/common/enums/UserMessageEnums.java → ...tstack/common/enums/UserMessageEnums.java b/...tstack/common/enums/UserMessageEnums.java → ...tstack/common/enums/UserMessageEnums.java
diff --git a/.../bootstack/common/enums/package-info.java → .../bootstack/common/enums/package-info.java b/.../bootstack/common/enums/package-info.java → .../bootstack/common/enums/package-info.java
diff --git a/...bootstack/common/json/JsonParseUtils.java → ...bootstack/common/json/JsonParseUtils.java b/...bootstack/common/json/JsonParseUtils.java → ...bootstack/common/json/JsonParseUtils.java
diff --git a/.../com/bootstack/common/json/JsonUtils.java → .../com/bootstack/common/json/JsonUtils.java b/.../com/bootstack/common/json/JsonUtils.java → .../com/bootstack/common/json/JsonUtils.java
diff --git a/...tstack/common/json/JsonValidateUtils.java → ...tstack/common/json/JsonValidateUtils.java b/...tstack/common/json/JsonValidateUtils.java → ...tstack/common/json/JsonValidateUtils.java
diff --git a/...m/bootstack/common/json/package-info.java → ...m/bootstack/common/json/package-info.java b/...m/bootstack/common/json/package-info.java → ...m/bootstack/common/json/package-info.java
diff --git a/...com/bootstack/common/office/CsvUtils.java → ...com/bootstack/common/office/CsvUtils.java b/...com/bootstack/common/office/CsvUtils.java → ...com/bootstack/common/office/CsvUtils.java
diff --git a/...bootstack/common/office/package-info.java → ...bootstack/common/office/package-info.java b/...bootstack/common/office/package-info.java → ...bootstack/common/office/package-info.java
diff --git a/...va/com/bootstack/common/package-info.java → ...va/com/bootstack/common/package-info.java b/...va/com/bootstack/common/package-info.java → ...va/com/bootstack/common/package-info.java
diff --git a/...a/com/bootstack/model/page/PageModel.java → .../com/bootstack/common/page/PageModel.java b/...a/com/bootstack/model/page/PageModel.java → .../com/bootstack/common/page/PageModel.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.bootstack.model.page;
+package com.bootstack.common.page;
 
 import org.springframework.data.domain.*;
 

diff --git a/.../com/bootstack/common/page/PageUtils.java → .../com/bootstack/common/page/PageUtils.java b/.../com/bootstack/common/page/PageUtils.java → .../com/bootstack/common/page/PageUtils.java
diff --git a/...m/bootstack/common/page/package-info.java → ...m/bootstack/common/page/package-info.java b/...m/bootstack/common/page/package-info.java → ...m/bootstack/common/page/package-info.java
diff --git a/.../bootstack/common/pinyin/PinYinUtils.java → .../bootstack/common/pinyin/PinYinUtils.java b/.../bootstack/common/pinyin/PinYinUtils.java → .../bootstack/common/pinyin/PinYinUtils.java
diff --git a/...bootstack/common/pinyin/package-info.java → ...bootstack/common/pinyin/package-info.java b/...bootstack/common/pinyin/package-info.java → ...bootstack/common/pinyin/package-info.java
diff --git a/...bootstack/common/support/DateSuooprt.java → ...bootstack/common/support/DateSuooprt.java b/...bootstack/common/support/DateSuooprt.java → ...bootstack/common/support/DateSuooprt.java
diff --git a/...ack/common/support/EncryptionSupport.java → ...ack/common/support/EncryptionSupport.java b/...ack/common/support/EncryptionSupport.java → ...ack/common/support/EncryptionSupport.java
diff --git a/...bootstack/common/support/PageSupport.java → ...bootstack/common/support/PageSupport.java b/...bootstack/common/support/PageSupport.java → ...bootstack/common/support/PageSupport.java
diff --git a/...ootstack/common/support/package-info.java → ...ootstack/common/support/package-info.java b/...ootstack/common/support/package-info.java → ...ootstack/common/support/package-info.java
diff --git a/...ck/common/validation/ValidationUtils.java → ...ck/common/validation/ValidationUtils.java b/...ck/common/validation/ValidationUtils.java → ...ck/common/validation/ValidationUtils.java
diff --git a/...stack/common/validation/package-info.java → ...stack/common/validation/package-info.java b/...stack/common/validation/package-info.java → ...stack/common/validation/package-info.java
diff --git a/bootstack-core/pom.xml → core/pom.xml b/bootstack-core/pom.xml → core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>incubator-bootstack</artifactId>
         <groupId>com.bootstack</groupId>
-        <version>1.0.4</version>
+        <version>1.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -49,14 +49,6 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.bootstack</groupId>
-            <artifactId>bootstack-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.bootstack</groupId>
-            <artifactId>bootstack-service</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.bootstack</groupId>
             <artifactId>bootstack-param</artifactId>

diff --git a/...om/bootstack/core/BootStackBootstrap.java → ...om/bootstack/core/BootStackBootstrap.java b/...om/bootstack/core/BootStackBootstrap.java → ...om/bootstack/core/BootStackBootstrap.java
@@ -44,7 +44,6 @@
 @SpringBootApplication
 @PropertySource(value = {
         "bootstack.properties",
-        "bootstack-database.properties",
         "bootstack-api.properties"
 })
 public class BootStackBootstrap {
@@ -53,4 +52,4 @@ public static void main(String[] args) {
         SpringApplication.run(BootStackBootstrap.class, args);
     }
 
-}
+}
diff --git a/.../BootStackAuthorizationOauth2Support.java → .../BootStackAuthorizationOauth2Support.java b/.../BootStackAuthorizationOauth2Support.java → .../BootStackAuthorizationOauth2Support.java
diff --git a/...ackAuthorizationResourceServerConfig.java → ...ackAuthorizationResourceServerConfig.java b/...ackAuthorizationResourceServerConfig.java → ...ackAuthorizationResourceServerConfig.java
@@ -19,8 +19,8 @@
 
 import com.bootstack.core.config.handler.BootStackAccessDeniedHandler;
 import com.bootstack.core.config.point.BootStackAuthenticationEntryPoint;
-import com.bootstack.model.system.method.SystemMethodModel;
-import com.bootstack.service.system.interfaces.SystemInterfaceService;
+import com.bootstack.storage.mysql.model.system.method.SystemMethodModel;
+import com.bootstack.storage.mysql.service.system.interfaces.SystemInterfaceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

diff --git a/...n/BootStackAuthorizationServerConfig.java → ...n/BootStackAuthorizationServerConfig.java b/...n/BootStackAuthorizationServerConfig.java → ...n/BootStackAuthorizationServerConfig.java
diff --git a/...tion/enhancer/BootStackTokenEnhancer.java → ...tion/enhancer/BootStackTokenEnhancer.java b/...tion/enhancer/BootStackTokenEnhancer.java → ...tion/enhancer/BootStackTokenEnhancer.java
diff --git a/.../authorization/enhancer/package-info.java → .../authorization/enhancer/package-info.java b/.../authorization/enhancer/package-info.java → .../authorization/enhancer/package-info.java
diff --git a/...on/exception/BootStackOauthException.java → ...on/exception/BootStackOauthException.java b/...on/exception/BootStackOauthException.java → ...on/exception/BootStackOauthException.java
diff --git a/...on/BootStackOauthExceptionSerializer.java → ...on/BootStackOauthExceptionSerializer.java b/...on/BootStackOauthExceptionSerializer.java → ...on/BootStackOauthExceptionSerializer.java
diff --git a/...kOauthWebResponseExceptionTranslator.java → ...kOauthWebResponseExceptionTranslator.java b/...kOauthWebResponseExceptionTranslator.java → ...kOauthWebResponseExceptionTranslator.java
diff --git a/...authorization/exception/package-info.java → ...authorization/exception/package-info.java b/...authorization/exception/package-info.java → ...authorization/exception/package-info.java
diff --git a/...re/config/authorization/package-info.java → ...re/config/authorization/package-info.java b/...re/config/authorization/package-info.java → ...re/config/authorization/package-info.java
diff --git a/...handler/BootStackAccessDeniedHandler.java → ...handler/BootStackAccessDeniedHandler.java b/...handler/BootStackAccessDeniedHandler.java → ...handler/BootStackAccessDeniedHandler.java
diff --git a/...ig/handler/BootStackExceptionHandler.java → ...ig/handler/BootStackExceptionHandler.java b/...ig/handler/BootStackExceptionHandler.java → ...ig/handler/BootStackExceptionHandler.java
@@ -19,7 +19,7 @@
 
 import com.bootstack.common.enums.SystemMessageEnums;
 import com.bootstack.common.validation.ValidationUtils;
-import com.bootstack.model.common.CommonResponseModel;
+import com.bootstack.storage.mysql.model.common.CommonResponseModel;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.validation.BindException;
 import org.springframework.web.HttpMediaTypeNotSupportedException;

diff --git a/...ack/core/config/handler/package-info.java → ...ack/core/config/handler/package-info.java b/...ack/core/config/handler/package-info.java → ...ack/core/config/handler/package-info.java
diff --git a/...g/mapper/BootStackObjectMapperConfig.java → ...g/mapper/BootStackObjectMapperConfig.java b/...g/mapper/BootStackObjectMapperConfig.java → ...g/mapper/BootStackObjectMapperConfig.java
diff --git a/...tack/core/config/mapper/package-info.java → ...tack/core/config/mapper/package-info.java b/...tack/core/config/mapper/package-info.java → ...tack/core/config/mapper/package-info.java
diff --git a/...m/bootstack/core/config/package-info.java → ...m/bootstack/core/config/package-info.java b/...m/bootstack/core/config/package-info.java → ...m/bootstack/core/config/package-info.java
diff --git a/...nt/BootStackAuthenticationEntryPoint.java → ...nt/BootStackAuthenticationEntryPoint.java b/...nt/BootStackAuthenticationEntryPoint.java → ...nt/BootStackAuthenticationEntryPoint.java
diff --git a/...stack/core/config/point/package-info.java → ...stack/core/config/point/package-info.java b/...stack/core/config/point/package-info.java → ...stack/core/config/point/package-info.java