Merge remote-tracking branch 'origin/master' into front-dev

backend/app/app/api/api_v1/endpoints/ytviewspayment.py

@@ -44,13 +44,13 @@ def ecpay_payment(
         'TotalAmount': user_data.amount,
         'TradeDesc': 'YT0.4訂單測試',
         'ItemName': user_data.item,
-        'ReturnURL': 'https://cloud.choozmo.com/ytviews-ecpay-result-return',
+        'ReturnURL': 'https://cloud.choozmo.com/api/v1/payment/ytviews-ecpay-result-return',
         'ChoosePayment': 'ALL',
         'ClientBackURL': 'https://cloud.choozmo.com/test-yt-views',
         'ItemURL': 'https://cloud.choozmo.com/test-yt-views',
         'Remark': '',
         'ChooseSubPayment': '',
-        'OrderResultURL': 'https://cloud.choozmo.com/test-yt-views',
+        'OrderResultURL': '',
         'NeedExtraPaidInfo': 'Y',
         'DeviceSource': '',
         'IgnorePayment': 'ATM#CVS#BARCODE',
@@ -168,13 +168,13 @@ def ecpay_payment(
         'TotalAmount': user_data.amount,
         'TradeDesc': 'YT0.4訂單',
         'ItemName': user_data.item,
-        'ReturnURL': 'https://cloud.choozmo.com/ytviews-ecpay-result-return',
+        'ReturnURL': 'https://cloud.choozmo.com/api/v1/payment/ytviews-ecpay-result-return',
         'ChoosePayment': 'ALL',
         'ClientBackURL': 'https://cloud.choozmo.com/yt-views',
         'ItemURL': 'https://cloud.choozmo.com/yt-views',
         'Remark': '',
         'ChooseSubPayment': '',
-        'OrderResultURL': 'https://cloud.choozmo.com/yt-views',
+        'OrderResultURL': '',
         'NeedExtraPaidInfo': 'Y',
         'DeviceSource': '',
         'IgnorePayment': 'ATM#CVS#BARCODE',
@@ -268,7 +268,7 @@ def ecpay_payment(
         print('An exception happened: ' + str(error))
 
 
-@router.post('/ytviews-list-all', response_model=List[schemas.YTViews])
+@router.get('/ytviews-list-all', response_model=List[schemas.YTViews])
 def get_list(
   *,
   db: Session = Depends(deps.get_db),

backend/app/app/core/test_chardet.py

@@ -0,0 +1,17 @@
+from chardet.universaldetector import UniversalDetector
+
+DEFAULT_ENCODING = "utf-8"
+
+def guess_codec(filenames: list) -> str:
+  codec_detector = UniversalDetector()
+  for filename in filenames:
+    codec_detector.feed(filename.encode('cp437'))
+    if codec_detector.done:
+      break
+
+  result = codec_detector.close()
+  encoding = result.get("encoding")
+  return encoding or DEFAULT_ENCODING
+  
+if __name__=="__main__":
+  pass

backend/app/app/crud/crud_ytviews.py

@@ -15,7 +15,7 @@ class CRUDYTViews(CRUDBase[YTViews, YTViewsCreate, YTViewsUpdate]):
         epayment:str,
         remark: str
     ) -> YTViews:
-        print("in create_with_payment_data")
+        
         obj_in_data = jsonable_encoder(obj_in)
         db_obj = self.model(**obj_in_data, 
                             epayment=epayment,