From a9f53bece58130c200a498238ae9afde05539a11 Mon Sep 17 00:00:00 2001
From: oddfar <oddfar@163.com>
Date: Mon, 25 Dec 2023 18:36:23 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96=20V1.0.11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .run/campus-server.run.xml                                    | 2 +-
 .../com/oddfar/campus/common/domain/entity/SysUserEntity.java | 1 -
 doc/docker/docker-compose.yml                                 | 4 ++--
 pom.xml                                                       | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

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 @@
   <configuration default="false" name="campus-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="campus/campus-imaotai:1.0.10" />
+        <option name="imageTag" value="campus/campus-imaotai:1.0.11" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="campus-modular/Dockerfile" />
       </settings>
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 @@
     </modules>
 
     <properties>
-        <revision>1.0.10</revision>
-        <campus.revision>1.1.8</campus.revision>
+        <revision>1.0.11</revision>
+        <campus.revision>1.1.9</campus.revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <bitwalker.version>1.21</bitwalker.version>