Skip to content

Commit

Permalink
南生论坛v2.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
maliangnansheng committed Jun 5, 2020
1 parent 8e0ad3f commit 6b7cd2d
Show file tree
Hide file tree
Showing 205 changed files with 11,916 additions and 11,038 deletions.
85 changes: 60 additions & 25 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.liang</groupId>
<artifactId>bbs-ssmv2.6</artifactId>
<artifactId>bbs-ssmv2.8.2</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>

Expand All @@ -16,15 +16,6 @@
<version>1.3.5</version>
</dependency>

<!-- 返回json字符串的支持 -->
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.5</version>
</dependency>


<!-- SpringMVC、Spring -->
<!-- https://mvnrepository.com/artifact/org.springframework/spring-webmvc -->
<dependency>
Expand Down Expand Up @@ -71,21 +62,21 @@
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
<version>1.3.1</version>
<version>2.0.4</version>
</dependency>

<!-- 数据库连接池、驱动 -->
<!-- https://mvnrepository.com/artifact/c3p0/c3p0 -->
<dependency>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
<version>0.9.1</version>
<version>0.9.1.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.41</version>
<version>8.0.19</version>
</dependency>

<!-- (jstl,servlet-api,junit) -->
Expand All @@ -111,25 +102,69 @@
<version>4.12</version>
</dependency>

<!-- 后台时间格式化 -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.10.3</version>
</dependency>

<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>

<!-- 七牛云 -->
<dependency>
<groupId>com.qiniu</groupId>
<artifactId>qiniu-java-sdk</artifactId>
<version>[7.2.0, 7.2.99]</version>
</dependency>

<!-- https://mvnrepository.com/artifact/log4j/log4j -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
</dependency>

<!-- 文件上传 -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
</dependency>

<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>geolite2-databases</artifactId>
<version>20151029</version>
</dependency>
<dependency>
<groupId>com.maxmind.geoip2</groupId>
<artifactId>geoip2</artifactId>
<version>2.6.0</version>
</dependency>

</dependencies>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.3</version>
</dependency>
<!-- 时间操作组件 -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.5</version>
</dependency>

<!-- thumbnailator图片压缩 -->
<dependency>
<groupId>net.coobird</groupId>
<artifactId>thumbnailator</artifactId>
<version>0.4.11</version>
</dependency>

</dependencies>
</project>
57 changes: 34 additions & 23 deletions src/main/java/com/liang/bean/Admin.java
Original file line number Diff line number Diff line change
@@ -1,33 +1,31 @@
package com.liang.bean;

import com.fasterxml.jackson.annotation.JsonIgnore;

import java.util.Date;

public class Admin {
private Integer aid;

// 管理员id
private String aid;
// 管理员名字
private String aname;

// 管理员密码
@JsonIgnore
private String apassword;

private String atime;
// 管理员创建时间
private Date createTime;
// 管理员更新时间
private Date updateTime;

public Admin() {
super();
}

public Admin(Integer aid, String aname, String apassword, String atime) {
super();
this.aid = aid;
this.aname = aname;
this.apassword = apassword;
this.atime = atime;
}

public Integer getAid() {
public String getAid() {
return aid;
}

public void setAid(Integer aid) {
public void setAid(String aid) {
this.aid = aid;
}

Expand All @@ -36,28 +34,41 @@ public String getAname() {
}

public void setAname(String aname) {
this.aname = aname == null ? null : aname.trim();
this.aname = aname;
}

public String getApassword() {
return apassword;
}

public void setApassword(String apassword) {
this.apassword = apassword == null ? null : apassword.trim();
this.apassword = apassword;
}

public Date getCreateTime() {
return createTime;
}

public void setCreateTime(Date createTime) {
this.createTime = createTime;
}

public String getAtime() {
return atime;
public Date getUpdateTime() {
return updateTime;
}

public void setAtime(String atime) {
this.atime = atime.substring(0,atime.length()-2);
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}

@Override
public String toString() {
return "Admin [aid=" + aid + ", aname=" + aname + ", apassword=" + apassword + ", atime=" + atime + "]";
return "Admin{" +
"aid='" + aid + '\'' +
", aname='" + aname + '\'' +
", apassword='" + apassword + '\'' +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
}

}
Loading

0 comments on commit 6b7cd2d

Please sign in to comment.