优化验证码短信签名相关代码

Controller/CloudStorage.py

@@ -2532,18 +2532,9 @@ class CloudStorageView(View):
         @param params: 消息参数
         @param temp_msg: sms码
         """
-        sign_ms = '周视'
-        # 根据APP包名确定短信签名
-        device_user_qs = Device_User.objects.filter(username=phone).values('userID')
-        if device_user_qs.exists():
-            user_id = device_user_qs[0]['userID']
-            user_ex_qs = UserExModel.objects.filter(userID=user_id).values('appBundleId')
-            if user_ex_qs.exists():
-                if user_ex_qs[0]['appBundleId'] in ['com.cloudlife.commissionf', 'com.cloudlife.commissionf_a']:
-                    sign_ms = '微瞳'
-
+        sign_name = CommonService.confirm_msg_sign_name_with_phone(phone)
         ali_sms = AliSmsObject()
-        ali_sms.send_code_sms_cloud(phone=phone, params=params, sign_name=sign_ms, temp_msg=temp_msg)
+        ali_sms.send_code_sms_cloud(phone=phone, params=params, sign_name=sign_name, temp_msg=temp_msg)
 
     @staticmethod
     def do_refund(request_dict, response):

Controller/InAppPurchaseController.py

@@ -27,7 +27,7 @@ from django.http import HttpResponse
 from Ansjer.config import LOGGER, CONFIG_INFO, CONFIG_TEST, PAY_TYPE_IN_APP_PURCHASE, BASE_DIR, CONFIG_US
 from Controller.CheckUserData import DataValid
 from Model.models import Order_Model, Store_Meal, Device_Info, UID_Bucket, Unused_Uid_Meal, AiService, Device_User, \
-    SysMsgModel, DeviceApplePackage, InAppPurchasePackage, InAppRefund, OrderPayLog, CouponModel
+    SysMsgModel, DeviceApplePackage, InAppPurchasePackage, InAppRefund, OrderPayLog, CouponModel, UserExModel
 from Object.AWS.S3Email import S3Email
 from Object.AliSmsObject import AliSmsObject
 from Object.AppleInAppPurchaseSubscriptionObject import InAppPurchase
@@ -397,9 +397,9 @@ class InAppPurchaseView(View):
         @param params: 消息参数
         @param temp_msg: sms码
         """
-        sign_ms = '周视'
+        sign_name = CommonService.confirm_msg_sign_name_with_phone(phone)
         ali_sms = AliSmsObject()
-        ali_sms.send_code_sms_cloud(phone=phone, params=params, sign_name=sign_ms, temp_msg=temp_msg)
+        ali_sms.send_code_sms_cloud(phone=phone, params=params, sign_name=sign_name, temp_msg=temp_msg)
 
     @classmethod
     def app_store_server_notifications(cls, request, request_dict):

Controller/UnicomCombo/UnicomComboPayNotifyController.py

@@ -218,9 +218,9 @@ class UnicomComboPayNotifyView(View):
                     params = u'{"devname":"' + serial_no + '","submittime":"' + \
                              time.strftime("%Y-%m-%d", time.localtime()) + '","name":"' + \
                              combo_qs.first()['combo_name'] + '"}'
-                    sign = '周视'
+                    sign_name = CommonService.confirm_msg_sign_name_with_phone(phone)
                     ali_sms = AliSmsObject()
-                    ali_sms.send_code_sms_cloud(phone, params, sign, 'SMS_251031744')
+                    ali_sms.send_code_sms_cloud(phone, params, sign_name, 'SMS_251031744')
             return True
         except Exception as e:
             print(e.args)

Controller/UserController.py

@@ -890,18 +890,13 @@ class v2authCodeView(TemplateView):
         elif phone is not None:
             phone = phone.strip()
             # 短信签名
-            if sign_name == 'zosi':
-                sign_ms = '周视'
-            elif sign_name == 'vsees':
-                sign_ms = '微瞳'
-            else:
-                sign_ms = 'Ansjer'
+            sign_name = CommonService.confirm_msg_sign_name(sign_name)
 
             if country_code is None:
