Commit 50f89ea2 by giaogiao

完成项目结构修改

parent a5bea444
...@@ -15,16 +15,13 @@ import java.io.IOException; ...@@ -15,16 +15,13 @@ import java.io.IOException;
/** /**
* Hello World Controller * Hello World Controller
* *
* @author geekidea
* @date 2019-10-09
**/ **/
@Slf4j @Slf4j
@Api(value = "Hello World2", tags = {"Hello World2"}) @Api(value = "Hello World2", tags = {"Hello World2"})
@RestController @RestController
@RequestMapping("/app/hello") @RequestMapping("/app")
public class AppHelloWorldController { public class AppHelloWorldController {
/** /**
* Hello World * Hello World
* *
......
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package com.jumeirah.api.system.controller; package com.jumeirah.api.app.controller;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.log.annotation.Module;
import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore;
import com.jumeirah.common.param.RegisterParam; import com.jumeirah.common.param.RegisterParam;
import com.jumeirah.common.service.RegisterService; import com.jumeirah.common.service.RegisterService;
import com.jumeirah.common.vo.LoginSysUserTokenVo; import com.jumeirah.common.vo.LoginSysUserTokenVo;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.log.annotation.Module;
import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -30,6 +30,7 @@ import org.springframework.validation.annotation.Validated; ...@@ -30,6 +30,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -45,11 +46,13 @@ import javax.servlet.http.HttpServletResponse; ...@@ -45,11 +46,13 @@ import javax.servlet.http.HttpServletResponse;
@RestController @RestController
@Module("system") @Module("system")
@Api(value = "用户注册API", tags = {"用户注册"}) @Api(value = "用户注册API", tags = {"用户注册"})
@RequestMapping("/app")
public class RegisterController { public class RegisterController {
@Autowired @Autowired
private RegisterService registerService; private RegisterService registerService;
@PostMapping("/register") @PostMapping("/register")
@OperationLogIgnore @OperationLogIgnore
@ApiOperation(value = "注册", notes = "web用户注册", response = LoginSysUserTokenVo.class) @ApiOperation(value = "注册", notes = "web用户注册", response = LoginSysUserTokenVo.class)
......
...@@ -15,7 +15,7 @@ spring-boot-plus: ...@@ -15,7 +15,7 @@ spring-boot-plus:
spring: spring:
datasource: datasource:
# url: jdbc:mysql://localhost:3306/spring_boot_plus?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true # url: jdbc:mysql://localhost:3306/spring_boot_plus?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
url: jdbc:mysql://localhost:3306/vike?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true url: jdbc:mysql://localhost:3306/Jumeirah?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: 123 password: 123
......
...@@ -16,7 +16,7 @@ spring-boot-plus: ...@@ -16,7 +16,7 @@ spring-boot-plus:
spring: spring:
datasource: datasource:
url: jdbc:mysql://mysql57:3306/vike?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true url: jdbc:mysql://mysql57:3306/Jumeirah?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: 123 password: 123
......
...@@ -15,7 +15,7 @@ spring-boot-plus: ...@@ -15,7 +15,7 @@ spring-boot-plus:
spring: spring:
datasource: datasource:
url: jdbc:mysql://mysql57:3306/vike?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true url: jdbc:mysql://mysql57:3306/Jumeirah?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: 123 password: 123
......
...@@ -192,9 +192,7 @@ spring-boot-plus: ...@@ -192,9 +192,7 @@ spring-boot-plus:
# - /actuator/** # - /actuator/**
- # 排除首页 - # 排除首页
- /,/index.html - /,/index.html
# 排除测试路径 - /app/world/*
- /hello/world,/fooBar/**,/exampleOrder/**
- /app/hello/*
- /system/hello/* - /system/hello/*
# 多行字符串权限配置 # 多行字符串权限配置
...@@ -212,7 +210,7 @@ spring-boot-plus: ...@@ -212,7 +210,7 @@ spring-boot-plus:
# token请求头名称 # token请求头名称
token-name: token token-name: token
# jwt密钥 # jwt密钥
secret: ljd123hl2jh secret: z2mys3h@$U3@&@!
# 发行人 # 发行人
issuer: ${spring.application.name} issuer: ${spring.application.name}
# 观众 # 观众
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment