Merge pull request #93 from yanyanho/main

fix the start script
Dapp-Learning-DAO · Dec 14, 2023 · 14e0d76 · 14e0d76
2 parents 2e42514 + 2645d74
commit 14e0d76
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -26,6 +26,7 @@ public class HiringSkill {
 
     private String skill;
 
+    //扩展字段
     private int type;
 
 }
diff --git 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"