同步正式服务器完成

src/weixin/control_auth.py

@@ -48,7 +48,8 @@ def get_wxauth_info(request):
     cur_match_id = ccc.get_signup_match().id
     #player = cm.Player.objects.filter(user_id=uid,match_id=cur_match_id).order_by("-id").first()
     gt_time = datetime.timedelta(days=-365)+datetime.datetime.now()
-    player = cm.Player.objects.filter(user_id=uid,match_status=1,ctime__gte=gt_time).order_by("-id").first()
+    #player = cm.Player.objects.filter(user_id=uid,match_status=1,ctime__gte=gt_time).order_by("-id").first()
+    player = cm.Player.objects.filter(user_id=uid).order_by("-id").first()
     #print(uid,cur_match_id)
     if player:
         user["role"] = player.role
@@ -117,11 +118,21 @@ def login_user_v3(request):
     #    raise ce.TipException(u"非法openid!")
 
     user = None
-    if unionid:
-        user = cm.UserInfo.objects.filter(unionid=unionid).order_by("-id").first()
+
+    if openid:
+        user = cm.UserInfo.objects.filter(openid=openid).order_by("-id").first()
     else:
-        if openid or phone:
-            user = cm.UserInfo.objects.filter(Q(phone=phone)|Q(openid=openid)).order_by("-id").first()
+        if unionid or phone:
+            user = cm.UserInfo.objects.filter(Q(phone=phone)|Q(unionid=unionid)).order_by("-id").first()
+
+    #if unionid:
+    #    user = cm.UserInfo.objects.filter(unionid=unionid).order_by("-id").first()
+
+    #if not user and openid:
+    #    user = cm.UserInfo.objects.filter(openid=openid).order_by("-id").first()
+
+    #if not user and phone:
+    #    user = cm.UserInfo.objects.filter(phone=phone).order_by("-id").first()
 
     if not user:
         #新用户
@@ -150,8 +161,7 @@ def login_user_v3(request):
         user.unionid = unionid
         user.save()
 
-        gt_time = datetime.timedelta(days=-365)+datetime.datetime.now()
-        player = cm.Player.objects.filter(user_id=user.id,match_status=1,ctime__gte=gt_time).order_by("-id").first()
+        player = cm.Player.objects.filter(user_id=user.id).order_by("-id").first()
         if player:
             role = player.role
         else:
@@ -185,16 +195,32 @@ def get_wxauth_info_v3(request):
     phcode = qdata.get("phcode")
 
     user = None
-    if unionid:
-        user = cm.UserInfo.objects.filter(unionid=unionid).values().first()
+
+    if openid:
+        user = cm.UserInfo.objects.filter(openid=openid).values().first()
     else:
         if phone:
             #orgcode = ccc.cache.get(phone)
             #if not phcode == orgcode and not phone=="13883187629":
             #    raise ce.TipException(u"验证码不正确!")
             user = cm.UserInfo.objects.filter(phone=phone).values().first()
-        if openid:
-            user = cm.UserInfo.objects.filter(openid=openid).values().first()
+        if unionid:
+            user = cm.UserInfo.objects.filter(unionid=unionid).values().first()
+
+    #if phone:
+    #    orgcode = ccc.cache.get(phone)
+    #    if not phcode == orgcode and not phone=="13883187629":
+    #        raise ce.TipException(u"验证码不正确!")
+
+    #if unionid:
+    #    user = cm.UserInfo.objects.filter(unionid=unionid).values().first()
+
+    #if not user and openid:
+    #    user = cm.UserInfo.objects.filter(openid=openid).values().first()
+
+    #if not user and phone:
+    #    user = cm.UserInfo.objects.filter(phone=phone).values().first()
+
     if not user:
         return {}
     cur_match_id = ccc.get_signup_match().id

src/weixin/controls.py

@@ -645,7 +645,7 @@ def add_model(cls,**kwargs):
 
         now = datetime.datetime.now()
         if not cm.Player.objects.filter(user_id=user_id,match_id=match_id).exists():
-            raise ce.TipException(u"请先完成报名再提交数据!")
+            raise ce.TipException(u"28号（周三）开始提交作业）")
 
         if now.weekday() in [5,6] or not now.strftime("%Y-%m-%d") in get_match_validdates(match_id):
             raise ce.TipException(u"今日不能提交数据!")

src/weixin/wzhifuSDK_V3.py

@@ -76,8 +76,8 @@ class WxPayConf_pub(object):
 
     #=======【证书路径设置】=====================================
     #证书路径,注意应该填写绝对路径
-    SSLCERT_PATH = "/tmp/wanzb_v3_api/src/weixin/cert/apiclient_cert.pem"
-    SSLKEY_PATH = "/tmp/wanzb_v3_api/src/weixin/cert/apiclient_key.pem"
+    SSLCERT_PATH = "/mnt/wzbapi/src/weixin/cert/apiclient_cert.pem"
+    SSLKEY_PATH = "/mnt/wzbapi/src/weixin/cert/apiclient_key.pem"
 
     #=======【curl超时设置】===================================
     CURL_TIMEOUT = 30