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 diff --git a/pom.xml b/pom.xml index 9ace569..97ccbdd 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 + JavaBaas 1.0.0 jar @@ -14,22 +14,17 @@ org.springframework.boot spring-boot-starter-parent - 1.3.2.RELEASE + 1.4.0.RELEASE UTF-8 - com.staryet.baas.Main + com.javabaas.server.Main 1.8 - staryet + javabaas - - org.mongodb - mongo-java-driver - 3.1.0 - org.springframework.boot spring-boot-starter-actuator 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 61% 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..91e79ce 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.admin.service.FieldService; +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. */ @@ -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,25 @@ 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}/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) 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 83% 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..4feb083 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; @@ -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()) { 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 86% 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..2c1c990 100644 --- a/src/main/java/com/staryet/baas/common/listener/ApplicationEventListener.java +++ b/src/main/java/com/javabaas/server/common/listener/ApplicationEventListener.java @@ -1,5 +1,6 @@ -package com.staryet.baas.common.listener; +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