diff --git a/Dockerfile b/Dockerfile index 288cfbe59..9b241be17 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:8-jre-alpine -#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories ##安装字体 -#RUN apk --no-cache add ttf-dejavu +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/mini-app/src/baseDefine.js b/mini-app/src/baseDefine.js index 2d618e2d3..d63b249de 100644 --- a/mini-app/src/baseDefine.js +++ b/mini-app/src/baseDefine.js @@ -4,11 +4,9 @@ * */ -export const baseUrl = 'http://127.0.0.1:18989/' -// export const baseUrl = 'http://36.1.51.30:18989/' -// export const baseUrl = 'http://41.liyiren.me:8696/' -// export const baseUrl = 'http://36.1.50.18:18989/' -// export const baseUrl = 'https://www.xiao4r.com/wine/winery/' +// export const baseUrl = 'http://127.0.0.1:18989/' +export const baseUrl = 'https://mall.xiao4r.com/api/' + export const imgbaseUrl = 'https://www.xiao4r.com/xiao4rstatic/img/winery/' export const sysImgBaseUrl = 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' diff --git a/mini-app/src/components/mall/tab/mall-bbs.wpy b/mini-app/src/components/mall/tab/mall-bbs.wpy index 50d87dfe2..bfd132ec9 100644 --- a/mini-app/src/components/mall/tab/mall-bbs.wpy +++ b/mini-app/src/components/mall/tab/mall-bbs.wpy @@ -9,61 +9,64 @@