bugfix

build.sh

@@ -7,49 +7,46 @@ gname=$(id -gn)
 sudo apt install redis-server
 python3 -m venv py3
 source py3/bin/activate
-$cdir/py3/bin/pip install -r requirements.txt
+pip install -r requirements.txt
 mkdir pkgs
 cd pkgs
 git clone https://git.opencomputing.cn/yumoqing/bricks
 cd bricks/bricks
 ./build.sh
-cd $dir/wwwroot
-ln -s $dir/pkgs/bricks/dist $dir/wwwroot/bricks
+cd $cdir/wwwroot
+ln -s $cdir/pkgs/bricks/dist $dir/wwwroot/bricks
 for m in apppublic sqlor ahserver bricks-for-python xls2ddl
 do
 	echo "install $m module..."
-	cd $dir
+	cd $cdir/pkgs
 	git clone https://git.opencomputing.cn/yumoqing/$m
-	cd $dir/$m
+	cd $m
 	$cdir/py3/bin/pip install .
 done
-dir=$(pwd)
 for m in appbase rbac accounting llmage platformbiz msp cpcc pf_pay filemgr dapi uapi rag charge
 do
 	echo "install $m module..."
-	cd $dir
+	cd $cdir/pkgs
 	git clone https://git.opencomputing.cn/yumoqing/$m
-	cd $dir/$m
+	cd $m
 	$cdir/py3/bin/pip install .
-	if [ -d $dir/$m/models ];then
-		cd $dir/$m/models
+	if [ -d $cdir/pkgs/$m/models ];then
+		cd $cdir/pkgs/$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
+	if [ -d $cdir/pkgs/$m/json ];then
+		cd $cdir/pkgs/$m/json
 		./build.sh
 	fi
-	if [ -d $dir/$m/data ]; then
-		cd $dir/$m/data
-		dbloader $dir sage data.xlsx
+	if [ -d $cdir/pkgs/$m/data ]; then
+		cd $cdir/pkgs/$m/data
+		dbloader $cdir sage data.xlsx
 	fi
 	rm $cdir/wwwroot/$m
-	ln -s $dir/$m/wwwroot $cdir/wwwroot/$m
+	ln -s $cdir/pkgs/$m/wwwroot $cdir/wwwroot/$m
 done
 mkdir $cdir/logs
-rm $cdir/wwwroot/bricks
-ln -s /d/public/bricks $cdir/wwwroot
 cd $cdir
 cat > $cdir/sage.service <<EOF
 [Unit]

requirements.txt

@@ -3,7 +3,3 @@ setuptools
 wheel
 alibabacloud_tea_openapi
 alibabacloud_dysmsapi20170525
-git+https://git.opencomputing.cn/yumoqing/bricks-for-python
-git+https://git.opencomputing.cn/yumoqing/apppublic
-git+https://git.opencomputing.cn/yumoqing/ahserver
-git+https://git.opencomputing.cn/yumoqing/sqlor