From 76c58aabef5f35772cf961b87b47b4deb6b3da96 Mon Sep 17 00:00:00 2001
From: chendelin1982 <chendelin1982@126.com>
Date: Tue, 28 Sep 2021 18:34:18 +0800
Subject: [PATCH] docs

---
 cli/Notes.md                              |   6 +-
 cli/__pycache__/controller.cpython-36.pyc | Bin 1699 -> 2119 bytes
 cli/__pycache__/model.cpython-36.pyc      | Bin 1975 -> 4304 bytes
 cli/controller.py                         |  20 ++++-
 cli/drupal2                               |   1 -
 cli/install.sh                            |   2 +-
 cli/joomla                                |   1 +
 cli/model.py                              |  86 ++++++++++++++++++----
 cli/requirements.txt                      |   4 +-
 cli/stackhub.py                           |   7 ++
 cli/test.py                               |   4 +
 cli/version                               |   2 +
 12 files changed, 110 insertions(+), 23 deletions(-)
 delete mode 160000 cli/drupal2
 create mode 160000 cli/joomla
 create mode 100644 cli/version

diff --git a/cli/Notes.md b/cli/Notes.md
index e3922121..b6b1ca4e 100644
--- a/cli/Notes.md
+++ b/cli/Notes.md
@@ -11,4 +11,8 @@
 用户同步 stackhub 上已经存放的清单，而不是通过 API 获取。原因：
 
 1. 避免API使用需要授权或超时
