万伟斌 / product-project · 提交

转到一个项目

作者 wanweibin
提交 27715ca9c6658e33c0f55be789df8f68882c61df 1 个父辈 bb31e313

update

内嵌 并排对比
正在显示 36 个修改的文件 包含 93 行增加 和 415 行删除
venv
runtime/log/*
db.sqlite3
.idea
.env
\ No newline at end of file
... ...
# Default ignored files
/workspace.xml
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="SQLite - db.sqlite3" uuid="40358238-ad1d-4a4e-aa6e-a585a40363bc">
<driver-ref>sqlite.xerial</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/db.sqlite3</jdbc-url>
</data-source>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PublishConfigData">
<serverData>
<paths name="10.1.10.113">
<serverdata>
<mappings>
<mapping local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
<paths name="192.168.26.59">
<serverdata>
<mappings>
<mapping local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
</serverData>
</component>
</project>
\ No newline at end of file
<component name="ProjectDictionaryState">
<dictionary name="a2">
<words>
<w>abelzhu</w>
<w>agentid</w>
<w>authsucc</w>
<w>blocksize</w>
<w>btntxt</w>
<w>corpid</w>
<w>corpsecret</w>
<w>corsheaders</w>
<w>getuserdetail</w>
<w>getuserinfo</w>
<w>lconf</w>
<w>msgtype</w>
<w>simplejwt</w>
<w>textcard</w>
<w>touser</w>
<w>usercenter</w>
<w>userid</w>
<w>userlogin</w>
<w>vanwhebin</w>
<w>wxlogin</w>
<w>xlsx</w>
</words>
</dictionary>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="FacetManager">
<facet type="django" name="Django">
<configuration>
<option name="rootFolder" value="$MODULE_DIR$/wxProject" />
<option name="settingsModule" value="wxProject/settings.py" />
<option name="manageScript" value="manage.py" />
<option name="environment" value="&lt;map/&gt;" />
<option name="doNotUseTestRunner" value="false" />
<option name="trackFilePattern" value="" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="Python 3.8 (end)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Django Lib" level="project" />
</component>
<component name="TemplatesService">
<option name="TEMPLATE_CONFIGURATION" value="Django" />
<option name="TEMPLATE_FOLDERS">
<list>
<option value="$MODULE_DIR$/venv/Lib/site-packages/django/forms/templates" />
</list>
</option>
</component>
</module>
\ No newline at end of file
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Django Lib">
<CLASSES>
<root url="file://$PROJECT_DIR$/venv/Lib/site-packages" />
</CLASSES>
<SOURCES />
</library>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (end)" project-jdk-type="Python SDK" />
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/end.iml" filepath="$PROJECT_DIR$/.idea/end.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="FacetManager">
<facet type="django" name="Django">
<configuration>
<option name="rootFolder" value="$MODULE_DIR$" />
<option name="settingsModule" value="wxProject/settings.py" />
<option name="manageScript" value="$MODULE_DIR$/manage.py" />
<option name="environment" value="&lt;map/&gt;" />
<option name="doNotUseTestRunner" value="false" />
<option name="trackFilePattern" value="migrations" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Django Lib" level="project" />
</component>
<component name="PyDocumentationSettings">
<option name="format" value="PLAIN" />
<option name="myDocStringFormat" value="Plain" />
</component>
<component name="TemplatesService">
<option name="TEMPLATE_CONFIGURATION" value="Django" />
<option name="TEMPLATE_FOLDERS">
<list>
<option value="$MODULE_DIR$/venv/Lib/site-packages/django/forms/templates" />
</list>
</option>
</component>
</module>
\ No newline at end of file
# Generated by Django 3.1.1 on 2020-09-30 07:38
# Generated by Django 3.1.1 on 2020-10-08 07:45
from django.db import migrations, models
import django.db.models.deletion
... ... @@ -16,11 +16,14 @@ class Migration(migrations.Migration):
name='Auditor',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('leader', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='p', to='project.auditor', verbose_name='上级领导')),
('order', models.PositiveSmallIntegerField(blank=True, default=0, null=True, verbose_name='排序')),
],
options={
'ordering': ('order',),
},
),
migrations.CreateModel(
name='Program',
name='Project',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('category', models.CharField(default='', max_length=100, verbose_name='产品类目')),
... ... @@ -28,8 +31,24 @@ class Migration(migrations.Migration):
('market_share_analysis', models.TextField(default='', verbose_name='产品市场占有率分析')),
('context_analysis', models.TextField(default='', verbose_name='产品场景分析')),
('attachments', models.CharField(default='', max_length=800, verbose_name='附件地址')),
('is_done', models.BooleanField(blank=True, default=False, verbose_name='是否完成')),
('is_pass', models.BooleanField(blank=True, default=False, verbose_name='是否通过')),
('create_time', models.DateTimeField(auto_now_add=True)),
('auditor', models.ManyToManyField(blank=True, related_name='project_auditor', to='project.Auditor', verbose_name='审核人员')),
],
options={
'ordering': ('-is_done',),
},
),
migrations.CreateModel(
name='Result',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('is_accept', models.CharField(choices=[('accept', '通过'), ('reject', '否决')], max_length=10, null=True, verbose_name='审核项目')),
('memo', models.CharField(blank=True, default='', max_length=300, verbose_name='审核结果陈述')),
('create_time', models.DateTimeField(auto_now_add=True)),
('auditor', models.ManyToManyField(related_name='auditor', to='project.Auditor', verbose_name='审核人员')),
('auditor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='result_auditor', to='project.auditor', verbose_name='审核人员')),
('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='result_project', to='project.project', verbose_name='审核项目')),
],
options={
'ordering': ('-create_time',),
... ...
# Generated by Django 3.1.1 on 2020-09-30 07:38
# Generated by Django 3.1.1 on 2020-10-08 07:45
from django.conf import settings
from django.db import migrations, models
... ... @@ -16,8 +16,18 @@ class Migration(migrations.Migration):
operations = [
migrations.AddField(
model_name='project',
name='creator',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_creator', to=settings.AUTH_USER_MODEL, verbose_name='创建人员'),
),
migrations.AddField(
model_name='auditor',
name='leader',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='p', to='project.auditor', verbose_name='上级领导'),
),
migrations.AddField(
model_name='auditor',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='aud', to=settings.AUTH_USER_MODEL, verbose_name='审批人员'),
field=models.ForeignKey(choices=[(1, 'admin'), (2, 'wanweibin'), (3, 'wanweibin1')], on_delete=django.db.models.deletion.CASCADE, related_name='aud', to=settings.AUTH_USER_MODEL, verbose_name='审批人员'),
),
]
... ...
# Generated by Django 3.1.1 on 2020-09-30 08:07
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('project', '0002_auditor_user'),
]
operations = [
migrations.AlterField(
model_name='program',
name='auditor',
field=models.ManyToManyField(related_name='project_auditor', to='project.Auditor', verbose_name='审核人员'),
),
]
# Generated by Django 3.1.1 on 2020-09-30 08:43
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('project', '0003_auto_20200930_1607'),
]
operations = [
migrations.AlterField(
model_name='auditor',
name='user',
field=models.CharField(choices=[('admin', 'admin')], max_length=100, verbose_name='审批人员'),
),
]
# Generated by Django 3.1.1 on 2020-09-30 09:21
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('project', '0004_auto_20200930_1643'),
]
operations = [
migrations.AlterField(
model_name='auditor',
name='user',
field=models.ForeignKey(choices=[{'id': 1, 'username': 'admin'}, {'id': 2, 'username': 'wanweibin'}, {'id': 3, 'username': 'wanweibin1'}], on_delete=django.db.models.deletion.CASCADE, related_name='aud', to=settings.AUTH_USER_MODEL, verbose_name='审批人员'),
),
]
# Generated by Django 3.1.1 on 2020-09-30 09:45
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('project', '0005_auto_20200930_1721'),
]
operations = [
migrations.AlterField(
model_name='auditor',
name='user',
field=models.ForeignKey(choices=[(1, 'admin'), (2, 'wanweibin'), (3, 'wanweibin1')], on_delete=django.db.models.deletion.CASCADE, related_name='aud', to=settings.AUTH_USER_MODEL, verbose_name='审批人员'),
),
migrations.RenameModel(
old_name='Program',
new_name='Project',
),
migrations.CreateModel(
name='Result',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('is_accept', models.CharField(choices=[('accept', '通过'), ('reject', '否决')], max_length=10, null=True, verbose_name='审核项目')),
('memo', models.CharField(blank=True, default='', max_length=300, verbose_name='审核结果陈述')),
('create_time', models.DateTimeField(auto_now_add=True)),
('auditor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='result_auditor', to='project.auditor', verbose_name='审核人员')),
('program', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='result_project', to='project.project', verbose_name='审核项目')),
],
options={
'ordering': ('-create_time',),
},
),
]
# Generated by Django 3.1.1 on 2020-10-07 04:21
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('project', '0006_auto_20200930_1745'),
]
operations = [
migrations.AlterField(
model_name='project',
name='auditor',
field=models.ManyToManyField(blank=True, related_name='project_auditor', to='project.Auditor', verbose_name='审核人员'),
),
]
# Generated by Django 3.1.1 on 2020-10-07 07:44
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('project', '0007_auto_20201007_1221'),
]
operations = [
migrations.AddField(
model_name='project',
name='is_done',
field=models.BooleanField(blank=True, default=False, verbose_name='是否完成'),
),
migrations.AddField(
model_name='project',
name='is_pass',
field=models.BooleanField(blank=True, default=False, verbose_name='是否通过'),
),
]
# Generated by Django 3.1.1 on 2020-10-07 08:26
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('project', '0008_auto_20201007_1544'),
]
operations = [
migrations.AlterModelOptions(
name='project',
options={'ordering': ('-is_done',)},
),
migrations.RenameField(
model_name='result',
old_name='program',
new_name='project',
),
migrations.AddField(
model_name='project',
name='creator',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='project_creator', to=settings.AUTH_USER_MODEL, verbose_name='创建人员'),
),
]
# Generated by Django 3.1.1 on 2020-10-07 08:26
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('project', '0009_auto_20201007_1626'),
]
operations = [
migrations.AlterField(
model_name='project',
name='creator',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_creator', to=settings.AUTH_USER_MODEL, verbose_name='创建人员'),
),
]
# Generated by Django 3.1.1 on 2020-10-07 09:16
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('project', '0010_auto_20201007_1626'),
]
operations = [
migrations.AlterModelOptions(
name='auditor',
options={'ordering': ('order',)},
),
migrations.AddField(
model_name='auditor',
name='order',
field=models.PositiveSmallIntegerField(blank=True, default=0, null=True, verbose_name='排序'),
),
]
... ... @@ -17,7 +17,7 @@ class AuditorSerializer(serializers.ModelSerializer):
class ProjectSerializer(serializers.ModelSerializer):
creator = serializers.ReadOnlyField(source='project_creator.id')
creator = serializers.ReadOnlyField(source='project_creator')
# teacher = serializers.ReadOnlyField(source='teacher.username') # 外键字段 只读
class Meta:
... ...
... ... @@ -11,6 +11,7 @@ from .serializers import ProjectSerializer
from .models import Auditor, Project, Result
from utils.helpers import WxPushHelper
from utils.pagination import MyPageNumberPagination
from utils.util import response
class CreateProject(CreateAPIView):
... ... @@ -29,7 +30,7 @@ class CreateProject(CreateAPIView):
obj_dict = serializer.data
wx_client.push_card(request.user.wx_token,
reverse("project:retrieve_project", kwargs={"pk": obj_dict['id']}), u"流程创建成功")
return Response(obj_dict)
return response(obj_dict)
class ProjectDetail(RetrieveAPIView):
... ... @@ -37,6 +38,8 @@ class ProjectDetail(RetrieveAPIView):
serializer_class = ProjectSerializer
permission_classes = (IsAuthenticated,)
# def get_object(self):
class AuditProject(UpdateAPIView):
queryset = Project.objects.all()
... ... @@ -89,7 +92,7 @@ class AuditProject(UpdateAPIView):
obj.save()
wx_client.push_card(obj.creator.wx_token, reverse("project:retrieve_project", kwargs={"pk": obj.id}), desc)
return Response(ProjectSerializer(obj).data)
return response(ProjectSerializer(obj).data)
class AuditProjectsList(ListAPIView):
... ... @@ -102,4 +105,4 @@ class AuditProjectsList(ListAPIView):
def get(self, request, *args, **kwargs):
qs = self.get_queryset(user=request.user)
return Response(ProjectSerializer(qs, many=True).data)
return response(ProjectSerializer(qs, many=True).data)
... ...
asgiref==3.2.10
certifi==2020.6.20
chardet==3.0.4
Django==3.1.1
django-cors-headers==3.5.0
django-environ==0.4.5
django-filter==2.4.0
djangorestframework==3.12.1
djangorestframework-simplejwt==4.4.0
idna==2.10
mysqlclient==2.0.1
Pillow==7.2.0
PyJWT==1.7.1
pytz==2020.1
requests==2.24.0
sqlparse==0.3.1
urllib3==1.25.10
... ...
# Generated by Django 3.1.1 on 2020-09-30 07:38
# Generated by Django 3.1.1 on 2020-10-08 07:45
from django.conf import settings
from django.db import migrations, models
... ...
import os
# _*_ coding: utf-8 _*_
# @Time : 2020/9/24 21:48
# @Author vanwhebin
from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin, BaseUserManager, Group, Permission
from django.utils.translation import gettext_lazy as _
... ...
... ... @@ -10,9 +10,9 @@ from rest_framework.generics import CreateAPIView
from usercenter.serializers import MediaSerializer
from usercenter.models import Media
from wxProject.settings import MEDIA_ROOT, UPLOAD_MEDIA_CHOICES
from utils.util import uuid, get_md5_hash, response as res
from utils.util import uuid, get_md5_hash, response
from rest_framework.permissions import IsAuthenticated, AllowAny
from rest_framework import response, status
from rest_framework import status
class UploadMedia(CreateAPIView):
... ... @@ -25,11 +25,11 @@ class UploadMedia(CreateAPIView):
uploaded_file.name = uploaded_file.name.strip('"')
if not uploaded_file:
return response.Response(u"文件上传失败", status=status.HTTP_400_BAD_REQUEST)
return response(u"文件上传失败", status=status.HTTP_400_BAD_REQUEST)
ext_pos = uploaded_file.name.rfind('.')
uploaded_file_ext = uploaded_file.name[ext_pos:]
if not self.allowed_extension(uploaded_file_ext):
return response.Response(u"非法文件类型", status=status.HTTP_400_BAD_REQUEST)
return response({"msg": "非法文件类型"}, status=status.HTTP_400_BAD_REQUEST)
hash_file_name = uuid() + uploaded_file_ext
time_tag = time.strftime('%Y-%m-%d')
file_path = time_tag + os.sep + hash_file_name
... ... @@ -53,7 +53,7 @@ class UploadMedia(CreateAPIView):
)
os.remove(os.path.join(MEDIA_ROOT, file_path))
# return response.Response(MediaSerializer(file, context={'request': request}).data)
return res(MediaSerializer(file, context={'request': request}).data)
return response(MediaSerializer(file, context={'request': request}).data)
@staticmethod
def allowed_extension(ext):
... ...
... ... @@ -9,6 +9,7 @@ import pytz
import datetime
from uuid import uuid4
from base64 import urlsafe_b64encode
from rest_framework import status
from django.http import JsonResponse
from wxProject.settings import TIME_ZONE, BASE_LOG_DIR
... ... @@ -24,7 +25,7 @@ def get_yesterday(day=1):
return (datetime.datetime.now(pytz.timezone(TIME_ZONE)) - datetime.timedelta(days=day)).strftime("%Y-%m-%d")
def response(data="", code=0, **kwargs):
def response(data="", status_code=status.HTTP_200_OK, code=0, **kwargs):
""" 格式化返回信息 """
res = {
"code": code,
... ... @@ -32,7 +33,7 @@ def response(data="", code=0, **kwargs):
"data": data,
}
res.update(kwargs)
return JsonResponse(data=res)
return JsonResponse(data=res, status=status_code)
def save_log(directory, content, log_type=None):
... ...
__pycache__
... ...
"""
Django settings for wxProject project.
Generated by 'django-admin startproject' using Django 3.1.1.
For more information on this file, see
https://docs.djangoproject.com/en/3.1/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/3.1/ref/settings/
"""
# _*_ coding: utf-8 _*_
# @Time : 2020/9/24 21:43
# @Author vanwhebin
import os
import environ
from pathlib import Path
from datetime import timedelta
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
env = environ.Env()
READ_DOT_ENV_FILE = env.bool('DJANGO_READ_DOT_ENV_FILE', default=True) # 使用.env，此项设置为True
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
if READ_DOT_ENV_FILE:
env.read_env(os.path.join(BASE_DIR, '.env'))
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = '@llib83ily_q%g4)vere-+n#_6oj#b$=7r7_@btj9u5tm&1$-4'
DEBUG = env.bool('DJANGO_DEBUG', False)
# DEBUG = True
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
ALLOWED_HOSTS = ['*']
SECRET_KEY = '@llib83ily_q%g4)vere-+n#_6oj#b$=7r7_@btj9u5tm&1$-4'
ALLOWED_HOSTS = ['*']
# Application definition
INSTALLED_APPS = [
'django.contrib.admin',
... ... @@ -75,15 +68,30 @@ TEMPLATES = [
WSGI_APPLICATION = 'wxProject.wsgi.application'
# Database
# https://docs.djangoproject.com/en/3.1/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': BASE_DIR / 'db.sqlite3',
'ENGINE': 'django.db.backends.mysql',
'NAME': env('MYSQL_DATABASE', default='wxproject'),
'HOST': env('MYSQL_HOST', default='127.0.0.1'),
'PORT': env('MYSQL_PORT', default='3306'),
'USER': env('MYSQL_USER', default='autouser'),
'PASSWORD': env('MYSQL_PASSWORD', default='m6Q&P0xTJ^$h3X8DAzpS!Y%Xs8'),
'OPTIONS': {'charset': 'utf8mb4'}
}
# 'default': {
# 'ENGINE': 'django.db.backends.mysql',
# 'NAME': 'wxProject',
# 'USER': 'root',
# 'PASSWORD': '123456',
# 'HOST': '127.0.0.1',
# 'PORT': '3306',
# # 'ENGINE': 'django.db.backends.sqlite3',
# # 'NAME': os.path.realpath(os.path.join(BASE_DIR, 'db.sqlite3'))
# }
}
# Password validation
... ... @@ -134,7 +142,6 @@ CORS_ORIGIN_WHITELIST = (
'http://localhost:8080', # 凡是出现在白名单中的域名，都可以访问后端接口
)
REST_FRAMEWORK = {
# Use Django's standard `django.contrib.auth` permissions,
# or allow read-only access for unauthenticated users.
... ... @@ -167,5 +174,3 @@ SIMPLE_JWT = {
# 项目用户验证模型
AUTH_USER_MODEL = "usercenter.User"
... ...