V2.5 dev

Dockerfile

@@ -1,34 +1,14 @@
-ARG BASEIMAGE=python:3.8-buster
-FROM ${BASEIMAGE} as build_deps
-EXPOSE 80
-WORKDIR /var/arkid
+ARG BASEIMAGE=registry.cn-zhangjiakou.aliyuncs.com/ark-releases/python38:latest
+FROM ${BASEIMAGE}
 ARG DEBIAN=http://mirrors.aliyun.com/debian
 ARG DEBIANSRT=http://mirrors.aliyun.com/debian-security
-ARG PIP="https://mirrors.aliyun.com/pypi/simple/"
-#ARG DEBIAN=http://deb.debian.org/debian
-#ARG DEBIANSRT=http://security.debian.org/debian-security
-#ARG PIP="https://pypi.python.org/simple"
-
-RUN set -eux; \
-    sed -i "s@http://deb.debian.org/debian@$DEBIAN@g" /etc/apt/sources.list; \
-    sed -i "s@http://security.debian.org/debian-security@$DEBIANSRT@g" /etc/apt/sources.list ; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        gettext xmlsec1 supervisor \
-        freetds-dev freetds-bin \
-        python-dev python-pip \
-        default-libmysqlclient-dev tini gosu; \
-    # verify that the binary works
-    gosu nobody true; \
-    rm -rf /var/lib/apt/lists/*; \
-    groupadd -r arkid && useradd -r -g arkid arkid; \
-    setcap 'cap_net_bind_service=+ep' /usr/local/bin/python3.8
-
-ADD requirements.txt ./
-RUN sed -i "s@https://mirrors.aliyun.com/pypi/simple@$PIP@g" requirements.txt;
-RUN pip install --no-cache-dir -r requirements.txt
+ARG PIP=https://mirrors.aliyun.com/pypi/simple
+WORKDIR /var/arkid
 
 ADD . .
-RUN chmod +x docker-entrypoint.sh
+RUN sed -i "s@https://mirrors.aliyun.com/pypi/simple@$PIP@g" requirements.txt; \
+    cat requirements.txt; \
+    pip install --no-cache-dir -r requirements.txt; \
+    chmod +x docker-entrypoint.sh
 ENTRYPOINT ["/var/arkid/docker-entrypoint.sh"]
 CMD ["tini", "--", "/usr/local/bin/python3.8", "manage.py", "runserver", "0.0.0.0:80"]

Pipfile

@@ -24,6 +24,7 @@ mkdocs-material = "*"
 pyjwt = "*"
 django-celery-beat = "*"
 django-cors-headers = "*"
+mkdocstrings-python-legacy = "*"
 
 [requires]
 python_version = "3.8"

api/v1/pages/app_manage/app_list.py

@@ -5,28 +5,35 @@
 name = '应用列表'
 
 
-page = pages.TablePage(tag=tag, name=name)
+page = pages.TabsPage(tag=tag, name=name)
+
 edit_page = pages.FormPage(name=_("编辑应用"))
 config_page = pages.FormPage(name=_("配置应用"))
 openapi_page = pages.FormPage(name=_("开放API配置"))
 appstore_page = pages.TabsPage(name=_("APP Store", "应用商店"))
-app_list_page = pages.TablePage(name=_("APP Store", "应用商店"))
-app_purchased_page = pages.TablePage(name=_("Purchased", "已购买"))
-order_page = pages.FormPage(name=_('Order', '购买'))
+store_page = pages.CardsPage(name=_("APP Store", "应用商店"))
+app_purchased_page = pages.CardsPage(name=_("Purchased", "已安装"))
+order_page = pages.StepPage(name=_('Order', '购买'))
+trial_page = pages.FormPage(name=_('Trial', '试用'))
+installed_page = pages.CardsPage(name='本地应用')
+price_page = pages.CardsPage(name='选择价格')
+copies_page = pages.FormPage(name='人天份数')
+payment_page = pages.FormPage(name='支付')
 
 pages.register_front_pages(page)
+pages.register_front_pages(installed_page)
 pages.register_front_pages(edit_page)
 pages.register_front_pages(config_page)
 pages.register_front_pages(openapi_page)
 pages.register_front_pages(appstore_page)
-pages.register_front_pages(app_list_page)
+pages.register_front_pages(store_page)
 pages.register_front_pages(app_purchased_page)
 pages.register_front_pages(order_page)
+pages.register_front_pages(trial_page)
+pages.register_front_pages(price_page)
+pages.register_front_pages(copies_page)
+pages.register_front_pages(payment_page)
 
-appstore_page.add_pages([
-    app_list_page,
-    app_purchased_page
-])
 
 router = routers.FrontRouter(
     path=tag,
@@ -35,7 +42,13 @@
     page=page,
 )
 
-page.create_actions(
+page.add_pages([
+    installed_page,
+    store_page,
+    app_purchased_page
+])
+
+installed_page.create_actions(
     init_action=actions.DirectAction(
         path='/api/v1/tenant/{tenant_id}/apps/',
         method=actions.FrontActionMethod.GET,
@@ -44,10 +57,6 @@
         'create':actions.CreateAction(
             path='/api/v1/tenant/{tenant_id}/apps/'
         ),
-        'appstore':actions.OpenAction(
-            name='应用商店',
-            page=appstore_page
-        )
     },
     local_actions={
         "config":actions.OpenAction(
@@ -104,15 +113,16 @@
     }
 )
 
-app_list_page.create_actions(
+store_page.create_actions(
     init_action=actions.DirectAction(
         path='/api/v1/tenant/{tenant_id}/arkstore/apps/',
         method=actions.FrontActionMethod.GET
     ),
     local_actions={
-        "order": actions.OpenAction(
-            name='购买',
-            page=order_page
+        "order": actions.DirectAction(
+            name='安装到本地',
+            path='/api/v1/tenant/{tenant_id}/arkstore/install/{uuid}/',
+            method=actions.FrontActionMethod.POST
         )
     },
 )
@@ -123,23 +133,73 @@
         method=actions.FrontActionMethod.GET
     ),
     local_actions={
-        "install": actions.DirectAction(
-            path="/api/v1/tenant/{tenant_id}/install/{uuid}/",
-            method=actions.FrontActionMethod.POST
+        "order": actions.OpenAction(
+            name='购买',
+            page=order_page
+        ),
+        "trial": actions.OpenAction(
+            name='试用',
+            page=trial_page
         )
     },
 )
 
-order_page.create_actions(
+order_page.add_pages([
+    price_page,
+    copies_page,
+    payment_page
+])
+
+price_page.create_actions(
     init_action=actions.DirectAction(
         path='/api/v1/tenant/{tenant_id}/arkstore/order/extensions/{uuid}/',
-        method=actions.FrontActionMethod.GET,
+        method=actions.FrontActionMethod.GET
+    ),
+    local_actions={
+       'next': actions.NextAction(
+            name="选择价格"
+        ),
+    }
+)
+
+copies_page.create_actions(
+    init_action=actions.DirectAction(
+        path="/api/v1/tenant/{tenant_id}/arkstore/order/extensions/{uuid}/set_copies/",
+        method=actions.FrontActionMethod.POST
+    ),
+    global_actions={
+       'next': actions.NextAction(
+            name="创建订单",
+            path="/api/v1/tenant/{tenant_id}/arkstore/order/extensions/{uuid}/",
+            method=actions.FrontActionMethod.POST
+        ),
+    }
+)
+
+payment_page.create_actions(
+    init_action=actions.DirectAction(
+        path="/api/v1/tenant/{tenant_id}/arkstore/order/{order_no}/payment/",
+        method=actions.FrontActionMethod.GET
     ),
     global_actions={
-        "payed": actions.DirectAction(
-            name='已支付',
-            path='/api/v1/tenant/{tenant_id}/arkstore/order/status/extensions/{uuid}/',
+       'next': actions.NextAction(
+            name="已支付",
+            path="/api/v1/tenant/{tenant_id}/arkstore/purchase/order/{order_no}/payment_status/",
             method=actions.FrontActionMethod.GET
         ),
+    }
+)
+
+trial_page.create_actions(
+    init_action=actions.DirectAction(
+        path='/api/v1/tenant/{tenant_id}/arkstore/trial/extensions/{uuid}/',
+        method=actions.FrontActionMethod.GET,
+    ),
+    global_actions={
+        "confirm": actions.DirectAction(
+            name='试用',
+            path='/api/v1/tenant/{tenant_id}/arkstore/trial/extensions/{uuid}/',
+            method=actions.FrontActionMethod.POST
+        ),
     },
 )

api/v1/pages/developer_manage/api_docs.py

@@ -8,5 +8,5 @@
 router = FrontRouter(
     path=tag,
     name=name,
-    url='/api/v1/redoc'
+    url='/api/v1/docs/redoc/'
 )

api/v1/pages/tenant_manage/tenant_config.py

@@ -4,8 +4,10 @@
 name = '租户配置'
 
 page = pages.FormPage(tag = tag, name = name)
+delete_tenant_page = pages.FormPage("注销租户")
 
 pages.register_front_pages(page)
+pages.register_front_pages(delete_tenant_page)
 
 router = routers.FrontRouter(
     path=tag,
@@ -23,5 +25,22 @@
         "confirm": actions.ConfirmAction(
             path="/api/v1/tenants/{tenant_id}/config/"
         ),
+        "logout": actions.CreateAction(
+            name="注销",
+            path="/api/v1/tenants/{tenant_id}/logout/",
+            method=actions.FrontActionMethod.POST,
+        )
+    }
+)
+
+delete_tenant_page.create_actions(
+    init_action=actions.DirectAction(
+        path="/api/v1/tenants/{tenant_id}/logout/",
+        method=actions.FrontActionMethod.POST,
+    ),
+    global_actions={
+        "confirm": actions.ConfirmAction(
+            path="/api/v1/tenants/{tenant_id}/logout/"
+        ),
     }
 )

api/v1/schema/approve_request.py

@@ -15,17 +15,17 @@ class Config:
         model_fields = ['id']
 
     username: str = Field(title=_('Username', '用户名'))
-    path: str = Field(title=_('Path', '请求路径'))
+    request_path: str = Field(title=_('Path', '请求路径'))
     method: str = Field(title=_('Method', '请求方法'))
     status: str = Field(title=_('Status', '状态'))
 
     @staticmethod
     def resolve_username(obj):
         return obj.user.username
 
-    @staticmethod
-    def resolve_path(obj):
-        return obj.action.path
+    # @staticmethod
+    # def resolve_path(obj):
+    #     return obj.action.path
 
     @staticmethod
     def resolve_method(obj):