Skip to content

Commit

Permalink
修改:Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
jamebal committed Mar 5, 2021
1 parent 8098cd7 commit e912f5b
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## myproject
upsh.sh
push.sh
update.sh
HELP.md
/log/
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.cn-guangzhou.aliyuncs.com/jmalcloud/jmal-mongo:latest
MAINTAINER [email protected]
ENV VERSION 2.1.7
ENV VERSION 2.1.8

RUN mkdir -p /jmalcloud/files /jmal-cloud-view/dist

Expand Down
6 changes: 5 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
13 changes: 10 additions & 3 deletions src/main/java/com/jmal/clouddisk/model/Urlset.java
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e912f5b

Please sign in to comment.