From e912f5bfe9859206e483f8ed7429459712018920 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Fri, 5 Mar 2021 16:37:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9ADockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                          |  2 +-
 docker/Dockerfile                                   |  2 +-
 pom.xml                                             |  6 +++++-
 src/main/java/com/jmal/clouddisk/model/Urlset.java  | 13 ++++++++++---
 .../clouddisk/service/impl/FileServiceImpl.java     |  1 -
 .../clouddisk/service/impl/UserServiceImpl.java     |  2 --
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8163d8d2..8d70d603 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 ## myproject
-upsh.sh
+push.sh
 update.sh
 HELP.md
 /log/
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d1388494..cbe47d0c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM registry.cn-guangzhou.aliyuncs.com/jmalcloud/jmal-mongo:latest
 MAINTAINER zhushilun084@163.com
-ENV VERSION 2.1.7
+ENV VERSION 2.1.8
 
 RUN mkdir -p /jmalcloud/files /jmal-cloud-view/dist
 
diff --git a/pom.xml b/pom.xml
index a07c508f..bdfa0da9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.jmal</groupId>
     <artifactId>clouddisk</artifactId>
-    <version>2.1.7</version>
+    <version>2.1.8</version>
     <name>clouddisk</name>
     <description>Cloud Disk</description>
 
@@ -159,6 +159,10 @@
             <artifactId>tika-core</artifactId>
             <version>1.25</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/src/main/java/com/jmal/clouddisk/model/Urlset.java b/src/main/java/com/jmal/clouddisk/model/Urlset.java
index f5619e97..fd4dee0f 100644
--- a/src/main/java/com/jmal/clouddisk/model/Urlset.java
+++ b/src/main/java/com/jmal/clouddisk/model/Urlset.java
@@ -1,7 +1,9 @@
 package com.jmal.clouddisk.model;
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import lombok.Data;
-import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -11,30 +13,35 @@
  * @Date 2021/02/25 4:26 下午
  */
 
-@XmlRootElement
+@JacksonXmlRootElement(localName = "urlset")
 @Data
 public class Urlset {
 
+    @JacksonXmlElementWrapper(useWrapping = false)
     private List<Url> url = new ArrayList<>();
 
-    @XmlRootElement
+    @JacksonXmlRootElement(localName = "url")
     @Data
     public static class Url {
         /***
          * 必填标签,这是具体某一个链接的定义入口，每一条数据都要用<url>和</url>包含在里面，这是必须的
          */
+        @JacksonXmlProperty(localName = "loc")
         private String loc;
         /***
          * 可以不提交该标签,用来指定该链接的最后更新时间
          */
+        @JacksonXmlProperty(localName = "lastmod")
         private String lastmod;
         /***
          * 可以不提交该标签,用这个标签告诉此链接可能会出现的更新频率
          */
+        @JacksonXmlProperty(localName = "changefreq")
         private String changefreq;
         /***
          * 可以不提交该标签,用来指定此链接相对于其他链接的优先权比值，此值定于0.0-1.0之间
          */
+        @JacksonXmlProperty(localName = "priority")
         private String priority;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/jmal/clouddisk/service/impl/FileServiceImpl.java b/src/main/java/com/jmal/clouddisk/service/impl/FileServiceImpl.java
index 0ff2f32e..fd4be383 100644
--- a/src/main/java/com/jmal/clouddisk/service/impl/FileServiceImpl.java
+++ b/src/main/java/com/jmal/clouddisk/service/impl/FileServiceImpl.java
@@ -44,7 +44,6 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.socket.WebSocketSession;
-import sun.net.www.content.image.jpeg;
 
 import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
diff --git a/src/main/java/com/jmal/clouddisk/service/impl/UserServiceImpl.java b/src/main/java/com/jmal/clouddisk/service/impl/UserServiceImpl.java
index 807f52d7..424ed771 100644
--- a/src/main/java/com/jmal/clouddisk/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/jmal/clouddisk/service/impl/UserServiceImpl.java
@@ -7,8 +7,6 @@
 import cn.hutool.crypto.Padding;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.symmetric.DES;
-import cn.hutool.crypto.symmetric.SymmetricAlgorithm;
-import cn.hutool.crypto.symmetric.SymmetricCrypto;
 import cn.hutool.extra.cglib.CglibUtil;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.jmal.clouddisk.annotation.AnnoManageUtil;