diff --git a/aitrainer-cron b/aitrainer-cron index 56a6d87..a7a2b21 100644 --- a/aitrainer-cron +++ b/aitrainer-cron @@ -1 +1 @@ -*/5 * * * * /usr/local/bin/python /aitrainer_backoffice/aitrainer_backoffice/manage.py runcrons --settings aitrainer_backoffice.settings.deploy >> /var/log/cronjob.log 2>&1 +*/5 * * * * /aitrainer_backoffice/cron.sh >> /var/log/cronjob.log 2>&1 diff --git a/aitrainer_backoffice/aitrainer_backoffice/settings/deploy.py b/aitrainer_backoffice/aitrainer_backoffice/settings/deploy.py index 1ea0768..b06f115 100644 --- a/aitrainer_backoffice/aitrainer_backoffice/settings/deploy.py +++ b/aitrainer_backoffice/aitrainer_backoffice/settings/deploy.py @@ -9,8 +9,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale')] # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = "lkasdjhklj84ujn3jk4nr5j43njk" #os.environ['DJANGO_KEY'] -GOOGLE_APPLICATION_CREDENTIALS="/aitrainer_backoffice/aitrainer_backoffice/aitrainer_backoffice/asset/aitrainer-firebase-adminsdk.json" +SECRET_KEY = os.environ['DJANGO_KEY'] os.environ["WORKOUTTEST_SETTING"] = "DEPLOY" @@ -21,6 +20,7 @@ ALLOWED_HOSTS = ['62.171.188.119', "admin.aitrainer.app"] env = os.environ['GOOGLE_APPLICATION_CREDENTIALS'] FIREBASE_APP = initialize_app() +DEFAULT_AUTO_FIELD='django.db.models.AutoField' INSTALLED_APPS = [ 'aitrainer_backoffice', diff --git a/aitrainer_backoffice/controlling/automation/fcm.py b/aitrainer_backoffice/controlling/automation/fcm.py index fad0e6e..fe59c78 100644 --- a/aitrainer_backoffice/controlling/automation/fcm.py +++ b/aitrainer_backoffice/controlling/automation/fcm.py @@ -53,9 +53,9 @@ class FCM: if registration_token == None: return "Registration token is null" try: - #notification_image_url = image_url - #if image_url == None: - notification_image_url = self.logo_url + notification_image_url = image_url + if image_url == None: + notification_image_url = self.logo_url #registration_token = 'cOqNt8rzo074gbIkBSpCgW:APA91bEBuNi3iVzGKb4JhxqN2j80MoJbNptLHk2qsdeKBQz5grpHtrPPXvDqn5BJVVSaj1nwGPwgN7pi6FIApog_TTP3g1yobgmgpPN6udrYgzILlVPMvdGGFDSDh6gKlczhlTL9NEp0' print(f'image: {notification_image_url}' )