Skip to content

Commit ac27c24

Browse files
cadecodecadecode
committed
feat: 引入 nacos、openFeign
1 parent bfd0d6a commit ac27c24

14 files changed

Lines changed: 152 additions & 382 deletions

File tree

‎example/example_api/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@
1818
<artifactId>mica-auto</artifactId>
1919
<scope>provided</scope>
2020
</dependency>
21+
<!-- rpc -->
22+
<dependency>
23+
<groupId>org.springframework.cloud</groupId>
24+
<artifactId>spring-cloud-starter-openfeign</artifactId>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.springframework.cloud</groupId>
28+
<artifactId>spring-cloud-starter-loadbalancer</artifactId>
29+
</dependency>
30+
2131
<dependency>
2232
<groupId>com.github.cadecode</groupId>
2333
<artifactId>uni-boot-framework-api</artifactId>

‎example/example_svc/pom.xml‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,26 @@
1313
<description>微服务样例模块-SERVICE</description>
1414

1515
<dependencies>
16+
<!--cloud-->
1617
<dependency>
17-
<groupId>com.github.cadecode</groupId>
18-
<artifactId>uni-boot-example-api</artifactId>
18+
<groupId>org.springframework.cloud</groupId>
19+
<artifactId>spring-cloud-starter-bootstrap</artifactId>
1920
</dependency>
2021
<dependency>
21-
<groupId>com.github.cadecode</groupId>
22-
<artifactId>uni-boot-common-plugin-actuator</artifactId>
22+
<groupId>com.alibaba.cloud</groupId>
23+
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
2324
</dependency>
24-
<!--SpringBoot tomcat-->
25+
<dependency>
26+
<groupId>com.alibaba.cloud</groupId>
27+
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
28+
</dependency>
29+
<!--tomcat-->
2530
<dependency>
2631
<groupId>org.springframework.boot</groupId>
2732
<artifactId>spring-boot-starter-tomcat</artifactId>
2833
<scope>provided</scope>
2934
</dependency>
30-
<!--SpringBoot test-->
35+
<!--test-->
3136
<dependency>
3237
<groupId>org.springframework.boot</groupId>
3338
<artifactId>spring-boot-starter-test</artifactId>
@@ -38,5 +43,14 @@
3843
<groupId>com.github.ulisesbocchio</groupId>
3944
<artifactId>jasypt-spring-boot-starter</artifactId>
4045
</dependency>
46+
47+
<dependency>
48+
<groupId>com.github.cadecode</groupId>
49+
<artifactId>uni-boot-common-plugin-actuator</artifactId>
50+
</dependency>
51+
<dependency>
52+
<groupId>com.github.cadecode</groupId>
53+
<artifactId>uni-boot-example-api</artifactId>
54+
</dependency>
4155
</dependencies>
4256
</project>

‎example/example_svc/src/main/java/com/github/cadecode/uniboot/example/svc/UniExampleApplication.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@
55
import org.springframework.boot.autoconfigure.SpringBootApplication;
66
import org.springframework.boot.builder.SpringApplicationBuilder;
77
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
8+
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
9+
import org.springframework.cloud.openfeign.EnableFeignClients;
810
import org.springframework.context.annotation.EnableAspectJAutoProxy;
911

