Merge pull request 'master' (#39) from master into gateway

Reviewed-on: http://git.feashow.cn/clay/fateverse/pulls/39
This commit is contained in:
clay
2024-03-25 11:30:51 +00:00
11 changed files with 14 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
FROM openjdk:11.0.10-jre FROM azul/zulu-openjdk:11.0.22-jdk
VOLUME /tmp VOLUME /tmp
RUN useradd -b /home -m -s /bin/bash clay RUN useradd -b /home -m -s /bin/bash clay
RUN chmod a+xr -R /home/clay && chown clay:clay -R /home/clay RUN chmod a+xr -R /home/clay && chown clay:clay -R /home/clay

View File

@@ -28,7 +28,7 @@
<dependency> <dependency>
<groupId>cn.fateverse</groupId> <groupId>cn.fateverse</groupId>
<artifactId>common-decrypt</artifactId> <artifactId>common-decrypt</artifactId>
<optional>true</optional> <!-- <optional>true</optional>-->
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@@ -36,6 +36,7 @@ dubbo:
protocol: protocol:
name: dubbo name: dubbo
port: -1 port: -1
serialization: fastjson2
registry: registry:
address: nacos://${spring.cloud.nacos.discovery.server-addr} address: nacos://${spring.cloud.nacos.discovery.server-addr}
username: ${spring.cloud.nacos.discovery.username} username: ${spring.cloud.nacos.discovery.username}

View File

@@ -39,6 +39,7 @@ dubbo:
protocol: protocol:
name: dubbo name: dubbo
port: -1 port: -1
serialization: fastjson2
registry: registry:
address: nacos://${spring.cloud.nacos.discovery.server-addr} address: nacos://${spring.cloud.nacos.discovery.server-addr}
username: ${spring.cloud.nacos.discovery.username} username: ${spring.cloud.nacos.discovery.username}

View File

@@ -12,7 +12,7 @@
<artifactId>common-dubbo</artifactId> <artifactId>common-dubbo</artifactId>
<properties> <properties>
<dubbo.version>3.2.1</dubbo.version> <dubbo.version>3.1.0</dubbo.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<dependencies> <dependencies>

View File

@@ -34,6 +34,7 @@ dubbo:
protocol: protocol:
name: dubbo name: dubbo
port: -1 port: -1
serialization: fastjson2
registry: registry:
address: nacos://${spring.cloud.nacos.discovery.server-addr} address: nacos://${spring.cloud.nacos.discovery.server-addr}
username: ${spring.cloud.nacos.discovery.username} username: ${spring.cloud.nacos.discovery.username}

View File

@@ -33,6 +33,7 @@ dubbo:
protocol: protocol:
name: dubbo name: dubbo
port: -1 port: -1
serialization: fastjson2
registry: registry:
address: nacos://${spring.cloud.nacos.discovery.server-addr} address: nacos://${spring.cloud.nacos.discovery.server-addr}
username: ${spring.cloud.nacos.discovery.username} username: ${spring.cloud.nacos.discovery.username}

View File

@@ -34,6 +34,7 @@ dubbo:
protocol: protocol:
name: dubbo name: dubbo
port: -1 port: -1
serialization: fastjson2
registry: registry:
address: nacos://${spring.cloud.nacos.discovery.server-addr} address: nacos://${spring.cloud.nacos.discovery.server-addr}
username: ${spring.cloud.nacos.discovery.username} username: ${spring.cloud.nacos.discovery.username}

View File

@@ -39,6 +39,7 @@ dubbo:
protocol: protocol:
name: dubbo name: dubbo
port: -1 port: -1
serialization: fastjson2
registry: registry:
address: nacos://${spring.cloud.nacos.discovery.server-addr} address: nacos://${spring.cloud.nacos.discovery.server-addr}
username: ${spring.cloud.nacos.discovery.username} username: ${spring.cloud.nacos.discovery.username}

View File

@@ -16,13 +16,13 @@
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>
</properties> </properties>
<modules> <modules>
<module>monitor</module> <!-- <module>monitor</module>-->
<module>custom-query</module> <!-- <module>custom-query</module>-->
<module>code-gen</module> <!-- <module>code-gen</module>-->
<module>workflow</module> <module>workflow</module>
<!-- <module>code-gen-test-oracle</module>--> <!-- <module>code-gen-test-oracle</module>-->
<!-- <module>code-gen-test-mysql</module>--> <!-- <module>code-gen-test-mysql</module>-->
<module>sentinel-dashboard</module> <!-- <module>sentinel-dashboard</module>-->
<!-- <module>sentinel-dashboard-pro</module>--> <!-- <module>sentinel-dashboard-pro</module>-->
<!-- <module>xxl-job-admin</module>--> <!-- <module>xxl-job-admin</module>-->
</modules> </modules>

View File

@@ -52,6 +52,7 @@ dubbo:
protocol: protocol:
name: dubbo name: dubbo
port: -1 port: -1
serialization: fastjson2
registry: registry:
address: nacos://${spring.cloud.nacos.discovery.server-addr} address: nacos://${spring.cloud.nacos.discovery.server-addr}
username: ${spring.cloud.nacos.discovery.username} username: ${spring.cloud.nacos.discovery.username}