合并代码版本 1.4.0

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>top.yexuejc</groupId>
     <artifactId>yexuejc-base</artifactId>
-    <version>1.3.9</version>
+    <version>1.4.0</version>
 
     <name>${project.artifactId}</name>
     <url>https://github.com/yexuejc/yexuejc-base</url>
@@ -51,6 +51,7 @@
         <commons-io.version>2.6</commons-io.version>
         <bcprov-jdk15on.version>1.60</bcprov-jdk15on.version>
         <guava.version>20.0</guava.version>
+        <apache-poi.version>3.13</apache-poi.version>
         <!-- 文件拷贝时的编码 -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -96,6 +97,18 @@
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>${apache-poi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>${apache-poi.version}</version>
+        </dependency>
+
     </dependencies>
 
 
@@ -201,7 +214,7 @@
         <!--<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>-->
         <!--</repository>-->
 
-        <!-- 私服仓库发布
+        <!-- 私服仓库发布-->
         <repository>
             <id>releases</id>
             <name>nexus-release</name>
@@ -212,18 +225,18 @@
             <name>nexus-snapshots</name>
             <url>${repos.yexuejc.url}maven-snapshots/</url>
         </snapshotRepository>
-        -->
 
-        <repository>
+
+       <!-- <repository>
             <id>releases</id>
             <name>nexus-release</name>
-            <url>${repos.yexuejc.url}maven-releases/</url>
+            <url>${repos.mcworle.url}maven-releases/</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>nexus-snapshots</name>
-            <url>${repos.yexuejc.url}maven-snapshots/</url>
-        </snapshotRepository>
+            <url>${repos.mcworle.url}maven-snapshots/</url>
+        </snapshotRepository>-->
     </distributionManagement>
 
     <profiles>

src/main/java/com/yexuejc/base/util/ExcelImportUtil.java

@@ -1,5 +1,15 @@
 package com.yexuejc.base.util;
 
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
 /**
  * excel 格式验证工具
  *
@@ -48,5 +58,20 @@ public class ExcelImportUtil {
         return true;
     }
 
+    public void readExcel(String path) throws IOException {
+        Workbook wb = null;
+        if (isExcel2007(path)) {
+            wb = new XSSFWorkbook(new FileInputStream(new File(path)));
+        } else if (isExcel2003(path)) {
+            wb = new HSSFWorkbook(new FileInputStream(new File(path)));
+        } else {
+            throw new NullPointerException("请上传excel文件");
+        }
+        Sheet sheet = wb.getSheetAt(0);
+        for (int i = 2; i < sheet.getLastRowNum() + 1; i++) {
+            Row row = sheet.getRow(i);
+        }
+    }
+
 
 }

src/main/java/com/yexuejc/base/util/JwtUtil.java

@@ -124,4 +124,19 @@ public class JwtUtil {
         return JsonUtil.json2Obj(subject, cls);
     }
 
+    /**
+     * 解密token为字符串
+     *
+     * @param token
+     * @return
+     */
+    public String parseStr(String token) {
+        String subject = null;
+        try {
+            subject = Jwts.parser().setSigningKey(JWT_SIGNATURE_KEY).parseClaimsJws(token).getBody().getSubject();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return subject;
+    }
 }