diff --git a/.run/campus-server.run.xml b/.run/campus-server.run.xml index 54a85e9..e3b1809 100644 --- a/.run/campus-server.run.xml +++ b/.run/campus-server.run.xml @@ -2,7 +2,7 @@ - diff --git a/campus-common/src/main/java/com/oddfar/campus/common/domain/entity/SysUserEntity.java b/campus-common/src/main/java/com/oddfar/campus/common/domain/entity/SysUserEntity.java index b32ae06..a0697a0 100644 --- a/campus-common/src/main/java/com/oddfar/campus/common/domain/entity/SysUserEntity.java +++ b/campus-common/src/main/java/com/oddfar/campus/common/domain/entity/SysUserEntity.java @@ -61,7 +61,6 @@ public class SysUserEntity extends BaseEntity { private String avatar; /** 密码 */ - @JsonIgnore private String password; /** 帐号状态(0正常 1停用) */ diff --git a/doc/docker/docker-compose.yml b/doc/docker/docker-compose.yml index bf4655a..8da0997 100755 --- a/doc/docker/docker-compose.yml +++ b/doc/docker/docker-compose.yml @@ -59,13 +59,13 @@ services: network_mode: "host" campus-server: - image: campus/campus-imaotai:1.0.10 + image: campus/campus-imaotai:1.0.11 container_name: campus-imaotai environment: # 时区上海 TZ: Asia/Shanghai SERVER_PORT: 8160 -# spring.config.additional-location: /home/campus/conf/application-prod.yml + spring.config.additional-location: /home/campus/conf/application-prod.yml volumes: - /docker/server/conf:/home/campus/conf privileged: true diff --git a/pom.xml b/pom.xml index ed47699..be6a9ee 100644 --- a/pom.xml +++ b/pom.xml @@ -21,8 +21,8 @@ - 1.0.10 - 1.1.8 + 1.0.11 + 1.1.9 UTF-8 1.8 1.21