Merge pull request 'master' (#39) from master into gateway
Reviewed-on: http://git.feashow.cn/clay/fateverse/pulls/39
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
FROM openjdk:11.0.10-jre
|
||||
FROM azul/zulu-openjdk:11.0.22-jdk
|
||||
VOLUME /tmp
|
||||
RUN useradd -b /home -m -s /bin/bash clay
|
||||
RUN chmod a+xr -R /home/clay && chown clay:clay -R /home/clay
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
<dependency>
|
||||
<groupId>cn.fateverse</groupId>
|
||||
<artifactId>common-decrypt</artifactId>
|
||||
<optional>true</optional>
|
||||
<!-- <optional>true</optional>-->
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@@ -36,6 +36,7 @@ dubbo:
|
||||
protocol:
|
||||
name: dubbo
|
||||
port: -1
|
||||
serialization: fastjson2
|
||||
registry:
|
||||
address: nacos://${spring.cloud.nacos.discovery.server-addr}
|
||||
username: ${spring.cloud.nacos.discovery.username}
|
||||
|
||||
@@ -39,6 +39,7 @@ dubbo:
|
||||
protocol:
|
||||
name: dubbo
|
||||
port: -1
|
||||
serialization: fastjson2
|
||||
registry:
|
||||
address: nacos://${spring.cloud.nacos.discovery.server-addr}
|
||||
username: ${spring.cloud.nacos.discovery.username}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<artifactId>common-dubbo</artifactId>
|
||||
|
||||
<properties>
|
||||
<dubbo.version>3.2.1</dubbo.version>
|
||||
<dubbo.version>3.1.0</dubbo.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<dependencies>
|
||||
|
||||
@@ -34,6 +34,7 @@ dubbo:
|
||||
protocol:
|
||||
name: dubbo
|
||||
port: -1
|
||||
serialization: fastjson2
|
||||
registry:
|
||||
address: nacos://${spring.cloud.nacos.discovery.server-addr}
|
||||
username: ${spring.cloud.nacos.discovery.username}
|
||||
|
||||
@@ -33,6 +33,7 @@ dubbo:
|
||||
protocol:
|
||||
name: dubbo
|
||||
port: -1
|
||||
serialization: fastjson2
|
||||
registry:
|
||||
address: nacos://${spring.cloud.nacos.discovery.server-addr}
|
||||
username: ${spring.cloud.nacos.discovery.username}
|
||||
|
||||
@@ -34,6 +34,7 @@ dubbo:
|
||||
protocol:
|
||||
name: dubbo
|
||||
port: -1
|
||||
serialization: fastjson2
|
||||
registry:
|
||||
address: nacos://${spring.cloud.nacos.discovery.server-addr}
|
||||
username: ${spring.cloud.nacos.discovery.username}
|
||||
|
||||
@@ -39,6 +39,7 @@ dubbo:
|
||||
protocol:
|
||||
name: dubbo
|
||||
port: -1
|
||||
serialization: fastjson2
|
||||
registry:
|
||||
address: nacos://${spring.cloud.nacos.discovery.server-addr}
|
||||
username: ${spring.cloud.nacos.discovery.username}
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
<maven.deploy.skip>true</maven.deploy.skip>
|
||||
</properties>
|
||||
<modules>
|
||||
<module>monitor</module>
|
||||
<module>custom-query</module>
|
||||
<module>code-gen</module>
|
||||
<!-- <module>monitor</module>-->
|
||||
<!-- <module>custom-query</module>-->
|
||||
<!-- <module>code-gen</module>-->
|
||||
<module>workflow</module>
|
||||
<!-- <module>code-gen-test-oracle</module>-->
|
||||
<!-- <module>code-gen-test-mysql</module>-->
|
||||
<module>sentinel-dashboard</module>
|
||||
<!-- <module>sentinel-dashboard</module>-->
|
||||
<!-- <module>sentinel-dashboard-pro</module>-->
|
||||
<!-- <module>xxl-job-admin</module>-->
|
||||
</modules>
|
||||
|
||||
@@ -52,6 +52,7 @@ dubbo:
|
||||
protocol:
|
||||
name: dubbo
|
||||
port: -1
|
||||
serialization: fastjson2
|
||||
registry:
|
||||
address: nacos://${spring.cloud.nacos.discovery.server-addr}
|
||||
username: ${spring.cloud.nacos.discovery.username}
|
||||
|
||||
Reference in New Issue
Block a user