From 58b260c4acf6a6eed0d61344a05a3066bc36ff37 Mon Sep 17 00:00:00 2001
From: "udf_admin@163.com" <udf_admin@163.com>
Date: Tue, 5 May 2020 08:35:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/index.html                              |  2 +-
 udf-api/udf-api-common/pom.xml                | 25 ++++++++---------
 .../udf/api/general/web/FileController.java   | 27 +++++++++++++++++++
 .../main/resources/application-dev.properties |  5 ++++
 .../resources/application-prod.properties     |  5 ++++
 .../src/main/resources/templates/common.html  |  1 +
 6 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 udf-api/udf-api-general/src/main/java/org/itkk/udf/api/general/web/FileController.java

diff --git a/admin/index.html b/admin/index.html
index 3c7c536..5bb2732 100644
--- a/admin/index.html
+++ b/admin/index.html
@@ -77,7 +77,7 @@
   <script src="https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.js"
           integrity="sha256-a5YRB27CcBwBFcT5EF/f3E4vzIqyHrSR878nseNYw64=" crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/vue-cookies@1.7.0/vue-cookies.min.js"></script>
-  <link rel="icon" href="favicon.ico">
+  <link rel="icon" href="/file/favicon.ico">
   <title><%=process.env.VUE_APP_TITLE%></title>
   <style>
     .start-loading-center {
diff --git a/udf-api/udf-api-common/pom.xml b/udf-api/udf-api-common/pom.xml
index f8f2522..da3c534 100644
--- a/udf-api/udf-api-common/pom.xml
+++ b/udf-api/udf-api-common/pom.xml
@@ -45,19 +45,20 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
-        <!-- itext7 -->
-        <!--        <dependency>-->
-        <!--            <groupId>com.itextpdf</groupId>-->
-        <!--            <artifactId>itext7-core</artifactId>-->
-        <!--            <version>${itext7.version}</version>-->
-        <!--            <type>pom</type>-->
-        <!--        </dependency>-->
-
         <!-- udf-starter-file-db -->
-        <!--        <dependency>-->
-        <!--            <groupId>org.itkk.udf</groupId>-->
-        <!--            <artifactId>udf-starter-file-db</artifactId>-->
-        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.itkk.udf</groupId>
+            <artifactId>udf-starter-file-db</artifactId>
+        </dependency>
+        <!-- itext7 -->
+        <!--<dependency>-->
+        <!--    <groupId>com.itextpdf</groupId>-->
+        <!--    <artifactId>itext7-core</artifactId>-->
+        <!--    <version>${itext7.version}</version>-->
+        <!--    <type>pom</type>-->
+        <!--</dependency>-->
+
+
     </dependencies>
     <!-- 构建 -->
     <build>
diff --git a/udf-api/udf-api-general/src/main/java/org/itkk/udf/api/general/web/FileController.java b/udf-api/udf-api-general/src/main/java/org/itkk/udf/api/general/web/FileController.java
new file mode 100644
index 0000000..a032910
--- /dev/null
+++ b/udf-api/udf-api-general/src/main/java/org/itkk/udf/api/general/web/FileController.java
@@ -0,0 +1,27 @@
+package org.itkk.udf.api.general.web;
+
+
+import org.itkk.udf.api.common.CommonConstant;
+import org.itkk.udf.api.common.CommonUtil;
+import org.itkk.udf.starter.file.db.web.DbFileBaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping(value = CommonConstant.URL_ROOT_WEB_PRIVATE + "file/")
+public class FileController extends DbFileBaseController {
+
+    /**
+     * httpServletRequest
+     */
+    @Autowired
+    private HttpServletRequest httpServletRequest;
+
+    @Override
+    public String getCurrentUserId() {
+        return CommonUtil.getUser(httpServletRequest).getUserId();
+    }
+}
diff --git a/udf-api/udf-api-server/src/main/resources/application-dev.properties b/udf-api/udf-api-server/src/main/resources/application-dev.properties
index 2d593a9..71c0170 100644
--- a/udf-api/udf-api-server/src/main/resources/application-dev.properties
+++ b/udf-api/udf-api-server/src/main/resources/application-dev.properties
@@ -9,6 +9,11 @@ org.itkk.udf.starter.core.properties.guavaCacheProperties.expireAfterWrite=10
 logging.file.name=d:/app/application-log/${spring.application.name}_${server.port}_${spring.profiles.active}/base.log
 logging.file.max-size=100MB
 logging.file.max-history=31
+# FILE DB
+com.imaxus.db.file.properties.mapping.public=D:/app/file/store/pubic/
+com.imaxus.db.file.properties.mapping.temp=D:/app/file/store/temp/
+com.imaxus.db.file.properties.fileUploadSupportType=doc,docx,xls,xlsx,ppt,pptx,pdf,jpg,jpeg,png
+com.imaxus.db.file.properties.previewSupportContentType=application/pdf,image/jpeg,image/png
 # EXCEPTION
 org.itkk.udf.starter.core.properties.outputExceptionStackTrace=true
 # DataSource Dynamic
diff --git a/udf-api/udf-api-server/src/main/resources/application-prod.properties b/udf-api/udf-api-server/src/main/resources/application-prod.properties
index f7313d9..6859e7a 100644
--- a/udf-api/udf-api-server/src/main/resources/application-prod.properties
+++ b/udf-api/udf-api-server/src/main/resources/application-prod.properties
@@ -9,6 +9,11 @@ org.itkk.udf.starter.core.properties.guavaCacheProperties.expireAfterWrite=10
 logging.file.name=/usr/local/share/app/application-log/${spring.application.name}_${server.port}_${spring.profiles.active}/base.log
 logging.file.max-size=100MB
 logging.file.max-history=31
+# FILE DB
+com.imaxus.db.file.properties.mapping.public=/usr/local/share/nginx/file/store/pubic/
+com.imaxus.db.file.properties.mapping.temp=/usr/local/share/nginx/file/store/temp/
+com.imaxus.db.file.properties.fileUploadSupportType=doc,docx,xls,xlsx,ppt,pptx,pdf,jpg,jpeg,png
+com.imaxus.db.file.properties.previewSupportContentType=application/pdf,image/jpeg,image/png
 # EXCEPTION
 org.itkk.udf.starter.core.properties.outputExceptionStackTrace=false
 # DataSource Dynamic
diff --git a/udf-api/udf-api-server/src/main/resources/templates/common.html b/udf-api/udf-api-server/src/main/resources/templates/common.html
index 6a0b148..ed69e01 100644
--- a/udf-api/udf-api-server/src/main/resources/templates/common.html
+++ b/udf-api/udf-api-server/src/main/resources/templates/common.html
@@ -8,6 +8,7 @@
           integrity="sha256-L/W5Wfqfa0sdBNIKN9cG6QA5F2qx4qICmU2VgLruv9Y=" crossorigin="anonymous">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css"
           integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous">
+    <link rel="icon" href="/file/favicon.ico">
     <style lang="css">
         body, html {
             position: relative;