预发行准备

2024-12-01 18:58:40 +08:00 · 2023-05-17 10:38:03 +08:00 · 2023-05-17 10:38:03 +08:00 · 3976edfd73
commit 3976edfd73
parent 9907ba545b
8678 changed files with 1093 additions and 593 deletions
--- a/.gitee/ISSUE_TEMPLATE.zh-CN.md
+++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md
--- a/.gitmodules
+++ b/.gitmodules
--- a/.workflow/main-docker-build-pipeline.yml
+++ b/.workflow/main-docker-build-pipeline.yml
--- a/0
+++ b/0
--- a/Dockerfile.temp
+++ b/Dockerfile.temp
--- a/README.md
+++ b/README.md
@ -8,7 +8,7 @@
 </p>

 <p align="center">
-    <img src="https://img.shields.io/badge/Latest Release-3.7.0-orange" />
+    <img src="https://img.shields.io/badge/Latest Release-3.7.1-orange" />
    <img src="https://img.shields.io/badge/PHP-8+-green" />
    <img src="https://img.shields.io/badge/MySQL-5.7+-blueviolet" />
    <img src="https://img.shields.io/badge/License-GPL3.0-blue" />
--- a/app/Admin/Actions/Grid/BatchAction/DeviceRecordBatchDiscardAction.php
+++ b/app/Admin/Actions/Grid/BatchAction/DeviceRecordBatchDiscardAction.php
--- a/app/Admin/Actions/Grid/RowAction/DeviceRecordCancelDeleteAction.php
+++ b/app/Admin/Actions/Grid/RowAction/DeviceRecordCancelDeleteAction.php
--- a/app/Admin/Actions/Grid/RowAction/DeviceRecordCancelDiscardAction.php
+++ b/app/Admin/Actions/Grid/RowAction/DeviceRecordCancelDiscardAction.php
--- a/app/Admin/Actions/Grid/RowAction/DeviceRecordDiscardAction.php
+++ b/app/Admin/Actions/Grid/RowAction/DeviceRecordDiscardAction.php
--- a/app/Admin/Actions/Grid/RowAction/MaintenanceRecordDeleteAction.php
+++ b/app/Admin/Actions/Grid/RowAction/MaintenanceRecordDeleteAction.php
--- a/app/Admin/Actions/Grid/RowAction/MaintenanceRecordForceDeleteAction.php
+++ b/app/Admin/Actions/Grid/RowAction/MaintenanceRecordForceDeleteAction.php
--- a/app/Admin/Actions/Grid/ToolAction/ConsumableImportAction.php
+++ b/app/Admin/Actions/Grid/ToolAction/ConsumableImportAction.php
--- a/app/Admin/Actions/Grid/ToolAction/DevicePrintListAction.php
+++ b/app/Admin/Actions/Grid/ToolAction/DevicePrintListAction.php
--- a/app/Admin/Actions/Grid/ToolAction/DevicePrintTagAction.php
+++ b/app/Admin/Actions/Grid/ToolAction/DevicePrintTagAction.php
--- a/app/Admin/Controllers/DevicePrintController.php
+++ b/app/Admin/Controllers/DevicePrintController.php
--- a/app/Admin/Forms/ConsumableRecordImportForm.php
+++ b/app/Admin/Forms/ConsumableRecordImportForm.php
--- a/app/Admin/Forms/DeviceRecordTagPrintForm.php
+++ b/app/Admin/Forms/DeviceRecordTagPrintForm.php
--- a/app/Console/Commands/Test.php
+++ b/app/Console/Commands/Test.php
--- a/app/Http/Controllers/AssetController.php
+++ b/app/Http/Controllers/AssetController.php
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
--- a/app/Http/Controllers/CheckController.php
+++ b/app/Http/Controllers/CheckController.php
--- a/app/Services/MaintenanceService.php
+++ b/app/Services/MaintenanceService.php
--- a/config/admin.php
+++ b/config/admin.php
@ -324,5 +324,5 @@ return [
    */

    'demo' => env('ADMIN_DEMO', false),
-    'chemex_version' => '3.7.0',
+    'chemex_version' => '3.7.1',
 ];
