From 320753fd57fc0927da48ba0203c947b0f3b4a7df Mon Sep 17 00:00:00 2001
From: chendelin1982 <chendelin1982@126.com>
Date: Fri, 8 Oct 2021 15:03:27 +0800
Subject: [PATCH] controller

---
 cli/__pycache__/controller.cpython-36.pyc | Bin 2189 -> 2172 bytes
 cli/controller.py                         |  13 ++++++++-----
 cli/joomla                                |   1 -
 3 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 160000 cli/joomla

diff --git a/cli/__pycache__/controller.cpython-36.pyc b/cli/__pycache__/controller.cpython-36.pyc
index 99497b2975eafa107124cda73e0b3317774ad8bd..9d4876caa7bad6fef154d84caf8ce6aa4d25047d 100644
GIT binary patch
delta 366
zcmX|5yH3L}6!o>^yxNq45S4gHs6520?NGL|b$|geFtVVk4h2)1$Z?qxF+^fOVnF^9
z{(+SN*!m4@tR1-N(BYnYUb64&;<W0ugTVj$z3y$ld!OvdB7`uUE>5BmG?9>#3~*E2
zR6q)nX)A{s5wu29A~`ZPV|I;XOgqw*p0F@MorAj3{>&>CP7VV5IRMdR83@!sMt(|V
zC1p97Q!C?&;=ks@I@_GMgFD?FMx$`wQXaY!dl2fe8eVY>qS(~=R;hwMVJ^6|Zq9jg
zX%*%CYFb=tUik4!&}<1cj(fvaGaNl$;Dco>njd~rZXii)1VUZ2W+w~FBI@6Vs?m=g
z;wTBtx7}Lb!C1L-@R3dIaeNuZQQK@dx6m=qPN%wCH1-NOEa1p|IR_A!sq^*^{lroq

delta 375
zcmY+8ze@u#6vy-KN76f6Z4s?F9axdJ+*Qy)Q0PzxU0hsTM9Sq_8}BY9mnurd;bsTP
z-{IhYpu5h3|ALc~i-Wm>gTs4#@=5aE_osSabG9lK_jP#MUwCrf%sT@iWa{ea$_Bbo
zkca^@q?tn<QKOEgh*_G<8QFDo3lcNJO4QOf`kaF}k<QGyg~@@=EFd|@$`t1SD0O9p
z%}=3VN{&&pbhAkLRjNXZt9R>QSrkD&O2d)t#XOCghH$h{U3-nV8j#sgi5*l|G)j~g
z8DOeYsz-Z!sTOn?=Ske}1W|f<){o<(rm4Q|y>d%G&v5bIz^aS0{X@#bi%9q(PsTip
zJb&Q*H~v^~Itk^7r@?g+d%mwn`h!s%d4I#z3+_Neec@HuRAq7wJ8D99tLu7;*eF`D
ORkYPJX@RRg$-^(*-CQ*Q

diff --git a/cli/controller.py b/cli/controller.py
index bc3cc77a..5b9be3e4 100644
--- a/cli/controller.py
+++ b/cli/controller.py
@@ -32,23 +32,26 @@ class Create:
     def downRepo(self):
         '''download repository'''
         
-        cmd = "git clone --depth=1 " + model.SmoothUrl.res(github_url) + "/websoft9/docker-" + self.app_name + " " + self.folder
+        geturl = model.SmoothUrl()
+        gitop = model.GitOp()
+        
+        cmd = "git clone --depth=1 " + geturl.res(github_url) + "/websoft9/docker-" + self.app_name + " " + self.folder
         if os.path.exists("./"+self.folder):
             print(os.path.abspath(self.folder)+" folder already exists")
             sys.exit(0)
         else:
-            GitOp.gitClone(cmd)
+            gitop.gitClone(cmd)
             
     def setEnv(self):
         '''set the usable port for application'''
-        fileop=FileOp()
-        print(fileop.fileToJson('./joomla/.env_all'))
+        fileop=model.FileOp()
+        print(fileop.fileToJson('./drupal/.env'))
         pass
             
     def upRepo(self):
         '''docker-compose up repository'''
         
-        cmd = "docker-compose -f docker-compose-production.yml --env-file .env_all up -d"
+        cmd = "docker-compose up -d"
         print(cmd)
         os.chdir(self.folder)
         os.system(cmd)
diff --git a/cli/joomla b/cli/joomla
deleted file mode 160000
index 93735135..00000000
--- a/cli/joomla
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 93735135cf4529fc7830446bb6604f7c15daae2f