Commit 50aacff5 by zhangxingmin

配置

parent 85ac018c
...@@ -37,11 +37,6 @@ ...@@ -37,11 +37,6 @@
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<!-- 阿里数据库连接池 --> <!-- 阿里数据库连接池 -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
...@@ -53,6 +48,11 @@ ...@@ -53,6 +48,11 @@
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
</dependency> </dependency>
<dependency>
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
</dependency>
<!-- swagger2--> <!-- swagger2-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
...@@ -65,11 +65,17 @@ ...@@ -65,11 +65,17 @@
<artifactId>yd-scrm-service</artifactId> <artifactId>yd-scrm-service</artifactId>
</dependency> </dependency>
<!-- 认证模块 --> <!--对于bootstrap.properties/bootstrap.yaml配置文件(我们合起来成为Bootstrap配置文件)的支持,需要导入如下的依赖 -->
<dependency> <dependency>
<groupId>com.yd</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>yd-auth-core</artifactId> <artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<!-- 认证模块 -->
<!-- <dependency>-->
<!-- <groupId>com.yd</groupId>-->
<!-- <artifactId>yd-auth-core</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
</dependencies> </dependencies>
</project> </project>
...@@ -13,8 +13,7 @@ public class ScrmApiApplication { ...@@ -13,8 +13,7 @@ public class ScrmApiApplication {
public static void main(String[] args) { public static void main(String[] args) {
new SpringApplicationBuilder(ScrmApiApplication.class) new SpringApplicationBuilder(ScrmApiApplication.class)
.properties("spring.config.name:bootstrap", "config/bootstrap.yml") .properties("spring.application.name=" + ServerNameConstants.ydScrmApi)
.properties("spring.application.name="+ ServerNameConstants.ydScrmApi)
.build().run(args); .build().run(args);
System.out.println("(♥◠‿◠)ノ゙ yd-scrm-api启动成功 ლ(´ڡ`ლ)゙ "); System.out.println("(♥◠‿◠)ノ゙ yd-scrm-api启动成功 ლ(´ڡ`ლ)゙ ");
} }
......
package com.yd.scrm.api.controller; package com.yd.scrm.api.controller;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import org.springframework.security.access.prepost.PreAuthorize; //import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -25,7 +25,7 @@ public class ScrmController { ...@@ -25,7 +25,7 @@ public class ScrmController {
* 需要特定角色才能访问 * 需要特定角色才能访问
*/ */
@GetMapping("/admin") @GetMapping("/admin")
@PreAuthorize("hasRole('ADMIN')") // @PreAuthorize("hasRole('ADMIN')")
public Result<String> adminOperation() { public Result<String> adminOperation() {
return Result.success("管理员操作成功"); return Result.success("管理员操作成功");
} }
......
${AnsiColor.GREEN}
_ _ _ __ __ ____ _ _ _ _
| | (_)_ __ | | _\ \ / /__ / ___| |__ __ _| |_ / \ _ __ (_)
| | | | '_ \| |/ /\ \ /\ / / _ \ | | '_ \ / _` | __| / _ \ | '_ \| |
| |___| | | | | < \ V V / __/ |___| | | | (_| | |_ / ___ \| |_) | |
|_____|_|_| |_|_|\_\ \_/\_/ \___|\____|_| |_|\__,_|\__/_/ \_\ .__/|_|
|_|
${AnsiColor.BRIGHT_WHITE}
Spring Boot Version: ${spring-boot.version}
\ No newline at end of file
...@@ -40,7 +40,7 @@ spring: ...@@ -40,7 +40,7 @@ spring:
# 配置中心 # 配置中心
config: config:
# 命名空间id(此处不用public,因public初始化的空间, id为空) # 命名空间id(此处不用public,因public初始化的空间, id为空)
namespace: d2446fdc-2683-4c82-aa86-61242c61b5cd namespace: c1e4cbcf-d8b7-4da9-a75a-7b75890fc390
# nacos的ip地址和端口 # nacos的ip地址和端口
server-addr: 139.224.145.34:8848 server-addr: 139.224.145.34:8848
# 这个就表示 在我们nacos命名空间id为 dev中 有一个data-id 为 demo-service.yml 的配置文件 读取这个里面的配置 # 这个就表示 在我们nacos命名空间id为 dev中 有一个data-id 为 demo-service.yml 的配置文件 读取这个里面的配置
...@@ -49,6 +49,11 @@ spring: ...@@ -49,6 +49,11 @@ spring:
# 共享配置, 可以把公共配置放在同个命名空间下,然后创建一个 common.yml 文件 ,里面可以放共用的配置 # 共享配置, 可以把公共配置放在同个命名空间下,然后创建一个 common.yml 文件 ,里面可以放共用的配置
shared-configs[0]: shared-configs[0]:
dataId: yd-common.yml dataId: yd-common.yml
group: YD_GROUP
refresh: true
extension-configs: # 扩展配置
- data-id: yd-scrm-api.yml
group: YD_GROUP
refresh: true refresh: true
# 发布到注册中心 (如果没有使用可以不配) # 发布到注册中心 (如果没有使用可以不配)
discovery: discovery:
...@@ -77,6 +82,7 @@ spring: ...@@ -77,6 +82,7 @@ spring:
shared-configs[0]: shared-configs[0]:
dataId: yd-common.yml dataId: yd-common.yml
refresh: true refresh: true
group: YD_GROUP
# 发布到注册中心 (如果没有使用可以不配) # 发布到注册中心 (如果没有使用可以不配)
discovery: discovery:
# 命名空间id(此处不用public,因public初始化的空间, id为空) # 命名空间id(此处不用public,因public初始化的空间, id为空)
......
#3.2.1\u4EE5\u4E0A\u4F7F\u7528
modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
#3.2.1\u4EE5\u4E0B\u4F7F\u7528\u6216\u8005\u4E0D\u914D\u7F6E
#modulelist=com.p6spy.engine.logging.P6LogFactory,com.p6spy.engine.outage.P6OutageFactory
# \u81EA\u5B9A\u4E49\u65E5\u5FD7\u6253\u5370
logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
#\u65E5\u5FD7\u8F93\u51FA\u5230\u63A7\u5236\u53F0
appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
# \u4F7F\u7528\u65E5\u5FD7\u7CFB\u7EDF\u8BB0\u5F55 sql
#appender=com.p6spy.engine.spy.appender.Slf4JLogger
# \u8BBE\u7F6E p6spy driver \u4EE3\u7406
deregisterdrivers=true
# \u53D6\u6D88JDBC URL\u524D\u7F00
useprefix=true
# \u914D\u7F6E\u8BB0\u5F55 Log \u4F8B\u5916,\u53EF\u53BB\u6389\u7684\u7ED3\u679C\u96C6\u6709error,info,batch,debug,statement,commit,rollback,result,resultset.
excludecategories=info,debug,result,commit,resultset
# \u65E5\u671F\u683C\u5F0F
dateformat=yyyy-MM-dd HH:mm:ss
# \u5B9E\u9645\u9A71\u52A8\u53EF\u591A\u4E2A
#driverlist=org.h2.Driver
# \u662F\u5426\u5F00\u542F\u6162SQL\u8BB0\u5F55
outagedetection=true
# \u6162SQL\u8BB0\u5F55\u6807\u51C6 2 \u79D2
outagedetectioninterval=2
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