diff --git a/src/main/java/com/dl/officialsite/hiring/Hiring.java b/src/main/java/com/dl/officialsite/hiring/Hiring.java index 405c8235..1d685665 100644 --- a/src/main/java/com/dl/officialsite/hiring/Hiring.java +++ b/src/main/java/com/dl/officialsite/hiring/Hiring.java @@ -30,9 +30,6 @@ public class Hiring { private String company; - private String invoice; - - private String yearlySalary; private String benefits; diff --git a/src/main/java/com/dl/officialsite/hiring/HiringSkill.java b/src/main/java/com/dl/officialsite/hiring/HiringSkill.java index c918c16f..79031f67 100644 --- a/src/main/java/com/dl/officialsite/hiring/HiringSkill.java +++ b/src/main/java/com/dl/officialsite/hiring/HiringSkill.java @@ -26,6 +26,7 @@ public class HiringSkill { private String skill; + //扩展字段 private int type; } diff --git a/start.sh b/start.sh index ecad5c34..da802596 100644 --- a/start.sh +++ b/start.sh @@ -19,23 +19,26 @@ else fi if [[ -n "$SECRET_KEY" ]];then - sed "s/{{SECRET_KEY}}/$SECRET_KEY/g" conf/application-template.yml > conf/application.yml + sed "s/{{SECRET_KEY}}/$SECRET_KEY/g" conf/application-template.yml else echo "by hand" fi if [[ -n "$BUCKET_NAME" ]];then - sed "s/{{BUCKET_NAME}}/$BUCKET_NAME/g" conf/application-template.yml > conf/application.yml + sed "s/{{BUCKET_NAME}}/$BUCKET_NAME/g" conf/application-template.yml else echo "by hand" fi if [[ -n "$REGION_NAME" ]];then - sed "s/{{REGION_NAME}}/$REGION_NAME/g" conf/application-template.yml > conf/application.yml + sed "s/{{REGION_NAME}}/$REGION_NAME/g" conf/application-template.yml else echo "by hand" fi + +cp ../application.yml conf/application.yml + SERVER_PORT=$(cat $CONF_DIR/application.yml | grep "server:" -A 3 | grep "port" | awk '{print $2}'| sed 's/\r//') if [ ${SERVER_PORT}"" = "" ];then echo "$CONF_DIR/application.yml server port has not been configured"