update

@@ -2,6 +2,7 @@
 # @Time     :   2020/10/7 10:40
 # @Time     :   2020/10/7 10:40
 # @Author       vanwhebin
 # @Author       vanwhebin
 import re
 import re
+from urllib import parse
 from rest_framework.generics import CreateAPIView, RetrieveAPIView, UpdateAPIView, ListAPIView
 from rest_framework.generics import CreateAPIView, RetrieveAPIView, UpdateAPIView, ListAPIView
 from rest_framework.permissions import IsAuthenticated, IsAdminUser
 from rest_framework.permissions import IsAuthenticated, IsAdminUser
 from rest_framework.exceptions import ValidationError
 from rest_framework.exceptions import ValidationError
@@ -39,6 +40,7 @@ class CreateProject(CreateAPIView):
 			# 企业微信推送
 			# 企业微信推送
 			obj_dict = serializer.data
 			obj_dict = serializer.data
 			url = re.sub("PK", str(obj_dict['id']), FRONT_URL['flow_detail'])
 			url = re.sub("PK", str(obj_dict['id']), FRONT_URL['flow_detail'])
+			url = re.sub("REDIRECT_URL", parse.quote(url, safe=''), FRONT_URL['wx_authorize'])
 			first_auditor = User.objects.filter(pk=AUDITORS[0][0]).first()
 			first_auditor = User.objects.filter(pk=AUDITORS[0][0]).first()
 			wx_client.push_card(first_auditor.wx_token, url, f"{request.user.username}提交了一个产品立项申请")
 			wx_client.push_card(first_auditor.wx_token, url, f"{request.user.username}提交了一个产品立项申请")
 			wx_client.push_card(request.user.wx_token, url, u"流程创建成功")
 			wx_client.push_card(request.user.wx_token, url, u"流程创建成功")
@@ -96,6 +98,7 @@ class AuditProject(UpdateAPIView):
 			wx_client = WxPushHelper()
 			wx_client = WxPushHelper()
 			full_audit_done = self._check_audit(obj)
 			full_audit_done = self._check_audit(obj)
 			url = re.sub("PK", str(obj.id), FRONT_URL['flow_detail'])
 			url = re.sub("PK", str(obj.id), FRONT_URL['flow_detail'])
+			url = re.sub("REDIRECT_URL", parse.quote(url, safe=''), FRONT_URL['wx_authorize'])
 			desc = "产品立项流程所有审批已完成" if full_audit_done else f"{request.user.username}已审批完成"
 			desc = "产品立项流程所有审批已完成" if full_audit_done else f"{request.user.username}已审批完成"
 			if full_audit_done:
 			if full_audit_done:
 				obj.is_done = True
 				obj.is_done = True

@@ -98,6 +98,6 @@ class WxUserlogin(APIView):
                 user.save()
                 user.save()
             # 获取token
             # 获取token
         token_obj = TokenObtainPairSerializer.get_token(user)
         token_obj = TokenObtainPairSerializer.get_token(user)
-        return response({"access_token": str(token_obj.access_token)})
+        return response({"access_token": str(token_obj.access_token), 'fresh_token': token_obj.fresh_token})
 
 
 
 

@@ -177,5 +177,6 @@ SIMPLE_JWT = {
 }
 }
 
 
 FRONT_URL = {
 FRONT_URL = {
+	"wx_authorize": "https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww0f3efc2873ad11c3&redirect_uri=REDIRECT_URL&response_type=code&scope=snsapi_base#wechat_redirect",
 	"flow_detail": "http://project.tacklifetools.com/product/audit/PK"
 	"flow_detail": "http://project.tacklifetools.com/product/audit/PK"
 }
 }