3 лет назад · 531ab3a349
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,4 @@ Desktop.ini
 
				 #App
			
 
				 common/config/config.php
			
 
				 
			
 
				-frontendApi/web/pdfs/
			
 
				+frontendApi/web/pdfs/
			
--- a/LICENSE.md
+++ b/LICENSE.md
--- a/README.md
+++ b/README.md
--- a/REGION_insert.sql
+++ b/REGION_insert.sql
--- a/Vagrantfile
+++ b/Vagrantfile
--- a/ak-upload-server/ar.upload.ming.conf
+++ b/ak-upload-server/ar.upload.ming.conf
--- a/ak-upload-server/auth.dev.lua
+++ b/ak-upload-server/auth.dev.lua
--- a/ak-upload-server/auth.prod.lua
+++ b/ak-upload-server/auth.prod.lua
--- a/ak-upload-server/server.dev.py
+++ b/ak-upload-server/server.dev.py
--- a/ak-upload-server/server.prod.py
+++ b/ak-upload-server/server.prod.py
--- a/ak-upload-server/token.php
+++ b/ak-upload-server/token.php
--- a/ak-upload-server/upload.py
+++ b/ak-upload-server/upload.py
--- a/ak-upload-server/upload_img_filter.conf
+++ b/ak-upload-server/upload_img_filter.conf
--- a/ak-upload-server/upload_img_filter.dev.conf
+++ b/ak-upload-server/upload_img_filter.dev.conf
--- a/ak-upload-server/upload_img_filter.prod.conf
+++ b/ak-upload-server/upload_img_filter.prod.conf
--- a/ak-upload-server/venv/bin/activate
+++ b/ak-upload-server/venv/bin/activate
--- a/ak-upload-server/venv/bin/activate.csh
+++ b/ak-upload-server/venv/bin/activate.csh
--- a/ak-upload-server/venv/bin/activate.fish
+++ b/ak-upload-server/venv/bin/activate.fish
--- a/ak-upload-server/venv/bin/easy_install
+++ b/ak-upload-server/venv/bin/easy_install
--- a/ak-upload-server/venv/bin/easy_install-3.6
+++ b/ak-upload-server/venv/bin/easy_install-3.6
--- a/ak-upload-server/venv/bin/pip
+++ b/ak-upload-server/venv/bin/pip
--- a/ak-upload-server/venv/bin/pip3
+++ b/ak-upload-server/venv/bin/pip3
--- a/ak-upload-server/venv/bin/pip3.6
+++ b/ak-upload-server/venv/bin/pip3.6
--- a/ak-upload-server/venv/bin/python
+++ b/ak-upload-server/venv/bin/python
--- a/ak-upload-server/venv/bin/python3
+++ b/ak-upload-server/venv/bin/python3
--- a/ak-upload-server/venv/bin/python3.6
+++ b/ak-upload-server/venv/bin/python3.6
--- a/ak-upload-server/venv/lib/python3.6/site-packages/easy-install.pth
+++ b/ak-upload-server/venv/lib/python3.6/site-packages/easy-install.pth
--- a/ak-upload-server/venv/lib/python3.6/site-packages/setuptools-28.8.0-py3.6.egg
+++ b/ak-upload-server/venv/lib/python3.6/site-packages/setuptools-28.8.0-py3.6.egg
--- a/ak-upload-server/venv/lib/python3.6/site-packages/setuptools.pth
+++ b/ak-upload-server/venv/lib/python3.6/site-packages/setuptools.pth
--- a/ak-upload-server/venv/pyvenv.cfg
+++ b/ak-upload-server/venv/pyvenv.cfg
--- a/backend/assets/AppAsset.php
+++ b/backend/assets/AppAsset.php
--- a/backend/codeception.yml
+++ b/backend/codeception.yml
--- a/backend/config/.gitignore
+++ b/backend/config/.gitignore
--- a/backend/config/bootstrap.php
+++ b/backend/config/bootstrap.php
--- a/backend/config/main-local.php
+++ b/backend/config/main-local.php
--- a/backend/config/main.php
+++ b/backend/config/main.php
--- a/backend/config/params.php
+++ b/backend/config/params.php
--- a/backend/config/test.php
+++ b/backend/config/test.php
--- a/backend/controllers/SiteController.php
+++ b/backend/controllers/SiteController.php
--- a/backend/controllers/TestController.php
+++ b/backend/controllers/TestController.php
--- a/backend/models/.gitkeep
+++ b/backend/models/.gitkeep
--- a/backend/runtime/.gitignore
+++ b/backend/runtime/.gitignore
--- a/backend/tests/_bootstrap.php
+++ b/backend/tests/_bootstrap.php
--- a/backend/tests/_data/.gitignore
+++ b/backend/tests/_data/.gitignore
--- a/backend/tests/_data/login_data.php
+++ b/backend/tests/_data/login_data.php
--- a/backend/tests/_output/.gitignore
+++ b/backend/tests/_output/.gitignore
--- a/backend/tests/_support/.gitignore
+++ b/backend/tests/_support/.gitignore
--- a/backend/tests/_support/FunctionalTester.php
+++ b/backend/tests/_support/FunctionalTester.php
--- a/backend/tests/_support/UnitTester.php
+++ b/backend/tests/_support/UnitTester.php
--- a/backend/tests/functional.suite.yml
+++ b/backend/tests/functional.suite.yml
--- a/backend/tests/functional/LoginCest.php
+++ b/backend/tests/functional/LoginCest.php
--- a/backend/tests/functional/_bootstrap.php
+++ b/backend/tests/functional/_bootstrap.php
--- a/backend/tests/unit.suite.yml
+++ b/backend/tests/unit.suite.yml
--- a/backend/tests/unit/_bootstrap.php
+++ b/backend/tests/unit/_bootstrap.php
--- a/backend/views/layouts/main.php
+++ b/backend/views/layouts/main.php
--- a/backend/views/site/addDecTest.php
+++ b/backend/views/site/addDecTest.php
--- a/backend/views/site/error.php
+++ b/backend/views/site/error.php
--- a/backend/views/site/index.php
+++ b/backend/views/site/index.php
--- a/backend/views/site/login.php
+++ b/backend/views/site/login.php
--- a/backend/web/.gitignore
+++ b/backend/web/.gitignore
--- a/backend/web/assets/.gitignore
+++ b/backend/web/assets/.gitignore
--- a/backend/web/css/site.css
+++ b/backend/web/css/site.css
--- a/backend/web/favicon.ico
+++ b/backend/web/favicon.ico
--- a/backend/web/index.php
+++ b/backend/web/index.php
--- a/backend/web/robots.txt
+++ b/backend/web/robots.txt
--- a/backend/web/test.php
+++ b/backend/web/test.php
--- a/backendApi/config/bootstrap.php
+++ b/backendApi/config/bootstrap.php
--- a/backendApi/config/main.php
+++ b/backendApi/config/main.php
--- a/backendApi/config/menu.php
+++ b/backendApi/config/menu.php
@@ -26,7 +26,7 @@ return [
 
				         ]
			
 
				     ],
			
 
				     'shop'=>[
			
 
				-        'name'=>'Products Management',//商城管理
			
 
				+        'name'=>'Shopping Mall',//商城管理
			
 
				         'class' => '',
			
 
				         'icon'=>'el-icon-goods',
			
 
				         'controller'=>'shop',
			
--- a/backendApi/config/params.php
+++ b/backendApi/config/params.php
--- a/backendApi/config/urlManagerRules.php
+++ b/backendApi/config/urlManagerRules.php
--- a/backendApi/modules/v1/Module.php
+++ b/backendApi/modules/v1/Module.php
--- a/backendApi/modules/v1/components/UserAuth.php
+++ b/backendApi/modules/v1/components/UserAuth.php
--- a/backendApi/modules/v1/controllers/AdController.php
+++ b/backendApi/modules/v1/controllers/AdController.php
--- a/backendApi/modules/v1/controllers/AdminController.php
+++ b/backendApi/modules/v1/controllers/AdminController.php
--- a/backendApi/modules/v1/controllers/ArticleController.php
+++ b/backendApi/modules/v1/controllers/ArticleController.php
--- a/backendApi/modules/v1/controllers/AtlasController.php
+++ b/backendApi/modules/v1/controllers/AtlasController.php
--- a/backendApi/modules/v1/controllers/BaseController.php
+++ b/backendApi/modules/v1/controllers/BaseController.php
--- a/backendApi/modules/v1/controllers/BonusController.php
+++ b/backendApi/modules/v1/controllers/BonusController.php
--- a/backendApi/modules/v1/controllers/ConfigController.php
+++ b/backendApi/modules/v1/controllers/ConfigController.php
--- a/backendApi/modules/v1/controllers/DashboardController.php
+++ b/backendApi/modules/v1/controllers/DashboardController.php
--- a/backendApi/modules/v1/controllers/FileController.php
+++ b/backendApi/modules/v1/controllers/FileController.php
--- a/backendApi/modules/v1/controllers/FinanceController.php
+++ b/backendApi/modules/v1/controllers/FinanceController.php
--- a/backendApi/modules/v1/controllers/LogController.php
+++ b/backendApi/modules/v1/controllers/LogController.php
--- a/backendApi/modules/v1/controllers/MessageController.php
+++ b/backendApi/modules/v1/controllers/MessageController.php
--- a/backendApi/modules/v1/controllers/OauthController.php
+++ b/backendApi/modules/v1/controllers/OauthController.php
--- a/backendApi/modules/v1/controllers/ReconsumeController.php
+++ b/backendApi/modules/v1/controllers/ReconsumeController.php
--- a/backendApi/modules/v1/controllers/ReportController.php
+++ b/backendApi/modules/v1/controllers/ReportController.php
--- a/backendApi/modules/v1/controllers/ShopController.php
+++ b/backendApi/modules/v1/controllers/ShopController.php
--- a/backendApi/modules/v1/controllers/SiteController.php
+++ b/backendApi/modules/v1/controllers/SiteController.php
--- a/backendApi/modules/v1/controllers/UserController.php
+++ b/backendApi/modules/v1/controllers/UserController.php
--- a/backendApi/modules/v1/models/Admin.php
+++ b/backendApi/modules/v1/models/Admin.php
--- a/backendApi/modules/v1/models/AdminForm.php
+++ b/backendApi/modules/v1/models/AdminForm.php
--- a/backendApi/modules/v1/models/AdminRole.php
+++ b/backendApi/modules/v1/models/AdminRole.php
--- a/backendApi/modules/v1/models/AdminRoleForm.php
+++ b/backendApi/modules/v1/models/AdminRoleForm.php
--- a/backendApi/modules/v1/models/AdminToken.php
+++ b/backendApi/modules/v1/models/AdminToken.php
--- a/backendApi/modules/v1/models/LoginForm.php
+++ b/backendApi/modules/v1/models/LoginForm.php
--- a/backendApi/modules/v1/models/User.php
+++ b/backendApi/modules/v1/models/User.php
--- a/backendApi/modules/v1/models/exportForms/AtlasExportForm.php
+++ b/backendApi/modules/v1/models/exportForms/AtlasExportForm.php
--- a/backendApi/modules/v1/models/exportForms/BaseExportForm.php
+++ b/backendApi/modules/v1/models/exportForms/BaseExportForm.php