ming преди 3 години
родител
ревизия
3b63e366c6
променени са 7 файла, в които са добавени 8 реда и са изтрити 5 реда
  1. BIN
      OpenshotService/.DS_Store
  2. BIN
      OpenshotService/font/arial.ttf
  3. 1 1
      OpenshotService/openshot_video_generator.py
  4. BIN
      api/.DS_Store
  5. 4 4
      api/main.py
  6. BIN
      api/static/.DS_Store
  7. 3 0
      etc/docker cmd.txt

BIN
OpenshotService/.DS_Store


BIN
OpenshotService/font/arial.ttf


+ 1 - 1
OpenshotService/openshot_video_generator.py

@@ -630,6 +630,6 @@ def update_user_left_time(user_id, duration):
 
 
 from rpyc.utils.server import ThreadedServer
-t = ThreadedServer(video_service, port=8878)
+t = ThreadedServer(video_service, port=8858)
 print('service started')
 t.start()

BIN
api/.DS_Store


+ 4 - 4
api/main.py

@@ -380,7 +380,7 @@ def notify_group(msg):
         r = requests.post("https://notify-api.line.me/api/notify",headers=headers, params=params)
 
 def gen_video(name_hash,name,text_content, image_urls,avatar):
-    c = rpyc.connect("localhost", 8878)
+    c = rpyc.connect("localhost", 8858)
     c._config['sync_request_timeout'] = None
     remote_svc = c.root
     my_answer = remote_svc.call_video(name_hash,name,text_content, image_urls,avatar) # method call
@@ -388,7 +388,7 @@ def gen_video(name_hash,name,text_content, image_urls,avatar):
     os.remove(tmp_video_dir+name_hash+'.mp4')
 
 def gen_video_eng(name_hash,name,text_content, image_urls,sub_titles,avatar):
-    c = rpyc.connect("localhost", 8878)
+    c = rpyc.connect("localhost", 8858)
     c._config['sync_request_timeout'] = None
     remote_svc = c.root
     my_answer = remote_svc.call_video_eng(name_hash,name,text_content, image_urls,sub_titles,avatar) # method call
@@ -417,7 +417,7 @@ def gen_video_queue(name_hash,name,text_content, image_urls,avatar):
         top1 = first(db.query('SELECT * FROM video_queue'))
         try:
             db.query('UPDATE video_queue_status SET status = 1;')
-            c = rpyc.connect("localhost", 8878)
+            c = rpyc.connect("localhost", 8858)
             c._config['sync_request_timeout'] = None
             remote_svc = c.root
             my_answer = remote_svc.call_video(top1['name_hash'],top1['name'],top1['text_content'].split(','), top1['image_urls'].split(','),top1['avatar']) # method call
@@ -455,7 +455,7 @@ def gen_video_queue_eng(name_hash,name,text_content, image_urls,sub_titles,avata
         top1 = first(db.query('SELECT * FROM video_queue'))
         try:
             db.query('UPDATE video_queue_status SET status = 1;')
-            c = rpyc.connect("localhost", 8878)
+            c = rpyc.connect("localhost", 8858)
             c._config['sync_request_timeout'] = None
             remote_svc = c.root
             my_answer = remote_svc.call_video_eng(top1['name_hash'],top1['name'],top1['text_content'].split(','), top1['image_urls'].split(','),top1['subtitles'].split(','),top1['avatar']) # method call

BIN
api/static/.DS_Store


+ 3 - 0
etc/docker cmd.txt

@@ -1,5 +1,8 @@
 sudo docker build -t openshot_service -< Dockerfile
 
+
+
+
 sudo docker run -d -it  --name tcontainer -p 8888:8888 -v /home/ming/workspace/AI_anchor_openshot:/app a8e05cc7c0c6