-2. 避免未发布的应用被安装
\ No newline at end of file
+2. 避免未发布的应用被安装
+
+#### 如何获取所有已占用的端口号？
+
+基于 psutil 模块打印所有端口信息，然后匹配关键词
\ No newline at end of file
diff --git a/cli/__pycache__/controller.cpython-36.pyc b/cli/__pycache__/controller.cpython-36.pyc
index e4777edd2d033aaae0d4e636dedd826a5634eff8..1ebb91a8542aab36bd044003e94066899d8e1178 100644
GIT binary patch
literal 2119
zcmaJ?&5qkP5GM6!S@vd=O}aibMO8EnpaQng_E5A)iv<>K&>oy1L4iOQK`YX+yt1T{
zbkY^Jr`^Zs3-ncb?Ty!-`U-pM3}t(rO&S>*4rfN>aK7Q^ulDwW`0r=gUoIj4ke$Z{
z{Rm$90t6$BmL%y$nou*h63dKsV#8>aWa%UhCCpA-<|G~)CcVdm`K*6QSpULGe3%7n
z0J8zi`iwp&(cZtXI+;dPyN?U?q-jT!m}M%9v!*GFJX1woP0B(lO|A~+N;UG^IDT2E
z`RZhn*UPJq-nLEhs#z}Nq!ur)MjJQA&oZgtQ*`9G>*ldQIf7T-2f+!R4o*gybxGi4
zHgjNfm<!o@+I=dDO63$H@xc+_V|b+lf)NO#(?3CINAhwee6SjE6~)U+#XNp0YPQN%
zELE1DLSk`V7I9uzO4Mb^#iTjYewr3lq0)4S3uA(WwztgQla1@GGngc9L#QGPy0Dae
zK>>{}p~%thvSz&0-j7AepESDP;7NX#bp>js=BeOKeVuKm1+dyW@)@}IVY<m?zsts~
zg1%|wV%k-<<Y}sdG==R}CF;X8{dJX<okt8{4S`v{YcJ6Q2X1PL>07>SEN>ju2KNz$
zJOZ(Si`(30^bd<!%)W#+WB?ez<}#1<VD!2+OnO}dCO#Wt^J(u`@J#W@(mphtNnQ^d
zQ7?F|%q+*<@WByrIEGh#34)Pxl9F=@lAc>2;a$LmIJLz?)X-b`pkc%o23vcxx@264
z4`2;(2qLmYAN8$ar!ZIwQ!#W(YzAU^6n<7f1FPNd(!XwrO<!WBn6b%r1`4CsO)-MY
zI)dyM4rsQ~+!6VmDsRzS_{;$h%rB^Tq58%apyh%xW2Hn57DMJ?b5()bTiiOQrqOy(
zQNO**>ep3SXDq~il7*_pS$hwzU6_}3#l!KK@kY(R`yy=b#IN~@tY_+*nAQ0y7vn1$
zw$>zW55ulVVO9b@>@4KJ0R>2b$D2m`0t=!0&zE(r=D&zi+k#6SbhMDJMA_AHgi%&4
zwS)bwy>1chnwHhQ>_i&7EzckXoJwHXv=8eXW3G{9fYEloWH&I;J{}X>K7>ys!bI!`
z^nf1H;WaFqnD@{Ha-h|ID!B^PoQEr!os>L;i>ROkBHUrYsYxNCU9)UiMVKq<!2&;2
zuRh0Q@DRjq_tw49dA2E_7hlsE4?$rRkcU1-3>DA@U~Py4bZ3pM1xecN{WVBHy8tZY
z+U!F7(+%%<7QSg2!?i-%Lqb1Wme2^idNrN_8HE$j(yT0T$uR>W5g$Wh0_j-0`J5F(
z7%V+NO7Z0y7x4gtZWdzIASyAqB)W+0P@fLzwj7;*TaN!D@b?vau;x6uD%IDxk*PRs
z57rgmaZjVZxC0^L0L5Jp+LlUmB={NH5CRdQK=5{sV-AMkihCgNQ`2U?b$j3kzU%wO
z4&;G<I|BZ_iSR%~fw>)~c;XW<=s>Pcp!PYJ(loe07EgwT^Vd`-KE%(Fd(EQn%0l~(
VIzs;*OJ=AjgkE>3V>{NZ{(qz8-4Or)

delta 779
zcmZuuO=}cE5bf^i`QF{EF^QsJ#t;Id?t1VNFp7|XiZGzw1|cllquF71XQ-J~3=1AM
zM?s|jfZ)Yn;K{oePaX#^q9FbV!Kz8zXs}`4yna<(ue$4F`)xD5)@*v8Uf%B=NXEXg
zzm|dg7JkJRf?|pfS$z2CF;^lM%7_i+$MQB)wsH=ba%Lhnapx)zcOLF6#UHY;@e?bs
z==H15mW>2#{e*9FU%%nm>Y-4p1TI45<}etS50X4<>8{wm=TT%~o^yPJvcW<iQs4!c
zBOIev`nZ{|`Bkpy527QnC0G9v)2mCE0m}%X0S@uG04GeSg(dyYxXvHx@5bh(sB}v!
zwNr1(Qgg<Yd4|n6XJZdlf69p~hCWuLmAoUv2Kf5D46NE<MSqbSkySh|%48IZ+PX6O
zBXz>Ha#Z$gOz*IY_62pw_&Q(YXT|=)HYB|=>Hf*kKg=5rIf`h1N8hzBtDw_K#!ows
z2g4-jBHQf^gGnBARA|BltOVx~Dzm?*1^_E01PDj%z(o@NeT2%I<kZXthK`!iU#;aA
zQD{S((oYdAB2-3E0@Pz$BW<1FxLD2V*`3A!9Vlpsj%fRi4W!{bXl6ho1(O6DeB#tI
wv=HJ(-YfTZbI5kmq+h~03Q(2${Qt}<XKR$H$uPOeF|DBP+Cp+^NYQeC13x;5WdHyG

diff --git a/cli/__pycache__/model.cpython-36.pyc b/cli/__pycache__/model.cpython-36.pyc
index c7402bc5e2ee53e1cff5409d46cd62d4e6b98aa4..94ae1bef786cb888ea819a0dab5906161bd48d39 100644
GIT binary patch
literal 4304
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
Ov(V{uu5>Qg`o96JZhPtg

delta 869
zcmZ`$y>HV%6u)O*Z09>^QW7du5<(HCs0@X@sL)D)BFcwaPM|ccP3vIC>Ddu&m9|5=
zFd$Ujj@a2j;(tJ5VL6EfrY;~cGw?12iG`DXzvtik^1FMV>hJT7*=#oTIk(jQs1x#y
z{Bux~IYji~sIhPWzQrtuIN&E)60PQ^f;3A98I}pMEF0ulF37WdP+*0i$cn)j8w*OT
z1Y}fGX5%A!ij6N4M|bEUap+KE6;uhwKxLq+qB0!|m4)iG1NVuYJXRw$kA8_%vbN#I
zwLbT2;*C)kUts%yVyuXmM?@W@ZD&AkkSCA#ASNB?Xag9+p0-mRDSZGAIND3CLx%*&
z0Q*ydkwnLMmg1{G_H-b-W3f5VJJt|@JU5ofBXt9e?CUFJ%TQQGjg#rk<Dz;a8>AU~
zfgAQ?J1OdV>GnN$tM5j!G;!9j=XNFKZrhOwm-CQI>*2jSH%DKI9{0MjG%y;4U7PX(
zwv*J0-GJ%b-ICynRlT0efCgoth!j*c@k+l1lVT}d6+iW<l!i5Ph^Qv&v@+>XCviv^
zJ}QoAN@LNBH~VY5g%c~jrx(O)TAawA=$Tf_>w0mkwT>N5j`(4n5f9R3@h*|SrkWGj
z{hPhv#q)mHb(^-q&tinv6x9`-Q<PV9UX2C~Q8!AofevvU=EVzR1*XMUV?R5gaw<r+
z#xID#Y`}~-GAA2N+x%}&sYfyA)2i|M6qa5@L<W)tRI_xheD;LY!boafh}k=lw0eF!
zej4&X8qsDy_WaR0d~a=5(hfeiq-tq074_G8JY099NE*G-LYTNzxOzoqaC?|O(`)m{
q<t6+D%l&cTZq$N#8l7C-kx$`l74f!^FJw^Oh0B@+mX<5$GQR-?@YM<c

diff --git a/cli/controller.py b/cli/controller.py
index 681ccf5d..819d6c86 100644
--- a/cli/controller.py
+++ b/cli/controller.py
@@ -1,4 +1,5 @@
-import model, os
+import model, os, sys, subprocess
+from model import GitOp
 
 path_repo = "./data/application.list"
 path_project = ""
@@ -29,14 +30,27 @@ class Create:
             self.folder = self.app_name
     
     def downRepo(self):
+        '''download repository'''
+        
         cmd = "git clone --depth=1 " + model.SmoothUrl.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:
-            os.system(cmd)
+            GitOp.gitClone(cmd)
+            
+    def setEnv(self):
+        '''set the usable port for application'''
+        
+        pass
             
     def upRepo(self):
+        '''docker-compose up repository'''
+        
         cmd = "docker-compose -f docker-compose-production.yml --env-file .env_all up -d"
         print(cmd)
         os.chdir(self.folder)
-        os.system(cmd)
\ No newline at end of file
+        os.system(cmd)
+        
+    def printResult(self):
+        pass
\ No newline at end of file
diff --git a/cli/drupal2 b/cli/drupal2
deleted file mode 160000
index 8531fd12..00000000
--- a/cli/drupal2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8531fd12cacfb9881de3c270f2b81e17b20f5a99
diff --git a/cli/install.sh b/cli/install.sh
index 24dc8c31..b664d85f 100644
--- a/cli/install.sh
+++ b/cli/install.sh
@@ -1 +1 @@
-yum install git pwgen jq wget curl figlet boxes -y
\ No newline at end of file
+yum install git wget figlet boxes -y
\ No newline at end of file
diff --git a/cli/joomla b/cli/joomla
new file mode 160000
index 00000000..93735135
--- /dev/null
+++ b/cli/joomla
@@ -0,0 +1 @@
+Subproject commit 93735135cf4529fc7830446bb6604f7c15daae2f
diff --git a/cli/model.py b/cli/model.py
index 36c3ab25..1063373d 100644
--- a/cli/model.py
+++ b/cli/model.py
@@ -1,12 +1,12 @@
 
-import os, io, sys, platform, shutil, urllib3, json, time, subprocess, pprint
+import os, io, sys, platform, psutil, json, secrets, string
 from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Type, Union
 
-import urllib.parse
 import urllib.request
 
+
 class SmoothUrl:
-    ''' get url '''
+    ''' Get the best smooth url for Git or Download'''
     
     def __init__(self):
         pass
@@ -14,28 +14,31 @@ class SmoothUrl:
     def res(url_list: Tuple):
         
         for item in url_list:
-            req = urllib.request.Request(item)
             try:
                 urllib.request.urlopen(item,timeout=3).read()
+                print("Smooth URL is: " + item)
                 return item
-            except urllib.error.URLError as e:
-                print(e.reason)
+            except:
                 continue
         
-        return None
+        print("Necessary resource URL can not reachable, system exit!")
+        sys.exit(0)
+        
 
-
-class Github:
-    '''Github operation'''
+class GitOp:
+    '''Git operation'''
     
     def __init__(self):
         pass
     
-    def gitClone():
-        pass
-    
-    
-
+    def gitClone(cmd: str):
+        '''git clone'''
+        try:
+            print("Command is： "+cmd)
+            os.system(cmd)
+        except:
+            print("Git clone failed, try again and check your URL can be accessed")
+            sys.exit(0)
 
 class FileOp:
     '''File operation'''
@@ -45,4 +48,55 @@ class FileOp:
     
     def printJson(path: str):
         with open(path,newline='') as file:
-            print(file.read())
\ No newline at end of file
+            print(file.read())
+    
+    def convertToJson(path: str):
+        pass
+            
+
+class NetOp:
+    '''Network and port manage'''
+     
+    def __init__(self):
+        pass
+     
+    def checkPort(self, port: int):
+        '''check the target port's status'''
+        search_key = "port="+str(port)
+        if str(psutil.net_connections()).find(search_key) != -1:
+            print(str(port)+" is used")
+            return False
+        else:
+            print(str(port)+" is free")
+            return True
+     
+    def setPort(self, port: int):
+        '''set usable port'''
+        while self.checkPort(port) == False:
+            port=port+1
+         
+        print(port)
+        return port
+
+class SecurityOp:
+    '''Password and security operation'''
+    
+    def __int__(self):
+        pass
+    
+    def randomPass(self, length: Optional[int] = 16):
+        '''set password'''
+        
+        alphabet = string.ascii_letters + string.digits
+        while True:
+            password = ''.join(secrets.choice(alphabet) for i in range(length))
+            if (any(c.islower() for c in password)
+                    and any(c.isupper() for c in password)
+                    and sum(c.isdigit() for c in password) >= 3):
+                break
+        print(password)
+    
+     
+test=SecurityOp()
+#test.setPort(9001)
+test.randomPass(25)
\ No newline at end of file
diff --git a/cli/requirements.txt b/cli/requirements.txt
index 7379290e..14fedd0b 100644
--- a/cli/requirements.txt
+++ b/cli/requirements.txt
@@ -1 +1,3 @@
-typer
\ No newline at end of file
+typer
+psutil
+jq
\ No newline at end of file
diff --git a/cli/stackhub.py b/cli/stackhub.py
index 0a9bab23..a7a002dc 100644
--- a/cli/stackhub.py
+++ b/cli/stackhub.py
@@ -19,6 +19,13 @@ def create(app_name: str, project_name: Optional[str] = None):
     create = controller.Create(app_name, project_name)
     create.downRepo()
     create.upRepo()
+    create.setEnv()
+    create.printResult()
+
+@app.command()
+def start(app_name: str, project_name: Optional[str] = None):
+    '''start one application'''
+    pass
     
 @app.command()
 def update(name: str):
diff --git a/cli/test.py b/cli/test.py
index e69de29b..6c4e5795 100644
--- a/cli/test.py
+++ b/cli/test.py
@@ -0,0 +1,4 @@
+import json
+
+with open("./joomla/.env_all","r") as file:
+    jsonData = json.dump(file, tempfile)
\ No newline at end of file
diff --git a/cli/version b/cli/version
new file mode 100644
index 00000000..fcd84483
--- /dev/null
+++ b/cli/version
@@ -0,0 +1,2 @@
+stable: 1.3
+compatible: 1.23
\ No newline at end of file