diff --git a/Dockerfile b/Dockerfile index 189d9199e..288cfbe59 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ -FROM java:8-alpine -WORKDIR /app -COPY ruoyi-admin.jar /app/app.jar -ENTRYPOINT ["java","-Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC","-jar","/app/app.jar"] - +FROM openjdk:8-jre-alpine +#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories +##安装字体 +#RUN apk --no-cache add ttf-dejavu +COPY ruoyi-admin.jar /app/app.jar +ENTRYPOINT ["java","-Duser.timezone=GMT+08","-jar","/app/app.jar"] diff --git a/deploy.sh b/deploy.sh index 136e5b52f..d36f80011 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,15 +1,15 @@ #!/bin/bash -imageName="wine" +imageName="mall" echo "==========打包=========" mvn clean package -Dmaven.test.skip=true echo "==========上传服务器=========" -scp ruoyi-admin/target/ruoyi-admin.jar root@62.234.123.172:/root/wine/ -scp Dockerfile root@62.234.123.172:/root/wine/ +scp ruoyi-admin/target/ruoyi-admin.jar root@192.144.217.65:/root/mall/ +scp Dockerfile root@192.144.217.65:/root/mall/ echo "==========远程执行=========" -ssh root@62.234.123.172 > /dev/null 2>&1 << eeooff -cd /root/wine +ssh root@192.144.217.65 > /dev/null 2>&1 << eeooff +cd /root/mall docker build -t $imageName . docker stop $imageName docker rm $imageName diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index afd9466e5..66ca0c84b 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -62,7 +62,7 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 10MB + max-file-size: 20MB # 设置总上传的文件大小 max-request-size: 20MB # 服务模块 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/CosUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/CosUtils.java index 2eae54e50..253e5298b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/CosUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/CosUtils.java @@ -58,7 +58,9 @@ public class CosUtils { // 指定要上传到 COS 上对象键 - String key = ReUtil.replaceAll(StrUtil.trim(fastSimpleUUID() + Optional.of(file.getOriginalFilename()).orElse(StrUtil.EMPTY)), SPECIAL_CHARACTERS, StrUtil.EMPTY); + String filename = file.getOriginalFilename(); + String suffix = filename.substring(filename.lastIndexOf(".")); + String key = ReUtil.replaceAll(fastSimpleUUID() + "." + suffix, SPECIAL_CHARACTERS, StrUtil.EMPTY); // 生成 cos 客户端。 COSClient cosClient = new COSClient(cosCredentials, clientConfig); ObjectMetadata metadata = new ObjectMetadata(); diff --git a/ruoyi-ui/src/views/winery/order/index.vue b/ruoyi-ui/src/views/winery/order/index.vue index 5fc5c953d..bb28d7992 100644 --- a/ruoyi-ui/src/views/winery/order/index.vue +++ b/ruoyi-ui/src/views/winery/order/index.vue @@ -28,15 +28,6 @@ @keyup.enter.native="handleQuery" /> - - - - - @@ -145,6 +134,11 @@ {{ parseTime(scope.row.cancelTime, '{y}-{m}-{d}') }} + + + + +