소스 검색

Merge remote-tracking branch 'origin/master'

wudianlong 2 년 전
부모
커밋
e11b8b36d1
4개의 변경된 파일8개의 추가작업 그리고 8개의 파일을 삭제
  1. 4 4
      energy/dayTask/clean_mysql.sh
  2. 1 1
      energy/dayTask/mysql_to_hdfs.sh
  3. 2 2
      energy/history/clean_mysql.sh
  4. 1 1
      energy/history/mysql_to_hdfs.sh

+ 4 - 4
energy/dayTask/clean_mysql.sh

@@ -1,11 +1,11 @@
 #! /bin/bash
 
-. ./config.sh
+. /opt/app/bi-app/energy/dayTask/config.sh
 
 host=$MYSQL_HOST
 username=$MYSQL_USER
 password=$MYSQL_PASSWORD
-database=saga_dw
+database=saga_dev
 
 del_energy_15_min="truncate table energy_15_min;"
 del_energy_5_min="truncate table energy_5_min;"
@@ -18,11 +18,11 @@ mysql -h${host}  -P3306  -u${username} -p${password} ${database} -e "${del_energ
 }
 
 clean_energy_5(){
-mysql -h${host}  -P3306  -u${username} -p${password} ${database} -e "${del_energy_15_min_fjd}"
+mysql -h${host}  -P3306  -u${username} -p${password} ${database} -e "${del_energy_5_min}"
 }
 
 clean_energy_15_fjd(){
-mysql -h${host}  -P3306  -u${username} -p${password} ${database} -e "${del_energy_5_min}"
+mysql -h${host}  -P3306  -u${username} -p${password} ${database} -e "${del_energy_15_min_fjd}"
 }
 
 clean_energy_5_fjd(){

+ 1 - 1
energy/dayTask/mysql_to_hdfs.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ./config.sh
+. /opt/app/bi-app/energy/dayTask/config.sh
 
 if [ -n "$2" ] ;then
     echo "如果是输入的日期按照取输入日期"

+ 2 - 2
energy/history/clean_mysql.sh

@@ -1,11 +1,11 @@
 #! /bin/bash
 
-. ./config.sh
+. /opt/app/bi-app/energy/history/config.sh
 
 url=$MYSQL_URL
 username=$MYSQL_USER
 password=$MYSQL_PASSWORD
-database=saga_dw
+database=saga_dev
 
 del_energy_15_min_history="truncate table energy_15_min_history;"
 del_energy_5_min_history="truncate table energy_5_min_history;"

+ 1 - 1
energy/history/mysql_to_hdfs.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ./config.sh
+. /opt/app/bi-app/energy/history/config.sh
 
 url=$MYSQL_URL
 username=$MYSQL_USER