modify S3

conf/app.conf

@@ -16,9 +16,8 @@ replicateToken = "r8_9OCCea50go2Qkh0f0jhu3DbNjyzuyt61VNVI6"
 replicateTimeout = 10
 bucketName = "aon-watermark"
 region = "us-west-2"
-awsAccessKeyID = "ASIAU6GDZFLVTQUJAM5N"
-awsSecretAccessKey = "rL9CGK+ljJ6BTJB48tlKZGv9fVb2rbVkRFqWqPQO"
-awsSsessionToken = "IQoJb3JpZ2luX2VjENP//////////wEaCWV1LXdlc3QtMiJIMEYCIQD+okPPmKk2bGkQ7XJieB7eaVrLyMsBiKqDIKkSnBuGXwIhAMbqozgbnV54cDuwQ4UcM3NFVcchuXhC0n5cv19uxawwKvkCCMz//////////wEQABoMMzM5NzEzMDEwNDExIgyBhks7yqa6KqAET/kqzQLDC5JX6Jf7DJLHzqSALfEggPeS3opS9pljCWwjnHEfJJWTfhYpPxxu30LxQQd/ZIm/BBuX/q+YsrlD+XSBl4dPJfGs4jPZsGl6oNbeJL4N1y2tAP031uXxyxakKgwtCSn1G/cLPZQAYzxzvAO7zK5I0UFbhjYtP1ACqsUP6aFNmjwd9O7SaLqc0p6xYXQrqGBZzJzFm7t0J7isjxDQXeJrusoHZA7UCY9xbPe0VGeomGdd6cI3PZUIPqpN86x+qAfc6Vs3NC3SMUV3Vy2ZtFzCs6DdkyC1T0cgBChr+5dtgeGznXYBLlvJ9OQMJI9BVpeqCj7hDzzINxQykFVlhzz3RDDYmVOhrOt5VDjkgZLNfOYI6ZadVkU9n8XDqI/vS/0402xa5yq8ZLKsZspYQR2fvIUd6ljI7eXqijYwthYR90+Efz10oezExPRJY+4w6NH1tQY6pgFN+pRgiztiU3e9TWqrcdxSfmxttzKZ3HSbKdbTn7v5E2VVHbWPNT1hpsfvBC3kWCRcoNj/Ssx9zSybcK+RRjaVW/K6xJPqDFnUOdoII/QAPS1ZSQeekp+nS9qjnGgj4AiyZpPlzuTKabLrEXb0NrDUdNaj/m9KsWKezQ/Qu1uwb7LWC6XlYdaBdzC89SaLhcvB4/3DzK7OScxsxj1qNrnwN3rSX4pk"
+awsAccessKeyID = "AKIAU6GDZFLV6IV2MBX2"
+awsSecretAccessKey = "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"
 watermarkUrl = "http://16.163.191.255:30008/add-watermark"
 
 [test]
@@ -31,8 +30,8 @@ replicateToken = "r8_9OCCea50go2Qkh0f0jhu3DbNjyzuyt61VNVI6"
 replicateTimeout = 10
 bucketName = "aon-watermark"
 region = "us-west-2"
-awsAccessKeyID = "ASIAU6GDZFLV7ZNJSXV7"
-awsSecretAccessKey = "oR19/lkVDJmlscR6RLIz8bS4sRVZ1ZUbkICBZ6Wk"
+awsAccessKeyID = "AKIAU6GDZFLV6IV2MBX2"
+awsSecretAccessKey = "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"
 watermarkUrl = "http://16.163.191.255:30008/add-watermark"
 
 
@@ -46,8 +45,8 @@ replicateToken = "r8_9OCCea50go2Qkh0f0jhu3DbNjyzuyt61VNVI6"
 replicateTimeout = 10
 bucketName = "aon-watermark"
 region = "us-west-2"
-awsAccessKeyID = "ASIAU6GDZFLV7ZNJSXV7"
-awsSecretAccessKey = "oR19/lkVDJmlscR6RLIz8bS4sRVZ1ZUbkICBZ6Wk"
+awsAccessKeyID = "AKIAU6GDZFLV6IV2MBX2"
+awsSecretAccessKey = "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"
 watermarkUrl = "http://16.163.191.255:30008/add-watermark"
 
 

conf/replicate_models_version.yaml

@@ -136,4 +136,9 @@ dreambooth:
 flux-schnell:
   version: ""
   url: "https://api.replicate.com/v1/models/black-forest-labs/flux-schnell/predictions"
-  stream: false
\ No newline at end of file
+  stream: false
+
+funasr:
+  version: "a503640460e2b1e59c84b6a736e0e72a99143a0fd012fe27d860fec9c9f6aa0c"
+  url: "https://api.replicate.com/v1/predictions"
+  stream: false

controllers/task.go

@@ -608,7 +608,7 @@ func addWatermark(sourceURL string, watermarkURL string) (string, error) {
 
 	// 添加水印
 	if watermarkImg != nil {
-		dc.DrawImageAnchored(watermarkImg, dc.Width()/2, dc.Height()-80, 0.5, 0.5) // 在中心添加水印
+		dc.DrawImageAnchored(watermarkImg, 0, dc.Height(), 0, 1) // 在中心添加水印
 	}
 
 	// 获取合成后的图像

lastupdate.tmp

-{"/Users/brent/Documents/wubanWork/aon_app_server/controllers":1723693546535841393}
\ No newline at end of file
+{"/Users/brent/Documents/wubanWork/aon_app_server/controllers":1723948236667217848}
\ No newline at end of file