Merge branch 'main' of git.opencomputing.cn:yumoqing/sage

build.sh

@@ -19,18 +19,26 @@ do
 	$cdir/py3/bin/pip install .
 done
 dir=$(pwd)
-for m in appbase rbac accounting llmage platformbiz msp cpcc pf_pay filemgr dapi uapi rag
+for m in appbase rbac accounting llmage platformbiz msp cpcc pf_pay filemgr dapi uapi rag charge
 do
 	echo "install $m module..."
 	cd $dir
 	git clone https://git.opencomputing.cn/yumoqing/$m
 	cd $dir/$m
 	$cdir/py3/bin/pip install .
-	cd $dir/$m/models
-	xls2ddl mysql . > mysql.ddl.sql
-	mysql -h db -utest -ptest123 sage < mysql.ddl.sql
-	cd $dir/$m/json
-	./build.sh
+	if [ -d $dir/$m/models ];then
+		cd $dir/$m/models
+		xls2ddl mysql . > mysql.ddl.sql
+		mysql -h db -utest -ptest123 sage < mysql.ddl.sql
+	fi
+	if [ -d $dir/$m/json ];then
+		cd $dir/$m/json
+		./build.sh
+	fi
+	if [ -d $dir/$m/data ]; then
+		cd $dir/$m/data
+		dbloader $dir sage data.xlsx
+	fi
 	rm $cdir/wwwroot/$m
 	ln -s $dir/$m/wwwroot $cdir/wwwroot/$m
 done