-                return self.phoneCode(phone, response, sign_ms)
+                return self.phoneCode(phone, response, sign_name)
             else:
                 country_code = str(country_code.strip())
-                return self.phoneCodeV2(country_code, phone, response, sign_ms)
+                return self.phoneCodeV2(country_code, phone, response, sign_name)
         else:
             return response.json(444)
 
@@ -1537,6 +1532,8 @@ class v2forgetPwdCodeView(TemplateView):
             return response.json(444, 'lang')
         if phone is not None:
             phone = phone.strip()
+            # 短信签名
+            sign_name = CommonService.confirm_msg_sign_name(sign_name)
             if country_code is None:
                 return self.do_send_phone_code(phone, response, sign_name, number, lang)
             else:
@@ -1561,10 +1558,6 @@ class v2forgetPwdCodeView(TemplateView):
         if reds_key_ttl > 240 and resetCode:
             return response.json(90)
         resetCode = RandomStr(6, True)
-        if sign_name == 'zosi':
-            sign_ms = '周视'
-        else:
-            sign_ms = 'Ansjer'
 
         now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
         region_country = users['region_country']
@@ -1575,8 +1568,7 @@ class v2forgetPwdCodeView(TemplateView):
         aliSms = AliSmsObject()
         if not number or number == '0':
             user_qs.update(last_login=now_time, language=lang)
-            msg_res = aliSms.send_code_sms(phone=phone, code=resetCode, sign_name=sign_ms,
-                                           temp_msg='SMS_151675019')
+            msg_res = aliSms.send_code_sms(phone=phone, code=resetCode, sign_name=sign_name, temp_msg='SMS_151675019')
             if msg_res["Code"] == "OK":
                 if not reds.set_data(key=reds_key, val=resetCode, expire=300):
                     return response.json(10, '生成缓存错误')
@@ -1591,7 +1583,7 @@ class v2forgetPwdCodeView(TemplateView):
                 user_qs.update(last_login=now_time, language=lang)
             else:
                 user_qs.update(last_login=now_time, language=lang, region_country=number)
-                msg_res = aliSms.send_code_sms(phone=phone, code=resetCode, sign_name=sign_ms,
+                msg_res = aliSms.send_code_sms(phone=phone, code=resetCode, sign_name=sign_name,
                                                temp_msg='SMS_151675019')
                 if msg_res["Code"] == "OK":
                     if not reds.set_data(key=reds_key, val=resetCode, expire=300):
@@ -1625,14 +1617,10 @@ class v2forgetPwdCodeView(TemplateView):
         if country_code == '86':
             rec_phone = phone
             temp_msg = 'SMS_151675019'
-            if sign_name == 'zosi':
-                sign_ms = '周视'
-            else:
-                sign_ms = 'Ansjer'
         else:
             temp_msg = 'SMS_172200051'
             rec_phone = str(country_code) + str(phone)
-            sign_ms = 'Ansjer'
+            sign_name = 'Ansjer'
         now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
         region_country = users['region_country']
         lang_id = LanguageModel.objects.filter(lang=lang).values('id')
@@ -1640,7 +1628,7 @@ class v2forgetPwdCodeView(TemplateView):
             'country_name')
         if not number or number == '0':
             user_qs.update(last_login=now_time, language=lang)
