File tree Expand file tree Collapse file tree 4 files changed +5
-6
lines changed
campus-common/src/main/java/com/oddfar/campus/common/domain/entity Expand file tree Collapse file tree 4 files changed +5
-6
lines changed Original file line number Diff line number Diff line change 22 <configuration default =" false" name =" campus-server" type =" docker-deploy" factoryName =" dockerfile" server-name =" Docker" >
33 <deployment type =" dockerfile" >
44 <settings >
5- <option name =" imageTag" value =" campus/campus-imaotai:1.0.10 " />
5+ <option name =" imageTag" value =" campus/campus-imaotai:1.0.11 " />
66 <option name =" buildOnly" value =" true" />
77 <option name =" sourceFilePath" value =" campus-modular/Dockerfile" />
88 </settings >
Original file line number Diff line number Diff line change @@ -61,7 +61,6 @@ public class SysUserEntity extends BaseEntity {
6161 private String avatar ;
6262
6363 /** 密码 */
64- @ JsonIgnore
6564 private String password ;
6665
6766 /** 帐号状态(0正常 1停用) */
Original file line number Diff line number Diff line change @@ -59,13 +59,13 @@ services:
5959 network_mode : " host"
6060
6161 campus-server :
62- image : campus/campus-imaotai:1.0.10
62+ image : campus/campus-imaotai:1.0.11
6363 container_name : campus-imaotai
6464 environment :
6565 # 时区上海
6666 TZ : Asia/Shanghai
6767 SERVER_PORT : 8160
68- # spring.config.additional-location: /home/campus/conf/application-prod.yml
68+ spring.config.additional-location : /home/campus/conf/application-prod.yml
6969 volumes :
7070 - /docker/server/conf:/home/campus/conf
7171 privileged : true
Original file line number Diff line number Diff line change 2121 </modules >
2222
2323 <properties >
24- <revision >1.0.10 </revision >
25- <campus .revision>1.1.8 </campus .revision>
24+ <revision >1.0.11 </revision >
25+ <campus .revision>1.1.9 </campus .revision>
2626 <project .build.sourceEncoding>UTF-8</project .build.sourceEncoding>
2727 <java .version>1.8</java .version>
2828 <bitwalker .version>1.21</bitwalker .version>
You can’t perform that action at this time.
0 commit comments