Merge branch '7.x' of ssh://git.bt.cn:30001/root/linux-panel into 7.x

php-garlic · Mar 22, 2022 · 86acfab · 86acfab
2 parents f2f3516 + 35405a8
commit 86acfab
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/class/public.py b/class/public.py
@@ -556,7 +556,9 @@ def ExecShell(cmdstring, timeout=None, shell=True,cwd=None,env=None,user = None)
         #编码修正
         if type(a) == bytes: a = a.decode('utf-8')
         if type(e) == bytes: e = e.decode('utf-8')
-    except:pass
+    except:
+        a = str(a)
+        e = str(e)
 
     return a,e