-
-
-
-
-
-
-{{ NoFooter }}
\ No newline at end of file
diff --git a/TempLate/GERP/index.html b/TempLate/GERP/index.html
index b631795d..e76bf349 100644
--- a/TempLate/GERP/index.html
+++ b/TempLate/GERP/index.html
@@ -5,16 +5,16 @@
GERP 管理系统
-
+
-
+
-
-
-
-
+
+
+
+
-
+
diff --git a/TempLate/index.html b/TempLate/index.html
index c19aa279..5c5602ba 100644
--- a/TempLate/index.html
+++ b/TempLate/index.html
@@ -5,8 +5,8 @@
银河锋锐软件开发工作室
-
-
+
+
diff --git a/gvsds/apps/core/views.py b/gvsds/apps/core/views.py
index a4d9e12c..af6f27a6 100644
--- a/gvsds/apps/core/views.py
+++ b/gvsds/apps/core/views.py
@@ -43,7 +43,7 @@ SUBDOMAIN_CONFIG = {
'3crb': {'dir': 'CCCRB', 'root_is_index': True},
'ccgo': {'dir': 'CCGO', 'root_is_index': True},
'invite': {'dir': '', 'root_is_index': True},
- 'doc': {'dir': 'Document', 'root_is_index': True},
+ 'doc': {'dir': '', 'root_is_index': True},
't4': {'dir': None, 'root_is_index': False},
'verify': {'dir': 'Verify', 'root_is_index': True},
'verifox': {'dir': 'Verifox', 'root_is_index': True},
@@ -129,6 +129,86 @@ def _serve_file(full_path, subdomain=None):
return response
+# ============================================================================
+# doc 子域 JSON API（页面由 GVSite SPA 渲染）
+# /API/GetDoc/
→ 文章 JSON
+# /API/GetSerieDirectory/ → 系列目录 / 单文档标记 JSON
+# ============================================================================
+
+
+def _doc_api(file_path):
+ """doc 子域 JSON API：API/GetDoc/ 与 API/GetSerieDirectory/。"""
+ from gvsds.apps.doc.manager import DocManager
+ from gvsdsdk.model_utils import UUIDObj
+
+ parts = file_path.split('/')
+ if len(parts) < 3 or parts[0] != 'API':
+ return None
+ action = parts[1]
+ uuid_text = parts[2].strip('/')
+ try:
+ uuid_bytes = UUIDObj(uuid_text).bytes
+ except (ValueError, TypeError, AttributeError):
+ return JsonResponse({'error': 'invalid_uuid'}, status=404)
+
+ if action == 'GetDoc':
+ doc = DocManager.GetDocument(uuid_bytes)
+ if doc is None:
+ return JsonResponse({'error': 'not_found'}, status=404)
+ return JsonResponse({
+ 'DocTitle': doc.DocTitle or '未命名文档',
+ 'DocContent': doc.DocContent or '',
+ 'DocFormat': doc.DocFormat,
+ 'DocPermission': 1,
+ 'DocDecrypt': True,
+ })
+
+ if action == 'GetSerieDirectory':
+ from gvsds.apps.doc.models import CommunityDocument, CommunitySeries
+ try:
+ serie = CommunitySeries.objects.get(DocSerieUUID=uuid_bytes)
+ except CommunitySeries.DoesNotExist:
+ serie = None
+ if serie is not None:
+ docs = CommunityDocument.objects.filter(DocSerieUUID=uuid_bytes)
+ chapters = [
+ {
+ 'id': UUIDObj(d.DocUUID).str.replace('-', ''),
+ 'title': d.DocTitle or '未命名文档',
+ 'sections': [],
+ }
+ for d in docs
+ ]
+ return JsonResponse({
+ 'title': serie.DocSerieName or '未命名系列',
+ 'document': False,
+ 'chapters': chapters,
+ })
+ # 非系列 UUID：单文档模式，返回所属系列的全部文章供侧边栏展示
+ doc = DocManager.GetDocument(uuid_bytes)
+ if doc is None:
+ return JsonResponse({'error': 'not_found'}, status=404)
+ chapters = []
+ if doc.DocSerieUUID:
+ serie_docs = CommunityDocument.objects.filter(DocSerieUUID=doc.DocSerieUUID)
+ chapters = [
+ {
+ 'id': UUIDObj(d.DocUUID).str.replace('-', ''),
+ 'title': d.DocTitle or '未命名文档',
+ 'sections': [],
+ }
+ for d in serie_docs
+ ]
+ return JsonResponse({
+ 'title': doc.DocTitle or '未命名文档',
+ 'document': True,
+ 'id': UUIDObj(doc.DocUUID).str.replace('-', ''),
+ 'chapters': chapters,
+ })
+
+ return None
+
+
class SubdomainView(View):
def get(self, request, file_path=''):
subdomain = _get_subdomain(request)
@@ -137,6 +217,14 @@ class SubdomainView(View):
if config.get('dir') is None:
raise Http404
+ # doc 子域：动态阅读 JSON API（页面由 GVSite SPA 渲染，走下方通用静态/SPA fallback）
+ # doc.gvsds.com/API/GetDoc/ → 文章 JSON
+ # doc.gvsds.com/API/GetSerieDirectory/ → 目录 JSON
+ if subdomain == 'doc' and file_path and file_path.startswith('API/'):
+ api_resp = _doc_api(file_path)
+ if api_resp:
+ return api_resp
+
# ugm 子域：未登录则跳转登录页，已登录则跳转 gerp
if subdomain == 'ugm':
# JWT Cookie 认证：检查 AccessToken 或 RefreshToken
diff --git a/gvsds/apps/doc/manager.py b/gvsds/apps/doc/manager.py
index 242f36cb..c8d6d628 100644
--- a/gvsds/apps/doc/manager.py
+++ b/gvsds/apps/doc/manager.py
@@ -17,7 +17,7 @@ class DocManager:
@staticmethod
def ListDocuments(Keyword=''):
- """获取文档列表（不含 DocContent 全文，仅标题与创建时间）"""
+ """获取文档列表（不含 DocContent 全文，仅标题/系列/创建时间/格式）"""
qs = CommunityDocument.objects.all()
if Keyword:
qs = qs.filter(DocTitle__icontains=Keyword)
@@ -25,7 +25,9 @@ class DocManager:
for d in qs:
data.append({
'DocUUID': UUIDObj(d.DocUUID).str,
+ 'DocSerieUUID': UUIDObj(d.DocSerieUUID).str if d.DocSerieUUID else None,
'DocTitle': d.DocTitle,
+ 'DocFormat': d.DocFormat,
'DocCreateTime': d.DocCreateTime.isoformat() if d.DocCreateTime else None,
})
return data
@@ -39,23 +41,24 @@ class DocManager:
return None
@staticmethod
- def AddDocument(Title, Content='', SerieUUID=None):
- """新建文档（可选绑定系列）"""
+ def AddDocument(Title, Content='', SerieUUID=None, Format='markdown'):
+ """新建文档（可选绑定系列；DocSerieUUID 为可空 UUID 列，直接存 bytes）
+
+ Format: 'markdown' 或 'html'（DocFormat 字段）。
+ """
create_data = {
'DocUUID': uuid.uuid4().bytes,
'DocTitle': Title,
'DocContent': Content,
+ 'DocFormat': Format if Format in ('markdown', 'html') else 'markdown',
}
- if SerieUUID:
- serie = DocManager.GetSerie(SerieUUID)
- if serie is not None:
- # DocSerieUUID 为 ForeignKey：传实例
- create_data['DocSerieUUID'] = serie
+ if SerieUUID and DocManager.GetSerie(SerieUUID) is not None:
+ create_data['DocSerieUUID'] = UUIDObj(SerieUUID).bytes
return CommunityDocument.objects.create(**create_data)
@staticmethod
def ModifyDocument(DocUUID, Data):
- """修改文档标题与内容
+ """修改文档标题/内容/格式
Returns:
(成功?, 错误消息 or None)
@@ -63,7 +66,7 @@ class DocManager:
doc = DocManager.GetDocument(DocUUID)
if doc is None:
return False, '文档不存在'
- for field in ('DocTitle', 'DocContent'):
+ for field in ('DocTitle', 'DocContent', 'DocFormat'):
if field in Data:
setattr(doc, field, Data[field])
doc.save()
@@ -86,12 +89,12 @@ class DocManager:
@staticmethod
def ListSeries():
- """获取系列列表"""
+ """获取系列列表（统一 DocSerie 前缀字段名）"""
data = []
for s in CommunitySeries.objects.all():
data.append({
- 'SerieUUID': UUIDObj(s.DocSerieUUID).str,
- 'SerieName': s.DocSerieName,
+ 'DocSerieUUID': UUIDObj(s.DocSerieUUID).str,
+ 'DocSerieName': s.DocSerieName,
})
return data
@@ -152,7 +155,10 @@ class DocManager:
@staticmethod
def SerieHasDocuments(DocSerieUUID):
"""判断系列下是否还有文档（防删除）"""
- serie = DocManager.GetSerie(DocSerieUUID)
- if serie is None:
+ try:
+ serie_bytes = UUIDObj(DocSerieUUID).bytes
+ except (ValueError, AttributeError):
return False
- return CommunityDocument.objects.filter(DocSerieUUID=serie).exists()
+ if DocManager.GetSerie(DocSerieUUID) is None:
+ return False
+ return CommunityDocument.objects.filter(DocSerieUUID=serie_bytes).exists()
diff --git a/gvsds/apps/doc/migrations/0002_doc_redesign.py b/gvsds/apps/doc/migrations/0002_doc_redesign.py
new file mode 100644
index 00000000..6ffee531
--- /dev/null
+++ b/gvsds/apps/doc/migrations/0002_doc_redesign.py
@@ -0,0 +1,34 @@
+"""Redesign CommunityDocument
+
+系列字段 DocSerieUUID 由 FK 改为可空 UUIDField（非 FK，消除列名不一致）；
+删除冗余且从未使用的 DocPermission / DocPwd / DocPwdDesc 字段。
+"""
+import gvsds.apps.core.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('doc', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='communitydocument',
+ name='doc_permission',
+ ),
+ migrations.RemoveField(
+ model_name='communitydocument',
+ name='doc_pwd',
+ ),
+ migrations.RemoveField(
+ model_name='communitydocument',
+ name='doc_pwd_desc',
+ ),
+ migrations.AlterField(
+ model_name='communitydocument',
+ name='doc_serie_uuid',
+ field=gvsds.apps.core.models.UUIDField(blank=True, db_column='DocSerieUUID', null=True, serialize=False, verbose_name='所属系列UUID'),
+ ),
+ ]
diff --git a/gvsds/apps/doc/migrations/0003_doc_format.py b/gvsds/apps/doc/migrations/0003_doc_format.py
new file mode 100644
index 00000000..f188786e
--- /dev/null
+++ b/gvsds/apps/doc/migrations/0003_doc_format.py
@@ -0,0 +1,20 @@
+"""Add CommunityDocument.DocFormat
+
+内容格式字段：markdown（默认，兼容旧内容经 marked 渲染）或 html（富文本）。
+"""
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('doc', '0002_doc_redesign'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='communitydocument',
+ name='doc_format',
+ field=models.CharField(choices=[('markdown', 'Markdown'), ('html', '富文本 HTML')], db_column='DocFormat', default='markdown', max_length=16, verbose_name='内容格式'),
+ ),
+ ]
diff --git a/gvsds/apps/doc/models.py b/gvsds/apps/doc/models.py
index b59c76b5..d013dff5 100644
--- a/gvsds/apps/doc/models.py
+++ b/gvsds/apps/doc/models.py
@@ -8,21 +8,23 @@ from gvsds.apps.core.models import UUIDField
class CommunityDocument(QModel):
- """社区文档表——文档内容与权限管理"""
+ """社区文档表——文档内容管理
+
+ DocSerieUUID 为可空 UUIDField（非 FK）：系列仅是逻辑分组，
+ 避免 FK + to_field 导致列名（DocSerieUUID_id）与迁移不一致的坑。
+ """
DocUUID = UUIDField(primary_key=True, verbose_name='文档UUID')
- DocSerieUUID = models.ForeignKey(
- 'CommunitySeries', on_delete=models.CASCADE,
- to_field='DocSerieUUID',
- related_name='+',
- verbose_name='所属系列',
- )
+ DocSerieUUID = UUIDField(null=True, blank=True, verbose_name='所属系列UUID')
DocTitle = models.CharField(max_length=256, verbose_name='文档标题')
DocContent = models.TextField(verbose_name='文档内容')
+ DocFormat = models.CharField(
+ max_length=16,
+ default='markdown',
+ choices=(('markdown', 'Markdown'), ('html', '富文本 HTML')),
+ verbose_name='内容格式',
+ )
DocCreateTime = models.DateTimeField(default=datetime.datetime.utcnow, verbose_name='文档创建时间')
- DocPermission = models.IntegerField(default=0, verbose_name='文档权限')
- DocPwd = UUIDField(verbose_name='文档密码')
- DocPwdDesc = models.CharField(max_length=256, verbose_name='密码描述')
class Meta:
db_table = 'Document'
diff --git a/gvsds/apps/doc/serializers.py b/gvsds/apps/doc/serializers.py
index 45f5c9c5..ff7c8cc6 100644
--- a/gvsds/apps/doc/serializers.py
+++ b/gvsds/apps/doc/serializers.py
@@ -10,7 +10,7 @@ class CommunityDocumentSerializer(PascalCaseModelSerializer):
class Meta:
model = CommunityDocument
- fields = ['DocUUID', 'DocSerieUUID', 'DocTitle', 'DocContent', 'DocCreateTime']
+ fields = ['DocUUID', 'DocSerieUUID', 'DocTitle', 'DocContent', 'DocFormat', 'DocCreateTime']
def get_DocUUID(self, obj):
raw = obj.DocUUID
@@ -19,14 +19,12 @@ class CommunityDocumentSerializer(PascalCaseModelSerializer):
return str(raw) if raw else None
def get_DocSerieUUID(self, obj):
- raw = obj.DocSerieUUID_id if hasattr(obj, 'DocSerieUUID_id') else obj.DocSerieUUID
+ # DocSerieUUID 现为可空 UUIDField（非 FK），直接转字符串
+ raw = obj.DocSerieUUID
+ if raw is None:
+ return None
if isinstance(raw, bytes) and len(raw) == 16:
return str(uuid.UUID(bytes=raw))
- if isinstance(raw, CommunitySeries):
- raw2 = raw.DocSerieUUID
- if isinstance(raw2, bytes) and len(raw2) == 16:
- return str(uuid.UUID(bytes=raw2))
- return str(raw2) if raw2 else None
return str(raw) if raw else None
@@ -47,12 +45,14 @@ class CommunitySeriesSerializer(PascalCaseModelSerializer):
class DocAddSerializer(PascalCaseSerializer):
DocTitle = serializers.CharField(max_length=256)
DocSerieUUID = serializers.CharField(required=False)
+ DocFormat = serializers.ChoiceField(choices=('markdown', 'html'), required=False)
class DocModifySerializer(PascalCaseSerializer):
DocUUID = serializers.CharField()
DocTitle = serializers.CharField(max_length=256, required=False)
DocContent = serializers.CharField(required=False)
+ DocFormat = serializers.ChoiceField(choices=('markdown', 'html'), required=False)
class SerieAddSerializer(PascalCaseSerializer):
diff --git a/gvsds/apps/doc/views.py b/gvsds/apps/doc/views.py
index 03a142db..58318487 100644
--- a/gvsds/apps/doc/views.py
+++ b/gvsds/apps/doc/views.py
@@ -40,7 +40,7 @@ class CommunityDocumentViewSet(viewsets.ModelViewSet):
for d in qs:
data.append({
'DocUUID': UUIDObj(d.DocUUID).str,
- 'DocSerieUUID': UUIDObj(d.DocSerieUUID.pk if hasattr(d, 'DocSerieUUID_id') else d.DocSerieUUID).str,
+ 'DocSerieUUID': UUIDObj(d.DocSerieUUID).str if d.DocSerieUUID else None,
'DocTitle': d.DocTitle,
'DocCreateTime': d.DocCreateTime.isoformat() if d.DocCreateTime else None,
})
@@ -62,6 +62,7 @@ class CommunityDocumentViewSet(viewsets.ModelViewSet):
'DocUUID': UUIDObj(doc.DocUUID).str,
'DocTitle': doc.DocTitle,
'DocContent': doc.DocContent or '',
+ 'DocFormat': doc.DocFormat,
'DocCreateTime': doc.DocCreateTime.isoformat() if doc.DocCreateTime else None,
})
@@ -79,7 +80,12 @@ class CommunityDocumentViewSet(viewsets.ModelViewSet):
if DocManager.GetSerie(serie_uuid_str) is None:
return Response({'code': 1, 'msg': '系列不存在'}, status=400)
- doc = DocManager.AddDocument(Title=data['DocTitle'], Content='', SerieUUID=serie_uuid_str)
+ doc = DocManager.AddDocument(
+ Title=data['DocTitle'],
+ Content='',
+ SerieUUID=serie_uuid_str,
+ Format=data.get('DocFormat', 'markdown'),
+ )
return Response({
'code': 0,
'msg': '添加成功',
diff --git a/gvsds/apps/gerp/serializers.py b/gvsds/apps/gerp/serializers.py
index 255929cd..c09ebdbc 100644
--- a/gvsds/apps/gerp/serializers.py
+++ b/gvsds/apps/gerp/serializers.py
@@ -275,7 +275,7 @@ class FinanceShowSerializer(PascalCaseSerializer):
class DocAddSerializer(PascalCaseSerializer):
DocTitle = serializers.CharField(max_length=256)
DocContent = serializers.CharField(required=False, allow_blank=True, default='')
- SerieUUID = serializers.CharField(required=False)
+ DocSerieUUID = serializers.CharField(required=False)
DocTags = serializers.JSONField(default=list)
@@ -287,16 +287,12 @@ class DocModifySerializer(PascalCaseSerializer):
class SerieAddSerializer(PascalCaseSerializer):
- SerieName = serializers.CharField(max_length=256)
- SerieDescription = serializers.CharField(default='')
- SerieTags = serializers.JSONField(default=list)
+ DocSerieName = serializers.CharField(max_length=256)
class SerieModifySerializer(PascalCaseSerializer):
- SerieUUID = serializers.CharField()
- SerieName = serializers.CharField(max_length=256, required=False)
- SerieDescription = serializers.CharField(required=False)
- SerieTags = serializers.JSONField(required=False)
+ DocSerieUUID = serializers.CharField()
+ DocSerieName = serializers.CharField(max_length=256, required=False)
class WorkOrderCreateSerializer(PascalCaseSerializer):
diff --git a/gvsds/apps/gerp/views/doc.py b/gvsds/apps/gerp/views/doc.py
index fe5a0c82..d44197b1 100644
--- a/gvsds/apps/gerp/views/doc.py
+++ b/gvsds/apps/gerp/views/doc.py
@@ -74,10 +74,13 @@ class DocView(ELTAuthenticatedAPIView):
return Response({'code': 1, 'msg': '文档不存在'}, status=404)
return Response({
'code': 0,
- 'DocUUID': UUIDObj(doc.DocUUID).str,
- 'DocTitle': doc.DocTitle,
- 'DocContent': doc.DocContent or '',
- 'DocCreateTime': doc.DocCreateTime.isoformat() if doc.DocCreateTime else None,
+ 'data': {
+ 'DocUUID': UUIDObj(doc.DocUUID).str,
+ 'DocTitle': doc.DocTitle,
+ 'DocContent': doc.DocContent or '',
+ 'DocFormat': doc.DocFormat,
+ 'DocCreateTime': doc.DocCreateTime.isoformat() if doc.DocCreateTime else None,
+ },
})
def _AddDoc(self, request):
@@ -86,7 +89,12 @@ class DocView(ELTAuthenticatedAPIView):
ser.IsValid(raise_exception=True)
data = ser.ValidatedData
from gvsds.apps.doc.manager import DocManager
- doc = DocManager.AddDocument(data['DocTitle'], data.get('DocContent', ''))
+ doc = DocManager.AddDocument(
+ data['DocTitle'],
+ data.get('DocContent', ''),
+ SerieUUID=data.get('DocSerieUUID'),
+ Format=data.get('DocFormat', 'markdown'),
+ )
return Response({
'code': 0,
'msg': '添加成功',
@@ -171,7 +179,9 @@ class DocView(ELTAuthenticatedAPIView):
buffer.getvalue(),
content_type='application/vnd.openxmlformats-officedocument.wordprocessingml.document',
)
- response['Content-Disposition'] = f'attachment; filename*=UTF-8\'\'{__import__("urllib.parse", fromlist=["quote"]).quote(filename)}'
+ # 同时提供 ASCII filename 与 RFC 5987 filename*（兼容各浏览器下载文件名）
+ quoted = __import__('urllib.parse', fromlist=['quote']).quote(filename)
+ response['Content-Disposition'] = f"attachment; filename=\"document.docx\"; filename*=UTF-8''{quoted}"
return response
@staticmethod
@@ -186,7 +196,8 @@ class DocView(ELTAuthenticatedAPIView):
'
- 
- 张教授
-