Merge branch 'develop' into feature/auth

2023-08-10 17:31:03 +08:00
parent 8c07a5f5d7 2a2b5af0ca
commit 432db5aec5
20 changed files with 276 additions and 233 deletions
--- a/server/render/etc/render.yaml
+++ b/server/render/etc/render.yaml
@@ -13,4 +13,6 @@ AWS:
        Credentials:
            AccessKeyID: AKIAZB2JKUXDPNRP4YT2
            Secret: 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
-            Token:
+            Token:
+PythonApi: #python接口
+    CombineImageUrl: http://192.168.1.7:45678/LogoCombine #合成刀版图接口