1012
/**
1113
* 启动类
1214
*/
1315
@MapperScan("com.github.cadecode.**.mapper")
16+
@EnableFeignClients("com.github.cadecode")
17+
@EnableDiscoveryClient
1418
@EnableAspectJAutoProxy(exposeProxy = true)
1519
@SpringBootApplication
1620
public class UniExampleApplication extends SpringBootServletInitializer {

‎example/example_svc/src/main/resources/application-dev.yml‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎example/example_svc/src/main/resources/application.yml‎

Lines changed: 0 additions & 113 deletions
This file was deleted.

‎example/example_svc/src/main/resources/bootstrap.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
logging:
2+
file:
3+
path: /log/uni_boot_admin/example
4+
5+
spring:
6+
application:
7+
name: uni-boot-example
8+
cloud:
9+
nacos:
10+
server-addr: localhost:8848
11+
username: nacos
12+
password: nacos
13+
discovery:
14+
enabled: true
15+
namespace: uni_dev
16+
group: DEFAULT_GROUP
17+
config:
18+
enabled: true
19+
namespace: uni_dev
20+
group: DEFAULT_GROUP
21+
file-extension: yml
22+
shared-configs:
23+
- shared-config.${spring.cloud.nacos.config.file-extension}
24+
- shared-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

‎example/example_svc/src/main/resources/logback-spring.xml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,25 @@
88

99
<!--配置参数常量-->
1010
<!--级别：trace<debug<info<warn<error 增加，通常仅需要 debug/info/error-->
11-
<property name="level" value="DEBUG" />
11+
<property name="level" value="DEBUG"/>
1212

1313
<!--文件保留时间-->
14-
<property name="history" value="30" />
14+
<property name="history" value="30"/>
1515

16-
<!--文件存放位置-->
16+
<!--文件存放位置，直接指定-->
1717
<!--<property name="filePath" value="./logs" />-->
1818

1919
<!--文件存放位置-->
20-
<!--从 SpringBoot 配置文件中获取（注意文件名需要为 logback-spring.xml）-->
21-
<springProperty scope="context" name="filePath" source="logging.file.path" />
20+
<!--从 SpringBoot 配置文件中获取（注意文件名需要为 logback-spring.xml）
21+
SpringBoot 默认将 logging 路径配置加入环境变量 LOG_PATH
22+
-->
23+
<property name="filePath" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}"/>
2224

2325
<!--输出格式-->
2426
<property name="consolePattern"
25-
value="%red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%-15thread]) %highlight(%-5level) %cyan(%-50logger{50}) : %msg%n" />
27+
value="%red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%-15thread]) %highlight(%-5level) %cyan(%-50logger{50}) : %msg%n"/>
2628
<!--不带色彩的格式用以输出到文件-->
27-
<property name="filePattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-15thread] %-5level %-50logger{50} : %msg%n" />
29+
<property name="filePattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-15thread] %-5level %-50logger{50} : %msg%n"/>
2830

2931
<!--控制台输出日志-->
3032
<appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
@@ -105,28 +107,28 @@
105107
additivity 指定是否将 root 的 appender 加入到 logger 中，默认为 true
106108
-->
107109
<logger name="com.github.cadecode" level="${level}" additivity="true">
108-
<appender-ref ref="infoAppender" />
109-
<appender-ref ref="debugAppender" />
110+
<appender-ref ref="infoAppender"/>
111+
<appender-ref ref="debugAppender"/>
110112
</logger>
111113

112114
<!-- SpringFramework 日志-->
113-
<logger name="org.springframework" level="WARN" />
115+
<logger name="org.springframework" level="WARN"/>
114116

115117
<!-- mybatis 日志 -->
116118
<!-- mybatis 打印 sql
117119
SpringBoot 中只要配置 dao 或 mapper 包即可打印 sql
118120
普通 SSM 项目可能需要以下配置
119121
-->
120-
<logger name="org.apache.ibatis" level="DEBUG" />
121-
<logger name="java.sql" level="DEBUG" />
122+
<logger name="org.apache.ibatis" level="DEBUG"/>
123+
<logger name="java.sql" level="DEBUG"/>
122124

123125
<!--根 logger
124126
没有定义 logger 的包，使用此 logger
125127
-->
126128
<root level="INFO">
127-
<appender-ref ref="consoleAppender" />
128-
<appender-ref ref="debugAppender" />
129-
<appender-ref ref="infoAppender" />
130-
<appender-ref ref="errorAppender" />
129+
<appender-ref ref="consoleAppender"/>
130+
<appender-ref ref="debugAppender"/>
131+
<appender-ref ref="infoAppender"/>
132+
<appender-ref ref="errorAppender"/>
131133
</root>
132134
</configuration>

‎framework/framework_api/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@
1717
<artifactId>mica-auto</artifactId>
1818
<scope>provided</scope>
1919
</dependency>
20+
<!-- rpc -->
21+
<dependency>
22+
<groupId>org.springframework.cloud</groupId>
23+
<artifactId>spring-cloud-starter-openfeign</artifactId>
24+
</dependency>
25+
<dependency>
26+
<groupId>org.springframework.cloud</groupId>
27+
<artifactId>spring-cloud-starter-loadbalancer</artifactId>
28+
</dependency>
29+
2030
<dependency>
2131
<groupId>com.github.cadecode</groupId>
2232
<artifactId>uni-boot-common-core</artifactId>

0 commit comments

Comments
 (0)