vastsa
diff --git a/‎main.py‎
Lines changed: 8 additions & 10 deletions b/‎main.py‎
Lines changed: 8 additions & 10 deletions
diff --git a/‎static/assert/favicon.ico‎
264 KB b/‎static/assert/favicon.ico‎
264 KB
diff --git a/‎storage.py‎
Lines changed: 4 additions & 2 deletions b/‎storage.py‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎templates/admin.html‎
Lines changed: 4 additions & 3 deletions b/‎templates/admin.html‎
Lines changed: 4 additions & 3 deletions
@@ -76,7 +76,7 @@ async def admin():
 async def admin_post(s: AsyncSession = Depends(get_session)):
     query = select(Codes)
     codes = (await s.execute(query)).scalars().all()
-    return {'msg': '查询成功', 'data': codes}
+    return {'detail': '查询成功', 'data': codes}
 
 
 @app.delete(f'/{settings.ADMIN_ADDRESS}', dependencies=[Depends(admin_required)])
@@ -86,7 +86,7 @@ async def admin_delete(code: str, s: AsyncSession = Depends(get_session)):
     await storage.delete_file({'type': file.type, 'text': file.text})
     await s.delete(file)
     await s.commit()
-    return {'msg': '删除成功'}
+    return {'detail': '删除成功'}
 
 
 @app.get('/')
@@ -101,7 +101,7 @@ async def get_file(code: str, s: AsyncSession = Depends(get_session)):
     if not info:
         raise HTTPException(status_code=404, detail="口令不存在")
     if info.type == 'text':
-        return {'msg': '查询成功', 'data': info.text}
+        return {'detail': '查询成功', 'data': info.text}
     else:
         filepath = await storage.get_filepath(info.text)
         return FileResponse(filepath, filename=info.name)
@@ -112,21 +112,19 @@ async def index(code: str, ip: str = Depends(ip_limit), s: AsyncSession = Depend
     query = select(Codes).where(Codes.code == code)
     info = (await s.execute(query)).scalars().first()
     if not info:
-        error_count = ip_limit.add_ip(ip)
-        raise HTTPException(status_code=404, detail=f"取件码错误，错误{settings.ERROR_COUNT - error_count}次将被禁止10分钟")
+        error_count = settings.ERROR_COUNT - ip_limit.add_ip(ip)
+        raise HTTPException(status_code=404, detail=f"取件码错误，错误{error_count}次将被禁止10分钟")
     if info.exp_time < datetime.datetime.now() or info.count == 0:
         await storage.delete_file({'type': info.type, 'text': info.text})
         await s.delete(info)
         await s.commit()
         raise HTTPException(status_code=404, detail="取件码已过期，请联系寄件人")
-    count = info.count - 1
-    query = update(Codes).where(Codes.id == info.id).values(count=count)
-    await s.execute(query)
+    await s.execute(update(Codes).where(Codes.id == info.id).values(count=info.count - 1))
     await s.commit()
     if info.type != 'text':
         info.text = f'/select?code={code}'
     return {
-        'msg': '取件成功，请点击"取"查看',
+        'detail': '取件成功，请点击"取"查看',
         'data': {'type': info.type, 'text': info.text, 'name': info.name, 'code': info.code}
     }
 
@@ -170,7 +168,7 @@ async def share(text: str = Form(default=None), style: str = Form(default='2'),
     s.add(info)
     await s.commit()
     return {
-        'msg': '分享成功，请点击文件箱查看取件码',
+        'detail': '分享成功，请点击文件箱查看取件码',
         'data': {'code': code, 'key': key, 'name': name, 'text': _text}
     }
 
 
@@ -31,8 +31,10 @@ async def save_file(self, file, file_bytes, key):
         return text
 
     async def delete_file(self, file):
-        filepath = self.DATA_ROOT / file['text'].lstrip(self.STATIC_URL + '/')
-        await asyncio.to_thread(os.remove, filepath)
+        # 是文件就删除
+        if file['type'] != 'text':
+            filepath = self.DATA_ROOT / file['text'].lstrip(self.STATIC_URL + '/')
+            await asyncio.to_thread(os.remove, filepath)
 
     async def delete_files(self, files):
         for file in files:
 
@@ -6,11 +6,14 @@
           content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <link rel="stylesheet" href="/static/assert/index.css">
+    <link rel="shortcut icon" href="/static/assert/favicon.ico" type="image/x-icon"/>
     <title>后台管理-{{title}}</title>
     <meta name="description" content="{{description}}"/>
     <meta name="keywords" content="{{keywords}}"/>
     <meta name="generator" content="FileCodeBox"/>
     <meta name="template" content="Lan"/>
+    <script src="/static/assert/vue.min.js"></script>
+    <script src="/static/assert/index.js"></script>
 </head>
 <body>
 <div id="app">
@@ -57,8 +60,6 @@
 </div>
 
 </body>
-<script src="/static/assert/vue.min.js"></script>
-<script src="/static/assert/index.js"></script>
 <script src="/static/assert/axios.min.js"></script>
 <script>
     new Vue({
@@ -99,7 +100,7 @@
                 axios.delete('?code=' + code, {'headers': {'pwd': this.pwd}}).then(res => {
                     this.files = this.files.filter(item => item.code !== code)
                     this.$message({
-                        message: res.data.msg,
+                        message: res.data.detail,
                         type: 'success'
                     });
                 })