-            msg_res = aliSms.send_code_sms(phone=rec_phone, code=resetCode, sign_name=sign_ms,
+            msg_res = aliSms.send_code_sms(phone=rec_phone, code=resetCode, sign_name=sign_name,
                                            temp_msg=temp_msg)
             if msg_res["Code"] == "OK":
                 if not reds.set_data(key=reds_key, val=resetCode, expire=300):
@@ -1656,7 +1644,7 @@ class v2forgetPwdCodeView(TemplateView):
                 user_qs.update(last_login=now_time, language=lang)
             else:
                 user_qs.update(last_login=now_time, language=lang, region_country=number)
-                msg_res = aliSms.send_code_sms(phone=rec_phone, code=resetCode, sign_name=sign_ms,
+                msg_res = aliSms.send_code_sms(phone=rec_phone, code=resetCode, sign_name=sign_name,
                                                temp_msg=temp_msg)
                 if msg_res["Code"] == "OK":
                     if not reds.set_data(key=reds_key, val=resetCode, expire=300):
@@ -3085,6 +3073,8 @@ class OauthAuthCodeView(TemplateView):
             # return self.emailCode(email, response)
         elif phone is not None:
             phone = phone.strip()
+            # 短信签名
+            sign_name = CommonService.confirm_msg_sign_name(sign_name)
             if country_code is None:
                 return self.phoneCode(phone, response, sign_name)
             else:
@@ -3184,17 +3174,9 @@ class OauthAuthCodeView(TemplateView):
         identifyingCode = RandomStr(6, True)
         # 发送手机验证码
         aliSms = AliSmsObject()
-        if sign_name == 'zosi':
-            sign_ms = '周视'
-        else:
-            sign_ms = 'Ansjer'
-        res = aliSms.send_code_sms(phone=phone, code=identifyingCode, sign_name=sign_ms,
-                                   temp_msg='SMS_151600991')
-        print(res)
+        res = aliSms.send_code_sms(phone=phone, code=identifyingCode, sign_name=sign_name, temp_msg='SMS_151600991')
         if res["Code"] == "OK":
             if reds.set_data(key=reds_key, val=identifyingCode, expire=300) is not True:
-                # if reds.set_data(key=phone + '_identifyingCode', val=identifyingCode, expire=60) is not True:
-
                 return response.json(10, '生成缓存系统错误')
             return response.json(0)
         else:
@@ -3216,33 +3198,21 @@ class OauthAuthCodeView(TemplateView):
         if user_qs.exists() or phone_qs.exists():
             return response.json(101)
         identifyingCode = RandomStr(6, True)
-        # 短信签名
-        # sign_name_dict = {
-        #     'ansjer':'Ansjer',
-        #     'zosi':'周视'
-        # }
-        sign_ms = ''
+
         if country_code == '86':
             # 国内短信推送模板
             temp_msg = 'SMS_151600991'
             rec_phone = phone
-            if sign_name == 'zosi':
-                sign_ms = '周视'
-            else:
-                sign_ms = 'Ansjer'
         else:
             # 国际短信推送模板
             temp_msg = 'SMS_172165867'
             rec_phone = country_code + phone
-            sign_ms = 'Ansjer'
+            sign_name = 'Ansjer'
 
         # 发送手机验证码
         aliSms = AliSmsObject()
-        res = aliSms.send_code_sms(phone=rec_phone, code=identifyingCode, sign_name=sign_ms,
-                                   temp_msg=temp_msg)
-        print(res)
+        res = aliSms.send_code_sms(phone=rec_phone, code=identifyingCode, sign_name=sign_name, temp_msg=temp_msg)
         if res["Code"] == "OK":
-            # if reds.set_data(key=reds_key, val=identifyingCode, expire=60) is not True:
             if reds.set_data(key=reds_key, val=identifyingCode, expire=300) is not True:
                 return response.json(10, '生成缓存系统错误')
             return response.json(0)
@@ -3429,6 +3399,8 @@ class SingleLoginView(TemplateView):
         elif phone is not None and code_type == "1":
             phone = phone.strip()
             country_code = str(country_code.strip())
+            # 短信签名
+            sign_name = CommonService.confirm_msg_sign_name(sign_name)
             return self.get_change_phone_code(country_code, phone, response, sign_name)
         elif phone is not None:
             phone = phone.strip()
@@ -3490,19 +3462,15 @@ class SingleLoginView(TemplateView):
             # 国内短信推送模板
             temp_msg = 'SMS_151675019'
             rec_phone = phone
-            if sign_name == 'zosi':
-                sign_ms = '周视'
-            else:
-                sign_ms = 'Ansjer'
         else:
             # 国际短信推送模板
             temp_msg = 'SMS_172200051'
             rec_phone = country_code + phone
-            sign_ms = 'Ansjer'
+            sign_name = 'Ansjer'
 
         # 发送手机验证码
         alisms = AliSmsObject()
-        res = alisms.send_code_sms(phone=rec_phone, code=identifying_code, sign_name=sign_ms, temp_msg=temp_msg)
+        res = alisms.send_code_sms(phone=rec_phone, code=identifying_code, sign_name=sign_name, temp_msg=temp_msg)
         if res["Code"] == "OK":
             if reds.set_data(key=reds_key, val=identifying_code, expire=300) is not True:
                 return response.json(10, '生成缓存系统错误')
@@ -3632,20 +3600,15 @@ class SingleLoginView(TemplateView):
         if country_code == '86':
             # 国内短信推送模板
             temp_msg = 'SMS_151675018'
-            rec_phone = phone
-            if sign_name == 'zosi':
-                sign_ms = '周视'
-            else:
-                sign_ms = 'Ansjer'
         else:
             # 国际短信推送模板
             temp_msg = 'SMS_172165867'
             rec_phone = country_code + phone
-            sign_ms = 'Ansjer'
+            sign_name = 'Ansjer'
 
         # 发送手机验证码
         alisms = AliSmsObject()
-        res = alisms.send_code_sms(phone=rec_phone, code=identifying_code, sign_name=sign_ms, temp_msg=temp_msg)
+        res = alisms.send_code_sms(phone=rec_phone, code=identifying_code, sign_name=sign_name, temp_msg=temp_msg)
         if res["Code"] == "OK":
             if reds.set_data(key=reds_key, val=identifying_code, expire=300) is not True:
                 return response.json(10, '生成缓存系统错误')
@@ -4360,12 +4323,10 @@ class loginCodeView(View):
                     return response.json(90)
                 login_code = RandomStr(6, True)
                 aliSms = AliSmsObject()
-                if sign_name == 'zosi':
-                    sign_sms = '周视'
-                else:
-                    sign_sms = 'Ansjer'
+                # 短信签名
+                sign_name = CommonService.confirm_msg_sign_name(sign_name)
 
-                res = aliSms.send_code_sms(phone=phone, code=login_code, sign_name=sign_sms, temp_msg='SMS_151675022')
+                res = aliSms.send_code_sms(phone=phone, code=login_code, sign_name=sign_name, temp_msg='SMS_151675022')
 
                 if res['Code'] == 'OK':
                     if redisObject.set_data(key=login_code_key, val=login_code, expire=300) is not True:

Service/CommonService.py

@@ -23,7 +23,7 @@ from Ansjer.config import BASE_DIR, SERVER_DOMAIN_SSL, CONFIG_INFO, CONFIG_TEST,
     ME_COUNTRY_ID_LIST, EA_COUNTRY_ID_LIST
 from Controller.CheckUserData import RandomStr
 from Model.models import iotdeviceInfoModel, Device_Info, UIDModel, AppDeviceType, UIDCompanySerialModel, GatewayPush, \
-    Device_User
+    Device_User, UserExModel
 from Object.AWS.S3Email import S3Email
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -919,3 +919,36 @@ GCqvlyw5dfxNA+EtxNE2wCW/LW7ENJlACgcfgPlBZtpLheWoZB/maw4=
                 '请求Alexa服务器更新事件网关异常:error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)),
                 'servers@ansjer.com')
             pass
+
+    @staticmethod
+    def confirm_msg_sign_name(sign_name):
+        """
+        确认短信签名
+        @param sign_name: app签名标识
+        @return:
+        """
+        if sign_name == 'zosi':
+            sign_name = '周视'
+        elif sign_name == 'vsees':
+            sign_name = '微瞳'
+        else:
+            sign_name = 'Ansjer'
+        return sign_name
+
+    @staticmethod
+    def confirm_msg_sign_name_with_phone(phone):
+        """
+        根据手机号确认短信签名
+        @param phone: 手机号码
+        @return:
+        """
+        sign_name = '周视'
+        # 根据用户APP包名确定短信签名
+        device_user_qs = Device_User.objects.filter(username=phone).values('userID')
+        if device_user_qs.exists():
+            user_id = device_user_qs[0]['userID']
+            user_ex_qs = UserExModel.objects.filter(userID=user_id).values('appBundleId')
+            if user_ex_qs.exists():
+                if user_ex_qs[0]['appBundleId'] in ['com.cloudlife.commissionf', 'com.cloudlife.commissionf_a']:
+                    sign_ms = '微瞳'
+        return sign_name