From 9683a6c5973a4d056349b1e5c5ed9a29ad5876d3 Mon Sep 17 00:00:00 2001 From: "2884686@qq.com" <2884686@qq.com> Date: Thu, 28 Jul 2016 00:32:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +++--- .../baas => javabaas/server}/Main.java | 10 +++--- .../admin/controller/ApiStatController.java | 8 ++--- .../admin/controller/AppController.java | 30 ++++++++-------- .../admin/controller/ClazzController.java | 22 ++++++------ .../admin/controller/ConsoleController.java | 16 ++++----- .../admin/controller/FieldController.java | 16 ++++----- .../admin/controller/StatusController.java | 6 ++-- .../server}/admin/entity/ApiMethod.java | 2 +- .../server}/admin/entity/ApiStat.java | 2 +- .../server}/admin/entity/App.java | 6 ++-- .../server}/admin/entity/Clazz.java | 2 +- .../server}/admin/entity/ClazzAcl.java | 4 +-- .../server}/admin/entity/ClazzAclMethod.java | 2 +- .../server}/admin/entity/ClientPlatform.java | 2 +- .../server}/admin/entity/Field.java | 2 +- .../server}/admin/entity/FieldType.java | 2 +- .../server}/admin/entity/dto/AppDto.java | 4 +-- .../server}/admin/entity/dto/AppExport.java | 6 ++-- .../server}/admin/entity/dto/ClazzExport.java | 4 +-- .../server}/admin/entity/dto/FieldExport.java | 2 +- .../admin/repository/AppRepository.java | 4 +-- .../admin/repository/ClazzRepository.java | 4 +-- .../admin/repository/FieldRepository.java | 6 ++-- .../server}/admin/service/AppService.java | 36 +++++++++---------- .../server}/admin/service/ClazzService.java | 26 +++++++------- .../server}/admin/service/ConsoleService.java | 8 ++--- .../server}/admin/service/FieldService.java | 22 ++++++------ .../server}/admin/service/StatService.java | 10 +++--- .../cloud/controller/CloudController.java | 12 +++---- .../controller/CloudMasterController.java | 10 +++--- .../server}/cloud/entity/CloudRequest.java | 4 +-- .../server}/cloud/entity/CloudResponse.java | 2 +- .../cloud/entity/CloudResponseCode.java | 2 +- .../server}/cloud/entity/CloudSetting.java | 2 +- .../server}/cloud/entity/HookSetting.java | 2 +- .../server}/cloud/service/CloudService.java | 22 ++++++------ .../server}/cloud/util/SignUtil.java | 6 ++-- .../common/controller/ErrorController.java | 8 ++--- .../common/controller/TimeController.java | 2 +- .../server}/common/entity/SimpleCode.java | 4 +-- .../server}/common/entity/SimpleError.java | 2 +- .../server}/common/entity/SimpleResult.java | 2 +- .../common/filter/SimpleCORSFilter.java | 4 +-- .../common/interceptor/AdminInterceptor.java | 8 ++--- .../common/interceptor/AuthInterceptor.java | 23 +++++++----- .../common/interceptor/HeaderInterceptor.java | 6 ++-- .../common/interceptor/MasterInterceptor.java | 6 ++-- .../listener/ApplicationEventListener.java | 4 ++- .../server}/common/service/MasterService.java | 2 +- .../server}/common/util/JSONUtil.java | 6 ++-- .../server}/config/AuthConfig.java | 5 +-- .../server}/config/BaasConfig.java | 2 +- .../file/controller/FileController.java | 16 ++++----- .../server}/file/entity/BaasFile.java | 6 ++-- .../file/entity/FileStoragePlatform.java | 6 ++-- .../server}/file/entity/FileToken.java | 2 +- .../file/entity/qiniu/PersistentItem.java | 2 +- .../file/entity/qiniu/PersistentResult.java | 2 +- .../file/entity/qiniu/QiniuConfig.java | 2 +- .../server}/file/handler/IFileHandler.java | 4 +-- .../file/handler/impl/QiniuFileHandler.java | 30 ++++++++-------- .../file/handler/impl/TestFileHandler.java | 10 +++--- .../server}/file/service/FileService.java | 20 +++++------ .../server}/hook/entity/HookEvent.java | 2 +- .../server}/hook/entity/HookRequest.java | 6 ++-- .../server}/hook/entity/HookResponse.java | 4 +-- .../server}/hook/entity/HookResponseCode.java | 2 +- .../server}/hook/service/HookService.java | 26 +++++++------- .../log/appender/LogbackMongoAppender.java | 6 ++-- .../server}/log/controller/LogController.java | 6 ++-- .../server}/log/entity/BaasLog.java | 4 +-- .../server}/log/service/LogService.java | 4 +-- .../server}/log/service/MongoConnection.java | 2 +- .../object/controller/ObjectController.java | 28 +++++++-------- .../server}/object/dao/IDao.java | 8 ++--- .../dao/impl/mongo/MongoDBConfiguration.java | 2 +- .../object/dao/impl/mongo/MongoDao.java | 18 +++++----- .../dao/impl/mongo/MongoProperties.java | 2 +- .../server}/object/entity/BaasAcl.java | 4 +-- .../server}/object/entity/BaasInclude.java | 2 +- .../server}/object/entity/BaasList.java | 2 +- .../server}/object/entity/BaasObject.java | 2 +- .../server}/object/entity/BaasQuery.java | 2 +- .../server}/object/entity/BaasSort.java | 2 +- .../server}/object/entity/ClassIds.java | 2 +- .../entity/error/DuplicateKeyError.java | 6 ++-- .../entity/error/FieldRequiredError.java | 6 ++-- .../object/entity/error/FieldTypeError.java | 6 ++-- .../server}/object/service/ObjectService.java | 34 +++++++++--------- .../push/controller/PushController.java | 16 ++++----- .../server}/push/entity/Push.java | 2 +- .../server}/push/entity/PushAccount.java | 2 +- .../server}/push/entity/PushLog.java | 6 ++-- .../server}/push/handler/IPushHandler.java | 4 +-- .../push/handler/impl/JPushHandler.java | 14 ++++---- .../push/handler/impl/TestPushHandler.java | 6 ++-- .../server}/push/service/PushService.java | 22 ++++++------ .../controller/InstallationController.java | 10 +++--- .../user/controller/UserController.java | 18 +++++----- .../server}/user/entity/BaasAuth.java | 4 +-- .../server}/user/entity/BaasInstallation.java | 4 +-- .../server}/user/entity/BaasUser.java | 4 +-- .../user/service/InstallationService.java | 8 ++--- .../server}/user/service/UserService.java | 20 +++++------ .../server}/user/util/SnsAuthUtil.java | 8 ++--- src/main/resources/application.properties | 18 +++++----- .../baas => javabaas/server}/AclTests.java | 24 ++++++------- .../baas => javabaas/server}/AppTests.java | 34 +++++++++--------- .../baas => javabaas/server}/AuthTests.java | 16 ++++----- .../baas => javabaas/server}/ClazzTests.java | 20 +++++------ .../baas => javabaas/server}/CloudTests.java | 28 +++++++-------- .../baas => javabaas/server}/FieldTests.java | 20 +++++------ .../baas => javabaas/server}/FileTests.java | 14 ++++---- .../baas => javabaas/server}/HookTests.java | 36 +++++++++---------- .../baas => javabaas/server}/ObjectTests.java | 28 +++++++-------- .../baas => javabaas/server}/PushTests.java | 8 ++--- .../baas => javabaas/server}/Test.java | 2 +- .../baas => javabaas/server}/UserTests.java | 28 +++++++-------- .../customer/CustomerCloudController.java | 6 ++-- .../customer/CustomerHookController.java | 12 +++---- 121 files changed, 577 insertions(+), 573 deletions(-) rename src/main/java/com/{staryet/baas => javabaas/server}/Main.java (85%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/controller/ApiStatController.java (83%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/controller/AppController.java (79%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/controller/ClazzController.java (81%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/controller/ConsoleController.java (88%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/controller/FieldController.java (85%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/controller/StatusController.java (86%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/ApiMethod.java (93%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/ApiStat.java (97%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/App.java (89%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/Clazz.java (96%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/ClazzAcl.java (94%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/ClazzAclMethod.java (88%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/ClientPlatform.java (94%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/Field.java (97%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/FieldType.java (93%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/dto/AppDto.java (87%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/dto/AppExport.java (90%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/dto/ClazzExport.java (90%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/entity/dto/FieldExport.java (95%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/repository/AppRepository.java (73%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/repository/ClazzRepository.java (83%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/repository/FieldRepository.java (77%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/service/AppService.java (92%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/service/ClazzService.java (92%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/service/ConsoleService.java (89%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/service/FieldService.java (92%) rename src/main/java/com/{staryet/baas => javabaas/server}/admin/service/StatService.java (95%) rename src/main/java/com/{staryet/baas => javabaas/server}/cloud/controller/CloudController.java (81%) rename src/main/java/com/{staryet/baas => javabaas/server}/cloud/controller/CloudMasterController.java (81%) rename src/main/java/com/{staryet/baas => javabaas/server}/cloud/entity/CloudRequest.java (93%) rename src/main/java/com/{staryet/baas => javabaas/server}/cloud/entity/CloudResponse.java (93%) rename src/main/java/com/{staryet/baas => javabaas/server}/cloud/entity/CloudResponseCode.java (79%) rename src/main/java/com/{staryet/baas => javabaas/server}/cloud/entity/CloudSetting.java (96%) rename src/main/java/com/{staryet/baas => javabaas/server}/cloud/entity/HookSetting.java (97%) rename src/main/java/com/{staryet/baas => javabaas/server}/cloud/service/CloudService.java (84%) rename src/main/java/com/{staryet/baas => javabaas/server}/cloud/util/SignUtil.java (83%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/controller/ErrorController.java (94%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/controller/TimeController.java (91%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/entity/SimpleCode.java (97%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/entity/SimpleError.java (94%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/entity/SimpleResult.java (97%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/filter/SimpleCORSFilter.java (87%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/interceptor/AdminInterceptor.java (91%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/interceptor/AuthInterceptor.java (81%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/interceptor/HeaderInterceptor.java (93%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/interceptor/MasterInterceptor.java (88%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/listener/ApplicationEventListener.java (94%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/service/MasterService.java (91%) rename src/main/java/com/{staryet/baas => javabaas/server}/common/util/JSONUtil.java (90%) rename src/main/java/com/{staryet/baas => javabaas/server}/config/AuthConfig.java (91%) rename src/main/java/com/{staryet/baas => javabaas/server}/config/BaasConfig.java (96%) rename src/main/java/com/{staryet/baas => javabaas/server}/file/controller/FileController.java (92%) rename src/main/java/com/{staryet/baas => javabaas/server}/file/entity/BaasFile.java (88%) rename src/main/java/com/{staryet/baas => javabaas/server}/file/entity/FileStoragePlatform.java (81%) rename src/main/java/com/{staryet/baas => javabaas/server}/file/entity/FileToken.java (70%) rename src/main/java/com/{staryet/baas => javabaas/server}/file/entity/qiniu/PersistentItem.java (88%) rename src/main/java/com/{staryet/baas => javabaas/server}/file/entity/qiniu/PersistentResult.java (94%) rename src/main/java/com/{staryet/baas => javabaas/server}/file/entity/qiniu/QiniuConfig.java (95%) rename src/main/java/com/{staryet/baas => javabaas/server}/file/handler/IFileHandler.java (86%) rename src/main/java/com/{staryet/baas => javabaas/server}/file/handler/impl/QiniuFileHandler.java (93%) rename src/main/java/com/{staryet/baas => javabaas/server}/file/handler/impl/TestFileHandler.java (85%) rename src/main/java/com/{staryet/baas => javabaas/server}/file/service/FileService.java (84%) rename src/main/java/com/{staryet/baas => javabaas/server}/hook/entity/HookEvent.java (93%) rename src/main/java/com/{staryet/baas => javabaas/server}/hook/entity/HookRequest.java (80%) rename src/main/java/com/{staryet/baas => javabaas/server}/hook/entity/HookResponse.java (85%) rename src/main/java/com/{staryet/baas => javabaas/server}/hook/entity/HookResponseCode.java (79%) rename src/main/java/com/{staryet/baas => javabaas/server}/hook/service/HookService.java (89%) rename src/main/java/com/{staryet/baas => javabaas/server}/log/appender/LogbackMongoAppender.java (91%) rename src/main/java/com/{staryet/baas => javabaas/server}/log/controller/LogController.java (85%) rename src/main/java/com/{staryet/baas => javabaas/server}/log/entity/BaasLog.java (70%) rename src/main/java/com/{staryet/baas => javabaas/server}/log/service/LogService.java (93%) rename src/main/java/com/{staryet/baas => javabaas/server}/log/service/MongoConnection.java (96%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/controller/ObjectController.java (92%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/dao/IDao.java (81%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/dao/impl/mongo/MongoDBConfiguration.java (96%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/dao/impl/mongo/MongoDao.java (94%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/dao/impl/mongo/MongoProperties.java (99%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/entity/BaasAcl.java (95%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/entity/BaasInclude.java (94%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/entity/BaasList.java (85%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/entity/BaasObject.java (97%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/entity/BaasQuery.java (87%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/entity/BaasSort.java (87%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/entity/ClassIds.java (93%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/entity/error/DuplicateKeyError.java (60%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/entity/error/FieldRequiredError.java (61%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/entity/error/FieldTypeError.java (56%) rename src/main/java/com/{staryet/baas => javabaas/server}/object/service/ObjectService.java (97%) rename src/main/java/com/{staryet/baas => javabaas/server}/push/controller/PushController.java (81%) rename src/main/java/com/{staryet/baas => javabaas/server}/push/entity/Push.java (96%) rename src/main/java/com/{staryet/baas => javabaas/server}/push/entity/PushAccount.java (93%) rename src/main/java/com/{staryet/baas => javabaas/server}/push/entity/PushLog.java (89%) rename src/main/java/com/{staryet/baas => javabaas/server}/push/handler/IPushHandler.java (87%) rename src/main/java/com/{staryet/baas => javabaas/server}/push/handler/impl/JPushHandler.java (92%) rename src/main/java/com/{staryet/baas => javabaas/server}/push/handler/impl/TestPushHandler.java (72%) rename src/main/java/com/{staryet/baas => javabaas/server}/push/service/PushService.java (81%) rename src/main/java/com/{staryet/baas => javabaas/server}/user/controller/InstallationController.java (81%) rename src/main/java/com/{staryet/baas => javabaas/server}/user/controller/UserController.java (94%) rename src/main/java/com/{staryet/baas => javabaas/server}/user/entity/BaasAuth.java (79%) rename src/main/java/com/{staryet/baas => javabaas/server}/user/entity/BaasInstallation.java (89%) rename src/main/java/com/{staryet/baas => javabaas/server}/user/entity/BaasUser.java (91%) rename src/main/java/com/{staryet/baas => javabaas/server}/user/service/InstallationService.java (77%) rename src/main/java/com/{staryet/baas => javabaas/server}/user/service/UserService.java (96%) rename src/main/java/com/{staryet/baas => javabaas/server}/user/util/SnsAuthUtil.java (95%) rename src/test/java/com/{staryet/baas => javabaas/server}/AclTests.java (95%) rename src/test/java/com/{staryet/baas => javabaas/server}/AppTests.java (86%) rename src/test/java/com/{staryet/baas => javabaas/server}/AuthTests.java (95%) rename src/test/java/com/{staryet/baas => javabaas/server}/ClazzTests.java (86%) rename src/test/java/com/{staryet/baas => javabaas/server}/CloudTests.java (87%) rename src/test/java/com/{staryet/baas => javabaas/server}/FieldTests.java (80%) rename src/test/java/com/{staryet/baas => javabaas/server}/FileTests.java (89%) rename src/test/java/com/{staryet/baas => javabaas/server}/HookTests.java (89%) rename src/test/java/com/{staryet/baas => javabaas/server}/ObjectTests.java (98%) rename src/test/java/com/{staryet/baas => javabaas/server}/PushTests.java (84%) rename src/test/java/com/{staryet/baas => javabaas/server}/Test.java (98%) rename src/test/java/com/{staryet/baas => javabaas/server}/UserTests.java (92%) rename src/test/java/com/{staryet/baas => javabaas/server}/customer/CustomerCloudController.java (90%) rename src/test/java/com/{staryet/baas => javabaas/server}/customer/CustomerHookController.java (93%) diff --git a/pom.xml b/pom.xml index 9ace569..f48d9ec 100644 --- a/pom.xml +++ b/pom.xml @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.staryet - baas + com.javabaas + jbserver 1.0.0 jar @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.3.2.RELEASE + 1.3.6.RELEASE UTF-8 - com.staryet.baas.Main + com.javabaas.server.Main 1.8 - staryet + javabaas diff --git a/src/main/java/com/staryet/baas/Main.java b/src/main/java/com/javabaas/server/Main.java similarity index 85% rename from src/main/java/com/staryet/baas/Main.java rename to src/main/java/com/javabaas/server/Main.java index f8ac033..4296f75 100644 --- a/src/main/java/com/staryet/baas/Main.java +++ b/src/main/java/com/javabaas/server/Main.java @@ -1,9 +1,9 @@ -package com.staryet.baas; +package com.javabaas.server; -import com.staryet.baas.common.interceptor.AdminInterceptor; -import com.staryet.baas.common.interceptor.AuthInterceptor; -import com.staryet.baas.common.interceptor.HeaderInterceptor; -import com.staryet.baas.common.interceptor.MasterInterceptor; +import com.javabaas.server.common.interceptor.AdminInterceptor; +import com.javabaas.server.common.interceptor.AuthInterceptor; +import com.javabaas.server.common.interceptor.HeaderInterceptor; +import com.javabaas.server.common.interceptor.MasterInterceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/com/staryet/baas/admin/controller/ApiStatController.java b/src/main/java/com/javabaas/server/admin/controller/ApiStatController.java similarity index 83% rename from src/main/java/com/staryet/baas/admin/controller/ApiStatController.java rename to src/main/java/com/javabaas/server/admin/controller/ApiStatController.java index 7254a88..7817bd6 100644 --- a/src/main/java/com/staryet/baas/admin/controller/ApiStatController.java +++ b/src/main/java/com/javabaas/server/admin/controller/ApiStatController.java @@ -1,8 +1,8 @@ -package com.staryet.baas.admin.controller; +package com.javabaas.server.admin.controller; -import com.staryet.baas.admin.entity.ApiMethod; -import com.staryet.baas.admin.entity.ClientPlatform; -import com.staryet.baas.admin.service.StatService; +import com.javabaas.server.admin.entity.ApiMethod; +import com.javabaas.server.admin.entity.ClientPlatform; +import com.javabaas.server.admin.service.StatService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/staryet/baas/admin/controller/AppController.java b/src/main/java/com/javabaas/server/admin/controller/AppController.java similarity index 79% rename from src/main/java/com/staryet/baas/admin/controller/AppController.java rename to src/main/java/com/javabaas/server/admin/controller/AppController.java index c571e1f..161dfca 100644 --- a/src/main/java/com/staryet/baas/admin/controller/AppController.java +++ b/src/main/java/com/javabaas/server/admin/controller/AppController.java @@ -1,13 +1,13 @@ -package com.staryet.baas.admin.controller; +package com.javabaas.server.admin.controller; -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.entity.dto.AppDto; -import com.staryet.baas.admin.entity.dto.AppExport; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.admin.service.StatService; -import com.staryet.baas.common.entity.SimpleResult; -import com.staryet.baas.object.service.ObjectService; -import com.staryet.baas.user.service.UserService; +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.entity.dto.AppDto; +import com.javabaas.server.admin.entity.dto.AppExport; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.admin.service.StatService; +import com.javabaas.server.common.entity.SimpleResult; +import com.javabaas.server.object.service.ObjectService; +import com.javabaas.server.user.service.UserService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -15,8 +15,6 @@ import java.util.LinkedList; import java.util.List; -import static com.staryet.baas.common.entity.SimpleResult.success; - /** * 应用控制器 * Created by Staryet on 15/9/17. @@ -35,7 +33,7 @@ public class AppController { @RequestMapping(value = "", method = RequestMethod.POST) public SimpleResult insert(@RequestBody App app) { App newApp = appService.insert(app); - SimpleResult result = success(); + SimpleResult result = SimpleResult.success(); result.putData("app", newApp); return result; } @@ -44,7 +42,7 @@ public SimpleResult insert(@RequestBody App app) { @ResponseBody public SimpleResult delete(@PathVariable String id) { appService.delete(id); - return success(); + return SimpleResult.success(); } @RequestMapping(value = "/{id}", method = RequestMethod.GET) @@ -75,14 +73,14 @@ public List list() { @ResponseBody public SimpleResult resetKey(@PathVariable String id) { appService.resetKey(id); - return success(); + return SimpleResult.success(); } @RequestMapping(value = "/{id}/resetMasterKey", method = RequestMethod.PUT) @ResponseBody public SimpleResult resetMasterKey(@PathVariable String id) { appService.resetMasterKey(id); - return success(); + return SimpleResult.success(); } @RequestMapping(value = "/{id}/export", method = RequestMethod.GET) @@ -95,7 +93,7 @@ public AppExport export(@PathVariable String id) { @ResponseBody public SimpleResult importData(@RequestBody AppExport appExport) { appService.importData(appExport); - return success(); + return SimpleResult.success(); } } \ No newline at end of file diff --git a/src/main/java/com/staryet/baas/admin/controller/ClazzController.java b/src/main/java/com/javabaas/server/admin/controller/ClazzController.java similarity index 81% rename from src/main/java/com/staryet/baas/admin/controller/ClazzController.java rename to src/main/java/com/javabaas/server/admin/controller/ClazzController.java index 23ee15d..60e3951 100644 --- a/src/main/java/com/staryet/baas/admin/controller/ClazzController.java +++ b/src/main/java/com/javabaas/server/admin/controller/ClazzController.java @@ -1,17 +1,15 @@ -package com.staryet.baas.admin.controller; +package com.javabaas.server.admin.controller; -import com.staryet.baas.admin.entity.Clazz; -import com.staryet.baas.admin.entity.ClazzAcl; -import com.staryet.baas.admin.entity.dto.ClazzExport; -import com.staryet.baas.admin.service.ClazzService; -import com.staryet.baas.common.entity.SimpleResult; +import com.javabaas.server.admin.entity.Clazz; +import com.javabaas.server.admin.entity.ClazzAcl; +import com.javabaas.server.admin.entity.dto.ClazzExport; +import com.javabaas.server.admin.service.ClazzService; +import com.javabaas.server.common.entity.SimpleResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import static com.staryet.baas.common.entity.SimpleResult.success; - /** * 类控制器 * Created by Staryet on 15/6/15. @@ -26,14 +24,14 @@ public class ClazzController { @RequestMapping(value = "", method = RequestMethod.POST) public SimpleResult insert(@RequestHeader(value = "JB-AppId") String appId, @RequestBody Clazz clazz) { clazzService.insert(appId, clazz); - return success(); + return SimpleResult.success(); } @RequestMapping(value = "/{name}", method = RequestMethod.DELETE) @ResponseBody public SimpleResult delete(@RequestHeader(value = "JB-AppId") String appId, @PathVariable String name) { clazzService.delete(appId, name); - return success(); + return SimpleResult.success(); } @RequestMapping(value = "/{name}", method = RequestMethod.GET) @@ -52,7 +50,7 @@ public ClazzExport export(@RequestHeader(value = "JB-AppId") String appId, @Path @ResponseBody public SimpleResult importData(@RequestHeader(value = "JB-AppId") String appId, @RequestBody ClazzExport clazzExport) { clazzService.importData(appId, clazzExport); - return success(); + return SimpleResult.success(); } @RequestMapping(value = "", method = RequestMethod.GET) @@ -65,7 +63,7 @@ public List list(@RequestHeader(value = "JB-AppId") String appId) { @ResponseBody public SimpleResult setAcl(@RequestHeader(value = "JB-AppId") String appId, @PathVariable String name, @RequestBody ClazzAcl acl) { clazzService.setAcl(appId, name, acl); - return success(); + return SimpleResult.success(); } } diff --git a/src/main/java/com/staryet/baas/admin/controller/ConsoleController.java b/src/main/java/com/javabaas/server/admin/controller/ConsoleController.java similarity index 88% rename from src/main/java/com/staryet/baas/admin/controller/ConsoleController.java rename to src/main/java/com/javabaas/server/admin/controller/ConsoleController.java index ef7a9ce..1967132 100644 --- a/src/main/java/com/staryet/baas/admin/controller/ConsoleController.java +++ b/src/main/java/com/javabaas/server/admin/controller/ConsoleController.java @@ -1,10 +1,10 @@ -package com.staryet.baas.admin.controller; +package com.javabaas.server.admin.controller; -import com.staryet.baas.admin.service.ConsoleService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.entity.SimpleResult; -import com.staryet.baas.config.AuthConfig; +import com.javabaas.server.admin.service.ConsoleService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleResult; +import com.javabaas.server.config.AuthConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletResponse; /** - * API统计 + * 管理端鉴权 * Created by Codi on 15/10/20. */ @RestController @@ -41,7 +41,7 @@ public SimpleResult adminKey(HttpServletRequest request) { } else { String sessionTokenExist = consoleService.getSessionToken(username); if (!sessionToken.equals(sessionTokenExist)) { - throw new SimpleError(SimpleCode.CONSOLE_SESSIONTOKEN_ERROR); + throw new SimpleError(SimpleCode.CONSOLE_SESSION_TOKEN_ERROR); } else { result.put("key", authConfig.getKey()); } diff --git a/src/main/java/com/staryet/baas/admin/controller/FieldController.java b/src/main/java/com/javabaas/server/admin/controller/FieldController.java similarity index 85% rename from src/main/java/com/staryet/baas/admin/controller/FieldController.java rename to src/main/java/com/javabaas/server/admin/controller/FieldController.java index 17568ae..d8b1fec 100644 --- a/src/main/java/com/staryet/baas/admin/controller/FieldController.java +++ b/src/main/java/com/javabaas/server/admin/controller/FieldController.java @@ -1,15 +1,13 @@ -package com.staryet.baas.admin.controller; +package com.javabaas.server.admin.controller; -import com.staryet.baas.admin.entity.Field; -import com.staryet.baas.admin.service.FieldService; -import com.staryet.baas.common.entity.SimpleResult; +import com.javabaas.server.admin.entity.Field; +import com.javabaas.server.common.entity.SimpleResult; +import com.javabaas.server.admin.service.FieldService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import static com.staryet.baas.common.entity.SimpleResult.success; - /** * Created by Staryet on 15/6/15. */ @@ -25,7 +23,7 @@ public SimpleResult insert(@RequestHeader(value = "JB-AppId") String appId, @PathVariable String clazzName, @RequestBody Field field) { fieldService.insert(appId, clazzName, field); - return success(); + return SimpleResult.success(); } @RequestMapping(value = "/{clazzName}/field/{name}", method = RequestMethod.DELETE) @@ -33,7 +31,7 @@ public SimpleResult delete(@RequestHeader(value = "JB-AppId") String appId, @PathVariable String clazzName, @PathVariable String name) { fieldService.delete(appId, clazzName, name); - return success(); + return SimpleResult.success(); } @RequestMapping(value = "/{clazzName}/field/{name}", method = RequestMethod.PUT) @@ -42,7 +40,7 @@ public SimpleResult update(@RequestHeader(value = "JB-AppId") String appId, @PathVariable String name, @RequestBody Field field) { fieldService.update(appId, clazzName, name, field); - return success(); + return SimpleResult.success(); } @RequestMapping(value = "/{clazzName}/field/{name}", method = RequestMethod.GET) diff --git a/src/main/java/com/staryet/baas/admin/controller/StatusController.java b/src/main/java/com/javabaas/server/admin/controller/StatusController.java similarity index 86% rename from src/main/java/com/staryet/baas/admin/controller/StatusController.java rename to src/main/java/com/javabaas/server/admin/controller/StatusController.java index 364f7be..06783e4 100644 --- a/src/main/java/com/staryet/baas/admin/controller/StatusController.java +++ b/src/main/java/com/javabaas/server/admin/controller/StatusController.java @@ -1,7 +1,7 @@ -package com.staryet.baas.admin.controller; +package com.javabaas.server.admin.controller; -import com.staryet.baas.admin.service.FieldService; -import com.staryet.baas.object.dao.impl.mongo.MongoDao; +import com.javabaas.server.admin.service.FieldService; +import com.javabaas.server.object.dao.impl.mongo.MongoDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/staryet/baas/admin/entity/ApiMethod.java b/src/main/java/com/javabaas/server/admin/entity/ApiMethod.java similarity index 93% rename from src/main/java/com/staryet/baas/admin/entity/ApiMethod.java rename to src/main/java/com/javabaas/server/admin/entity/ApiMethod.java index 964f252..75d7122 100644 --- a/src/main/java/com/staryet/baas/admin/entity/ApiMethod.java +++ b/src/main/java/com/javabaas/server/admin/entity/ApiMethod.java @@ -1,4 +1,4 @@ -package com.staryet.baas.admin.entity; +package com.javabaas.server.admin.entity; /** * Created by Staryet on 15/8/17. diff --git a/src/main/java/com/staryet/baas/admin/entity/ApiStat.java b/src/main/java/com/javabaas/server/admin/entity/ApiStat.java similarity index 97% rename from src/main/java/com/staryet/baas/admin/entity/ApiStat.java rename to src/main/java/com/javabaas/server/admin/entity/ApiStat.java index 867c895..1d9a94c 100644 --- a/src/main/java/com/staryet/baas/admin/entity/ApiStat.java +++ b/src/main/java/com/javabaas/server/admin/entity/ApiStat.java @@ -1,4 +1,4 @@ -package com.staryet.baas.admin.entity; +package com.javabaas.server.admin.entity; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/com/staryet/baas/admin/entity/App.java b/src/main/java/com/javabaas/server/admin/entity/App.java similarity index 89% rename from src/main/java/com/staryet/baas/admin/entity/App.java rename to src/main/java/com/javabaas/server/admin/entity/App.java index b795965..d5a9161 100644 --- a/src/main/java/com/staryet/baas/admin/entity/App.java +++ b/src/main/java/com/javabaas/server/admin/entity/App.java @@ -1,7 +1,7 @@ -package com.staryet.baas.admin.entity; +package com.javabaas.server.admin.entity; -import com.staryet.baas.cloud.entity.CloudSetting; -import com.staryet.baas.push.entity.PushAccount; +import com.javabaas.server.push.entity.PushAccount; +import com.javabaas.server.cloud.entity.CloudSetting; import org.springframework.data.mongodb.core.mapping.Document; /** diff --git a/src/main/java/com/staryet/baas/admin/entity/Clazz.java b/src/main/java/com/javabaas/server/admin/entity/Clazz.java similarity index 96% rename from src/main/java/com/staryet/baas/admin/entity/Clazz.java rename to src/main/java/com/javabaas/server/admin/entity/Clazz.java index dee2cc9..008a41e 100644 --- a/src/main/java/com/staryet/baas/admin/entity/Clazz.java +++ b/src/main/java/com/javabaas/server/admin/entity/Clazz.java @@ -1,4 +1,4 @@ -package com.staryet.baas.admin.entity; +package com.javabaas.server.admin.entity; import org.springframework.data.mongodb.core.mapping.DBRef; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/src/main/java/com/staryet/baas/admin/entity/ClazzAcl.java b/src/main/java/com/javabaas/server/admin/entity/ClazzAcl.java similarity index 94% rename from src/main/java/com/staryet/baas/admin/entity/ClazzAcl.java rename to src/main/java/com/javabaas/server/admin/entity/ClazzAcl.java index 1ef8a67..76c19a0 100644 --- a/src/main/java/com/staryet/baas/admin/entity/ClazzAcl.java +++ b/src/main/java/com/javabaas/server/admin/entity/ClazzAcl.java @@ -1,6 +1,6 @@ -package com.staryet.baas.admin.entity; +package com.javabaas.server.admin.entity; -import com.staryet.baas.user.entity.BaasUser; +import com.javabaas.server.user.entity.BaasUser; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/src/main/java/com/staryet/baas/admin/entity/ClazzAclMethod.java b/src/main/java/com/javabaas/server/admin/entity/ClazzAclMethod.java similarity index 88% rename from src/main/java/com/staryet/baas/admin/entity/ClazzAclMethod.java rename to src/main/java/com/javabaas/server/admin/entity/ClazzAclMethod.java index c14aaff..3a96e87 100644 --- a/src/main/java/com/staryet/baas/admin/entity/ClazzAclMethod.java +++ b/src/main/java/com/javabaas/server/admin/entity/ClazzAclMethod.java @@ -1,4 +1,4 @@ -package com.staryet.baas.admin.entity; +package com.javabaas.server.admin.entity; /** * Created by Staryet on 15/8/17. diff --git a/src/main/java/com/staryet/baas/admin/entity/ClientPlatform.java b/src/main/java/com/javabaas/server/admin/entity/ClientPlatform.java similarity index 94% rename from src/main/java/com/staryet/baas/admin/entity/ClientPlatform.java rename to src/main/java/com/javabaas/server/admin/entity/ClientPlatform.java index 422d1e2..23335a2 100644 --- a/src/main/java/com/staryet/baas/admin/entity/ClientPlatform.java +++ b/src/main/java/com/javabaas/server/admin/entity/ClientPlatform.java @@ -1,4 +1,4 @@ -package com.staryet.baas.admin.entity; +package com.javabaas.server.admin.entity; /** * Created by Staryet on 15/8/17. diff --git a/src/main/java/com/staryet/baas/admin/entity/Field.java b/src/main/java/com/javabaas/server/admin/entity/Field.java similarity index 97% rename from src/main/java/com/staryet/baas/admin/entity/Field.java rename to src/main/java/com/javabaas/server/admin/entity/Field.java index 252cf21..b04a3c9 100644 --- a/src/main/java/com/staryet/baas/admin/entity/Field.java +++ b/src/main/java/com/javabaas/server/admin/entity/Field.java @@ -1,4 +1,4 @@ -package com.staryet.baas.admin.entity; +package com.javabaas.server.admin.entity; import org.springframework.data.mongodb.core.mapping.DBRef; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/src/main/java/com/staryet/baas/admin/entity/FieldType.java b/src/main/java/com/javabaas/server/admin/entity/FieldType.java similarity index 93% rename from src/main/java/com/staryet/baas/admin/entity/FieldType.java rename to src/main/java/com/javabaas/server/admin/entity/FieldType.java index 646e6d1..eee7d25 100644 --- a/src/main/java/com/staryet/baas/admin/entity/FieldType.java +++ b/src/main/java/com/javabaas/server/admin/entity/FieldType.java @@ -1,4 +1,4 @@ -package com.staryet.baas.admin.entity; +package com.javabaas.server.admin.entity; /** * Created by Staryet on 15/6/17. diff --git a/src/main/java/com/staryet/baas/admin/entity/dto/AppDto.java b/src/main/java/com/javabaas/server/admin/entity/dto/AppDto.java similarity index 87% rename from src/main/java/com/staryet/baas/admin/entity/dto/AppDto.java rename to src/main/java/com/javabaas/server/admin/entity/dto/AppDto.java index c626fbf..706f7da 100644 --- a/src/main/java/com/staryet/baas/admin/entity/dto/AppDto.java +++ b/src/main/java/com/javabaas/server/admin/entity/dto/AppDto.java @@ -1,6 +1,6 @@ -package com.staryet.baas.admin.entity.dto; +package com.javabaas.server.admin.entity.dto; -import com.staryet.baas.admin.entity.App; +import com.javabaas.server.admin.entity.App; /** * Created by Codi on 16/1/4. diff --git a/src/main/java/com/staryet/baas/admin/entity/dto/AppExport.java b/src/main/java/com/javabaas/server/admin/entity/dto/AppExport.java similarity index 90% rename from src/main/java/com/staryet/baas/admin/entity/dto/AppExport.java rename to src/main/java/com/javabaas/server/admin/entity/dto/AppExport.java index e3d962a..b53699c 100644 --- a/src/main/java/com/staryet/baas/admin/entity/dto/AppExport.java +++ b/src/main/java/com/javabaas/server/admin/entity/dto/AppExport.java @@ -1,7 +1,7 @@ -package com.staryet.baas.admin.entity.dto; +package com.javabaas.server.admin.entity.dto; -import com.staryet.baas.cloud.entity.CloudSetting; -import com.staryet.baas.push.entity.PushAccount; +import com.javabaas.server.push.entity.PushAccount; +import com.javabaas.server.cloud.entity.CloudSetting; import java.util.List; diff --git a/src/main/java/com/staryet/baas/admin/entity/dto/ClazzExport.java b/src/main/java/com/javabaas/server/admin/entity/dto/ClazzExport.java similarity index 90% rename from src/main/java/com/staryet/baas/admin/entity/dto/ClazzExport.java rename to src/main/java/com/javabaas/server/admin/entity/dto/ClazzExport.java index 27bcfe4..f69b882 100644 --- a/src/main/java/com/staryet/baas/admin/entity/dto/ClazzExport.java +++ b/src/main/java/com/javabaas/server/admin/entity/dto/ClazzExport.java @@ -1,6 +1,6 @@ -package com.staryet.baas.admin.entity.dto; +package com.javabaas.server.admin.entity.dto; -import com.staryet.baas.admin.entity.ClazzAcl; +import com.javabaas.server.admin.entity.ClazzAcl; import java.util.List; diff --git a/src/main/java/com/staryet/baas/admin/entity/dto/FieldExport.java b/src/main/java/com/javabaas/server/admin/entity/dto/FieldExport.java similarity index 95% rename from src/main/java/com/staryet/baas/admin/entity/dto/FieldExport.java rename to src/main/java/com/javabaas/server/admin/entity/dto/FieldExport.java index 7f4285a..69d92cc 100644 --- a/src/main/java/com/staryet/baas/admin/entity/dto/FieldExport.java +++ b/src/main/java/com/javabaas/server/admin/entity/dto/FieldExport.java @@ -1,4 +1,4 @@ -package com.staryet.baas.admin.entity.dto; +package com.javabaas.server.admin.entity.dto; /** * Created by Codi on 15/11/9. diff --git a/src/main/java/com/staryet/baas/admin/repository/AppRepository.java b/src/main/java/com/javabaas/server/admin/repository/AppRepository.java similarity index 73% rename from src/main/java/com/staryet/baas/admin/repository/AppRepository.java rename to src/main/java/com/javabaas/server/admin/repository/AppRepository.java index 2a826c4..581cc69 100644 --- a/src/main/java/com/staryet/baas/admin/repository/AppRepository.java +++ b/src/main/java/com/javabaas/server/admin/repository/AppRepository.java @@ -1,6 +1,6 @@ -package com.staryet.baas.admin.repository; +package com.javabaas.server.admin.repository; -import com.staryet.baas.admin.entity.App; +import com.javabaas.server.admin.entity.App; import org.springframework.data.mongodb.repository.MongoRepository; /** diff --git a/src/main/java/com/staryet/baas/admin/repository/ClazzRepository.java b/src/main/java/com/javabaas/server/admin/repository/ClazzRepository.java similarity index 83% rename from src/main/java/com/staryet/baas/admin/repository/ClazzRepository.java rename to src/main/java/com/javabaas/server/admin/repository/ClazzRepository.java index 50fbce1..acfe8a8 100644 --- a/src/main/java/com/staryet/baas/admin/repository/ClazzRepository.java +++ b/src/main/java/com/javabaas/server/admin/repository/ClazzRepository.java @@ -1,6 +1,6 @@ -package com.staryet.baas.admin.repository; +package com.javabaas.server.admin.repository; -import com.staryet.baas.admin.entity.Clazz; +import com.javabaas.server.admin.entity.Clazz; import org.springframework.data.domain.Pageable; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/com/staryet/baas/admin/repository/FieldRepository.java b/src/main/java/com/javabaas/server/admin/repository/FieldRepository.java similarity index 77% rename from src/main/java/com/staryet/baas/admin/repository/FieldRepository.java rename to src/main/java/com/javabaas/server/admin/repository/FieldRepository.java index ca22cad..aebedf3 100644 --- a/src/main/java/com/staryet/baas/admin/repository/FieldRepository.java +++ b/src/main/java/com/javabaas/server/admin/repository/FieldRepository.java @@ -1,7 +1,7 @@ -package com.staryet.baas.admin.repository; +package com.javabaas.server.admin.repository; -import com.staryet.baas.admin.entity.Clazz; -import com.staryet.baas.admin.entity.Field; +import com.javabaas.server.admin.entity.Clazz; +import com.javabaas.server.admin.entity.Field; import org.springframework.data.domain.Pageable; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/com/staryet/baas/admin/service/AppService.java b/src/main/java/com/javabaas/server/admin/service/AppService.java similarity index 92% rename from src/main/java/com/staryet/baas/admin/service/AppService.java rename to src/main/java/com/javabaas/server/admin/service/AppService.java index 3f0650b..6148037 100644 --- a/src/main/java/com/staryet/baas/admin/service/AppService.java +++ b/src/main/java/com/javabaas/server/admin/service/AppService.java @@ -1,22 +1,22 @@ -package com.staryet.baas.admin.service; +package com.javabaas.server.admin.service; -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.entity.Clazz; -import com.staryet.baas.admin.entity.Field; -import com.staryet.baas.admin.entity.FieldType; -import com.staryet.baas.admin.entity.dto.AppExport; -import com.staryet.baas.admin.entity.dto.ClazzExport; -import com.staryet.baas.admin.repository.AppRepository; -import com.staryet.baas.cloud.entity.CloudSetting; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.file.service.FileService; -import com.staryet.baas.object.dao.impl.mongo.MongoDao; -import com.staryet.baas.push.entity.PushAccount; -import com.staryet.baas.push.service.PushService; -import com.staryet.baas.user.service.InstallationService; -import com.staryet.baas.user.service.UserService; +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.entity.Field; +import com.javabaas.server.admin.repository.AppRepository; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.object.dao.impl.mongo.MongoDao; +import com.javabaas.server.push.entity.PushAccount; +import com.javabaas.server.user.service.UserService; +import com.javabaas.server.admin.entity.Clazz; +import com.javabaas.server.admin.entity.FieldType; +import com.javabaas.server.admin.entity.dto.AppExport; +import com.javabaas.server.admin.entity.dto.ClazzExport; +import com.javabaas.server.cloud.entity.CloudSetting; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.util.JSONUtil; +import com.javabaas.server.file.service.FileService; +import com.javabaas.server.push.service.PushService; +import com.javabaas.server.user.service.InstallationService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/staryet/baas/admin/service/ClazzService.java b/src/main/java/com/javabaas/server/admin/service/ClazzService.java similarity index 92% rename from src/main/java/com/staryet/baas/admin/service/ClazzService.java rename to src/main/java/com/javabaas/server/admin/service/ClazzService.java index 1802180..54e9875 100644 --- a/src/main/java/com/staryet/baas/admin/service/ClazzService.java +++ b/src/main/java/com/javabaas/server/admin/service/ClazzService.java @@ -1,16 +1,16 @@ -package com.staryet.baas.admin.service; - -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.entity.Clazz; -import com.staryet.baas.admin.entity.ClazzAcl; -import com.staryet.baas.admin.entity.ClazzAclMethod; -import com.staryet.baas.admin.entity.dto.ClazzExport; -import com.staryet.baas.admin.entity.dto.FieldExport; -import com.staryet.baas.admin.repository.ClazzRepository; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.object.service.ObjectService; +package com.javabaas.server.admin.service; + +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.entity.Clazz; +import com.javabaas.server.admin.entity.ClazzAcl; +import com.javabaas.server.admin.entity.ClazzAclMethod; +import com.javabaas.server.admin.entity.dto.ClazzExport; +import com.javabaas.server.admin.entity.dto.FieldExport; +import com.javabaas.server.admin.repository.ClazzRepository; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.util.JSONUtil; +import com.javabaas.server.object.service.ObjectService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/staryet/baas/admin/service/ConsoleService.java b/src/main/java/com/javabaas/server/admin/service/ConsoleService.java similarity index 89% rename from src/main/java/com/staryet/baas/admin/service/ConsoleService.java rename to src/main/java/com/javabaas/server/admin/service/ConsoleService.java index 7bf8b0f..9294068 100644 --- a/src/main/java/com/staryet/baas/admin/service/ConsoleService.java +++ b/src/main/java/com/javabaas/server/admin/service/ConsoleService.java @@ -1,8 +1,8 @@ -package com.staryet.baas.admin.service; +package com.javabaas.server.admin.service; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.config.AuthConfig; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.config.AuthConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; diff --git a/src/main/java/com/staryet/baas/admin/service/FieldService.java b/src/main/java/com/javabaas/server/admin/service/FieldService.java similarity index 92% rename from src/main/java/com/staryet/baas/admin/service/FieldService.java rename to src/main/java/com/javabaas/server/admin/service/FieldService.java index 00dacaa..d949425 100644 --- a/src/main/java/com/staryet/baas/admin/service/FieldService.java +++ b/src/main/java/com/javabaas/server/admin/service/FieldService.java @@ -1,14 +1,14 @@ -package com.staryet.baas.admin.service; - -import com.staryet.baas.admin.entity.Clazz; -import com.staryet.baas.admin.entity.Field; -import com.staryet.baas.admin.entity.FieldType; -import com.staryet.baas.admin.entity.dto.FieldExport; -import com.staryet.baas.admin.repository.FieldRepository; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.object.service.ObjectService; +package com.javabaas.server.admin.service; + +import com.javabaas.server.admin.entity.Clazz; +import com.javabaas.server.admin.entity.Field; +import com.javabaas.server.admin.entity.FieldType; +import com.javabaas.server.admin.entity.dto.FieldExport; +import com.javabaas.server.admin.repository.FieldRepository; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.util.JSONUtil; +import com.javabaas.server.object.service.ObjectService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/staryet/baas/admin/service/StatService.java b/src/main/java/com/javabaas/server/admin/service/StatService.java similarity index 95% rename from src/main/java/com/staryet/baas/admin/service/StatService.java rename to src/main/java/com/javabaas/server/admin/service/StatService.java index 6e32192..8fa54b2 100644 --- a/src/main/java/com/staryet/baas/admin/service/StatService.java +++ b/src/main/java/com/javabaas/server/admin/service/StatService.java @@ -1,9 +1,9 @@ -package com.staryet.baas.admin.service; +package com.javabaas.server.admin.service; -import com.staryet.baas.admin.entity.ApiMethod; -import com.staryet.baas.admin.entity.ApiStat; -import com.staryet.baas.admin.entity.Clazz; -import com.staryet.baas.admin.entity.ClientPlatform; +import com.javabaas.server.admin.entity.ApiMethod; +import com.javabaas.server.admin.entity.ApiStat; +import com.javabaas.server.admin.entity.Clazz; +import com.javabaas.server.admin.entity.ClientPlatform; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; diff --git a/src/main/java/com/staryet/baas/cloud/controller/CloudController.java b/src/main/java/com/javabaas/server/cloud/controller/CloudController.java similarity index 81% rename from src/main/java/com/staryet/baas/cloud/controller/CloudController.java rename to src/main/java/com/javabaas/server/cloud/controller/CloudController.java index 6a738c4..666fc91 100644 --- a/src/main/java/com/staryet/baas/cloud/controller/CloudController.java +++ b/src/main/java/com/javabaas/server/cloud/controller/CloudController.java @@ -1,10 +1,10 @@ -package com.staryet.baas.cloud.controller; +package com.javabaas.server.cloud.controller; -import com.staryet.baas.cloud.service.CloudService; -import com.staryet.baas.common.entity.SimpleResult; -import com.staryet.baas.common.service.MasterService; -import com.staryet.baas.user.entity.BaasUser; -import com.staryet.baas.user.service.UserService; +import com.javabaas.server.cloud.service.CloudService; +import com.javabaas.server.common.entity.SimpleResult; +import com.javabaas.server.common.service.MasterService; +import com.javabaas.server.user.entity.BaasUser; +import com.javabaas.server.user.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/staryet/baas/cloud/controller/CloudMasterController.java b/src/main/java/com/javabaas/server/cloud/controller/CloudMasterController.java similarity index 81% rename from src/main/java/com/staryet/baas/cloud/controller/CloudMasterController.java rename to src/main/java/com/javabaas/server/cloud/controller/CloudMasterController.java index 4a1bce6..9bd2251 100644 --- a/src/main/java/com/staryet/baas/cloud/controller/CloudMasterController.java +++ b/src/main/java/com/javabaas/server/cloud/controller/CloudMasterController.java @@ -1,9 +1,9 @@ -package com.staryet.baas.cloud.controller; +package com.javabaas.server.cloud.controller; -import com.staryet.baas.cloud.entity.CloudSetting; -import com.staryet.baas.cloud.service.CloudService; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.entity.SimpleResult; +import com.javabaas.server.cloud.entity.CloudSetting; +import com.javabaas.server.cloud.service.CloudService; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/staryet/baas/cloud/entity/CloudRequest.java b/src/main/java/com/javabaas/server/cloud/entity/CloudRequest.java similarity index 93% rename from src/main/java/com/staryet/baas/cloud/entity/CloudRequest.java rename to src/main/java/com/javabaas/server/cloud/entity/CloudRequest.java index b86d6ae..22ed334 100644 --- a/src/main/java/com/staryet/baas/cloud/entity/CloudRequest.java +++ b/src/main/java/com/javabaas/server/cloud/entity/CloudRequest.java @@ -1,6 +1,6 @@ -package com.staryet.baas.cloud.entity; +package com.javabaas.server.cloud.entity; -import com.staryet.baas.user.entity.BaasUser; +import com.javabaas.server.user.entity.BaasUser; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/cloud/entity/CloudResponse.java b/src/main/java/com/javabaas/server/cloud/entity/CloudResponse.java similarity index 93% rename from src/main/java/com/staryet/baas/cloud/entity/CloudResponse.java rename to src/main/java/com/javabaas/server/cloud/entity/CloudResponse.java index 638d6ab..82f05c4 100644 --- a/src/main/java/com/staryet/baas/cloud/entity/CloudResponse.java +++ b/src/main/java/com/javabaas/server/cloud/entity/CloudResponse.java @@ -1,4 +1,4 @@ -package com.staryet.baas.cloud.entity; +package com.javabaas.server.cloud.entity; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/cloud/entity/CloudResponseCode.java b/src/main/java/com/javabaas/server/cloud/entity/CloudResponseCode.java similarity index 79% rename from src/main/java/com/staryet/baas/cloud/entity/CloudResponseCode.java rename to src/main/java/com/javabaas/server/cloud/entity/CloudResponseCode.java index 62bf33d..842d107 100644 --- a/src/main/java/com/staryet/baas/cloud/entity/CloudResponseCode.java +++ b/src/main/java/com/javabaas/server/cloud/entity/CloudResponseCode.java @@ -1,4 +1,4 @@ -package com.staryet.baas.cloud.entity; +package com.javabaas.server.cloud.entity; /** * Created by Codi on 15/10/9. diff --git a/src/main/java/com/staryet/baas/cloud/entity/CloudSetting.java b/src/main/java/com/javabaas/server/cloud/entity/CloudSetting.java similarity index 96% rename from src/main/java/com/staryet/baas/cloud/entity/CloudSetting.java rename to src/main/java/com/javabaas/server/cloud/entity/CloudSetting.java index 35bd327..c8d9658 100644 --- a/src/main/java/com/staryet/baas/cloud/entity/CloudSetting.java +++ b/src/main/java/com/javabaas/server/cloud/entity/CloudSetting.java @@ -1,4 +1,4 @@ -package com.staryet.baas.cloud.entity; +package com.javabaas.server.cloud.entity; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/cloud/entity/HookSetting.java b/src/main/java/com/javabaas/server/cloud/entity/HookSetting.java similarity index 97% rename from src/main/java/com/staryet/baas/cloud/entity/HookSetting.java rename to src/main/java/com/javabaas/server/cloud/entity/HookSetting.java index d7d1090..4c1939c 100644 --- a/src/main/java/com/staryet/baas/cloud/entity/HookSetting.java +++ b/src/main/java/com/javabaas/server/cloud/entity/HookSetting.java @@ -1,4 +1,4 @@ -package com.staryet.baas.cloud.entity; +package com.javabaas.server.cloud.entity; /** * Created by Staryet on 15/9/23. diff --git a/src/main/java/com/staryet/baas/cloud/service/CloudService.java b/src/main/java/com/javabaas/server/cloud/service/CloudService.java similarity index 84% rename from src/main/java/com/staryet/baas/cloud/service/CloudService.java rename to src/main/java/com/javabaas/server/cloud/service/CloudService.java index e2636c5..f87e1be 100644 --- a/src/main/java/com/staryet/baas/cloud/service/CloudService.java +++ b/src/main/java/com/javabaas/server/cloud/service/CloudService.java @@ -1,15 +1,15 @@ -package com.staryet.baas.cloud.service; +package com.javabaas.server.cloud.service; -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.cloud.entity.CloudRequest; -import com.staryet.baas.cloud.entity.CloudResponse; -import com.staryet.baas.cloud.entity.CloudSetting; -import com.staryet.baas.cloud.util.SignUtil; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.entity.SimpleResult; -import com.staryet.baas.user.entity.BaasUser; +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.cloud.entity.CloudRequest; +import com.javabaas.server.cloud.entity.CloudResponse; +import com.javabaas.server.cloud.entity.CloudSetting; +import com.javabaas.server.cloud.util.SignUtil; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleResult; +import com.javabaas.server.user.entity.BaasUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/src/main/java/com/staryet/baas/cloud/util/SignUtil.java b/src/main/java/com/javabaas/server/cloud/util/SignUtil.java similarity index 83% rename from src/main/java/com/staryet/baas/cloud/util/SignUtil.java rename to src/main/java/com/javabaas/server/cloud/util/SignUtil.java index 2d5ca78..039c2ef 100644 --- a/src/main/java/com/staryet/baas/cloud/util/SignUtil.java +++ b/src/main/java/com/javabaas/server/cloud/util/SignUtil.java @@ -1,7 +1,7 @@ -package com.staryet.baas.cloud.util; +package com.javabaas.server.cloud.util; -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.service.AppService; +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.service.AppService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.DigestUtils; diff --git a/src/main/java/com/staryet/baas/common/controller/ErrorController.java b/src/main/java/com/javabaas/server/common/controller/ErrorController.java similarity index 94% rename from src/main/java/com/staryet/baas/common/controller/ErrorController.java rename to src/main/java/com/javabaas/server/common/controller/ErrorController.java index 053d100..9bd049e 100644 --- a/src/main/java/com/staryet/baas/common/controller/ErrorController.java +++ b/src/main/java/com/javabaas/server/common/controller/ErrorController.java @@ -1,9 +1,9 @@ -package com.staryet.baas.common.controller; +package com.javabaas.server.common.controller; import com.fasterxml.jackson.core.JsonParseException; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.entity.SimpleResult; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleResult; import org.apache.catalina.connector.ClientAbortException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/com/staryet/baas/common/controller/TimeController.java b/src/main/java/com/javabaas/server/common/controller/TimeController.java similarity index 91% rename from src/main/java/com/staryet/baas/common/controller/TimeController.java rename to src/main/java/com/javabaas/server/common/controller/TimeController.java index 5460b1d..24244fd 100644 --- a/src/main/java/com/staryet/baas/common/controller/TimeController.java +++ b/src/main/java/com/javabaas/server/common/controller/TimeController.java @@ -1,4 +1,4 @@ -package com.staryet.baas.common.controller; +package com.javabaas.server.common.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/main/java/com/staryet/baas/common/entity/SimpleCode.java b/src/main/java/com/javabaas/server/common/entity/SimpleCode.java similarity index 97% rename from src/main/java/com/staryet/baas/common/entity/SimpleCode.java rename to src/main/java/com/javabaas/server/common/entity/SimpleCode.java index 51f7af4..cb8ab9f 100644 --- a/src/main/java/com/staryet/baas/common/entity/SimpleCode.java +++ b/src/main/java/com/javabaas/server/common/entity/SimpleCode.java @@ -1,4 +1,4 @@ -package com.staryet.baas.common.entity; +package com.javabaas.server.common.entity; /** * Created by Staryet on 15/8/24. @@ -20,7 +20,7 @@ public enum SimpleCode { //1xx 管理端相关 CONSOLE_USER_ERROR(101, "用户名密码错误"), CONSOLE_NOT_LOGIN(102, "未登录"), - CONSOLE_SESSIONTOKEN_ERROR(103, "SessionToken无效"), + CONSOLE_SESSION_TOKEN_ERROR(103, "SessionToken无效"), //10xx 应用相关 APP_NOT_FOUND(1001, "应用不存在"), APP_ALREADY_EXIST(1002, "应用名已存在"), diff --git a/src/main/java/com/staryet/baas/common/entity/SimpleError.java b/src/main/java/com/javabaas/server/common/entity/SimpleError.java similarity index 94% rename from src/main/java/com/staryet/baas/common/entity/SimpleError.java rename to src/main/java/com/javabaas/server/common/entity/SimpleError.java index 510ce00..03ddbdd 100644 --- a/src/main/java/com/staryet/baas/common/entity/SimpleError.java +++ b/src/main/java/com/javabaas/server/common/entity/SimpleError.java @@ -1,4 +1,4 @@ -package com.staryet.baas.common.entity; +package com.javabaas.server.common.entity; /** * Created by Staryet on 15/6/18. diff --git a/src/main/java/com/staryet/baas/common/entity/SimpleResult.java b/src/main/java/com/javabaas/server/common/entity/SimpleResult.java similarity index 97% rename from src/main/java/com/staryet/baas/common/entity/SimpleResult.java rename to src/main/java/com/javabaas/server/common/entity/SimpleResult.java index 2da109d..0f5e316 100644 --- a/src/main/java/com/staryet/baas/common/entity/SimpleResult.java +++ b/src/main/java/com/javabaas/server/common/entity/SimpleResult.java @@ -1,4 +1,4 @@ -package com.staryet.baas.common.entity; +package com.javabaas.server.common.entity; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/src/main/java/com/staryet/baas/common/filter/SimpleCORSFilter.java b/src/main/java/com/javabaas/server/common/filter/SimpleCORSFilter.java similarity index 87% rename from src/main/java/com/staryet/baas/common/filter/SimpleCORSFilter.java rename to src/main/java/com/javabaas/server/common/filter/SimpleCORSFilter.java index 5067a5d..e2c23d4 100644 --- a/src/main/java/com/staryet/baas/common/filter/SimpleCORSFilter.java +++ b/src/main/java/com/javabaas/server/common/filter/SimpleCORSFilter.java @@ -1,4 +1,4 @@ -package com.staryet.baas.common.filter; +package com.javabaas.server.common.filter; import org.springframework.stereotype.Component; @@ -14,7 +14,7 @@ public class SimpleCORSFilter implements Filter { public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { HttpServletResponse response = (HttpServletResponse) res; - response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader("Access-Control-Allow-Origin", "http://127.0.0.1:8081"); response.setHeader("Access-Control-Allow-Credentials", "true"); response.setHeader("Access-Control-Allow-Methods", "GET,POST,PUT,DELETE,OPTIONS"); response.setHeader("Access-Control-Allow-Headers", "content-type,JB-Plat,JB-AppId,JB-Sign,JB-AdminSign,JB-MasterSign,JB-Timestamp"); diff --git a/src/main/java/com/staryet/baas/common/interceptor/AdminInterceptor.java b/src/main/java/com/javabaas/server/common/interceptor/AdminInterceptor.java similarity index 91% rename from src/main/java/com/staryet/baas/common/interceptor/AdminInterceptor.java rename to src/main/java/com/javabaas/server/common/interceptor/AdminInterceptor.java index 9def0b9..864221d 100644 --- a/src/main/java/com/staryet/baas/common/interceptor/AdminInterceptor.java +++ b/src/main/java/com/javabaas/server/common/interceptor/AdminInterceptor.java @@ -1,8 +1,8 @@ -package com.staryet.baas.common.interceptor; +package com.javabaas.server.common.interceptor; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.config.AuthConfig; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.config.AuthConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.DigestUtils; diff --git a/src/main/java/com/staryet/baas/common/interceptor/AuthInterceptor.java b/src/main/java/com/javabaas/server/common/interceptor/AuthInterceptor.java similarity index 81% rename from src/main/java/com/staryet/baas/common/interceptor/AuthInterceptor.java rename to src/main/java/com/javabaas/server/common/interceptor/AuthInterceptor.java index 9a65728..b97ba97 100644 --- a/src/main/java/com/staryet/baas/common/interceptor/AuthInterceptor.java +++ b/src/main/java/com/javabaas/server/common/interceptor/AuthInterceptor.java @@ -1,10 +1,10 @@ -package com.staryet.baas.common.interceptor; +package com.javabaas.server.common.interceptor; -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.config.AuthConfig; +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.config.AuthConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.DigestUtils; @@ -34,7 +34,8 @@ public class AuthInterceptor implements HandlerInterceptor { * @throws Exception */ @Override - public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception { + public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) + throws Exception { String appId = httpServletRequest.getHeader("JB-AppId"); String masterSign = httpServletRequest.getHeader("JB-MasterSign"); String sign = httpServletRequest.getHeader("JB-Sign"); @@ -76,12 +77,16 @@ public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletRespo } @Override - public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) throws Exception { + public void postHandle(HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse, + Object o, ModelAndView modelAndView) throws Exception { } @Override - public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception { + public void afterCompletion(HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse, + Object o, Exception e) throws Exception { } diff --git a/src/main/java/com/staryet/baas/common/interceptor/HeaderInterceptor.java b/src/main/java/com/javabaas/server/common/interceptor/HeaderInterceptor.java similarity index 93% rename from src/main/java/com/staryet/baas/common/interceptor/HeaderInterceptor.java rename to src/main/java/com/javabaas/server/common/interceptor/HeaderInterceptor.java index 8c83e54..340610c 100644 --- a/src/main/java/com/staryet/baas/common/interceptor/HeaderInterceptor.java +++ b/src/main/java/com/javabaas/server/common/interceptor/HeaderInterceptor.java @@ -1,7 +1,7 @@ -package com.staryet.baas.common.interceptor; +package com.javabaas.server.common.interceptor; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleCode; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/src/main/java/com/staryet/baas/common/interceptor/MasterInterceptor.java b/src/main/java/com/javabaas/server/common/interceptor/MasterInterceptor.java similarity index 88% rename from src/main/java/com/staryet/baas/common/interceptor/MasterInterceptor.java rename to src/main/java/com/javabaas/server/common/interceptor/MasterInterceptor.java index eee305f..8d15e26 100644 --- a/src/main/java/com/staryet/baas/common/interceptor/MasterInterceptor.java +++ b/src/main/java/com/javabaas/server/common/interceptor/MasterInterceptor.java @@ -1,7 +1,7 @@ -package com.staryet.baas.common.interceptor; +package com.javabaas.server.common.interceptor; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/src/main/java/com/staryet/baas/common/listener/ApplicationEventListener.java b/src/main/java/com/javabaas/server/common/listener/ApplicationEventListener.java similarity index 94% rename from src/main/java/com/staryet/baas/common/listener/ApplicationEventListener.java rename to src/main/java/com/javabaas/server/common/listener/ApplicationEventListener.java index 002fd09..88c94a2 100644 --- a/src/main/java/com/staryet/baas/common/listener/ApplicationEventListener.java +++ b/src/main/java/com/javabaas/server/common/listener/ApplicationEventListener.java @@ -1,4 +1,4 @@ -package com.staryet.baas.common.listener; +package com.javabaas.server.common.listener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -45,12 +45,14 @@ public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) { } catch (Exception e) { error = true; log.error(e, e); + log.error("Redis error!"); } try { this.mongoTemplate.executeCommand("{ buildInfo: 1 }"); } catch (Exception e) { error = true; log.error(e, e); + log.error("MongoDB error!"); } if (!error) { log.info("JavaBaasServer started."); diff --git a/src/main/java/com/staryet/baas/common/service/MasterService.java b/src/main/java/com/javabaas/server/common/service/MasterService.java similarity index 91% rename from src/main/java/com/staryet/baas/common/service/MasterService.java rename to src/main/java/com/javabaas/server/common/service/MasterService.java index 1e0fb7a..96363e6 100644 --- a/src/main/java/com/staryet/baas/common/service/MasterService.java +++ b/src/main/java/com/javabaas/server/common/service/MasterService.java @@ -1,4 +1,4 @@ -package com.staryet.baas.common.service; +package com.javabaas.server.common.service; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/src/main/java/com/staryet/baas/common/util/JSONUtil.java b/src/main/java/com/javabaas/server/common/util/JSONUtil.java similarity index 90% rename from src/main/java/com/staryet/baas/common/util/JSONUtil.java rename to src/main/java/com/javabaas/server/common/util/JSONUtil.java index 428ad23..0144da7 100644 --- a/src/main/java/com/staryet/baas/common/util/JSONUtil.java +++ b/src/main/java/com/javabaas/server/common/util/JSONUtil.java @@ -1,10 +1,10 @@ -package com.staryet.baas.common.util; +package com.javabaas.server.common.util; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/staryet/baas/config/AuthConfig.java b/src/main/java/com/javabaas/server/config/AuthConfig.java similarity index 91% rename from src/main/java/com/staryet/baas/config/AuthConfig.java rename to src/main/java/com/javabaas/server/config/AuthConfig.java index d9818e6..02646ef 100644 --- a/src/main/java/com/staryet/baas/config/AuthConfig.java +++ b/src/main/java/com/javabaas/server/config/AuthConfig.java @@ -1,4 +1,4 @@ -package com.staryet.baas.config; +package com.javabaas.server.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; @@ -12,6 +12,7 @@ public class AuthConfig { public static final long DEFAULT_TIMEOUT = 600000; + public static final String DEFAULT_ADMIN_KEY = "JavaBaas"; public static final String DEFAULT_USERNAME = "admin"; public static final String DEFAULT_PASSWORD = "admin"; @@ -23,7 +24,7 @@ public class AuthConfig { public String getKey() { if (key == null) { - return ""; + return DEFAULT_ADMIN_KEY; } else { return key; } diff --git a/src/main/java/com/staryet/baas/config/BaasConfig.java b/src/main/java/com/javabaas/server/config/BaasConfig.java similarity index 96% rename from src/main/java/com/staryet/baas/config/BaasConfig.java rename to src/main/java/com/javabaas/server/config/BaasConfig.java index bc263f7..d729149 100644 --- a/src/main/java/com/staryet/baas/config/BaasConfig.java +++ b/src/main/java/com/javabaas/server/config/BaasConfig.java @@ -1,4 +1,4 @@ -package com.staryet.baas.config; +package com.javabaas.server.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/staryet/baas/file/controller/FileController.java b/src/main/java/com/javabaas/server/file/controller/FileController.java similarity index 92% rename from src/main/java/com/staryet/baas/file/controller/FileController.java rename to src/main/java/com/javabaas/server/file/controller/FileController.java index 6adbb61..cba5dcf 100644 --- a/src/main/java/com/staryet/baas/file/controller/FileController.java +++ b/src/main/java/com/javabaas/server/file/controller/FileController.java @@ -1,13 +1,13 @@ -package com.staryet.baas.file.controller; +package com.javabaas.server.file.controller; import com.fasterxml.jackson.core.type.TypeReference; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.entity.SimpleResult; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.file.entity.BaasFile; -import com.staryet.baas.file.entity.FileStoragePlatform; -import com.staryet.baas.file.service.FileService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleResult; +import com.javabaas.server.file.entity.BaasFile; +import com.javabaas.server.file.entity.FileStoragePlatform; +import com.javabaas.server.file.service.FileService; +import com.javabaas.server.common.util.JSONUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/staryet/baas/file/entity/BaasFile.java b/src/main/java/com/javabaas/server/file/entity/BaasFile.java similarity index 88% rename from src/main/java/com/staryet/baas/file/entity/BaasFile.java rename to src/main/java/com/javabaas/server/file/entity/BaasFile.java index 8af92a9..c70b667 100644 --- a/src/main/java/com/staryet/baas/file/entity/BaasFile.java +++ b/src/main/java/com/javabaas/server/file/entity/BaasFile.java @@ -1,7 +1,7 @@ -package com.staryet.baas.file.entity; +package com.javabaas.server.file.entity; -import com.staryet.baas.object.entity.BaasList; -import com.staryet.baas.object.entity.BaasObject; +import com.javabaas.server.object.entity.BaasList; +import com.javabaas.server.object.entity.BaasObject; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/file/entity/FileStoragePlatform.java b/src/main/java/com/javabaas/server/file/entity/FileStoragePlatform.java similarity index 81% rename from src/main/java/com/staryet/baas/file/entity/FileStoragePlatform.java rename to src/main/java/com/javabaas/server/file/entity/FileStoragePlatform.java index cd6d688..22528cc 100644 --- a/src/main/java/com/staryet/baas/file/entity/FileStoragePlatform.java +++ b/src/main/java/com/javabaas/server/file/entity/FileStoragePlatform.java @@ -1,7 +1,7 @@ -package com.staryet.baas.file.entity; +package com.javabaas.server.file.entity; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; /** * Created by Staryet on 15/8/27. diff --git a/src/main/java/com/staryet/baas/file/entity/FileToken.java b/src/main/java/com/javabaas/server/file/entity/FileToken.java similarity index 70% rename from src/main/java/com/staryet/baas/file/entity/FileToken.java rename to src/main/java/com/javabaas/server/file/entity/FileToken.java index ca79be2..eed12db 100644 --- a/src/main/java/com/staryet/baas/file/entity/FileToken.java +++ b/src/main/java/com/javabaas/server/file/entity/FileToken.java @@ -1,4 +1,4 @@ -package com.staryet.baas.file.entity; +package com.javabaas.server.file.entity; /** * Created by Staryet on 15/8/27. diff --git a/src/main/java/com/staryet/baas/file/entity/qiniu/PersistentItem.java b/src/main/java/com/javabaas/server/file/entity/qiniu/PersistentItem.java similarity index 88% rename from src/main/java/com/staryet/baas/file/entity/qiniu/PersistentItem.java rename to src/main/java/com/javabaas/server/file/entity/qiniu/PersistentItem.java index 231a5f8..b717446 100644 --- a/src/main/java/com/staryet/baas/file/entity/qiniu/PersistentItem.java +++ b/src/main/java/com/javabaas/server/file/entity/qiniu/PersistentItem.java @@ -1,4 +1,4 @@ -package com.staryet.baas.file.entity.qiniu; +package com.javabaas.server.file.entity.qiniu; /** * Created by Codi on 15/11/12. diff --git a/src/main/java/com/staryet/baas/file/entity/qiniu/PersistentResult.java b/src/main/java/com/javabaas/server/file/entity/qiniu/PersistentResult.java similarity index 94% rename from src/main/java/com/staryet/baas/file/entity/qiniu/PersistentResult.java rename to src/main/java/com/javabaas/server/file/entity/qiniu/PersistentResult.java index 74be292..6aa79fe 100644 --- a/src/main/java/com/staryet/baas/file/entity/qiniu/PersistentResult.java +++ b/src/main/java/com/javabaas/server/file/entity/qiniu/PersistentResult.java @@ -1,4 +1,4 @@ -package com.staryet.baas.file.entity.qiniu; +package com.javabaas.server.file.entity.qiniu; import java.util.List; diff --git a/src/main/java/com/staryet/baas/file/entity/qiniu/QiniuConfig.java b/src/main/java/com/javabaas/server/file/entity/qiniu/QiniuConfig.java similarity index 95% rename from src/main/java/com/staryet/baas/file/entity/qiniu/QiniuConfig.java rename to src/main/java/com/javabaas/server/file/entity/qiniu/QiniuConfig.java index 556d47a..32faf9a 100644 --- a/src/main/java/com/staryet/baas/file/entity/qiniu/QiniuConfig.java +++ b/src/main/java/com/javabaas/server/file/entity/qiniu/QiniuConfig.java @@ -1,4 +1,4 @@ -package com.staryet.baas.file.entity.qiniu; +package com.javabaas.server.file.entity.qiniu; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/staryet/baas/file/handler/IFileHandler.java b/src/main/java/com/javabaas/server/file/handler/IFileHandler.java similarity index 86% rename from src/main/java/com/staryet/baas/file/handler/IFileHandler.java rename to src/main/java/com/javabaas/server/file/handler/IFileHandler.java index 7443a44..707e7c7 100644 --- a/src/main/java/com/staryet/baas/file/handler/IFileHandler.java +++ b/src/main/java/com/javabaas/server/file/handler/IFileHandler.java @@ -1,6 +1,6 @@ -package com.staryet.baas.file.handler; +package com.javabaas.server.file.handler; -import com.staryet.baas.file.entity.BaasFile; +import com.javabaas.server.file.entity.BaasFile; import javax.servlet.http.HttpServletRequest; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/file/handler/impl/QiniuFileHandler.java b/src/main/java/com/javabaas/server/file/handler/impl/QiniuFileHandler.java similarity index 93% rename from src/main/java/com/staryet/baas/file/handler/impl/QiniuFileHandler.java rename to src/main/java/com/javabaas/server/file/handler/impl/QiniuFileHandler.java index ec98075..84db4af 100644 --- a/src/main/java/com/staryet/baas/file/handler/impl/QiniuFileHandler.java +++ b/src/main/java/com/javabaas/server/file/handler/impl/QiniuFileHandler.java @@ -1,5 +1,8 @@ -package com.staryet.baas.file.handler.impl; +package com.javabaas.server.file.handler.impl; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleResult; +import com.javabaas.server.config.BaasConfig; import com.qiniu.common.QiniuException; import com.qiniu.http.Response; import com.qiniu.processing.OperationManager; @@ -7,20 +10,17 @@ import com.qiniu.util.Auth; import com.qiniu.util.Base64; import com.qiniu.util.StringMap; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.entity.SimpleResult; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.config.BaasConfig; -import com.staryet.baas.file.entity.BaasFile; -import com.staryet.baas.file.entity.qiniu.PersistentResult; -import com.staryet.baas.file.entity.qiniu.QiniuConfig; -import com.staryet.baas.file.handler.IFileHandler; -import com.staryet.baas.file.service.FileService; -import com.staryet.baas.object.entity.BaasList; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.object.entity.BaasQuery; -import com.staryet.baas.object.service.ObjectService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.util.JSONUtil; +import com.javabaas.server.file.entity.BaasFile; +import com.javabaas.server.file.entity.qiniu.PersistentResult; +import com.javabaas.server.file.entity.qiniu.QiniuConfig; +import com.javabaas.server.file.handler.IFileHandler; +import com.javabaas.server.file.service.FileService; +import com.javabaas.server.object.entity.BaasList; +import com.javabaas.server.object.entity.BaasObject; +import com.javabaas.server.object.entity.BaasQuery; +import com.javabaas.server.object.service.ObjectService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/staryet/baas/file/handler/impl/TestFileHandler.java b/src/main/java/com/javabaas/server/file/handler/impl/TestFileHandler.java similarity index 85% rename from src/main/java/com/staryet/baas/file/handler/impl/TestFileHandler.java rename to src/main/java/com/javabaas/server/file/handler/impl/TestFileHandler.java index 44f06bc..a60146d 100644 --- a/src/main/java/com/staryet/baas/file/handler/impl/TestFileHandler.java +++ b/src/main/java/com/javabaas/server/file/handler/impl/TestFileHandler.java @@ -1,10 +1,10 @@ -package com.staryet.baas.file.handler.impl; +package com.javabaas.server.file.handler.impl; import com.fasterxml.jackson.core.type.TypeReference; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.file.entity.BaasFile; -import com.staryet.baas.file.handler.IFileHandler; -import com.staryet.baas.file.service.FileService; +import com.javabaas.server.common.util.JSONUtil; +import com.javabaas.server.file.entity.BaasFile; +import com.javabaas.server.file.handler.IFileHandler; +import com.javabaas.server.file.service.FileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/staryet/baas/file/service/FileService.java b/src/main/java/com/javabaas/server/file/service/FileService.java similarity index 84% rename from src/main/java/com/staryet/baas/file/service/FileService.java rename to src/main/java/com/javabaas/server/file/service/FileService.java index 815a4a1..2de302e 100644 --- a/src/main/java/com/staryet/baas/file/service/FileService.java +++ b/src/main/java/com/javabaas/server/file/service/FileService.java @@ -1,14 +1,14 @@ -package com.staryet.baas.file.service; +package com.javabaas.server.file.service; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.file.entity.BaasFile; -import com.staryet.baas.file.entity.FileStoragePlatform; -import com.staryet.baas.file.handler.IFileHandler; -import com.staryet.baas.file.handler.impl.QiniuFileHandler; -import com.staryet.baas.file.handler.impl.TestFileHandler; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.object.service.ObjectService; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.file.entity.FileStoragePlatform; +import com.javabaas.server.file.handler.impl.QiniuFileHandler; +import com.javabaas.server.file.handler.impl.TestFileHandler; +import com.javabaas.server.object.service.ObjectService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.file.entity.BaasFile; +import com.javabaas.server.file.handler.IFileHandler; +import com.javabaas.server.object.entity.BaasObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/src/main/java/com/staryet/baas/hook/entity/HookEvent.java b/src/main/java/com/javabaas/server/hook/entity/HookEvent.java similarity index 93% rename from src/main/java/com/staryet/baas/hook/entity/HookEvent.java rename to src/main/java/com/javabaas/server/hook/entity/HookEvent.java index 8e36dc8..e58420d 100644 --- a/src/main/java/com/staryet/baas/hook/entity/HookEvent.java +++ b/src/main/java/com/javabaas/server/hook/entity/HookEvent.java @@ -1,4 +1,4 @@ -package com.staryet.baas.hook.entity; +package com.javabaas.server.hook.entity; /** * Created by Codi on 15/10/11. diff --git a/src/main/java/com/staryet/baas/hook/entity/HookRequest.java b/src/main/java/com/javabaas/server/hook/entity/HookRequest.java similarity index 80% rename from src/main/java/com/staryet/baas/hook/entity/HookRequest.java rename to src/main/java/com/javabaas/server/hook/entity/HookRequest.java index 9480bb9..79c7995 100644 --- a/src/main/java/com/staryet/baas/hook/entity/HookRequest.java +++ b/src/main/java/com/javabaas/server/hook/entity/HookRequest.java @@ -1,7 +1,7 @@ -package com.staryet.baas.hook.entity; +package com.javabaas.server.hook.entity; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.user.entity.BaasUser; +import com.javabaas.server.user.entity.BaasUser; +import com.javabaas.server.object.entity.BaasObject; /** * Created by Staryet on 15/9/24. diff --git a/src/main/java/com/staryet/baas/hook/entity/HookResponse.java b/src/main/java/com/javabaas/server/hook/entity/HookResponse.java similarity index 85% rename from src/main/java/com/staryet/baas/hook/entity/HookResponse.java rename to src/main/java/com/javabaas/server/hook/entity/HookResponse.java index 58d4bf3..8121270 100644 --- a/src/main/java/com/staryet/baas/hook/entity/HookResponse.java +++ b/src/main/java/com/javabaas/server/hook/entity/HookResponse.java @@ -1,6 +1,6 @@ -package com.staryet.baas.hook.entity; +package com.javabaas.server.hook.entity; -import com.staryet.baas.object.entity.BaasObject; +import com.javabaas.server.object.entity.BaasObject; /** * Created by Staryet on 15/9/24. diff --git a/src/main/java/com/staryet/baas/hook/entity/HookResponseCode.java b/src/main/java/com/javabaas/server/hook/entity/HookResponseCode.java similarity index 79% rename from src/main/java/com/staryet/baas/hook/entity/HookResponseCode.java rename to src/main/java/com/javabaas/server/hook/entity/HookResponseCode.java index 8d3368b..1cb42c9 100644 --- a/src/main/java/com/staryet/baas/hook/entity/HookResponseCode.java +++ b/src/main/java/com/javabaas/server/hook/entity/HookResponseCode.java @@ -1,4 +1,4 @@ -package com.staryet.baas.hook.entity; +package com.javabaas.server.hook.entity; /** * Created by Staryet on 15/9/27. diff --git a/src/main/java/com/staryet/baas/hook/service/HookService.java b/src/main/java/com/javabaas/server/hook/service/HookService.java similarity index 89% rename from src/main/java/com/staryet/baas/hook/service/HookService.java rename to src/main/java/com/javabaas/server/hook/service/HookService.java index bb2c84d..3dc3823 100644 --- a/src/main/java/com/staryet/baas/hook/service/HookService.java +++ b/src/main/java/com/javabaas/server/hook/service/HookService.java @@ -1,17 +1,17 @@ -package com.staryet.baas.hook.service; +package com.javabaas.server.hook.service; -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.cloud.entity.CloudSetting; -import com.staryet.baas.cloud.entity.HookSetting; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.hook.entity.HookEvent; -import com.staryet.baas.hook.entity.HookRequest; -import com.staryet.baas.hook.entity.HookResponse; -import com.staryet.baas.hook.entity.HookResponseCode; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.user.entity.BaasUser; +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.cloud.entity.CloudSetting; +import com.javabaas.server.cloud.entity.HookSetting; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.hook.entity.HookEvent; +import com.javabaas.server.hook.entity.HookRequest; +import com.javabaas.server.hook.entity.HookResponse; +import com.javabaas.server.hook.entity.HookResponseCode; +import com.javabaas.server.object.entity.BaasObject; +import com.javabaas.server.user.entity.BaasUser; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/staryet/baas/log/appender/LogbackMongoAppender.java b/src/main/java/com/javabaas/server/log/appender/LogbackMongoAppender.java similarity index 91% rename from src/main/java/com/staryet/baas/log/appender/LogbackMongoAppender.java rename to src/main/java/com/javabaas/server/log/appender/LogbackMongoAppender.java index ff11f70..49065ef 100644 --- a/src/main/java/com/staryet/baas/log/appender/LogbackMongoAppender.java +++ b/src/main/java/com/javabaas/server/log/appender/LogbackMongoAppender.java @@ -1,11 +1,11 @@ -package com.staryet.baas.log.appender; +package com.javabaas.server.log.appender; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.AppenderBase; import com.mongodb.BasicDBObject; import com.mongodb.DBCollection; -import com.staryet.baas.common.listener.ApplicationEventListener; -import com.staryet.baas.log.service.MongoConnection; +import com.javabaas.server.common.listener.ApplicationEventListener; +import com.javabaas.server.log.service.MongoConnection; /** * MongoDb日志记录器 diff --git a/src/main/java/com/staryet/baas/log/controller/LogController.java b/src/main/java/com/javabaas/server/log/controller/LogController.java similarity index 85% rename from src/main/java/com/staryet/baas/log/controller/LogController.java rename to src/main/java/com/javabaas/server/log/controller/LogController.java index 65c4774..6a5c968 100644 --- a/src/main/java/com/staryet/baas/log/controller/LogController.java +++ b/src/main/java/com/javabaas/server/log/controller/LogController.java @@ -1,7 +1,7 @@ -package com.staryet.baas.log.controller; +package com.javabaas.server.log.controller; -import com.staryet.baas.log.entity.BaasLog; -import com.staryet.baas.log.service.LogService; +import com.javabaas.server.log.service.LogService; +import com.javabaas.server.log.entity.BaasLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/staryet/baas/log/entity/BaasLog.java b/src/main/java/com/javabaas/server/log/entity/BaasLog.java similarity index 70% rename from src/main/java/com/staryet/baas/log/entity/BaasLog.java rename to src/main/java/com/javabaas/server/log/entity/BaasLog.java index a685347..d741d9a 100644 --- a/src/main/java/com/staryet/baas/log/entity/BaasLog.java +++ b/src/main/java/com/javabaas/server/log/entity/BaasLog.java @@ -1,6 +1,6 @@ -package com.staryet.baas.log.entity; +package com.javabaas.server.log.entity; -import com.staryet.baas.object.entity.BaasObject; +import com.javabaas.server.object.entity.BaasObject; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/log/service/LogService.java b/src/main/java/com/javabaas/server/log/service/LogService.java similarity index 93% rename from src/main/java/com/staryet/baas/log/service/LogService.java rename to src/main/java/com/javabaas/server/log/service/LogService.java index ef6c7f7..202a1a1 100644 --- a/src/main/java/com/staryet/baas/log/service/LogService.java +++ b/src/main/java/com/javabaas/server/log/service/LogService.java @@ -1,9 +1,9 @@ -package com.staryet.baas.log.service; +package com.javabaas.server.log.service; import com.mongodb.BasicDBObject; import com.mongodb.DBCollection; import com.mongodb.DBCursor; -import com.staryet.baas.log.entity.BaasLog; +import com.javabaas.server.log.entity.BaasLog; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/src/main/java/com/staryet/baas/log/service/MongoConnection.java b/src/main/java/com/javabaas/server/log/service/MongoConnection.java similarity index 96% rename from src/main/java/com/staryet/baas/log/service/MongoConnection.java rename to src/main/java/com/javabaas/server/log/service/MongoConnection.java index 22f0526..30f0cb4 100644 --- a/src/main/java/com/staryet/baas/log/service/MongoConnection.java +++ b/src/main/java/com/javabaas/server/log/service/MongoConnection.java @@ -1,4 +1,4 @@ -package com.staryet.baas.log.service; +package com.javabaas.server.log.service; import com.mongodb.*; diff --git a/src/main/java/com/staryet/baas/object/controller/ObjectController.java b/src/main/java/com/javabaas/server/object/controller/ObjectController.java similarity index 92% rename from src/main/java/com/staryet/baas/object/controller/ObjectController.java rename to src/main/java/com/javabaas/server/object/controller/ObjectController.java index 3cbee70..4cdacd8 100644 --- a/src/main/java/com/staryet/baas/object/controller/ObjectController.java +++ b/src/main/java/com/javabaas/server/object/controller/ObjectController.java @@ -1,18 +1,18 @@ -package com.staryet.baas.object.controller; +package com.javabaas.server.object.controller; -import com.staryet.baas.admin.service.ClazzService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.entity.SimpleResult; -import com.staryet.baas.common.service.MasterService; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.object.entity.BaasInclude; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.object.entity.BaasQuery; -import com.staryet.baas.object.entity.BaasSort; -import com.staryet.baas.object.service.ObjectService; -import com.staryet.baas.user.entity.BaasUser; -import com.staryet.baas.user.service.UserService; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleResult; +import com.javabaas.server.common.service.MasterService; +import com.javabaas.server.object.entity.BaasInclude; +import com.javabaas.server.object.entity.BaasSort; +import com.javabaas.server.object.service.ObjectService; +import com.javabaas.server.user.entity.BaasUser; +import com.javabaas.server.user.service.UserService; +import com.javabaas.server.admin.service.ClazzService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.util.JSONUtil; +import com.javabaas.server.object.entity.BaasObject; +import com.javabaas.server.object.entity.BaasQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/staryet/baas/object/dao/IDao.java b/src/main/java/com/javabaas/server/object/dao/IDao.java similarity index 81% rename from src/main/java/com/staryet/baas/object/dao/IDao.java rename to src/main/java/com/javabaas/server/object/dao/IDao.java index f0fdebd..0421bf7 100644 --- a/src/main/java/com/staryet/baas/object/dao/IDao.java +++ b/src/main/java/com/javabaas/server/object/dao/IDao.java @@ -1,8 +1,8 @@ -package com.staryet.baas.object.dao; +package com.javabaas.server.object.dao; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.object.entity.BaasQuery; -import com.staryet.baas.object.entity.BaasSort; +import com.javabaas.server.object.entity.BaasQuery; +import com.javabaas.server.object.entity.BaasSort; +import com.javabaas.server.object.entity.BaasObject; import java.util.List; diff --git a/src/main/java/com/staryet/baas/object/dao/impl/mongo/MongoDBConfiguration.java b/src/main/java/com/javabaas/server/object/dao/impl/mongo/MongoDBConfiguration.java similarity index 96% rename from src/main/java/com/staryet/baas/object/dao/impl/mongo/MongoDBConfiguration.java rename to src/main/java/com/javabaas/server/object/dao/impl/mongo/MongoDBConfiguration.java index 35ea47d..58c668d 100644 --- a/src/main/java/com/staryet/baas/object/dao/impl/mongo/MongoDBConfiguration.java +++ b/src/main/java/com/javabaas/server/object/dao/impl/mongo/MongoDBConfiguration.java @@ -1,4 +1,4 @@ -package com.staryet.baas.object.dao.impl.mongo; +package com.javabaas.server.object.dao.impl.mongo; import com.mongodb.MongoClient; import com.mongodb.MongoClientOptions; diff --git a/src/main/java/com/staryet/baas/object/dao/impl/mongo/MongoDao.java b/src/main/java/com/javabaas/server/object/dao/impl/mongo/MongoDao.java similarity index 94% rename from src/main/java/com/staryet/baas/object/dao/impl/mongo/MongoDao.java rename to src/main/java/com/javabaas/server/object/dao/impl/mongo/MongoDao.java index 40c0d16..c543c52 100644 --- a/src/main/java/com/staryet/baas/object/dao/impl/mongo/MongoDao.java +++ b/src/main/java/com/javabaas/server/object/dao/impl/mongo/MongoDao.java @@ -1,14 +1,14 @@ -package com.staryet.baas.object.dao.impl.mongo; +package com.javabaas.server.object.dao.impl.mongo; import com.mongodb.*; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.object.dao.IDao; -import com.staryet.baas.object.entity.BaasList; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.object.entity.BaasQuery; -import com.staryet.baas.object.entity.BaasSort; -import com.staryet.baas.object.entity.error.DuplicateKeyError; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.object.dao.IDao; +import com.javabaas.server.object.entity.BaasList; +import com.javabaas.server.object.entity.BaasObject; +import com.javabaas.server.object.entity.BaasQuery; +import com.javabaas.server.object.entity.BaasSort; +import com.javabaas.server.object.entity.error.DuplicateKeyError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.MongoDbFactory; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/staryet/baas/object/dao/impl/mongo/MongoProperties.java b/src/main/java/com/javabaas/server/object/dao/impl/mongo/MongoProperties.java similarity index 99% rename from src/main/java/com/staryet/baas/object/dao/impl/mongo/MongoProperties.java rename to src/main/java/com/javabaas/server/object/dao/impl/mongo/MongoProperties.java index 884d025..d0ae589 100644 --- a/src/main/java/com/staryet/baas/object/dao/impl/mongo/MongoProperties.java +++ b/src/main/java/com/javabaas/server/object/dao/impl/mongo/MongoProperties.java @@ -1,4 +1,4 @@ -package com.staryet.baas.object.dao.impl.mongo; +package com.javabaas.server.object.dao.impl.mongo; import com.mongodb.*; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/staryet/baas/object/entity/BaasAcl.java b/src/main/java/com/javabaas/server/object/entity/BaasAcl.java similarity index 95% rename from src/main/java/com/staryet/baas/object/entity/BaasAcl.java rename to src/main/java/com/javabaas/server/object/entity/BaasAcl.java index b8d1838..9d60f07 100644 --- a/src/main/java/com/staryet/baas/object/entity/BaasAcl.java +++ b/src/main/java/com/javabaas/server/object/entity/BaasAcl.java @@ -1,6 +1,6 @@ -package com.staryet.baas.object.entity; +package com.javabaas.server.object.entity; -import com.staryet.baas.user.entity.BaasUser; +import com.javabaas.server.user.entity.BaasUser; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/object/entity/BaasInclude.java b/src/main/java/com/javabaas/server/object/entity/BaasInclude.java similarity index 94% rename from src/main/java/com/staryet/baas/object/entity/BaasInclude.java rename to src/main/java/com/javabaas/server/object/entity/BaasInclude.java index 5d78636..68baf2a 100644 --- a/src/main/java/com/staryet/baas/object/entity/BaasInclude.java +++ b/src/main/java/com/javabaas/server/object/entity/BaasInclude.java @@ -1,4 +1,4 @@ -package com.staryet.baas.object.entity; +package com.javabaas.server.object.entity; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/object/entity/BaasList.java b/src/main/java/com/javabaas/server/object/entity/BaasList.java similarity index 85% rename from src/main/java/com/staryet/baas/object/entity/BaasList.java rename to src/main/java/com/javabaas/server/object/entity/BaasList.java index 161fbab..468531f 100644 --- a/src/main/java/com/staryet/baas/object/entity/BaasList.java +++ b/src/main/java/com/javabaas/server/object/entity/BaasList.java @@ -1,4 +1,4 @@ -package com.staryet.baas.object.entity; +package com.javabaas.server.object.entity; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/com/staryet/baas/object/entity/BaasObject.java b/src/main/java/com/javabaas/server/object/entity/BaasObject.java similarity index 97% rename from src/main/java/com/staryet/baas/object/entity/BaasObject.java rename to src/main/java/com/javabaas/server/object/entity/BaasObject.java index 0585e07..5092c48 100644 --- a/src/main/java/com/staryet/baas/object/entity/BaasObject.java +++ b/src/main/java/com/javabaas/server/object/entity/BaasObject.java @@ -1,4 +1,4 @@ -package com.staryet.baas.object.entity; +package com.javabaas.server.object.entity; import java.util.Date; import java.util.LinkedHashMap; diff --git a/src/main/java/com/staryet/baas/object/entity/BaasQuery.java b/src/main/java/com/javabaas/server/object/entity/BaasQuery.java similarity index 87% rename from src/main/java/com/staryet/baas/object/entity/BaasQuery.java rename to src/main/java/com/javabaas/server/object/entity/BaasQuery.java index 44b5de9..2b087de 100644 --- a/src/main/java/com/staryet/baas/object/entity/BaasQuery.java +++ b/src/main/java/com/javabaas/server/object/entity/BaasQuery.java @@ -1,4 +1,4 @@ -package com.staryet.baas.object.entity; +package com.javabaas.server.object.entity; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/object/entity/BaasSort.java b/src/main/java/com/javabaas/server/object/entity/BaasSort.java similarity index 87% rename from src/main/java/com/staryet/baas/object/entity/BaasSort.java rename to src/main/java/com/javabaas/server/object/entity/BaasSort.java index 2e3afae..3617544 100644 --- a/src/main/java/com/staryet/baas/object/entity/BaasSort.java +++ b/src/main/java/com/javabaas/server/object/entity/BaasSort.java @@ -1,4 +1,4 @@ -package com.staryet.baas.object.entity; +package com.javabaas.server.object.entity; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/object/entity/ClassIds.java b/src/main/java/com/javabaas/server/object/entity/ClassIds.java similarity index 93% rename from src/main/java/com/staryet/baas/object/entity/ClassIds.java rename to src/main/java/com/javabaas/server/object/entity/ClassIds.java index 5e684ae..842078c 100644 --- a/src/main/java/com/staryet/baas/object/entity/ClassIds.java +++ b/src/main/java/com/javabaas/server/object/entity/ClassIds.java @@ -1,4 +1,4 @@ -package com.staryet.baas.object.entity; +package com.javabaas.server.object.entity; import java.util.*; diff --git a/src/main/java/com/staryet/baas/object/entity/error/DuplicateKeyError.java b/src/main/java/com/javabaas/server/object/entity/error/DuplicateKeyError.java similarity index 60% rename from src/main/java/com/staryet/baas/object/entity/error/DuplicateKeyError.java rename to src/main/java/com/javabaas/server/object/entity/error/DuplicateKeyError.java index 99d2b51..e2cbce5 100644 --- a/src/main/java/com/staryet/baas/object/entity/error/DuplicateKeyError.java +++ b/src/main/java/com/javabaas/server/object/entity/error/DuplicateKeyError.java @@ -1,7 +1,7 @@ -package com.staryet.baas.object.entity.error; +package com.javabaas.server.object.entity.error; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleCode; /** * 字段类型错误 diff --git a/src/main/java/com/staryet/baas/object/entity/error/FieldRequiredError.java b/src/main/java/com/javabaas/server/object/entity/error/FieldRequiredError.java similarity index 61% rename from src/main/java/com/staryet/baas/object/entity/error/FieldRequiredError.java rename to src/main/java/com/javabaas/server/object/entity/error/FieldRequiredError.java index 9497801..25c67ba 100644 --- a/src/main/java/com/staryet/baas/object/entity/error/FieldRequiredError.java +++ b/src/main/java/com/javabaas/server/object/entity/error/FieldRequiredError.java @@ -1,7 +1,7 @@ -package com.staryet.baas.object.entity.error; +package com.javabaas.server.object.entity.error; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleCode; /** * 字段类型错误 diff --git a/src/main/java/com/staryet/baas/object/entity/error/FieldTypeError.java b/src/main/java/com/javabaas/server/object/entity/error/FieldTypeError.java similarity index 56% rename from src/main/java/com/staryet/baas/object/entity/error/FieldTypeError.java rename to src/main/java/com/javabaas/server/object/entity/error/FieldTypeError.java index 35266e4..553d9f1 100644 --- a/src/main/java/com/staryet/baas/object/entity/error/FieldTypeError.java +++ b/src/main/java/com/javabaas/server/object/entity/error/FieldTypeError.java @@ -1,7 +1,7 @@ -package com.staryet.baas.object.entity.error; +package com.javabaas.server.object.entity.error; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleCode; /** * 字段类型错误 diff --git a/src/main/java/com/staryet/baas/object/service/ObjectService.java b/src/main/java/com/javabaas/server/object/service/ObjectService.java similarity index 97% rename from src/main/java/com/staryet/baas/object/service/ObjectService.java rename to src/main/java/com/javabaas/server/object/service/ObjectService.java index e0ff877..fdf5052 100644 --- a/src/main/java/com/staryet/baas/object/service/ObjectService.java +++ b/src/main/java/com/javabaas/server/object/service/ObjectService.java @@ -1,21 +1,21 @@ -package com.staryet.baas.object.service; +package com.javabaas.server.object.service; -import com.staryet.baas.admin.entity.*; -import com.staryet.baas.admin.service.ClazzService; -import com.staryet.baas.admin.service.FieldService; -import com.staryet.baas.admin.service.StatService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.file.entity.BaasFile; -import com.staryet.baas.file.service.FileService; -import com.staryet.baas.hook.service.HookService; -import com.staryet.baas.object.dao.IDao; -import com.staryet.baas.object.dao.impl.mongo.MongoDao; -import com.staryet.baas.object.entity.*; -import com.staryet.baas.object.entity.error.FieldRequiredError; -import com.staryet.baas.object.entity.error.FieldTypeError; -import com.staryet.baas.user.entity.BaasUser; +import com.javabaas.server.admin.entity.*; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.object.dao.impl.mongo.MongoDao; +import com.javabaas.server.object.entity.*; +import com.javabaas.server.object.entity.error.FieldRequiredError; +import com.javabaas.server.object.entity.error.FieldTypeError; +import com.javabaas.server.user.entity.BaasUser; +import com.javabaas.server.admin.service.ClazzService; +import com.javabaas.server.admin.service.FieldService; +import com.javabaas.server.admin.service.StatService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.util.JSONUtil; +import com.javabaas.server.file.entity.BaasFile; +import com.javabaas.server.file.service.FileService; +import com.javabaas.server.hook.service.HookService; +import com.javabaas.server.object.dao.IDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/src/main/java/com/staryet/baas/push/controller/PushController.java b/src/main/java/com/javabaas/server/push/controller/PushController.java similarity index 81% rename from src/main/java/com/staryet/baas/push/controller/PushController.java rename to src/main/java/com/javabaas/server/push/controller/PushController.java index 242eb50..e2d4dee 100644 --- a/src/main/java/com/staryet/baas/push/controller/PushController.java +++ b/src/main/java/com/javabaas/server/push/controller/PushController.java @@ -1,12 +1,12 @@ -package com.staryet.baas.push.controller; +package com.javabaas.server.push.controller; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.entity.SimpleResult; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.object.entity.BaasQuery; -import com.staryet.baas.push.entity.Push; -import com.staryet.baas.push.entity.PushAccount; -import com.staryet.baas.push.service.PushService; +import com.javabaas.server.push.entity.PushAccount; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleResult; +import com.javabaas.server.common.util.JSONUtil; +import com.javabaas.server.object.entity.BaasQuery; +import com.javabaas.server.push.entity.Push; +import com.javabaas.server.push.service.PushService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/staryet/baas/push/entity/Push.java b/src/main/java/com/javabaas/server/push/entity/Push.java similarity index 96% rename from src/main/java/com/staryet/baas/push/entity/Push.java rename to src/main/java/com/javabaas/server/push/entity/Push.java index bb3d4c0..ab0f35f 100644 --- a/src/main/java/com/staryet/baas/push/entity/Push.java +++ b/src/main/java/com/javabaas/server/push/entity/Push.java @@ -1,4 +1,4 @@ -package com.staryet.baas.push.entity; +package com.javabaas.server.push.entity; import javax.validation.constraints.NotNull; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/push/entity/PushAccount.java b/src/main/java/com/javabaas/server/push/entity/PushAccount.java similarity index 93% rename from src/main/java/com/staryet/baas/push/entity/PushAccount.java rename to src/main/java/com/javabaas/server/push/entity/PushAccount.java index 35f88f9..dcddc62 100644 --- a/src/main/java/com/staryet/baas/push/entity/PushAccount.java +++ b/src/main/java/com/javabaas/server/push/entity/PushAccount.java @@ -1,4 +1,4 @@ -package com.staryet.baas.push.entity; +package com.javabaas.server.push.entity; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/src/main/java/com/staryet/baas/push/entity/PushLog.java b/src/main/java/com/javabaas/server/push/entity/PushLog.java similarity index 89% rename from src/main/java/com/staryet/baas/push/entity/PushLog.java rename to src/main/java/com/javabaas/server/push/entity/PushLog.java index 68a1c3b..6ed1984 100644 --- a/src/main/java/com/staryet/baas/push/entity/PushLog.java +++ b/src/main/java/com/javabaas/server/push/entity/PushLog.java @@ -1,7 +1,7 @@ -package com.staryet.baas.push.entity; +package com.javabaas.server.push.entity; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.object.entity.BaasQuery; +import com.javabaas.server.object.entity.BaasQuery; +import com.javabaas.server.object.entity.BaasObject; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/push/handler/IPushHandler.java b/src/main/java/com/javabaas/server/push/handler/IPushHandler.java similarity index 87% rename from src/main/java/com/staryet/baas/push/handler/IPushHandler.java rename to src/main/java/com/javabaas/server/push/handler/IPushHandler.java index 9642c78..a7840cd 100644 --- a/src/main/java/com/staryet/baas/push/handler/IPushHandler.java +++ b/src/main/java/com/javabaas/server/push/handler/IPushHandler.java @@ -1,6 +1,6 @@ -package com.staryet.baas.push.handler; +package com.javabaas.server.push.handler; -import com.staryet.baas.push.entity.Push; +import com.javabaas.server.push.entity.Push; import java.util.Collection; diff --git a/src/main/java/com/staryet/baas/push/handler/impl/JPushHandler.java b/src/main/java/com/javabaas/server/push/handler/impl/JPushHandler.java similarity index 92% rename from src/main/java/com/staryet/baas/push/handler/impl/JPushHandler.java rename to src/main/java/com/javabaas/server/push/handler/impl/JPushHandler.java index 8573f08..795e2e7 100644 --- a/src/main/java/com/staryet/baas/push/handler/impl/JPushHandler.java +++ b/src/main/java/com/javabaas/server/push/handler/impl/JPushHandler.java @@ -1,4 +1,4 @@ -package com.staryet.baas.push.handler.impl; +package com.javabaas.server.push.handler.impl; import cn.jpush.api.JPushClient; import cn.jpush.api.common.APIConnectionException; @@ -11,12 +11,12 @@ import cn.jpush.api.push.model.notification.AndroidNotification; import cn.jpush.api.push.model.notification.IosNotification; import cn.jpush.api.push.model.notification.Notification; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.push.entity.Push; -import com.staryet.baas.push.entity.PushAccount; -import com.staryet.baas.push.handler.IPushHandler; -import com.staryet.baas.push.service.PushService; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.push.entity.Push; +import com.javabaas.server.push.entity.PushAccount; +import com.javabaas.server.push.handler.IPushHandler; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.push.service.PushService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/staryet/baas/push/handler/impl/TestPushHandler.java b/src/main/java/com/javabaas/server/push/handler/impl/TestPushHandler.java similarity index 72% rename from src/main/java/com/staryet/baas/push/handler/impl/TestPushHandler.java rename to src/main/java/com/javabaas/server/push/handler/impl/TestPushHandler.java index dbf7ba3..9ce37b5 100644 --- a/src/main/java/com/staryet/baas/push/handler/impl/TestPushHandler.java +++ b/src/main/java/com/javabaas/server/push/handler/impl/TestPushHandler.java @@ -1,7 +1,7 @@ -package com.staryet.baas.push.handler.impl; +package com.javabaas.server.push.handler.impl; -import com.staryet.baas.push.entity.Push; -import com.staryet.baas.push.handler.IPushHandler; +import com.javabaas.server.push.handler.IPushHandler; +import com.javabaas.server.push.entity.Push; import java.util.Collection; diff --git a/src/main/java/com/staryet/baas/push/service/PushService.java b/src/main/java/com/javabaas/server/push/service/PushService.java similarity index 81% rename from src/main/java/com/staryet/baas/push/service/PushService.java rename to src/main/java/com/javabaas/server/push/service/PushService.java index 24eeaaf..7614bb5 100644 --- a/src/main/java/com/staryet/baas/push/service/PushService.java +++ b/src/main/java/com/javabaas/server/push/service/PushService.java @@ -1,15 +1,15 @@ -package com.staryet.baas.push.service; +package com.javabaas.server.push.service; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.object.entity.BaasQuery; -import com.staryet.baas.object.service.ObjectService; -import com.staryet.baas.push.entity.Push; -import com.staryet.baas.push.entity.PushAccount; -import com.staryet.baas.push.entity.PushLog; -import com.staryet.baas.push.handler.IPushHandler; -import com.staryet.baas.push.handler.impl.JPushHandler; -import com.staryet.baas.user.service.InstallationService; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.object.entity.BaasQuery; +import com.javabaas.server.object.service.ObjectService; +import com.javabaas.server.push.entity.Push; +import com.javabaas.server.push.entity.PushAccount; +import com.javabaas.server.push.entity.PushLog; +import com.javabaas.server.push.handler.IPushHandler; +import com.javabaas.server.push.handler.impl.JPushHandler; +import com.javabaas.server.user.service.InstallationService; +import com.javabaas.server.object.entity.BaasObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/staryet/baas/user/controller/InstallationController.java b/src/main/java/com/javabaas/server/user/controller/InstallationController.java similarity index 81% rename from src/main/java/com/staryet/baas/user/controller/InstallationController.java rename to src/main/java/com/javabaas/server/user/controller/InstallationController.java index 9e3d71b..80becf4 100644 --- a/src/main/java/com/staryet/baas/user/controller/InstallationController.java +++ b/src/main/java/com/javabaas/server/user/controller/InstallationController.java @@ -1,10 +1,10 @@ -package com.staryet.baas.user.controller; +package com.javabaas.server.user.controller; import com.fasterxml.jackson.databind.ObjectMapper; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.entity.SimpleResult; -import com.staryet.baas.user.entity.BaasInstallation; -import com.staryet.baas.user.service.InstallationService; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleResult; +import com.javabaas.server.user.entity.BaasInstallation; +import com.javabaas.server.user.service.InstallationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/staryet/baas/user/controller/UserController.java b/src/main/java/com/javabaas/server/user/controller/UserController.java similarity index 94% rename from src/main/java/com/staryet/baas/user/controller/UserController.java rename to src/main/java/com/javabaas/server/user/controller/UserController.java index 4a16c49..ad8c9d3 100644 --- a/src/main/java/com/staryet/baas/user/controller/UserController.java +++ b/src/main/java/com/javabaas/server/user/controller/UserController.java @@ -1,14 +1,14 @@ -package com.staryet.baas.user.controller; +package com.javabaas.server.user.controller; import com.fasterxml.jackson.core.type.TypeReference; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.entity.SimpleResult; -import com.staryet.baas.common.service.MasterService; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.user.entity.BaasAuth; -import com.staryet.baas.user.entity.BaasUser; -import com.staryet.baas.user.service.UserService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleResult; +import com.javabaas.server.common.service.MasterService; +import com.javabaas.server.common.util.JSONUtil; +import com.javabaas.server.user.entity.BaasAuth; +import com.javabaas.server.user.entity.BaasUser; +import com.javabaas.server.user.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/staryet/baas/user/entity/BaasAuth.java b/src/main/java/com/javabaas/server/user/entity/BaasAuth.java similarity index 79% rename from src/main/java/com/staryet/baas/user/entity/BaasAuth.java rename to src/main/java/com/javabaas/server/user/entity/BaasAuth.java index 39400fb..f403b46 100644 --- a/src/main/java/com/staryet/baas/user/entity/BaasAuth.java +++ b/src/main/java/com/javabaas/server/user/entity/BaasAuth.java @@ -1,6 +1,6 @@ -package com.staryet.baas.user.entity; +package com.javabaas.server.user.entity; -import com.staryet.baas.object.entity.BaasObject; +import com.javabaas.server.object.entity.BaasObject; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/user/entity/BaasInstallation.java b/src/main/java/com/javabaas/server/user/entity/BaasInstallation.java similarity index 89% rename from src/main/java/com/staryet/baas/user/entity/BaasInstallation.java rename to src/main/java/com/javabaas/server/user/entity/BaasInstallation.java index 5fc6869..9050bca 100644 --- a/src/main/java/com/staryet/baas/user/entity/BaasInstallation.java +++ b/src/main/java/com/javabaas/server/user/entity/BaasInstallation.java @@ -1,6 +1,6 @@ -package com.staryet.baas.user.entity; +package com.javabaas.server.user.entity; -import com.staryet.baas.object.entity.BaasObject; +import com.javabaas.server.object.entity.BaasObject; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/user/entity/BaasUser.java b/src/main/java/com/javabaas/server/user/entity/BaasUser.java similarity index 91% rename from src/main/java/com/staryet/baas/user/entity/BaasUser.java rename to src/main/java/com/javabaas/server/user/entity/BaasUser.java index b7f7bed..9d7e8bc 100644 --- a/src/main/java/com/staryet/baas/user/entity/BaasUser.java +++ b/src/main/java/com/javabaas/server/user/entity/BaasUser.java @@ -1,6 +1,6 @@ -package com.staryet.baas.user.entity; +package com.javabaas.server.user.entity; -import com.staryet.baas.object.entity.BaasObject; +import com.javabaas.server.object.entity.BaasObject; import java.util.Map; diff --git a/src/main/java/com/staryet/baas/user/service/InstallationService.java b/src/main/java/com/javabaas/server/user/service/InstallationService.java similarity index 77% rename from src/main/java/com/staryet/baas/user/service/InstallationService.java rename to src/main/java/com/javabaas/server/user/service/InstallationService.java index 3b9c6d7..14b29d2 100644 --- a/src/main/java/com/staryet/baas/user/service/InstallationService.java +++ b/src/main/java/com/javabaas/server/user/service/InstallationService.java @@ -1,8 +1,8 @@ -package com.staryet.baas.user.service; +package com.javabaas.server.user.service; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.object.service.ObjectService; -import com.staryet.baas.user.entity.BaasInstallation; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.object.service.ObjectService; +import com.javabaas.server.user.entity.BaasInstallation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/staryet/baas/user/service/UserService.java b/src/main/java/com/javabaas/server/user/service/UserService.java similarity index 96% rename from src/main/java/com/staryet/baas/user/service/UserService.java rename to src/main/java/com/javabaas/server/user/service/UserService.java index 123c4f4..9ec6176 100644 --- a/src/main/java/com/staryet/baas/user/service/UserService.java +++ b/src/main/java/com/javabaas/server/user/service/UserService.java @@ -1,14 +1,14 @@ -package com.staryet.baas.user.service; +package com.javabaas.server.user.service; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.object.entity.BaasQuery; -import com.staryet.baas.object.service.ObjectService; -import com.staryet.baas.user.entity.BaasAuth; -import com.staryet.baas.user.entity.BaasUser; -import com.staryet.baas.user.util.SnsAuthUtil; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.util.JSONUtil; +import com.javabaas.server.object.entity.BaasObject; +import com.javabaas.server.object.entity.BaasQuery; +import com.javabaas.server.object.service.ObjectService; +import com.javabaas.server.user.entity.BaasAuth; +import com.javabaas.server.user.entity.BaasUser; +import com.javabaas.server.user.util.SnsAuthUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; diff --git a/src/main/java/com/staryet/baas/user/util/SnsAuthUtil.java b/src/main/java/com/javabaas/server/user/util/SnsAuthUtil.java similarity index 95% rename from src/main/java/com/staryet/baas/user/util/SnsAuthUtil.java rename to src/main/java/com/javabaas/server/user/util/SnsAuthUtil.java index 5fe2834..980a657 100644 --- a/src/main/java/com/staryet/baas/user/util/SnsAuthUtil.java +++ b/src/main/java/com/javabaas/server/user/util/SnsAuthUtil.java @@ -1,9 +1,9 @@ -package com.staryet.baas.user.util; +package com.javabaas.server.user.util; import com.fasterxml.jackson.core.type.TypeReference; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.user.entity.BaasAuth; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.user.entity.BaasAuth; +import com.javabaas.server.common.util.JSONUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3739290..a976f13 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,17 +1,19 @@ #Spring相关配置 #数据库环境配置 #spring.data.mongodb.host=58.132.171.126 -spring.data.mongodb.host=192.168.31.161 -spring.data.mongodb.port=27018 +#spring.data.mongodb.host=192.168.31.161 +spring.data.mongodb.host=127.0.0.1 +spring.data.mongodb.port=27017 spring.data.mongodb.database=baas -spring.data.mongodb.username=baas -spring.data.mongodb.password=baas -spring.data.mongodb.authentication-database=admin +#spring.data.mongodb.username=baas +#spring.data.mongodb.password=baas +#spring.data.mongodb.authentication-database=admin #spring.redis.host=58.132.171.126 -spring.redis.host=192.168.31.161 +#spring.redis.host=192.168.31.161 +spring.redis.host=127.0.0.1 #日志级别 logging.level.org.springframework.web.servlet.mvc.method.annotation=INFO -logging.level.com.staryet.baas=debug +logging.level.com.javabaas.server=debug #EndPoint management.context-path=/manage spring.jmx.enabled=false @@ -19,7 +21,7 @@ spring.jmx.enabled=false #回调地址 baas.host=http://58.132.171.126/ #用户鉴权 -baas.auth.key=V1hwT1UyRkhUblZpUjNoclVWTlZlbEpEVlhwU1FTVXpSQ1V6UkElM0QlM0Qc3Rhc +baas.auth.key=JavaBaas baas.auth.timeout=60000000 #七牛云存储 baas.qiniu.ak=Hu_Zh4Z89cZQ6l9u13-NAWP20FXhxHykhTlpCFis diff --git a/src/test/java/com/staryet/baas/AclTests.java b/src/test/java/com/javabaas/server/AclTests.java similarity index 95% rename from src/test/java/com/staryet/baas/AclTests.java rename to src/test/java/com/javabaas/server/AclTests.java index e7f78f8..50abc4a 100644 --- a/src/test/java/com/staryet/baas/AclTests.java +++ b/src/test/java/com/javabaas/server/AclTests.java @@ -1,16 +1,16 @@ -package com.staryet.baas; +package com.javabaas.server; -import com.staryet.baas.admin.entity.*; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.admin.service.ClazzService; -import com.staryet.baas.admin.service.FieldService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.object.entity.BaasAcl; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.object.service.ObjectService; -import com.staryet.baas.user.entity.BaasUser; -import com.staryet.baas.user.service.UserService; +import com.javabaas.server.admin.entity.*; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.object.entity.BaasAcl; +import com.javabaas.server.user.entity.BaasUser; +import com.javabaas.server.user.service.UserService; +import com.javabaas.server.admin.service.ClazzService; +import com.javabaas.server.admin.service.FieldService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.object.entity.BaasObject; +import com.javabaas.server.object.service.ObjectService; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/staryet/baas/AppTests.java b/src/test/java/com/javabaas/server/AppTests.java similarity index 86% rename from src/test/java/com/staryet/baas/AppTests.java rename to src/test/java/com/javabaas/server/AppTests.java index 7dd6128..7c955a1 100644 --- a/src/test/java/com/staryet/baas/AppTests.java +++ b/src/test/java/com/javabaas/server/AppTests.java @@ -1,20 +1,20 @@ -package com.staryet.baas; - -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.entity.Clazz; -import com.staryet.baas.admin.entity.Field; -import com.staryet.baas.admin.entity.FieldType; -import com.staryet.baas.admin.entity.dto.AppExport; -import com.staryet.baas.admin.entity.dto.ClazzExport; -import com.staryet.baas.admin.entity.dto.FieldExport; -import com.staryet.baas.admin.repository.ClazzRepository; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.admin.service.ClazzService; -import com.staryet.baas.admin.service.FieldService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.object.service.ObjectService; -import com.staryet.baas.user.service.UserService; +package com.javabaas.server; + +import com.javabaas.server.admin.entity.dto.FieldExport; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.user.service.UserService; +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.entity.Clazz; +import com.javabaas.server.admin.entity.Field; +import com.javabaas.server.admin.entity.FieldType; +import com.javabaas.server.admin.entity.dto.AppExport; +import com.javabaas.server.admin.entity.dto.ClazzExport; +import com.javabaas.server.admin.repository.ClazzRepository; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.admin.service.ClazzService; +import com.javabaas.server.admin.service.FieldService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.object.service.ObjectService; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/staryet/baas/AuthTests.java b/src/test/java/com/javabaas/server/AuthTests.java similarity index 95% rename from src/test/java/com/staryet/baas/AuthTests.java rename to src/test/java/com/javabaas/server/AuthTests.java index 96ae1e8..1668c0e 100644 --- a/src/test/java/com/staryet/baas/AuthTests.java +++ b/src/test/java/com/javabaas/server/AuthTests.java @@ -1,11 +1,11 @@ -package com.staryet.baas; - -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.entity.Clazz; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.admin.service.ClazzService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.config.AuthConfig; +package com.javabaas.server; + +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.entity.Clazz; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.admin.service.ClazzService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.config.AuthConfig; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/staryet/baas/ClazzTests.java b/src/test/java/com/javabaas/server/ClazzTests.java similarity index 86% rename from src/test/java/com/staryet/baas/ClazzTests.java rename to src/test/java/com/javabaas/server/ClazzTests.java index 57bbd47..c3a0a75 100644 --- a/src/test/java/com/staryet/baas/ClazzTests.java +++ b/src/test/java/com/javabaas/server/ClazzTests.java @@ -1,14 +1,14 @@ -package com.staryet.baas; +package com.javabaas.server; -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.entity.Clazz; -import com.staryet.baas.admin.entity.Field; -import com.staryet.baas.admin.entity.FieldType; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.admin.service.ClazzService; -import com.staryet.baas.admin.service.FieldService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.entity.Field; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.admin.entity.Clazz; +import com.javabaas.server.admin.entity.FieldType; +import com.javabaas.server.admin.service.ClazzService; +import com.javabaas.server.admin.service.FieldService; +import com.javabaas.server.common.entity.SimpleCode; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/staryet/baas/CloudTests.java b/src/test/java/com/javabaas/server/CloudTests.java similarity index 87% rename from src/test/java/com/staryet/baas/CloudTests.java rename to src/test/java/com/javabaas/server/CloudTests.java index 23ef6f2..c7b48b1 100644 --- a/src/test/java/com/staryet/baas/CloudTests.java +++ b/src/test/java/com/javabaas/server/CloudTests.java @@ -1,18 +1,18 @@ -package com.staryet.baas; +package com.javabaas.server; -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.repository.ClazzRepository; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.admin.service.ClazzService; -import com.staryet.baas.admin.service.FieldService; -import com.staryet.baas.cloud.entity.CloudSetting; -import com.staryet.baas.cloud.service.CloudService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.entity.SimpleResult; -import com.staryet.baas.object.service.ObjectService; -import com.staryet.baas.user.entity.BaasUser; -import com.staryet.baas.user.service.UserService; +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.repository.ClazzRepository; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.cloud.entity.CloudSetting; +import com.javabaas.server.cloud.service.CloudService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.common.entity.SimpleResult; +import com.javabaas.server.object.service.ObjectService; +import com.javabaas.server.user.entity.BaasUser; +import com.javabaas.server.user.service.UserService; +import com.javabaas.server.admin.service.ClazzService; +import com.javabaas.server.admin.service.FieldService; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/staryet/baas/FieldTests.java b/src/test/java/com/javabaas/server/FieldTests.java similarity index 80% rename from src/test/java/com/staryet/baas/FieldTests.java rename to src/test/java/com/javabaas/server/FieldTests.java index 088dc22..14356ea 100644 --- a/src/test/java/com/staryet/baas/FieldTests.java +++ b/src/test/java/com/javabaas/server/FieldTests.java @@ -1,14 +1,14 @@ -package com.staryet.baas; +package com.javabaas.server; -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.entity.Clazz; -import com.staryet.baas.admin.entity.Field; -import com.staryet.baas.admin.entity.FieldType; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.admin.service.ClazzService; -import com.staryet.baas.admin.service.FieldService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.entity.Clazz; +import com.javabaas.server.admin.entity.Field; +import com.javabaas.server.admin.entity.FieldType; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.admin.service.ClazzService; +import com.javabaas.server.admin.service.FieldService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/staryet/baas/FileTests.java b/src/test/java/com/javabaas/server/FileTests.java similarity index 89% rename from src/test/java/com/staryet/baas/FileTests.java rename to src/test/java/com/javabaas/server/FileTests.java index acf208c..1e3ef60 100644 --- a/src/test/java/com/staryet/baas/FileTests.java +++ b/src/test/java/com/javabaas/server/FileTests.java @@ -1,11 +1,11 @@ -package com.staryet.baas; +package com.javabaas.server; -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.file.entity.BaasFile; -import com.staryet.baas.file.entity.FileStoragePlatform; -import com.staryet.baas.file.service.FileService; +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.file.entity.FileStoragePlatform; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.common.util.JSONUtil; +import com.javabaas.server.file.entity.BaasFile; +import com.javabaas.server.file.service.FileService; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/staryet/baas/HookTests.java b/src/test/java/com/javabaas/server/HookTests.java similarity index 89% rename from src/test/java/com/staryet/baas/HookTests.java rename to src/test/java/com/javabaas/server/HookTests.java index f688748..1fdefc1 100644 --- a/src/test/java/com/staryet/baas/HookTests.java +++ b/src/test/java/com/javabaas/server/HookTests.java @@ -1,21 +1,21 @@ -package com.staryet.baas; - -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.entity.Clazz; -import com.staryet.baas.admin.entity.Field; -import com.staryet.baas.admin.entity.FieldType; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.admin.service.ClazzService; -import com.staryet.baas.admin.service.FieldService; -import com.staryet.baas.cloud.entity.CloudSetting; -import com.staryet.baas.cloud.entity.HookSetting; -import com.staryet.baas.cloud.service.CloudService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.object.service.ObjectService; -import com.staryet.baas.user.entity.BaasUser; -import com.staryet.baas.user.service.UserService; +package com.javabaas.server; + +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.entity.Field; +import com.javabaas.server.cloud.entity.HookSetting; +import com.javabaas.server.cloud.service.CloudService; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.user.service.UserService; +import com.javabaas.server.admin.entity.Clazz; +import com.javabaas.server.admin.entity.FieldType; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.admin.service.ClazzService; +import com.javabaas.server.admin.service.FieldService; +import com.javabaas.server.cloud.entity.CloudSetting; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.object.entity.BaasObject; +import com.javabaas.server.object.service.ObjectService; +import com.javabaas.server.user.entity.BaasUser; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/staryet/baas/ObjectTests.java b/src/test/java/com/javabaas/server/ObjectTests.java similarity index 98% rename from src/test/java/com/staryet/baas/ObjectTests.java rename to src/test/java/com/javabaas/server/ObjectTests.java index de49455..567024c 100644 --- a/src/test/java/com/staryet/baas/ObjectTests.java +++ b/src/test/java/com/javabaas/server/ObjectTests.java @@ -1,17 +1,17 @@ -package com.staryet.baas; - -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.entity.Clazz; -import com.staryet.baas.admin.entity.Field; -import com.staryet.baas.admin.entity.FieldType; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.admin.service.ClazzService; -import com.staryet.baas.admin.service.FieldService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.common.util.JSONUtil; -import com.staryet.baas.object.entity.*; -import com.staryet.baas.object.service.ObjectService; +package com.javabaas.server; + +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.entity.Field; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.object.entity.*; +import com.javabaas.server.admin.entity.Clazz; +import com.javabaas.server.admin.entity.FieldType; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.admin.service.ClazzService; +import com.javabaas.server.admin.service.FieldService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.util.JSONUtil; +import com.javabaas.server.object.service.ObjectService; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/staryet/baas/PushTests.java b/src/test/java/com/javabaas/server/PushTests.java similarity index 84% rename from src/test/java/com/staryet/baas/PushTests.java rename to src/test/java/com/javabaas/server/PushTests.java index 545b38e..65721c5 100644 --- a/src/test/java/com/staryet/baas/PushTests.java +++ b/src/test/java/com/javabaas/server/PushTests.java @@ -1,8 +1,8 @@ -package com.staryet.baas; +package com.javabaas.server; -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.push.service.PushService; +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.push.service.PushService; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/com/staryet/baas/Test.java b/src/test/java/com/javabaas/server/Test.java similarity index 98% rename from src/test/java/com/staryet/baas/Test.java rename to src/test/java/com/javabaas/server/Test.java index 9c4bd57..b6fdb18 100644 --- a/src/test/java/com/staryet/baas/Test.java +++ b/src/test/java/com/javabaas/server/Test.java @@ -1,4 +1,4 @@ -package com.staryet.baas; +package com.javabaas.server; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/test/java/com/staryet/baas/UserTests.java b/src/test/java/com/javabaas/server/UserTests.java similarity index 92% rename from src/test/java/com/staryet/baas/UserTests.java rename to src/test/java/com/javabaas/server/UserTests.java index 9f490d6..66f0c59 100644 --- a/src/test/java/com/staryet/baas/UserTests.java +++ b/src/test/java/com/javabaas/server/UserTests.java @@ -1,17 +1,17 @@ -package com.staryet.baas; - -import com.staryet.baas.admin.entity.App; -import com.staryet.baas.admin.entity.Field; -import com.staryet.baas.admin.entity.FieldType; -import com.staryet.baas.admin.service.AppService; -import com.staryet.baas.admin.service.FieldService; -import com.staryet.baas.common.entity.SimpleCode; -import com.staryet.baas.common.entity.SimpleError; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.object.service.ObjectService; -import com.staryet.baas.user.entity.BaasAuth; -import com.staryet.baas.user.entity.BaasUser; -import com.staryet.baas.user.service.UserService; +package com.javabaas.server; + +import com.javabaas.server.admin.entity.App; +import com.javabaas.server.admin.entity.Field; +import com.javabaas.server.admin.entity.FieldType; +import com.javabaas.server.admin.service.AppService; +import com.javabaas.server.common.entity.SimpleCode; +import com.javabaas.server.common.entity.SimpleError; +import com.javabaas.server.object.entity.BaasObject; +import com.javabaas.server.object.service.ObjectService; +import com.javabaas.server.user.entity.BaasAuth; +import com.javabaas.server.user.entity.BaasUser; +import com.javabaas.server.user.service.UserService; +import com.javabaas.server.admin.service.FieldService; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/staryet/baas/customer/CustomerCloudController.java b/src/test/java/com/javabaas/server/customer/CustomerCloudController.java similarity index 90% rename from src/test/java/com/staryet/baas/customer/CustomerCloudController.java rename to src/test/java/com/javabaas/server/customer/CustomerCloudController.java index dd92047..ef00d56 100644 --- a/src/test/java/com/staryet/baas/customer/CustomerCloudController.java +++ b/src/test/java/com/javabaas/server/customer/CustomerCloudController.java @@ -1,7 +1,7 @@ -package com.staryet.baas.customer; +package com.javabaas.server.customer; -import com.staryet.baas.cloud.entity.CloudRequest; -import com.staryet.baas.cloud.entity.CloudResponse; +import com.javabaas.server.cloud.entity.CloudResponse; +import com.javabaas.server.cloud.entity.CloudRequest; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/staryet/baas/customer/CustomerHookController.java b/src/test/java/com/javabaas/server/customer/CustomerHookController.java similarity index 93% rename from src/test/java/com/staryet/baas/customer/CustomerHookController.java rename to src/test/java/com/javabaas/server/customer/CustomerHookController.java index 03ca2dd..1e09dec 100644 --- a/src/test/java/com/staryet/baas/customer/CustomerHookController.java +++ b/src/test/java/com/javabaas/server/customer/CustomerHookController.java @@ -1,10 +1,10 @@ -package com.staryet.baas.customer; +package com.javabaas.server.customer; -import com.staryet.baas.hook.entity.HookRequest; -import com.staryet.baas.hook.entity.HookResponse; -import com.staryet.baas.hook.entity.HookResponseCode; -import com.staryet.baas.object.entity.BaasObject; -import com.staryet.baas.object.service.ObjectService; +import com.javabaas.server.hook.entity.HookResponse; +import com.javabaas.server.hook.entity.HookRequest; +import com.javabaas.server.hook.entity.HookResponseCode; +import com.javabaas.server.object.entity.BaasObject; +import com.javabaas.server.object.service.ObjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; From 33f260e999930f58501ff7722064cbb9048ae502 Mon Sep 17 00:00:00 2001 From: "2884686@qq.com" <2884686@qq.com> Date: Mon, 15 Aug 2016 14:29:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=9D=E5=AF=86=E5=92=8C=E5=8F=AA=E8=AF=BB?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/FieldController.java | 20 ++++++++++++++++++- .../server/admin/service/FieldService.java | 16 +++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/javabaas/server/admin/controller/FieldController.java b/src/main/java/com/javabaas/server/admin/controller/FieldController.java index d8b1fec..91e79ce 100644 --- a/src/main/java/com/javabaas/server/admin/controller/FieldController.java +++ b/src/main/java/com/javabaas/server/admin/controller/FieldController.java @@ -1,8 +1,8 @@ package com.javabaas.server.admin.controller; import com.javabaas.server.admin.entity.Field; -import com.javabaas.server.common.entity.SimpleResult; import com.javabaas.server.admin.service.FieldService; +import com.javabaas.server.common.entity.SimpleResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,6 +43,24 @@ public SimpleResult update(@RequestHeader(value = "JB-AppId") String appId, return SimpleResult.success(); } + @RequestMapping(value = "/{clazzName}/field/{name}/security", method = RequestMethod.PUT) + public SimpleResult security(@RequestHeader(value = "JB-AppId") String appId, + @PathVariable String clazzName, + @PathVariable String name, + @RequestParam boolean security) { + fieldService.setSecurity(appId, clazzName, name, security); + return SimpleResult.success(); + } + + @RequestMapping(value = "/{clazzName}/field/{name}/required", method = RequestMethod.PUT) + public SimpleResult required(@RequestHeader(value = "JB-AppId") String appId, + @PathVariable String clazzName, + @PathVariable String name, + @RequestParam boolean required) { + fieldService.setRequired(appId, clazzName, name, required); + return SimpleResult.success(); + } + @RequestMapping(value = "/{clazzName}/field/{name}", method = RequestMethod.GET) public Field get(@RequestHeader(value = "JB-AppId") String appId, @PathVariable String clazzName, diff --git a/src/main/java/com/javabaas/server/admin/service/FieldService.java b/src/main/java/com/javabaas/server/admin/service/FieldService.java index d949425..4feb083 100644 --- a/src/main/java/com/javabaas/server/admin/service/FieldService.java +++ b/src/main/java/com/javabaas/server/admin/service/FieldService.java @@ -80,6 +80,22 @@ public void update(String appId, String clazzName, String fieldName, Field field log.info("App:" + appId + " Class:" + clazzName + " Field:" + fieldName + " 字段已更新 " + jsonUtil.writeValueAsString(exist)); } + public void setRequired(String appId, String clazzName, String fieldName, boolean required) { + Field exist = get(appId, clazzName, fieldName); + exist.setRequired(required); + fieldRepository.save(exist); + deleteFieldsCache(appId, clazzName); + log.info("App:" + appId + " Class:" + clazzName + " Field:" + fieldName + " 字段已更新 " + jsonUtil.writeValueAsString(exist)); + } + + public void setSecurity(String appId, String clazzName, String fieldName, boolean security) { + Field exist = get(appId, clazzName, fieldName); + exist.setSecurity(security); + fieldRepository.save(exist); + deleteFieldsCache(appId, clazzName); + log.info("App:" + appId + " Class:" + clazzName + " Field:" + fieldName + " 字段已更新 " + jsonUtil.writeValueAsString(exist)); + } + public void delete(String appId, String clazzName, String name) { Field field = get(appId, clazzName, name); if (field.isInternal()) { From 1f7673899642b82929593e2bf8bc8814e7af58b5 Mon Sep 17 00:00:00 2001 From: "2884686@qq.com" <2884686@qq.com> Date: Thu, 18 Aug 2016 17:48:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7SpringBoot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index f48d9ec..97ccbdd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.javabaas - jbserver + JavaBaas 1.0.0 jar @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.6.RELEASE + 1.4.0.RELEASE @@ -25,11 +25,6 @@ - - org.mongodb - mongo-java-driver - 3.1.0 - org.springframework.boot spring-boot-starter-actuator From b4b4991aa17e97cd688eca4c232620f1baa91d2c Mon Sep 17 00:00:00 2001 From: "2884686@qq.com" <2884686@qq.com> Date: Thu, 18 Aug 2016 17:49:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E6=89=93=E5=8D=B0key=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/listener/ApplicationEventListener.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/javabaas/server/common/listener/ApplicationEventListener.java b/src/main/java/com/javabaas/server/common/listener/ApplicationEventListener.java index 88c94a2..2c1c990 100644 --- a/src/main/java/com/javabaas/server/common/listener/ApplicationEventListener.java +++ b/src/main/java/com/javabaas/server/common/listener/ApplicationEventListener.java @@ -1,5 +1,6 @@ package com.javabaas.server.common.listener; +import com.javabaas.server.config.AuthConfig; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -21,6 +22,8 @@ public class ApplicationEventListener implements ApplicationListener Date: Thu, 18 Aug 2016 17:57:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 293 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b5b190c..1d8ee52 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,299 @@ # JavaBaas -JavaBaas是基于Java语言开发的移动客户端后台开发框架，其核心设计目标是实现移动客户端的后台结构化数据存储、物理文件存储、消息推送等功能。极大的降低移动客户端的后台开发难度，实现快速开发。 +**JavaBaas** 是基于Java语言开发的后台服务框架，其核心设计目标是实现移动客户端的后台结构化数据存储、物理文件存储、消息推送等功能。极大的降低移动客户端的后台开发难度，实现快速开发。 + +项目地址：[GitHub](https://github.com/JavaBaas/JavaBaasServer) + +技术讨论群：479167886 + +完整文档参见：[www.javabaas.com](http://www.javabaas.com/) + +备注: [JavaBaas稳定版下载地址](http://7xr649.dl1.z0.glb.clouddn.com/JavaBaas.zip) ## 主要功能 -* 基于文档数据库的结构化数据存储 -* 基于ACL的权限管理机制 +* 结构化数据存储 +* 物理文件存储 +* ACL权限管理机制 * 用户系统 -* 基于云存储的物理文件存储 * 消息推送 -完整文档参见[http://www.javabaas.com](http://www.javabaas.com/) -技术讨论群:479167886 \ No newline at end of file +##快速上手 + +###相关环境 +####JDK +JavaBaas基于JDK1.8编写，编译及运行需要安装JDK1.8环境。 + +提示: 在Oracle官网可以下载最新的[JDK安装包](http://www.oracle.com/technetwork/java/javase/downloads/index.html)。 + +####MongoDB +JavaBaas使用MongoDB作为存储数据库，请先正确安装并启动MongoDB数据库。 + +提示: 在MongoDB官网可以下载最新的[MongoDB安装包](www.mongodb.com)。 + +####Redis +JavaBaas使用Redis作为缓存引擎，请先正确安装并启动Redis数据库。 + +提示: 在Redis官网可以下载最新的[Redis安装包](http://redis.io/)。 + +###启动 +Server目录下的`JavaBaas.jar`为系统启动文件，系统依赖环境配置正确后，使用以下命令启动系统： + +`java -jar JavaBaas.jar` +看到以下信息，表明系统启动成功。 + +``` +[main] s.b.c.e.t.TomcatEmbeddedServletContainer : Tomcat started on port(s): 8080 (http) +[main] c.s.b.c.l.ApplicationEventListener : JavaBaasServer started. +[main] c.j.s.c.l.ApplicationEventListener : Key: JavaBaas +[main] c.j.s.c.l.ApplicationEventListener : Timeout: 600000 +[main] com.staryet.baas.Main : Started Main in 2.653 seconds (JVM running for 3.232) +``` + +###命令行工具 +`JavaBaas`系统成功启动后，默认将在http 8080端口监听所有用户请求。此时首先要使用命令行工具`JBShell`创建应用。 + +命令行工具`JBShell`是JavaBaas的配套工具，使用`JBShell`可以完成应用的创建删除、类的创建删除、字段的创建删除、对象的增删改查等操作，以及一些便捷的辅助功能。 + +`JBShell`基于java编写，编译及运行需要安装JDK环境。 + +使用以下命令启动命令行工具： + +`java -jar JBShell.jar` + +启动成功后显示以下信息 + +``` + ___ ______ + |_ | | ___ \ + | | __ _ __ __ __ _ | |_/ / __ _ __ _ ___ + | | / _` |\ \ / // _` || ___ \ / _` | / _` |/ __| +/\__/ /| (_| | \ V /| (_| || |_/ /| (_| || (_| |\__ \ +\____/ \__,_| \_/ \__,_|\____/ \__,_| \__,_||___/ +Version:1.0.0 +Host:http://localhost:8080/api/ +AdminKey:JavaBaas +BAAS> +``` + +###配置 +`JBShell.jar `为命令行工具执行文件。同目录下的`config.properties`为配置文件。内容如下： + +``` +host = http://localhost:8080/api/ +key = JavaBaas +``` + +其中`host`为`JavaBaas`服务器所在的地址，本地调用`JBShell`默认使用localhost即可，远程管理需设置正确的远程服务器地址。 + +`key`为`JavaBaas`超级密钥，不设置默认为JavaBaas。 + +###创建应用 +在`JavaBaas`中，最高层的组织结构为应用系统，各应用之间权限、用户、数据相互隔离。为了开始使用`JavaBaas`，我们首先需要创建一个应用。 + +首先启动命令行工具，在命令行工具中，使用命令`app add Blog`，创建一个博客应用。 + +```bash +BAAS>app add Blog +App added. +``` +现在，我们成功创建了一个名为`Blog`的应用。 + +提示: 一般情况下建议使用大写字母开头做为应用名称 + +####查看应用列表 +在命令行工具中，使用`apps`命令可以查看当前`JavaBaas`中所有的应用。 + +``` +BAAS>apps +Blog +``` +现在我们可以看到，系统中只有我们刚刚创建的，名为`Blog`的一个应用。 + +####切换当前应用 +在命令行工具中，使用`use`命令即可切换当前应用，切换应用后，即可为当前应用创建类来存储数据。 + +``` +BAAS>use Blog +Set current app to Blog +``` +现在我们的应用即切换为刚刚创建的`Blog`。 + +####创建类 +在`JavaBaas`中，数据使用类进行组织。用户可以自由创建类，类名需使用英文字母开头且名称中只能包含数字与英文字母。类创建后，需要在类中创建字段以存储数据。同时、系统初始化后会自动创建用户类、设备类、文件类等系统内建类，内建类名使用下划线`_`开头，系统内建类禁止删除或修改。 + +现在我们使用命令`class add Article`创建一个类用于存储博客中的文章信息。 + +``` +Blog>class add Article +Class added. +``` +现在我们便在`Blog`应用中创建了名为`Article`的类。 + +提示: 一般情况下建议使用大写字母开头做为类名称 + +####查看类列表 +使用`class`命令，可以查看当前应用下所有的类。 + +``` +Blog>class +_File(0) +_Installation(0) +_PushLog(0) +_User(0) +Article(0) +``` +可以看到，当前应用中存在系统内建的文件类、设备类、推送日志类、用户类，以及我们刚刚创建的用于存储文章的`Article`类。 + +####切换当前类 +成功创建`Article`类后，我们需要为类创建用于存储文章标题、作者等信息的字段以存储数据。首先，我们需要将当前类切换至`Article`以便在此类下创建字段。 + +使用`set Article`命令，将当前类切换至`Article` + +``` +Blog>set Article +Set current class to Article +Blog Article> +``` +切换完成后，光标变为`Blog Article>`，表示当前应用为`Blog`，当前类为`Article`。 + +###创建字段 +使用`field add title`命令，在`Article`类中创建一个用于存储文章标题的字符型字段。 + +``` +Blog Article>field add title +Field added. +Blog Article> +``` +现在我们在类`Article`中创建了名为`title`的字符型字段。 + +使用`field add author`命令，在`Article`类中创建一个用于存储文章作者的字符型字段。 + +``` +Blog Article>field add author +Field added. +Blog Article> +``` +现在我们在类`Article`中创建了名为`author`的字符型字段。 + +提示: 一般情况下建议使用小写字母开头做为字段名称 + +####查看字段列表 +使用命令`fields`即可查看当前类中的所有字段列表。 + +``` +Blog Article>fields + author + title +``` +可以看到，当前类中存在两个我们刚创建的字符型字段。 + +###存储数据 +成功创建类并添加字段后，我们可以开始存储数据。使用命令行工具即可以进行基本的增删改查操作。 + +####插入数据 +使用命令`add`在`Article`类中插入数据。 + +``` +Blog Article>add {"title":"StarWars","author":"Lucas"} +Object added. +``` + +现在我们便在`Article`类中插入了一条数据记录。 + +提示: 在 JavaBaas 中，所有数据以json形式存储。详情参见[数据存储](/overview/object.md)文档。 + +####查询数据 +使用命令`list`查询`Article`类中的所有数据。 + +``` +Blog Article>list +{"_id":"f2e88fd91c3a49c988901f774cc9e879","createdAt":1471335596116,"updatedAt":1471335596116,"createdPlat":"admin","updatedPlat":"admin","acl":{"*":{"read":true,"write":true}},"author":"Lucas","title":"StarWars"} +``` + +可以看到，现在`Article`类中只有一条刚刚创建的数据。 + +####表格打印 +使用命令`table`打印`Article`类中的所有数据。 + +``` +Blog Article>table +┌──────────────────────────────────┬────────────────────┬────────────────────┐ +│ id │ author │ title │ +│ │ │ │ +├──────────────────────────────────┼────────────────────┼────────────────────┤ +│ f2e88fd91c3a49c988901f774cc9e879 │ Lucas │ StarWars │ +└──────────────────────────────────┴────────────────────┴────────────────────┘ +``` + +####删除数据 +使用命令`del id`，删除指定数据，其中 `id` 为刚才查询结果中的id。 + +``` +Blog Article>del f2e88fd91c3a49c988901f774cc9e879 +Object deleted. +``` + +###使用客户端SDK +我们已经成功创建了应用，构建了数据结构，并存储了一些数据。现在我们可以使用`客户端SDK`、`REST API`存取数据了。详见`客户端SDK`以及`REST API`相关文档。 + + +##自定义配置 +###配置文件 +Server目录下的`application.properties`为配置文件。 + +###MongoDB配置 +在application.properties中配置MongoDB数据库连接信息。 + +``` +spring.data.mongodb.host = 127.0.0.1 //MongoDB数据库地址 默认为127.0.0.1 +spring.data.mongodb.database = baas //用于存储数据的数据库名称 默认为baas +spring.data.mongodb.username = baas //用户名 不填写为无身份校验 +spring.data.mongodb.password = baas //密码 不填写为无身份校验 +spring.data.mongodb.authentication-database = admin //用于校验身份的数据库 +``` + +###Redis配置 +在application.properties中配置Redis数据库连接信息。 + +``` +spring.redis.host = 127.0.0.1 //Redis数据库地址 +``` + +###监听端口 +在`application.properties`中配置监听端口，不设置默认为8080。 + +``` +server.port = 8080 +``` + +###超级密钥 +超级密钥用于鉴定管理员的超级权限，系统的核心管理接口需要使用此权限进行调用。超级密钥可以自行设置，建议使用32位随机字符串。如：`c3ca79cca3c24147902c1114640268a5`。 + +在`application.properties`中配置超级密钥，不设置默认为JavaBaas。 + +注意: 为了保障数据安全，强烈建议不要使用默认密钥！ + +``` +baas.auth.key = c3ca79cca3c24147902c1114640268a5 +``` + +###服务器地址 +JavaBaas需要接收外部系统回调请求，因此需要配置系统部署服务器的ip地址。（本地测试时可使用127.0.0.1代替，生产环境需配置公网ip地址。） + +例如，在`application.properties`中配置当前服务器ip信息。 + +``` +host = http://58.132.171.126/ +``` + +###七牛云存储 +为了使用七牛云存储作为物理文件存储引擎，需要配置七牛云存储相关信息。 +在`application.properties`中配置以下信息。 + +``` +qiniu.ak = 七牛云存储的帐号ak +qiniu.sk = 七牛云存储的帐号sk +qiniu.bucket = bucket名称 +qiniu.file.host = bucket的存储域名 +``` + +##常见问题 \ No newline at end of file