--- a/config/iframe_tab.php
+++ b/config/iframe_tab.php
--- a/config/jwt.php
+++ b/config/jwt.php
--- a/database/migrations/2016_01_04_173148_create_admin_tables.php
+++ b/database/migrations/2016_01_04_173148_create_admin_tables.php
--- a/database/migrations/2020_09_07_090635_create_admin_settings_table.php
+++ b/database/migrations/2020_09_07_090635_create_admin_settings_table.php
--- a/database/migrations/2020_09_22_015815_create_admin_extensions_table.php
+++ b/database/migrations/2020_09_22_015815_create_admin_extensions_table.php
--- a/database/migrations/2020_11_01_083237_update_admin_menu_table.php
+++ b/database/migrations/2020_11_01_083237_update_admin_menu_table.php
--- a/database/migrations/2021_09_27_194135_version_3_2_1.php
+++ b/database/migrations/2021_09_27_194135_version_3_2_1.php
--- a/database/migrations/2021_10_15_091340_version_3_3_0.php
+++ b/database/migrations/2021_10_15_091340_version_3_3_0.php
--- a/database/migrations/2021_11_22_160713_version_3_4_0.php
+++ b/database/migrations/2021_11_22_160713_version_3_4_0.php
--- a/database/migrations/2022_03_18_104844_version_3_5_1.php
+++ b/database/migrations/2022_03_18_104844_version_3_5_1.php
--- a/database/migrations/2022_05_25_215950_version_3_5_2.php
+++ b/database/migrations/2022_05_25_215950_version_3_5_2.php
--- a/database/migrations/2022_07_18_093147_version_3_7_0.php
+++ b/database/migrations/2022_07_18_093147_version_3_7_0.php
--- a/docker-compose.yml
+++ b/docker-compose.yml
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
--- a/public/static/css/bootstrap.css
+++ b/public/static/css/bootstrap.css
--- a/public/static/js/print/images/.keep
+++ b/public/static/js/print/images/.keep
--- a/public/static/js/print/images/asset_logo4.gif
+++ b/public/static/js/print/images/asset_logo4.gif
--- a/public/static/js/print/images/stamp_0003.png
+++ b/public/static/js/print/images/stamp_0003.png
--- a/public/static/js/print/jquery-qrcode.js
+++ b/public/static/js/print/jquery-qrcode.js
--- a/public/static/js/print/jquery-qrcode.min.js
+++ b/public/static/js/print/jquery-qrcode.min.js
--- a/public/static/js/print/jquery.js
+++ b/public/static/js/print/jquery.js
--- a/public/static/js/print/jquery.print.js
+++ b/public/static/js/print/jquery.print.js
--- a/public/static/js/print/print.js
+++ b/public/static/js/print/print.js
--- a/public/static/js/print/qr/
+++ b/public/static/js/print/qr/
--- a/public/static/js/print/qr/css/font-awesome.min.css
+++ b/public/static/js/print/qr/css/font-awesome.min.css
--- a/public/static/js/print/qr/css/images/.keep
+++ b/public/static/js/print/qr/css/images/.keep
--- a/public/static/js/print/qr/css/images/print_lable.gif
+++ b/public/static/js/print/qr/css/images/print_lable.gif
--- a/public/static/js/print/qr/css/main.css
+++ b/public/static/js/print/qr/css/main.css
--- a/public/static/js/print/qr/css/skin_default.css
+++ b/public/static/js/print/qr/css/skin_default.css
--- a/public/static/js/print/qr/jquery.jqprint-0.3.js
+++ b/public/static/js/print/qr/jquery.jqprint-0.3.js
--- a/public/static/js/print/qrcode.js
+++ b/public/static/js/print/qrcode.js
--- a/public/vendor/dcat-admin-extensions/celaraze/dcat-routes/css/index.css
+++ b/public/vendor/dcat-admin-extensions/celaraze/dcat-routes/css/index.css
--- a/public/vendor/dcat-admin-extensions/celaraze/dcat-routes/js/index.js
+++ b/public/vendor/dcat-admin-extensions/celaraze/dcat-routes/js/index.js
--- a/public/vendor/dcat-admin/dcat/plugins/autocomplete/jquery.autocomplete.js
+++ b/public/vendor/dcat-admin/dcat/plugins/autocomplete/jquery.autocomplete.js
--- a/public/vendor/dcat-admin/dcat/plugins/autocomplete/jquery.autocomplete.min.js
+++ b/public/vendor/dcat-admin/dcat/plugins/autocomplete/jquery.autocomplete.min.js
--- a/public/vendor/iframe-tab/css/style.css
+++ b/public/vendor/iframe-tab/css/style.css
--- a/public/vendor/iframe-tab/css/swiper.min.css
+++ b/public/vendor/iframe-tab/css/swiper.min.css
--- a/public/vendor/iframe-tab/js/base.js
+++ b/public/vendor/iframe-tab/js/base.js
--- a/public/vendor/iframe-tab/js/extend.js
+++ b/public/vendor/iframe-tab/js/extend.js
--- a/public/vendor/iframe-tab/js/md5.js
+++ b/public/vendor/iframe-tab/js/md5.js
--- a/public/vendor/iframe-tab/js/swiper.min.js
+++ b/public/vendor/iframe-tab/js/swiper.min.js
--- a/resources/lang/zh_CN/custom-column-update.php
+++ b/resources/lang/zh_CN/custom-column-update.php
--- a/resources/views/asset_card_device.blade.php
+++ b/resources/views/asset_card_device.blade.php
--- a/resources/views/print_list.blade.php
+++ b/resources/views/print_list.blade.php
--- a/resources/views/print_tag.blade.php
+++ b/resources/views/print_tag.blade.php
--- a/resources/views/print_tag_label_pdf.blade.php
+++ b/resources/views/print_tag_label_pdf.blade.php
--- a/vendor/adldap2/adldap2-laravel/.github/issue_template.md
+++ b/vendor/adldap2/adldap2-laravel/.github/issue_template.md
--- a/vendor/adldap2/adldap2-laravel/.gitignore
+++ b/vendor/adldap2/adldap2-laravel/.gitignore
--- a/vendor/adldap2/adldap2-laravel/.scrutinizer.yml
+++ b/vendor/adldap2/adldap2-laravel/.scrutinizer.yml
--- a/vendor/adldap2/adldap2-laravel/.styleci.yml
+++ b/vendor/adldap2/adldap2-laravel/.styleci.yml
--- a/vendor/adldap2/adldap2-laravel/.travis.yml
+++ b/vendor/adldap2/adldap2-laravel/.travis.yml
--- a/vendor/adldap2/adldap2-laravel/composer.json
+++ b/vendor/adldap2/adldap2-laravel/composer.json
--- a/vendor/adldap2/adldap2-laravel/docs/.nojekyll
+++ b/vendor/adldap2/adldap2-laravel/docs/.nojekyll
--- a/vendor/adldap2/adldap2-laravel/docs/_sidebar.md
+++ b/vendor/adldap2/adldap2-laravel/docs/_sidebar.md
--- a/vendor/adldap2/adldap2-laravel/docs/auth.md
+++ b/vendor/adldap2/adldap2-laravel/docs/auth.md
--- a/vendor/adldap2/adldap2-laravel/docs/auth/events.md
+++ b/vendor/adldap2/adldap2-laravel/docs/auth/events.md
--- a/vendor/adldap2/adldap2-laravel/docs/auth/importing.md
+++ b/vendor/adldap2/adldap2-laravel/docs/auth/importing.md
--- a/vendor/adldap2/adldap2-laravel/docs/auth/installation.md
+++ b/vendor/adldap2/adldap2-laravel/docs/auth/installation.md
--- a/vendor/adldap2/adldap2-laravel/docs/auth/introduction.md
+++ b/vendor/adldap2/adldap2-laravel/docs/auth/introduction.md
--- a/vendor/adldap2/adldap2-laravel/docs/auth/middleware.md
+++ b/vendor/adldap2/adldap2-laravel/docs/auth/middleware.md
--- a/vendor/adldap2/adldap2-laravel/docs/auth/model-binding.md
+++ b/vendor/adldap2/adldap2-laravel/docs/auth/model-binding.md
--- a/vendor/adldap2/adldap2-laravel/docs/auth/setup.md
+++ b/vendor/adldap2/adldap2-laravel/docs/auth/setup.md
--- a/vendor/adldap2/adldap2-laravel/docs/auth/testing.md
+++ b/vendor/adldap2/adldap2-laravel/docs/auth/testing.md
--- a/vendor/adldap2/adldap2-laravel/docs/index.html
+++ b/vendor/adldap2/adldap2-laravel/docs/index.html
--- a/vendor/adldap2/adldap2-laravel/docs/installation.md
+++ b/vendor/adldap2/adldap2-laravel/docs/installation.md
--- a/vendor/adldap2/adldap2-laravel/docs/readme.md
+++ b/vendor/adldap2/adldap2-laravel/docs/readme.md
--- a/vendor/adldap2/adldap2-laravel/docs/setup.md
+++ b/vendor/adldap2/adldap2-laravel/docs/setup.md
--- a/vendor/adldap2/adldap2-laravel/docs/tutorials/basics.md
+++ b/vendor/adldap2/adldap2-laravel/docs/tutorials/basics.md
--- a/vendor/adldap2/adldap2-laravel/docs/tutorials/users.md
+++ b/vendor/adldap2/adldap2-laravel/docs/tutorials/users.md
--- a/vendor/adldap2/adldap2-laravel/docs/upgrading.md
+++ b/vendor/adldap2/adldap2-laravel/docs/upgrading.md
--- a/vendor/adldap2/adldap2-laravel/docs/usage.md
+++ b/vendor/adldap2/adldap2-laravel/docs/usage.md
--- a/vendor/adldap2/adldap2-laravel/license.md
+++ b/vendor/adldap2/adldap2-laravel/license.md
--- a/vendor/adldap2/adldap2-laravel/phpunit.xml
+++ b/vendor/adldap2/adldap2-laravel/phpunit.xml
--- a/vendor/adldap2/adldap2-laravel/readme.md
+++ b/vendor/adldap2/adldap2-laravel/readme.md
--- a/vendor/adldap2/adldap2-laravel/src/AdldapAuthServiceProvider.php
+++ b/vendor/adldap2/adldap2-laravel/src/AdldapAuthServiceProvider.php
--- a/vendor/adldap2/adldap2-laravel/src/AdldapServiceProvider.php
+++ b/vendor/adldap2/adldap2-laravel/src/AdldapServiceProvider.php
--- a/Show More
+++ b/Show More