Merge branch 'master' of https://github.com/youwenbusi/zk-client

yanyanho · Aug 19, 2020 · aee9646 · aee9646
2 parents d1fb799 + 9929c02
commit aee9646
Show file tree

Hide file tree

Showing 7,822 changed files with 59 additions and 1,491,945 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,5 +18,5 @@ _test_notes
 **/logs
 user
 zkclient/settings.py
-env/
 *.keystore
+env/src
diff --git a/commands/constants.py b/commands/constants.py
@@ -22,5 +22,5 @@
 DATABASE_DEFAULT_ADDRESS = "39.108.248.156"
 DATABASE_DEFAULT_PORT = 3306
 DATABASE_DEFAULT_USER = "root"
-DATABASE_DEFAULT_PASSWORD = "******"
+DATABASE_DEFAULT_PASSWORD = "xBj2019"
 DATABASE_DEFAULT_DATABASE = "zkclient"
diff --git a/env/bin/activate b/env/bin/activate
diff --git a/env/bin/activate.csh b/env/bin/activate.csh
diff --git a/env/bin/activate.fish b/env/bin/activate.fish
diff --git a/env/bin/chardetect b/env/bin/chardetect
diff --git a/env/bin/django-admin b/env/bin/django-admin
diff --git a/env/bin/django-admin.py b/env/bin/django-admin.py
diff --git a/env/bin/dmypy b/env/bin/dmypy
diff --git a/env/bin/easy_install b/env/bin/easy_install
diff --git a/env/bin/easy_install-3.7 b/env/bin/easy_install-3.7
diff --git a/env/bin/epylint b/env/bin/epylint
diff --git a/env/bin/flake8 b/env/bin/flake8
diff --git a/env/bin/isort b/env/bin/isort
diff --git a/env/bin/mypy b/env/bin/mypy
diff --git a/env/bin/pip b/env/bin/pip
diff --git a/env/bin/pip3 b/env/bin/pip3
diff --git a/env/bin/pip3.7 b/env/bin/pip3.7
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,5 +18,5 @@ _test_notes @@
     **/logs
     user
     zkclient/settings.py
-    env/
     *.keystore
+    env/src