上传图片
This commit is contained in:
kino
parent
c80e33f87d
commit
21bec38537
11
Dockerfile
11
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"]
|
||||
|
||||
10
deploy.sh
10
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
|
||||
|
||||
@ -62,7 +62,7 @@ spring:
|
||||
servlet:
|
||||
multipart:
|
||||
# 单个文件大小
|
||||
max-file-size: 10MB
|
||||
max-file-size: 20MB
|
||||
# 设置总上传的文件大小
|
||||
max-request-size: 20MB
|
||||
# 服务模块
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -28,15 +28,6 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="支付参数" prop="payMsg">
|
||||
<el-input
|
||||
v-model="queryParams.payMsg"
|
||||
placeholder="请输入支付参数"
|
||||
clearable
|
||||
size="small"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="总金额" prop="totalFee">
|
||||
<el-input
|
||||
v-model="queryParams.totalFee"
|
||||
@ -127,10 +118,8 @@
|
||||
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="订单ID" align="center" prop="id" v-if="false"/>
|
||||
<el-table-column label="部门ID" align="center" prop="deptId" />
|
||||
<el-table-column label="用户ID" align="center" prop="userId" />
|
||||
<el-table-column label="收货地址ID" align="center" prop="addressId" />
|
||||
<el-table-column label="支付参数" align="center" prop="payMsg" />
|
||||
<el-table-column label="总金额" align="center" prop="totalFee" />
|
||||
<el-table-column label="运单号" align="center" prop="transportNo" />
|
||||
<el-table-column label="订单状态" align="center" prop="status" />
|
||||
@ -145,6 +134,11 @@
|
||||
<span>{{ parseTime(scope.row.cancelTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>-->
|
||||
<!-- </template>-->
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
@ -164,7 +158,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
@ -176,18 +170,12 @@
|
||||
<!-- 添加或修改订单对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="部门ID" prop="deptId">
|
||||
<el-input v-model="form.deptId" placeholder="请输入部门ID" />
|
||||
</el-form-item>
|
||||
<el-form-item label="用户ID" prop="userId">
|
||||
<el-input v-model="form.userId" placeholder="请输入用户ID" />
|
||||
</el-form-item>
|
||||
<el-form-item label="收货地址ID" prop="addressId">
|
||||
<el-input v-model="form.addressId" placeholder="请输入收货地址ID" />
|
||||
</el-form-item>
|
||||
<el-form-item label="支付参数" prop="payMsg">
|
||||
<el-input v-model="form.payMsg" placeholder="请输入支付参数" />
|
||||
</el-form-item>
|
||||
<el-form-item label="总金额" prop="totalFee">
|
||||
<el-input v-model="form.totalFee" placeholder="请输入总金额" />
|
||||
</el-form-item>
|
||||
@ -258,10 +246,8 @@ export default {
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
deptId: undefined,
|
||||
userId: undefined,
|
||||
addressId: undefined,
|
||||
payMsg: undefined,
|
||||
totalFee: undefined,
|
||||
transportNo: undefined,
|
||||
status: undefined,
|
||||
@ -309,10 +295,8 @@ export default {
|
||||
reset() {
|
||||
this.form = {
|
||||
id: undefined,
|
||||
deptId: undefined,
|
||||
userId: undefined,
|
||||
addressId: undefined,
|
||||
payMsg: undefined,
|
||||
totalFee: undefined,
|
||||
transportNo: undefined,
|
||||
status: 0,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user