From 14f2dddd0a466b6ab660287f32f8a084bd8fecd9 Mon Sep 17 00:00:00 2001
From: ajaxfan <909938737@qq.com>
Date: Thu, 25 Feb 2021 19:40:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile-gz                                 |   3 ++
 .../extend/export/service/ExportService.java  |  34 +++++++++---------
 .../model/开标记录表.docx                     | Bin
 .../model/评审专家签到表.docx                 | Bin
 .../model/评标专家承诺书.docx                 | Bin
 .../model/评标委员会签字表.docx               | Bin
 .../export => resources}/model/评标报告.docx  | Bin
 7 files changed, 19 insertions(+), 18 deletions(-)
 rename src/main/{java/com/chinaunicom/mall/ebtp/extend/export => resources}/model/开标记录表.docx (100%)
 rename src/main/{java/com/chinaunicom/mall/ebtp/extend/export => resources}/model/评审专家签到表.docx (100%)
 rename src/main/{java/com/chinaunicom/mall/ebtp/extend/export => resources}/model/评标专家承诺书.docx (100%)
 rename src/main/{java/com/chinaunicom/mall/ebtp/extend/export => resources}/model/评标委员会签字表.docx (100%)
 rename src/main/{java/com/chinaunicom/mall/ebtp/extend/export => resources}/model/评标报告.docx (100%)

diff --git a/Dockerfile-gz b/Dockerfile-gz
index 982ea9b..8575787 100644
--- a/Dockerfile-gz
+++ b/Dockerfile-gz
@@ -3,5 +3,8 @@ ENV LC_ALL=zh_CN.utf8
 ENV LANG=zh_CN.utf8
 ENV LANGUAGE=zh_CN.utf8
 RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8
+
+RUN mkdir -p /model
+COPY /target/classes/model/. /model/
 ADD /target/biz_service_ebtp_extend-0.0.1.jar /biz_service_ebtp_extend-0.0.1.jar
 ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/biz_service_ebtp_extend-0.0.1.jar"]
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/ExportService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/ExportService.java
index b6adc16..a9e3768 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/ExportService.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/ExportService.java
@@ -1,31 +1,29 @@
 package com.chinaunicom.mall.ebtp.extend.export.service;
 
-import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame;
-import org.springframework.beans.factory.annotation.Value;
+import java.io.File;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
+
+import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame;
 
 public interface ExportService {
 
-    @Value("${mconfig.templet.path}")
-    String path = "";
-    String ERROR_MESSAGE = "导出失败，请联系管理员";
+	String ERROR_MESSAGE = "导出失败，请联系管理员";
 
-    /**
-     * 导出
-     *
-     * @param param
-     * @param request
-     * @param response
-     */
-    public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response);
+	/**
+	 * 导出
+	 *
+	 * @param param
+	 * @param request
+	 * @param response
+	 */
+	public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response);
 
+	default File getExportTemplet(String path) {
+		File f = new File("/model/" + path);
 
-    default File getExportTemplet(String path) {
-        File f = new File("d:/" + path);
+		return f;
+	}
 
-        return f;
-    }
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/开标记录表.docx b/src/main/resources/model/开标记录表.docx
similarity index 100%
rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/开标记录表.docx
rename to src/main/resources/model/开标记录表.docx
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/评审专家签到表.docx b/src/main/resources/model/评审专家签到表.docx
similarity index 100%
rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/评审专家签到表.docx
rename to src/main/resources/model/评审专家签到表.docx
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/评标专家承诺书.docx b/src/main/resources/model/评标专家承诺书.docx
similarity index 100%
rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/评标专家承诺书.docx
rename to src/main/resources/model/评标专家承诺书.docx
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/评标委员会签字表.docx b/src/main/resources/model/评标委员会签字表.docx
similarity index 100%
rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/评标委员会签字表.docx
rename to src/main/resources/model/评标委员会签字表.docx
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/评标报告.docx b/src/main/resources/model/评标报告.docx
similarity index 100%
rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/评标报告.docx
rename to src/main/resources/model/评标报告.docx