|
@@ -175,7 +175,7 @@ class ShopifyView(View):
|
|
|
# 至少包含任意两类字符
|
|
# 至少包含任意两类字符
|
|
|
categories = sum([has_upper, has_lower, has_digit, has_special])
|
|
categories = sum([has_upper, has_lower, has_digit, has_special])
|
|
|
|
|
|
|
|
- if re_flag is not True and categories > 2:
|
|
|
|
|
|
|
+ if re_flag is not True or categories < 2:
|
|
|
return response.json(109)
|
|
return response.json(109)
|
|
|
|
|
|
|
|
reds = RedisObject()
|
|
reds = RedisObject()
|
|
@@ -348,7 +348,6 @@ class ShopifyView(View):
|
|
|
country_qs = country_qs.values('country_id', 'country_name', 'country_code', 'api').order_by('country_name')
|
|
country_qs = country_qs.values('country_id', 'country_name', 'country_code', 'api').order_by('country_name')
|
|
|
country_list = []
|
|
country_list = []
|
|
|
for country in country_qs:
|
|
for country in country_qs:
|
|
|
- country['api'] = country['api']
|
|
|
|
|
country_list.append(country)
|
|
country_list.append(country)
|
|
|
return response.json(0, country_list)
|
|
return response.json(0, country_list)
|
|
|
except Exception as e:
|
|
except Exception as e:
|
