From 9ba5067ae6d0f4d5440fd1d4fe37e60f0936ea9f Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Fri, 30 Jun 2023 14:13:29 +0800
Subject: [PATCH] nginx

---
 appmanage/Dockerfile            |  2 +-
 appmanage/api/service/manage.py | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/appmanage/Dockerfile b/appmanage/Dockerfile
index 8b1d2295..7a4cb109 100644
--- a/appmanage/Dockerfile
+++ b/appmanage/Dockerfile
@@ -10,7 +10,7 @@ COPY static ./static
 COPY requirements.txt main.py database.sqlite  ./
 RUN apt update
 
-# Install supervisords
+# Install supervisord
 RUN apt install -y supervisor
 COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY config/cmd.sh /cmd.sh
diff --git a/appmanage/api/service/manage.py b/appmanage/api/service/manage.py
index ae2779d0..3d2af1ca 100644
--- a/appmanage/api/service/manage.py
+++ b/appmanage/api/service/manage.py
@@ -14,6 +14,7 @@ import re
 from threading import Thread
 from api.utils import shell_execute, docker, const
 from api.model.app import App
+from api.service import db
 from api.model.response import Response
 from api.model.config import Config
 from api.model.status_reason import StatusReason
@@ -44,6 +45,8 @@ scheduler = BackgroundScheduler()
 scheduler.add_job(auto_update, 'cron', hour=1)
 scheduler.start()
 
+nginx_token = None
+
 # 获取github文件内容
 def get_github_content(repo, path):
     url = 'https://websoft9.github.io/{repo}/{path}'
@@ -1108,10 +1111,10 @@ def check_real_domain(domain):
 
 
 def get_token():
-    url = 'http://172.17.0.1:9092/api/tokens'
+    url = const.NGINX_URL+"/api/tokens"
     headers = {'Content-type': 'application/json'}
-    cmd = "cat /usr/share/cockpit/myapps/config.json | jq -r '.NGINXPROXYMANAGER.NGINXPROXYMANAGER_PASSWORD'"
-    password = shell_execute.execute_command_output_all(cmd)["result"].rstrip('\n')
+    password = db.AppSearchUsers("nginx").json()["password"]
+
     myLogger.info_logger(password)
     param = {
         "identity": "help@websoft9.com",
@@ -1120,6 +1123,8 @@ def get_token():
     }
     response = requests.post(url, data=json.dumps(param), headers=headers)
 
+    nginx_token = response.json()
+    myLogger.info_logger(nginx_token)
     token = "Bearer " + response.json()["token"]
     return token