Skip to content

Commit 60eb72a

Browse files
committed
build: 添加tailscale配置
1 parent a84e62f commit 60eb72a

File tree

8 files changed

+36
-31
lines changed

8 files changed

+36
-31
lines changed

api-core/src/main/resources/application.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,35 +49,30 @@ mybatis-plus:
4949

5050
dubbo:
5151
application:
52-
# logger: logback
53-
# 元数据中心 local 本地 remote 远程 这里使用远程便于其他服务获取
54-
# 注意 这里不能使用 本地 local 会读取不到元数据
5552
metadataType: remote
56-
# 可选值 interface、instance、all,默认是 all,即接口级地址、应用级地址都注册
5753
register-mode: all
5854
service-discovery:
59-
# FORCE_INTERFACE,只消费接口级地址,如无地址则报错,单订阅 2.x 地址
60-
# APPLICATION_FIRST,智能决策接口级/应用级地址,双订阅
61-
# FORCE_APPLICATION,只消费应用级地址,如无地址则报错,单订阅 3.x 地址
6255
migration: FORCE_APPLICATION
6356
name: api-core
57+
qos-accept-foreign-ip: true
6458
protocol:
65-
# 设置为 tri 即可使用 Triple 3.0 新协议
66-
# 性能对比 dubbo 协议并没有提升 但基于 http2 用于多语言异构等 http 交互场景
67-
# 使用 dubbo 协议通信
6859
name: dubbo
69-
# dubbo 协议端口(-1表示自增端口,从20880开始)
7060
port: -1
71-
# 注册中心配置
61+
networker: net7
62+
host: ${host.tailscale}
63+
provider:
64+
networker: net7
65+
host: ${host.tailscale}
7266
registry:
73-
address: nacos://${nacos.host}
67+
address: nacos://${host.nacos}
7468
# 这里注意 由于 3.X 的 bug 导致注册组不生效
7569
group: ${spring.profiles.active}
7670
# 由于 group 不生效 这里使用 namespace 将 dubbo 服务与 cloud 服务隔离
7771
# 否则会导致正常请求路由到 dubbo 服务报错
7872
parameters:
7973
# 注意 这里要在 nacos 创建名为 dubbo 的 namespace 环境
8074
namespace: b9970d70-8f1c-402e-b139-4a98f487c197
75+
preferred: true
8176
# 消费者相关配置
8277
consumer:
8378
# 支持校验注解

api-core/src/main/resources/bootstrap-dev.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
nacos:
2-
host: 192.168.159.134:8848
1+
host:
2+
nacos: 192.168.159.134:8848
3+
tailscale: 100.72.207.93
34
spring:
45
application:
56
name: api-core
67
cloud:
78
nacos:
89
config:
9-
server-addr: ${nacos.host}
10+
server-addr: ${host.nacos}
1011
namespace: 294353ee-680c-462e-a646-f58c71add098
1112
group: ${spring.profiles.active}
1213
file-extension: yml
1314
prefix: ${spring.application.name}-${spring.profiles.active}
1415
discovery:
15-
server-addr: ${nacos.host}
16+
server-addr: ${host.nacos}
1617
group: ${spring.profiles.active}
1718
namespace: d67f22fd-85b4-4f7d-be13-c48c6bbbfebb
19+
ip: ${host.tailscale}
1820
main:
1921
allow-bean-definition-overriding: true
2022
server:

api-core/src/main/resources/bootstrap-test.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
nacos:
2-
host: 100.122.217.6:8848
1+
host:
2+
nacos: 110.41.167.152:8848
3+
tailscale: 100.72.207.93
34
spring:
45
application:
56
name: 'api-core'
67
cloud:
78
nacos:
89
config:
9-
server-addr: ${nacos.host}
10+
server-addr: ${host.nacos}
1011
namespace: 294353ee-680c-462e-a646-f58c71add098
1112
group: ${spring.profiles.active}
1213
file-extension: yml
1314
prefix: ${spring.application.name}-${spring.profiles.active}
1415
discovery:
15-
server-addr: ${nacos.host}
16+
server-addr: ${host.nacos}
1617
group: ${spring.profiles.active}
1718
namespace: d67f22fd-85b4-4f7d-be13-c48c6bbbfebb
19+
ip: ${host.tailscale}
20+
network-interface: net7
1821
server:
1922
port: 9001
2023
servlet:

api-gateway/src/main/resources/application.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ dubbo:
4545
protocol:
4646
name: dubbo
4747
port: -1
48+
provider:
49+
host: ${host.tailscale}
4850
registry:
4951
id: nacos-registry
50-
address: nacos://${nacos.host}?register-consumer-url=true
52+
address: nacos://${host.nacos}?register-consumer-url=true
5153
parameters:
5254
namespace: b9970d70-8f1c-402e-b139-4a98f487c197
5355
group: ${spring.profiles.active}

api-gateway/src/main/resources/bootstrap-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ spring:
66
cloud:
77
nacos:
88
config:
9-
server-addr: ${nacos.host}
9+
server-addr: ${host.nacos}
1010
namespace: ba7f9acd-6436-4c8f-b282-1e29bd576ac0
1111
group: ${spring.profiles.active}
1212
file-extension: yml
1313
prefix: ${spring.application.name}-${spring.profiles.active}
1414
discovery:
15-
server-addr: ${nacos.host}
15+
server-addr: ${host.nacos}
1616
group: ${spring.profiles.active}
1717
namespace: d67f22fd-85b4-4f7d-be13-c48c6bbbfebb
1818
main:

api-interface/src/main/resources/application.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ dubbo:
6666
protocol:
6767
name: dubbo
6868
port: -1
69+
provider:
70+
host: ${host.tailscale}
6971
registry:
70-
address: nacos://${nacos.host}
72+
address: nacos://${host.nacos}
7173
group: ${spring.profiles.active}
7274
parameters:
7375
# 这里要在nacos创建名为dubbo的namespace

api-interface/src/main/resources/bootstrap-dev.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
nacos:
2-
host: 192.168.159.134:8848
1+
host:
2+
nacos: 192.168.159.134:8848
3+
tailscale: 100.72.207.93
34
spring:
45
application:
56
name: 'api-interface'
67
cloud:
78
nacos:
89
config:
9-
server-addr: ${nacos.host}
10+
server-addr: ${host.nacos}
1011
namespace: ba7f9acd-6436-4c8f-b282-1e29bd576ac0
1112
group: ${spring.profiles.active}
1213
file-extension: yml
1314
prefix: ${spring.application.name}-${spring.profiles.active}
1415
discovery:
15-
server-addr: ${nacos.host}
16+
server-addr: ${host.nacos}
1617
group: ${spring.profiles.active}
1718
namespace: d67f22fd-85b4-4f7d-be13-c48c6bbbfebb
1819
server:

api-interface/src/main/resources/bootstrap-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ spring:
66
cloud:
77
nacos:
88
config:
9-
server-addr: ${nacos.host}
9+
server-addr: ${host.nacos}
1010
namespace: ba7f9acd-6436-4c8f-b282-1e29bd576ac0
1111
group: ${spring.profiles.active}
1212
file-extension: yml
1313
prefix: ${spring.application.name}-${spring.profiles.active}
1414
discovery:
15-
server-addr: ${nacos.host}
15+
server-addr: ${host.nacos}
1616
group: ${spring.profiles.active}
1717
namespace: d67f22fd-85b4-4f7d-be13-c48c6bbbfebb
1818
server:

0 commit comments

Comments
 (0)