diff --git a/.gitignore b/.gitignore index 5d0536a..692cf0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ build /venv -/api/api/static/ +/api/static/ /opencv /emtest/target /dataset/local diff --git a/Dockerfile b/Dockerfile index 0c96eb1..a1d52dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ADD detection /emblem/detection ADD alg /emblem/alg ADD api /emblem/api ADD web /emblem/web -RUN cd /emblem/api/api && ./manage.py collectstatic --noinput +RUN cd /emblem/api && ./manage.py collectstatic --noinput RUN mkdir -p /emblem/log ADD scripts /emblem/scripts ADD nginx.conf /emblem/nginx.conf diff --git a/Makefile b/Makefile index 2a3fac7..2bfde4b 100644 --- a/Makefile +++ b/Makefile @@ -12,14 +12,7 @@ else BUILD_SHARED_LIBS := OFF endif -API_FILES = \ - $(addprefix build/, \ - $(shell find -L \ - api/ip2region.db \ - api/api \ - api/scripts \ - -type f)\ - ) +API_FILES = $(addprefix build/, $(shell find -L api -type f)) WEB_FILES = \ $(addprefix build/, \ @@ -104,7 +97,7 @@ deploy-roi-worker: test: FORCE cd emtest && cargo test -- --nocapture - make -C api test + cd api; ./manage.py test tests make -C detection test OPENCV_TAG := 4.9.0 diff --git a/api/Makefile b/api/Makefile deleted file mode 100644 index 023aff0..0000000 --- a/api/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -IMAGE_TAG ?= $(shell git describe --always) - -.PHONY: FORCE - -DOCKER := docker - -all: - $(MAKE) web - $(MAKE) docker - $(MAKE) push - -docker: - $(DOCKER) build -t emblem:$(IMAGE_TAG) . - -push: - for tag in $(IMAGE_TAG) $(CI_COMMIT_BRANCH); do \ - $(DOCKER) tag emblem:$(IMAGE_TAG) registry.gitlab.com/euphon/emblem:$(IMAGE_TAG) &&\ - $(DOCKER) push registry.gitlab.com/euphon/emblem:$(IMAGE_TAG); \ - done - -docker-run: - $(DOCKER) build --network=host -t emblem:$(IMAGE_TAG) . - $(DOCKER) run -ti --rm -p 12345:80 emblem:$(IMAGE_TAG) - -web: FORCE - cd web; npm run build - -test: - cd api; ./manage.py migrate - cd api; ./manage.py test tests - -stress: - cd api; ./manage.py test tests.stress - -deploy: deploy-dev deploy-prod - -deploy-dev: FORCE - ./scripts/deploy --kubeconfig deploy/kubeconfig.derby \ - --db-host postgres-postgresql.db \ - --emblem-env dev \ - -n emblem \ - -i registry.gitlab.com/euphon/emblem:$(IMAGE_TAG) - -deploy-g: FORCE - ./scripts/deploy --kubeconfig deploy/kubeconfig.g \ - --db-host 10.42.0.1 \ - --emblem-env prod \ - -n emblem \ - -i registry.gitlab.com/euphon/emblem:$(IMAGE_TAG) - -deploy-prod: FORCE - ./scripts/deploy --kubeconfig deploy/kubeconfig.themblem \ - --db-host 192.168.33.175 \ - --emblem-env prod \ - -n emblem \ - -i registry.gitlab.com/euphon/emblem:$(IMAGE_TAG) -run: - ./scripts/run-tmux.sh - -vm: FORCE vm/sys.img $(DATA_IMGS) - q q +vblk:vm/sys.img +sd:vm/ext.img -f --no-net -- \ - -bios /usr/share/ovmf/OVMF.fd \ - -serial stdio \ - -device virtio-blk,drive=sys \ - -netdev user,id=n0,hostfwd=::10022-:22,hostfwd=::6006-:6006,hostfwd=::13000-:3000,hostfwd=::18000-:8000 \ - -device virtio-net-pci,netdev=n0 \ - $(shell for i in 0 1 2 3 4 5 6 7 8; do echo -drive file=vm/data-$$i.img,if=none,id=d$$i -device nvme,serial=NVME_$$i,drive=d$$i; done) \ - -device virtio-scsi \ - -drive file=$(EXT_IMG),if=none,id=ext0 -device scsi-hd,drive=ext0 diff --git a/api/db.sqlite3 b/api/db.sqlite3 new file mode 100644 index 0000000..e939d24 Binary files /dev/null and b/api/db.sqlite3 differ diff --git a/api/api/emblemapi/asgi.py b/api/emblemapi/asgi.py similarity index 100% rename from api/api/emblemapi/asgi.py rename to api/emblemapi/asgi.py diff --git a/api/api/emblemapi/settings.py b/api/emblemapi/settings.py similarity index 100% rename from api/api/emblemapi/settings.py rename to api/emblemapi/settings.py diff --git a/api/api/emblemapi/urls.py b/api/emblemapi/urls.py similarity index 100% rename from api/api/emblemapi/urls.py rename to api/emblemapi/urls.py diff --git a/api/api/emblemapi/wsgi.py b/api/emblemapi/wsgi.py similarity index 100% rename from api/api/emblemapi/wsgi.py rename to api/emblemapi/wsgi.py diff --git a/api/api/euphon.py b/api/euphon.py similarity index 100% rename from api/api/euphon.py rename to api/euphon.py diff --git a/api/api/keys.py b/api/keys.py similarity index 100% rename from api/api/keys.py rename to api/keys.py diff --git a/api/api/manage.py b/api/manage.py similarity index 100% rename from api/api/manage.py rename to api/manage.py diff --git a/api/api/notify.py b/api/notify.py similarity index 100% rename from api/api/notify.py rename to api/notify.py diff --git a/api/api/products/__init__.py b/api/products/__init__.py similarity index 100% rename from api/api/products/__init__.py rename to api/products/__init__.py diff --git a/api/api/products/admin.py b/api/products/admin.py similarity index 100% rename from api/api/products/admin.py rename to api/products/admin.py diff --git a/api/api/products/aliyun.py b/api/products/aliyun.py similarity index 100% rename from api/api/products/aliyun.py rename to api/products/aliyun.py diff --git a/api/api/products/apps.py b/api/products/apps.py similarity index 100% rename from api/api/products/apps.py rename to api/products/apps.py diff --git a/api/api/products/article.py b/api/products/article.py similarity index 100% rename from api/api/products/article.py rename to api/products/article.py diff --git a/api/api/products/ip2region.py b/api/products/ip2region.py similarity index 100% rename from api/api/products/ip2region.py rename to api/products/ip2region.py diff --git a/api/api/products/management/commands/bindbatch.py b/api/products/management/commands/bindbatch.py similarity index 100% rename from api/api/products/management/commands/bindbatch.py rename to api/products/management/commands/bindbatch.py diff --git a/api/api/products/management/commands/codebatchop.py b/api/products/management/commands/codebatchop.py similarity index 100% rename from api/api/products/management/commands/codebatchop.py rename to api/products/management/commands/codebatchop.py diff --git a/api/api/products/management/commands/exportbatch.py b/api/products/management/commands/exportbatch.py similarity index 100% rename from api/api/products/management/commands/exportbatch.py rename to api/products/management/commands/exportbatch.py diff --git a/api/api/products/management/commands/exportscandata.py b/api/products/management/commands/exportscandata.py similarity index 100% rename from api/api/products/management/commands/exportscandata.py rename to api/products/management/commands/exportscandata.py diff --git a/api/api/products/management/commands/importcode.py b/api/products/management/commands/importcode.py similarity index 100% rename from api/api/products/management/commands/importcode.py rename to api/products/management/commands/importcode.py diff --git a/api/api/products/management/commands/qrrepeatalert.py b/api/products/management/commands/qrrepeatalert.py similarity index 100% rename from api/api/products/management/commands/qrrepeatalert.py rename to api/products/management/commands/qrrepeatalert.py diff --git a/api/api/products/management/commands/sendalert.py b/api/products/management/commands/sendalert.py similarity index 100% rename from api/api/products/management/commands/sendalert.py rename to api/products/management/commands/sendalert.py diff --git a/api/api/products/management/commands/sendemail.py b/api/products/management/commands/sendemail.py similarity index 100% rename from api/api/products/management/commands/sendemail.py rename to api/products/management/commands/sendemail.py diff --git a/api/api/products/management/commands/sendmsg.py b/api/products/management/commands/sendmsg.py similarity index 100% rename from api/api/products/management/commands/sendmsg.py rename to api/products/management/commands/sendmsg.py diff --git a/api/api/products/migrations/0001_initial.py b/api/products/migrations/0001_initial.py similarity index 100% rename from api/api/products/migrations/0001_initial.py rename to api/products/migrations/0001_initial.py diff --git a/api/api/products/migrations/0002_initial.py b/api/products/migrations/0002_initial.py similarity index 100% rename from api/api/products/migrations/0002_initial.py rename to api/products/migrations/0002_initial.py diff --git a/api/api/products/migrations/0003_auto_20220209_2025.py b/api/products/migrations/0003_auto_20220209_2025.py similarity index 100% rename from api/api/products/migrations/0003_auto_20220209_2025.py rename to api/products/migrations/0003_auto_20220209_2025.py diff --git a/api/api/products/migrations/0004_tenant_password_reset_code.py b/api/products/migrations/0004_tenant_password_reset_code.py similarity index 100% rename from api/api/products/migrations/0004_tenant_password_reset_code.py rename to api/products/migrations/0004_tenant_password_reset_code.py diff --git a/api/api/products/migrations/0005_tenant_password_reset_code_expire.py b/api/products/migrations/0005_tenant_password_reset_code_expire.py similarity index 100% rename from api/api/products/migrations/0005_tenant_password_reset_code_expire.py rename to api/products/migrations/0005_tenant_password_reset_code_expire.py diff --git a/api/api/products/migrations/0006_systemlog.py b/api/products/migrations/0006_systemlog.py similarity index 100% rename from api/api/products/migrations/0006_systemlog.py rename to api/products/migrations/0006_systemlog.py diff --git a/api/api/products/migrations/0007_alter_systemlog_datetime.py b/api/products/migrations/0007_alter_systemlog_datetime.py similarity index 100% rename from api/api/products/migrations/0007_alter_systemlog_datetime.py rename to api/products/migrations/0007_alter_systemlog_datetime.py diff --git a/api/api/products/migrations/0008_counter.py b/api/products/migrations/0008_counter.py similarity index 100% rename from api/api/products/migrations/0008_counter.py rename to api/products/migrations/0008_counter.py diff --git a/api/api/products/migrations/0009_alter_counter_name.py b/api/products/migrations/0009_alter_counter_name.py similarity index 100% rename from api/api/products/migrations/0009_alter_counter_name.py rename to api/products/migrations/0009_alter_counter_name.py diff --git a/api/api/products/migrations/0010_auto_20220303_2039.py b/api/products/migrations/0010_auto_20220303_2039.py similarity index 100% rename from api/api/products/migrations/0010_auto_20220303_2039.py rename to api/products/migrations/0010_auto_20220303_2039.py diff --git a/api/api/products/migrations/0011_auto_20220306_1552.py b/api/products/migrations/0011_auto_20220306_1552.py similarity index 100% rename from api/api/products/migrations/0011_auto_20220306_1552.py rename to api/products/migrations/0011_auto_20220306_1552.py diff --git a/api/api/products/migrations/0012_alter_productpage_html.py b/api/products/migrations/0012_alter_productpage_html.py similarity index 100% rename from api/api/products/migrations/0012_alter_productpage_html.py rename to api/products/migrations/0012_alter_productpage_html.py diff --git a/api/api/products/migrations/0013_auto_20220306_1938.py b/api/products/migrations/0013_auto_20220306_1938.py similarity index 100% rename from api/api/products/migrations/0013_auto_20220306_1938.py rename to api/products/migrations/0013_auto_20220306_1938.py diff --git a/api/api/products/migrations/0014_assetfile_properties.py b/api/products/migrations/0014_assetfile_properties.py similarity index 100% rename from api/api/products/migrations/0014_assetfile_properties.py rename to api/products/migrations/0014_assetfile_properties.py diff --git a/api/api/products/migrations/0015_alter_assetfile_properties.py b/api/products/migrations/0015_alter_assetfile_properties.py similarity index 100% rename from api/api/products/migrations/0015_alter_assetfile_properties.py rename to api/products/migrations/0015_alter_assetfile_properties.py diff --git a/api/api/products/migrations/0016_auto_20220307_2001.py b/api/products/migrations/0016_auto_20220307_2001.py similarity index 100% rename from api/api/products/migrations/0016_auto_20220307_2001.py rename to api/products/migrations/0016_auto_20220307_2001.py diff --git a/api/api/products/migrations/0017_auto_20220309_1937.py b/api/products/migrations/0017_auto_20220309_1937.py similarity index 100% rename from api/api/products/migrations/0017_auto_20220309_1937.py rename to api/products/migrations/0017_auto_20220309_1937.py diff --git a/api/api/products/migrations/0018_auto_20220309_2024.py b/api/products/migrations/0018_auto_20220309_2024.py similarity index 100% rename from api/api/products/migrations/0018_auto_20220309_2024.py rename to api/products/migrations/0018_auto_20220309_2024.py diff --git a/api/api/products/migrations/0019_remove_counter_accumulated.py b/api/products/migrations/0019_remove_counter_accumulated.py similarity index 100% rename from api/api/products/migrations/0019_remove_counter_accumulated.py rename to api/products/migrations/0019_remove_counter_accumulated.py diff --git a/api/api/products/migrations/0020_auto_20220309_2038.py b/api/products/migrations/0020_auto_20220309_2038.py similarity index 100% rename from api/api/products/migrations/0020_auto_20220309_2038.py rename to api/products/migrations/0020_auto_20220309_2038.py diff --git a/api/api/products/migrations/0021_auto_20220312_2238.py b/api/products/migrations/0021_auto_20220312_2238.py similarity index 100% rename from api/api/products/migrations/0021_auto_20220312_2238.py rename to api/products/migrations/0021_auto_20220312_2238.py diff --git a/api/api/products/migrations/0022_codebatch_is_active.py b/api/products/migrations/0022_codebatch_is_active.py similarity index 100% rename from api/api/products/migrations/0022_codebatch_is_active.py rename to api/products/migrations/0022_codebatch_is_active.py diff --git a/api/api/products/migrations/0023_codebatch_tenant.py b/api/products/migrations/0023_codebatch_tenant.py similarity index 100% rename from api/api/products/migrations/0023_codebatch_tenant.py rename to api/products/migrations/0023_codebatch_tenant.py diff --git a/api/api/products/migrations/0024_auto_20220315_0817.py b/api/products/migrations/0024_auto_20220315_0817.py similarity index 100% rename from api/api/products/migrations/0024_auto_20220315_0817.py rename to api/products/migrations/0024_auto_20220315_0817.py diff --git a/api/api/products/migrations/0025_auto_20220315_2039.py b/api/products/migrations/0025_auto_20220315_2039.py similarity index 100% rename from api/api/products/migrations/0025_auto_20220315_2039.py rename to api/products/migrations/0025_auto_20220315_2039.py diff --git a/api/api/products/migrations/0026_alter_assetfile_uuid.py b/api/products/migrations/0026_alter_assetfile_uuid.py similarity index 100% rename from api/api/products/migrations/0026_alter_assetfile_uuid.py rename to api/products/migrations/0026_alter_assetfile_uuid.py diff --git a/api/api/products/migrations/0027_tenant_display_name.py b/api/products/migrations/0027_tenant_display_name.py similarity index 100% rename from api/api/products/migrations/0027_tenant_display_name.py rename to api/products/migrations/0027_tenant_display_name.py diff --git a/api/api/products/migrations/0028_assetfile_url.py b/api/products/migrations/0028_assetfile_url.py similarity index 100% rename from api/api/products/migrations/0028_assetfile_url.py rename to api/products/migrations/0028_assetfile_url.py diff --git a/api/api/products/migrations/0029_article.py b/api/products/migrations/0029_article.py similarity index 100% rename from api/api/products/migrations/0029_article.py rename to api/products/migrations/0029_article.py diff --git a/api/api/products/migrations/0030_auto_20220323_0809.py b/api/products/migrations/0030_auto_20220323_0809.py similarity index 100% rename from api/api/products/migrations/0030_auto_20220323_0809.py rename to api/products/migrations/0030_auto_20220323_0809.py diff --git a/api/api/products/migrations/0031_auto_20220323_0841.py b/api/products/migrations/0031_auto_20220323_0841.py similarity index 100% rename from api/api/products/migrations/0031_auto_20220323_0841.py rename to api/products/migrations/0031_auto_20220323_0841.py diff --git a/api/api/products/migrations/0032_assetfile_order.py b/api/products/migrations/0032_assetfile_order.py similarity index 100% rename from api/api/products/migrations/0032_assetfile_order.py rename to api/products/migrations/0032_assetfile_order.py diff --git a/api/api/products/migrations/0033_rename_url_assetfile_link.py b/api/products/migrations/0033_rename_url_assetfile_link.py similarity index 100% rename from api/api/products/migrations/0033_rename_url_assetfile_link.py rename to api/products/migrations/0033_rename_url_assetfile_link.py diff --git a/api/api/products/migrations/0034_auto_20220323_2015.py b/api/products/migrations/0034_auto_20220323_2015.py similarity index 100% rename from api/api/products/migrations/0034_auto_20220323_2015.py rename to api/products/migrations/0034_auto_20220323_2015.py diff --git a/api/api/products/migrations/0035_assetfile_external_url.py b/api/products/migrations/0035_assetfile_external_url.py similarity index 100% rename from api/api/products/migrations/0035_assetfile_external_url.py rename to api/products/migrations/0035_assetfile_external_url.py diff --git a/api/api/products/migrations/0036_miniprogramcontent.py b/api/products/migrations/0036_miniprogramcontent.py similarity index 100% rename from api/api/products/migrations/0036_miniprogramcontent.py rename to api/products/migrations/0036_miniprogramcontent.py diff --git a/api/api/products/migrations/0037_auto_20220323_2206.py b/api/products/migrations/0037_auto_20220323_2206.py similarity index 100% rename from api/api/products/migrations/0037_auto_20220323_2206.py rename to api/products/migrations/0037_auto_20220323_2206.py diff --git a/api/api/products/migrations/0038_auto_20220323_2306.py b/api/products/migrations/0038_auto_20220323_2306.py similarity index 100% rename from api/api/products/migrations/0038_auto_20220323_2306.py rename to api/products/migrations/0038_auto_20220323_2306.py diff --git a/api/api/products/migrations/0039_auto_20220325_1046.py b/api/products/migrations/0039_auto_20220325_1046.py similarity index 100% rename from api/api/products/migrations/0039_auto_20220325_1046.py rename to api/products/migrations/0039_auto_20220325_1046.py diff --git a/api/api/products/migrations/0040_alter_product_article.py b/api/products/migrations/0040_alter_product_article.py similarity index 100% rename from api/api/products/migrations/0040_alter_product_article.py rename to api/products/migrations/0040_alter_product_article.py diff --git a/api/api/products/migrations/0041_scandata_location.py b/api/products/migrations/0041_scandata_location.py similarity index 100% rename from api/api/products/migrations/0041_scandata_location.py rename to api/products/migrations/0041_scandata_location.py diff --git a/api/api/products/migrations/0042_auto_20220505_2022.py b/api/products/migrations/0042_auto_20220505_2022.py similarity index 100% rename from api/api/products/migrations/0042_auto_20220505_2022.py rename to api/products/migrations/0042_auto_20220505_2022.py diff --git a/api/api/products/migrations/0043_codebatch_qr_angle_allowed_error.py b/api/products/migrations/0043_codebatch_qr_angle_allowed_error.py similarity index 100% rename from api/api/products/migrations/0043_codebatch_qr_angle_allowed_error.py rename to api/products/migrations/0043_codebatch_qr_angle_allowed_error.py diff --git a/api/api/products/migrations/0044_scandata_succeeded.py b/api/products/migrations/0044_scandata_succeeded.py similarity index 100% rename from api/api/products/migrations/0044_scandata_succeeded.py rename to api/products/migrations/0044_scandata_succeeded.py diff --git a/api/api/products/migrations/0045_auto_20220505_2052.py b/api/products/migrations/0045_auto_20220505_2052.py similarity index 100% rename from api/api/products/migrations/0045_auto_20220505_2052.py rename to api/products/migrations/0045_auto_20220505_2052.py diff --git a/api/api/products/migrations/0046_scandata_message.py b/api/products/migrations/0046_scandata_message.py similarity index 100% rename from api/api/products/migrations/0046_scandata_message.py rename to api/products/migrations/0046_scandata_message.py diff --git a/api/api/products/migrations/0047_auto_20220505_2101.py b/api/products/migrations/0047_auto_20220505_2101.py similarity index 100% rename from api/api/products/migrations/0047_auto_20220505_2101.py rename to api/products/migrations/0047_auto_20220505_2101.py diff --git a/api/api/products/migrations/0048_alter_scandata_ip.py b/api/products/migrations/0048_alter_scandata_ip.py similarity index 100% rename from api/api/products/migrations/0048_alter_scandata_ip.py rename to api/products/migrations/0048_alter_scandata_ip.py diff --git a/api/api/products/migrations/0049_auto_20220506_1352.py b/api/products/migrations/0049_auto_20220506_1352.py similarity index 100% rename from api/api/products/migrations/0049_auto_20220506_1352.py rename to api/products/migrations/0049_auto_20220506_1352.py diff --git a/api/api/products/migrations/0050_auto_20220521_1447.py b/api/products/migrations/0050_auto_20220521_1447.py similarity index 100% rename from api/api/products/migrations/0050_auto_20220521_1447.py rename to api/products/migrations/0050_auto_20220521_1447.py diff --git a/api/api/products/migrations/0051_auto_20220521_1935.py b/api/products/migrations/0051_auto_20220521_1935.py similarity index 100% rename from api/api/products/migrations/0051_auto_20220521_1935.py rename to api/products/migrations/0051_auto_20220521_1935.py diff --git a/api/api/products/migrations/0052_auto_20220521_2008.py b/api/products/migrations/0052_auto_20220521_2008.py similarity index 100% rename from api/api/products/migrations/0052_auto_20220521_2008.py rename to api/products/migrations/0052_auto_20220521_2008.py diff --git a/api/api/products/migrations/0053_alter_serialcode_seq_num.py b/api/products/migrations/0053_alter_serialcode_seq_num.py similarity index 100% rename from api/api/products/migrations/0053_alter_serialcode_seq_num.py rename to api/products/migrations/0053_alter_serialcode_seq_num.py diff --git a/api/api/products/migrations/0054_tenant_next_seq_num.py b/api/products/migrations/0054_tenant_next_seq_num.py similarity index 100% rename from api/api/products/migrations/0054_tenant_next_seq_num.py rename to api/products/migrations/0054_tenant_next_seq_num.py diff --git a/api/api/products/migrations/0055_auto_20220524_1931.py b/api/products/migrations/0055_auto_20220524_1931.py similarity index 100% rename from api/api/products/migrations/0055_auto_20220524_1931.py rename to api/products/migrations/0055_auto_20220524_1931.py diff --git a/api/api/products/migrations/0056_auto_20220524_2023.py b/api/products/migrations/0056_auto_20220524_2023.py similarity index 100% rename from api/api/products/migrations/0056_auto_20220524_2023.py rename to api/products/migrations/0056_auto_20220524_2023.py diff --git a/api/api/products/migrations/0057_auto_20220525_2014.py b/api/products/migrations/0057_auto_20220525_2014.py similarity index 100% rename from api/api/products/migrations/0057_auto_20220525_2014.py rename to api/products/migrations/0057_auto_20220525_2014.py diff --git a/api/api/products/migrations/0058_auto_20220526_0900.py b/api/products/migrations/0058_auto_20220526_0900.py similarity index 100% rename from api/api/products/migrations/0058_auto_20220526_0900.py rename to api/products/migrations/0058_auto_20220526_0900.py diff --git a/api/api/products/migrations/0059_scandata_tenant.py b/api/products/migrations/0059_scandata_tenant.py similarity index 100% rename from api/api/products/migrations/0059_scandata_tenant.py rename to api/products/migrations/0059_scandata_tenant.py diff --git a/api/api/products/migrations/0060_admininfo_qr_verify_alert_rule.py b/api/products/migrations/0060_admininfo_qr_verify_alert_rule.py similarity index 100% rename from api/api/products/migrations/0060_admininfo_qr_verify_alert_rule.py rename to api/products/migrations/0060_admininfo_qr_verify_alert_rule.py diff --git a/api/api/products/migrations/0061_article_options.py b/api/products/migrations/0061_article_options.py similarity index 100% rename from api/api/products/migrations/0061_article_options.py rename to api/products/migrations/0061_article_options.py diff --git a/api/api/products/migrations/0062_job.py b/api/products/migrations/0062_job.py similarity index 100% rename from api/api/products/migrations/0062_job.py rename to api/products/migrations/0062_job.py diff --git a/api/api/products/migrations/0063_job_output.py b/api/products/migrations/0063_job_output.py similarity index 100% rename from api/api/products/migrations/0063_job_output.py rename to api/products/migrations/0063_job_output.py diff --git a/api/api/products/migrations/0064_miniprogram.py b/api/products/migrations/0064_miniprogram.py similarity index 100% rename from api/api/products/migrations/0064_miniprogram.py rename to api/products/migrations/0064_miniprogram.py diff --git a/api/api/products/migrations/0065_auto_20220703_2102.py b/api/products/migrations/0065_auto_20220703_2102.py similarity index 100% rename from api/api/products/migrations/0065_auto_20220703_2102.py rename to api/products/migrations/0065_auto_20220703_2102.py diff --git a/api/api/products/migrations/0066_article_url.py b/api/products/migrations/0066_article_url.py similarity index 100% rename from api/api/products/migrations/0066_article_url.py rename to api/products/migrations/0066_article_url.py diff --git a/api/api/products/migrations/0067_job_tenant.py b/api/products/migrations/0067_job_tenant.py similarity index 100% rename from api/api/products/migrations/0067_job_tenant.py rename to api/products/migrations/0067_job_tenant.py diff --git a/api/api/products/migrations/0068_miniprogramintegration.py b/api/products/migrations/0068_miniprogramintegration.py similarity index 100% rename from api/api/products/migrations/0068_miniprogramintegration.py rename to api/products/migrations/0068_miniprogramintegration.py diff --git a/api/api/products/migrations/0069_serialcodefeature.py b/api/products/migrations/0069_serialcodefeature.py similarity index 100% rename from api/api/products/migrations/0069_serialcodefeature.py rename to api/products/migrations/0069_serialcodefeature.py diff --git a/api/api/products/migrations/0070_codebatch_name.py b/api/products/migrations/0070_codebatch_name.py similarity index 100% rename from api/api/products/migrations/0070_codebatch_name.py rename to api/products/migrations/0070_codebatch_name.py diff --git a/api/api/products/migrations/0071_smsverifiedaction.py b/api/products/migrations/0071_smsverifiedaction.py similarity index 100% rename from api/api/products/migrations/0071_smsverifiedaction.py rename to api/products/migrations/0071_smsverifiedaction.py diff --git a/api/api/products/migrations/0072_auto_20230909_0953.py b/api/products/migrations/0072_auto_20230909_0953.py similarity index 100% rename from api/api/products/migrations/0072_auto_20230909_0953.py rename to api/products/migrations/0072_auto_20230909_0953.py diff --git a/api/api/products/migrations/0073_delete_serialcodefeature.py b/api/products/migrations/0073_delete_serialcodefeature.py similarity index 100% rename from api/api/products/migrations/0073_delete_serialcodefeature.py rename to api/products/migrations/0073_delete_serialcodefeature.py diff --git a/api/api/products/migrations/0074_estorarchiverecord.py b/api/products/migrations/0074_estorarchiverecord.py similarity index 100% rename from api/api/products/migrations/0074_estorarchiverecord.py rename to api/products/migrations/0074_estorarchiverecord.py diff --git a/api/api/products/migrations/0075_auto_20230927_2054.py b/api/products/migrations/0075_auto_20230927_2054.py similarity index 100% rename from api/api/products/migrations/0075_auto_20230927_2054.py rename to api/products/migrations/0075_auto_20230927_2054.py diff --git a/api/api/products/migrations/0076_auto_20230927_2115.py b/api/products/migrations/0076_auto_20230927_2115.py similarity index 100% rename from api/api/products/migrations/0076_auto_20230927_2115.py rename to api/products/migrations/0076_auto_20230927_2115.py diff --git a/api/api/products/migrations/0077_cameraconfig.py b/api/products/migrations/0077_cameraconfig.py similarity index 100% rename from api/api/products/migrations/0077_cameraconfig.py rename to api/products/migrations/0077_cameraconfig.py diff --git a/api/api/products/migrations/0078_scandata_phone_model.py b/api/products/migrations/0078_scandata_phone_model.py similarity index 100% rename from api/api/products/migrations/0078_scandata_phone_model.py rename to api/products/migrations/0078_scandata_phone_model.py diff --git a/api/api/products/migrations/0079_cameraconfig_disabled.py b/api/products/migrations/0079_cameraconfig_disabled.py similarity index 100% rename from api/api/products/migrations/0079_cameraconfig_disabled.py rename to api/products/migrations/0079_cameraconfig_disabled.py diff --git a/api/api/products/migrations/0080_cameraconfig_notes.py b/api/products/migrations/0080_cameraconfig_notes.py similarity index 100% rename from api/api/products/migrations/0080_cameraconfig_notes.py rename to api/products/migrations/0080_cameraconfig_notes.py diff --git a/api/api/products/migrations/0081_cameraconfig_populate.py b/api/products/migrations/0081_cameraconfig_populate.py similarity index 100% rename from api/api/products/migrations/0081_cameraconfig_populate.py rename to api/products/migrations/0081_cameraconfig_populate.py diff --git a/api/api/products/migrations/0082_camerarule.py b/api/products/migrations/0082_camerarule.py similarity index 100% rename from api/api/products/migrations/0082_camerarule.py rename to api/products/migrations/0082_camerarule.py diff --git a/api/api/products/migrations/0083_camerarule_populate.py b/api/products/migrations/0083_camerarule_populate.py similarity index 100% rename from api/api/products/migrations/0083_camerarule_populate.py rename to api/products/migrations/0083_camerarule_populate.py diff --git a/api/api/products/migrations/0084_delete_cameraconfig.py b/api/products/migrations/0084_delete_cameraconfig.py similarity index 100% rename from api/api/products/migrations/0084_delete_cameraconfig.py rename to api/products/migrations/0084_delete_cameraconfig.py diff --git a/api/api/products/migrations/0085_codebatch_scan_redirect_url.py b/api/products/migrations/0085_codebatch_scan_redirect_url.py similarity index 100% rename from api/api/products/migrations/0085_codebatch_scan_redirect_url.py rename to api/products/migrations/0085_codebatch_scan_redirect_url.py diff --git a/api/api/products/migrations/0086_auto_20240420_1210.py b/api/products/migrations/0086_auto_20240420_1210.py similarity index 100% rename from api/api/products/migrations/0086_auto_20240420_1210.py rename to api/products/migrations/0086_auto_20240420_1210.py diff --git a/api/api/products/migrations/0087_remove_productproperty_data_type.py b/api/products/migrations/0087_remove_productproperty_data_type.py similarity index 100% rename from api/api/products/migrations/0087_remove_productproperty_data_type.py rename to api/products/migrations/0087_remove_productproperty_data_type.py diff --git a/api/api/products/migrations/0088_auto_20240420_1310.py b/api/products/migrations/0088_auto_20240420_1310.py similarity index 100% rename from api/api/products/migrations/0088_auto_20240420_1310.py rename to api/products/migrations/0088_auto_20240420_1310.py diff --git a/api/api/products/migrations/0089_auto_20240421_2127.py b/api/products/migrations/0089_auto_20240421_2127.py similarity index 100% rename from api/api/products/migrations/0089_auto_20240421_2127.py rename to api/products/migrations/0089_auto_20240421_2127.py diff --git a/api/api/products/migrations/0090_productproperty_file.py b/api/products/migrations/0090_productproperty_file.py similarity index 100% rename from api/api/products/migrations/0090_productproperty_file.py rename to api/products/migrations/0090_productproperty_file.py diff --git a/api/api/products/migrations/0091_scandata_client_log_alter_authtoken_admin_and_more.py b/api/products/migrations/0091_scandata_client_log_alter_authtoken_admin_and_more.py similarity index 100% rename from api/api/products/migrations/0091_scandata_client_log_alter_authtoken_admin_and_more.py rename to api/products/migrations/0091_scandata_client_log_alter_authtoken_admin_and_more.py diff --git a/api/api/products/migrations/0092_codebatch_enable_auto_torch.py b/api/products/migrations/0092_codebatch_enable_auto_torch.py similarity index 100% rename from api/api/products/migrations/0092_codebatch_enable_auto_torch.py rename to api/products/migrations/0092_codebatch_enable_auto_torch.py diff --git a/api/api/products/migrations/0093_codebatch_camera_sensitivity.py b/api/products/migrations/0093_codebatch_camera_sensitivity.py similarity index 100% rename from api/api/products/migrations/0093_codebatch_camera_sensitivity.py rename to api/products/migrations/0093_codebatch_camera_sensitivity.py diff --git a/api/api/products/migrations/0094_scandata_labels.py b/api/products/migrations/0094_scandata_labels.py similarity index 100% rename from api/api/products/migrations/0094_scandata_labels.py rename to api/products/migrations/0094_scandata_labels.py diff --git a/api/api/products/migrations/0095_auto_20250215_1138.py b/api/products/migrations/0095_auto_20250215_1138.py similarity index 100% rename from api/api/products/migrations/0095_auto_20250215_1138.py rename to api/products/migrations/0095_auto_20250215_1138.py diff --git a/api/api/products/migrations/0096_codebatch_mini_prog_entry_path.py b/api/products/migrations/0096_codebatch_mini_prog_entry_path.py similarity index 100% rename from api/api/products/migrations/0096_codebatch_mini_prog_entry_path.py rename to api/products/migrations/0096_codebatch_mini_prog_entry_path.py diff --git a/api/api/products/migrations/0097_codebatch_mini_prog_entry_env_version.py b/api/products/migrations/0097_codebatch_mini_prog_entry_env_version.py similarity index 100% rename from api/api/products/migrations/0097_codebatch_mini_prog_entry_env_version.py rename to api/products/migrations/0097_codebatch_mini_prog_entry_env_version.py diff --git a/api/api/products/migrations/__init__.py b/api/products/migrations/__init__.py similarity index 100% rename from api/api/products/migrations/__init__.py rename to api/products/migrations/__init__.py diff --git a/api/api/products/miniprogram.py b/api/products/miniprogram.py similarity index 100% rename from api/api/products/miniprogram.py rename to api/products/miniprogram.py diff --git a/api/api/products/models.py b/api/products/models.py similarity index 100% rename from api/api/products/models.py rename to api/products/models.py diff --git a/api/api/products/sendmsg.py b/api/products/sendmsg.py similarity index 100% rename from api/api/products/sendmsg.py rename to api/products/sendmsg.py diff --git a/api/api/products/urls.py b/api/products/urls.py similarity index 100% rename from api/api/products/urls.py rename to api/products/urls.py diff --git a/api/api/products/v_urls.py b/api/products/v_urls.py similarity index 100% rename from api/api/products/v_urls.py rename to api/products/v_urls.py diff --git a/api/api/products/views.py b/api/products/views.py similarity index 100% rename from api/api/products/views.py rename to api/products/views.py diff --git a/api/api/requirements.txt b/api/requirements.txt similarity index 100% rename from api/api/requirements.txt rename to api/requirements.txt diff --git a/api/api/tests/data/0074252612205-roi.jpg b/api/tests/data/0074252612205-roi.jpg similarity index 100% rename from api/api/tests/data/0074252612205-roi.jpg rename to api/tests/data/0074252612205-roi.jpg diff --git a/api/api/tests/data/0074253255108-roi.jpg b/api/tests/data/0074253255108-roi.jpg similarity index 100% rename from api/api/tests/data/0074253255108-roi.jpg rename to api/tests/data/0074253255108-roi.jpg diff --git a/api/api/tests/data/qr.jpg b/api/tests/data/qr.jpg similarity index 100% rename from api/api/tests/data/qr.jpg rename to api/tests/data/qr.jpg diff --git a/api/api/tests/data/qr.png b/api/tests/data/qr.png similarity index 100% rename from api/api/tests/data/qr.png rename to api/tests/data/qr.png diff --git a/api/api/tests/data/qr1.jpg b/api/tests/data/qr1.jpg similarity index 100% rename from api/api/tests/data/qr1.jpg rename to api/tests/data/qr1.jpg diff --git a/api/api/tests/data/smoketest-qr.jpg b/api/tests/data/smoketest-qr.jpg similarity index 100% rename from api/api/tests/data/smoketest-qr.jpg rename to api/tests/data/smoketest-qr.jpg diff --git a/api/api/tests/data/smoketest-roi.jpg b/api/tests/data/smoketest-roi.jpg similarity index 100% rename from api/api/tests/data/smoketest-roi.jpg rename to api/tests/data/smoketest-roi.jpg diff --git a/api/api/tests/data/smoketest.jpg b/api/tests/data/smoketest.jpg similarity index 100% rename from api/api/tests/data/smoketest.jpg rename to api/tests/data/smoketest.jpg diff --git a/api/api/tests/data/smoketest.json b/api/tests/data/smoketest.json similarity index 100% rename from api/api/tests/data/smoketest.json rename to api/tests/data/smoketest.json diff --git a/api/api/tests/stress.py b/api/tests/stress.py similarity index 100% rename from api/api/tests/stress.py rename to api/tests/stress.py diff --git a/api/api/tests/test_api.py b/api/tests/test_api.py similarity index 100% rename from api/api/tests/test_api.py rename to api/tests/test_api.py diff --git a/api/api/tests/test_counter.py b/api/tests/test_counter.py similarity index 100% rename from api/api/tests/test_counter.py rename to api/tests/test_counter.py diff --git a/api/api/tests/test_oss.py b/api/tests/test_oss.py similarity index 100% rename from api/api/tests/test_oss.py rename to api/tests/test_oss.py diff --git a/scripts/entrypoint b/scripts/entrypoint index 42eb215..0561f01 100755 --- a/scripts/entrypoint +++ b/scripts/entrypoint @@ -9,7 +9,7 @@ import json BASE_DIR = os.path.realpath(os.path.dirname(__file__) + "/..") def prepare(): - manage_py = os.path.join(BASE_DIR, 'api/api/manage.py') + manage_py = os.path.join(BASE_DIR, 'api/manage.py') emblem_env = os.environ.get("EMBLEM_ENV") if emblem_env: em = ['sendalert', f"emblem {emblem_env} started"] @@ -35,7 +35,7 @@ def main(): '-w', '8', '-t', '0', 'emblemapi.wsgi:application' - ] + gunicorn_args, cwd=os.path.join(BASE_DIR, 'api/api')) + ] + gunicorn_args, cwd=os.path.join(BASE_DIR, 'api')) detection = subprocess.Popen(["python3", "app.py"], cwd=os.path.join(BASE_DIR, "detection")) procs = [nginx, gunicorn, detection] diff --git a/scripts/tmux.sh b/scripts/tmux.sh index af03f98..bb7f00d 100755 --- a/scripts/tmux.sh +++ b/scripts/tmux.sh @@ -9,7 +9,7 @@ cd $(dirname $0)/.. pip3 install -r requirements.txt -tmux new-window -n serve "cd api/api && ./manage.py runserver; $SHELL -i" +tmux new-window -n serve "cd api && ./manage.py runserver; $SHELL -i" tmux split-window "cd web && npm run serve; $SHELL -i" tmux split-window "cd detection && python3 app.py; $SHELL -i" $SHELL -i