From ad0bcfda9b8211b7402b63c4504b802868723376 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Wed, 27 Mar 2024 20:08:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BF=AE=E5=A4=8D):=20Dockerfile=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bunny <1319900154@qq.com> --- .idea/compiler.xml | 2 ++ .../atguigu/config/RedisConfiguration.java | 4 +--- spzx-manager/Dockerfile | 2 +- spzx-manager/pom.xml | 20 +++++++++++++++++++ spzx-server-gateway/Dockerfile | 2 +- .../src/main/resources/application.yml | 3 +++ spzx-service/service-order/Dockerfile | 2 +- spzx-service/service-product/Dockerfile | 2 +- spzx-service/service-user/Dockerfile | 2 +- 9 files changed, 31 insertions(+), 8 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 848d84e..375fb80 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -31,8 +31,10 @@ + + diff --git a/spzx-common/common-service/src/main/java/com/atguigu/config/RedisConfiguration.java b/spzx-common/common-service/src/main/java/com/atguigu/config/RedisConfiguration.java index 0226eab..288834f 100644 --- a/spzx-common/common-service/src/main/java/com/atguigu/config/RedisConfiguration.java +++ b/spzx-common/common-service/src/main/java/com/atguigu/config/RedisConfiguration.java @@ -59,13 +59,11 @@ public class RedisConfiguration { log.info("RedisConfiguration===>解决cache(@Cacheable)把数据缓存到redis中的value是乱码问题"); StringRedisSerializer redisSerializer = new StringRedisSerializer(); - // json序列化 - Jackson2JsonRedisSerializer serializer = jsonRedisSerializer(); // 配置序列化 RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig(); RedisCacheConfiguration redisCacheConfiguration = config .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer)) - .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(serializer)); + .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(jsonRedisSerializer())); RedisCacheManager cacheManager = RedisCacheManager.builder(factory) .cacheDefaults(redisCacheConfiguration).build(); diff --git a/spzx-manager/Dockerfile b/spzx-manager/Dockerfile index 421b7e4..f73d08c 100644 --- a/spzx-manager/Dockerfile +++ b/spzx-manager/Dockerfile @@ -11,7 +11,7 @@ RUN echo "Asia/Shanghai" > /etc/timezone WORKDIR /home/bunny # 复制jar包 -COPY target/sky-server-1.0-SNAPSHOT.jar /home/bunny/app.jar +COPY target/*.jar /home/bunny/app.jar #启动容器时的进程 ENTRYPOINT ["java","-jar","/home/bunny/app.jar"] diff --git a/spzx-manager/pom.xml b/spzx-manager/pom.xml index aaa2672..fa996d5 100644 --- a/spzx-manager/pom.xml +++ b/spzx-manager/pom.xml @@ -65,4 +65,24 @@ pagehelper-spring-boot-starter + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + diff --git a/spzx-server-gateway/Dockerfile b/spzx-server-gateway/Dockerfile index 421b7e4..f73d08c 100644 --- a/spzx-server-gateway/Dockerfile +++ b/spzx-server-gateway/Dockerfile @@ -11,7 +11,7 @@ RUN echo "Asia/Shanghai" > /etc/timezone WORKDIR /home/bunny # 复制jar包 -COPY target/sky-server-1.0-SNAPSHOT.jar /home/bunny/app.jar +COPY target/*.jar /home/bunny/app.jar #启动容器时的进程 ENTRYPOINT ["java","-jar","/home/bunny/app.jar"] diff --git a/spzx-server-gateway/src/main/resources/application.yml b/spzx-server-gateway/src/main/resources/application.yml index 352c3b7..f00656e 100644 --- a/spzx-server-gateway/src/main/resources/application.yml +++ b/spzx-server-gateway/src/main/resources/application.yml @@ -12,6 +12,9 @@ spring: namespace: ${bunny.nacos.discovery.namespace} server-addr: ${bunny.nacos.server-addr} log-name: logs/${spring.application.name} + sentinel: + log: + dir: logs/${spring.application.name}/sentinel gateway: discovery: locator: diff --git a/spzx-service/service-order/Dockerfile b/spzx-service/service-order/Dockerfile index 421b7e4..f73d08c 100644 --- a/spzx-service/service-order/Dockerfile +++ b/spzx-service/service-order/Dockerfile @@ -11,7 +11,7 @@ RUN echo "Asia/Shanghai" > /etc/timezone WORKDIR /home/bunny # 复制jar包 -COPY target/sky-server-1.0-SNAPSHOT.jar /home/bunny/app.jar +COPY target/*.jar /home/bunny/app.jar #启动容器时的进程 ENTRYPOINT ["java","-jar","/home/bunny/app.jar"] diff --git a/spzx-service/service-product/Dockerfile b/spzx-service/service-product/Dockerfile index 421b7e4..f73d08c 100644 --- a/spzx-service/service-product/Dockerfile +++ b/spzx-service/service-product/Dockerfile @@ -11,7 +11,7 @@ RUN echo "Asia/Shanghai" > /etc/timezone WORKDIR /home/bunny # 复制jar包 -COPY target/sky-server-1.0-SNAPSHOT.jar /home/bunny/app.jar +COPY target/*.jar /home/bunny/app.jar #启动容器时的进程 ENTRYPOINT ["java","-jar","/home/bunny/app.jar"] diff --git a/spzx-service/service-user/Dockerfile b/spzx-service/service-user/Dockerfile index 421b7e4..f73d08c 100644 --- a/spzx-service/service-user/Dockerfile +++ b/spzx-service/service-user/Dockerfile @@ -11,7 +11,7 @@ RUN echo "Asia/Shanghai" > /etc/timezone WORKDIR /home/bunny # 复制jar包 -COPY target/sky-server-1.0-SNAPSHOT.jar /home/bunny/app.jar +COPY target/*.jar /home/bunny/app.jar #启动容器时的进程 ENTRYPOINT ["java","-jar","/home/bunny/app.jar"]