1
0

2 Commits 1795ad3e26 ... 0146a954d7

Autor SHA1 Mensagem Data
  1 0146a954d7 Merge branch 'master' of http://gogs.imwork.top/Silos/imwork-plus há 1 semana atrás
  1 37e501daf4 1.打包 há 1 semana atrás

+ 1 - 1
imwork-windows/imwork-silos/src/main/resources/application.yml

@@ -38,7 +38,7 @@ spring:
     password: zh.3417.JXW
     #driver-class-name: org.postgresql.Driver
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://mysql.imwork.top:63306/imwork_silos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
+    url: jdbc:mysql://mysql.imwork.top:63306/imwork_silos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&allowPublicKeyRetrieval=true&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
     #Hikari 连接池配置
     type: com.zaxxer.hikari.HikariDataSource
     hikari:

Diff do ficheiro suprimidas por serem muito extensas
+ 6 - 0
imwork-windows/imwork-silos/src/main/resources/static/assets/lib/jplus/chart/chart.js


+ 26 - 0
pom.xml

@@ -100,6 +100,7 @@
         <easyexcel.version>4.0.3</easyexcel.version>
         <jasypt.version>3.0.5</jasypt.version>
         <gson.version>2.13.2</gson.version>
+        <poi.version>5.5.0</poi.version>
 
         <!--imwork-commons-->
         <imwork-commons.version>${project.version}</imwork-commons.version>
@@ -107,6 +108,31 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-excelant</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml-full</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-scratchpad</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff