he2802 1 年之前
父节点
当前提交
52b6a78836

+ 37 - 0
run-prod.sh

@@ -1,4 +1,41 @@
+#!/usr/bin/env bash
+# 定义应用组名
+group_name='zhongzheng'
+# 定义应用名称
+app_name='zhongzheng-saas-api'
+# 定义应用版本
+app_version='1.0-SNAPSHOT'
+# 定义应用环境
+profile_active='prod'
+echo '----copy jar----'
+docker stop ${app_name}
+echo '----stop container----'
+docker rm ${app_name}
+echo '----rm container----'
+docker rmi ${group_name}/${app_name}:${app_version}
+echo '----rm image----'
+# 打包编译docker镜像
+docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
+echo '----build image----'
+docker run -p 5055:5055 --name ${app_name} \
+--restart=always \
+-e 'spring.profiles.active'=${profile_active} \
+-e TZ="Asia/Shanghai" \
+-m 10240m \
+--cpus=3 \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
+-v /etc/localtime:/etc/localtime \
+-v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/prod_api:/logs \
+-v /mydata/app/${app_name}/logs:/var/logs \
+-d ${group_name}/${app_name}:${app_version}
+echo '----start container----'
 
+echo "开始等待20秒..."
+# 1-10秒内随机
+sleep 5
+echo "等待后继续"
 
 #!/usr/bin/env bash
 # 定义应用组名

+ 10 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/tencentcloud/service/impl/FaceOcrServiceImpl.java

@@ -93,7 +93,11 @@ public class FaceOcrServiceImpl implements IFaceOcrService {
                 clientProfile.setSignMethod(clientProfile.SIGN_TC3_256);
                 IaiClient iaiClient = new IaiClient(cred,"ap-guangzhou");
                 CompareFaceRequest faceRequest = new CompareFaceRequest();
-                faceRequest.setImageA(bo.getImageA()); //学习拍照
+                if(Validator.isNotEmpty(bo.getUrlA())){
+                    faceRequest.setUrlA(ossHost+"/"+bo.getUrlA());
+                }else{
+                    faceRequest.setImageA(bo.getImageA()); //学习拍照
+                }
                 faceRequest.setUrlB(oneInchPhotos); //一寸近照
                 faceRequest.setQualityControl(2L);
                 CompareFaceResponse response = iaiClient.CompareFace(faceRequest);
@@ -114,7 +118,11 @@ public class FaceOcrServiceImpl implements IFaceOcrService {
             clientProfile.setSignMethod(clientProfile.SIGN_TC3_256);
             IaiClient iaiClient = new IaiClient(cred,"ap-guangzhou");
             DetectFaceRequest faceRequest = new DetectFaceRequest();
-            faceRequest.setImage(bo.getImageA()); //学习拍照
+            if(Validator.isNotEmpty(bo.getUrlA())){
+                faceRequest.setUrl(ossHost+"/"+bo.getUrlA());
+            }else{
+                faceRequest.setImage(bo.getImageA()); //学习拍照
+            }
             faceRequest.setNeedFaceAttributes(1L);
             faceRequest.setNeedQualityDetection(1L);
             faceRequest.setMinFaceSize(40L);