Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java

@@ -88,7 +88,7 @@ public class TEmployeeInfoController {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
 		}
 		// 普通用户：
-		if (CommonConstants.ZERO_STRING.equals(user.getSystemFlag())) {
+		if (CommonConstants.ONE_STRING.equals(user.getSystemFlag())) {
 
 			// 菜单id
 			String menuId = "1536922631616278529";

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java

@@ -112,9 +112,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 					, "/tcheckidcard/inner/checkIdCardSingle", checkIdCard, TCheckIdCard.class, SecurityConstants.FROM_IN);
 			if (checkListR != null && checkListR.getData() != null) {
 				TCheckIdCard check = checkListR.getData();
-				if (check.getIsTrue() == CommonConstants.ZERO_INT) {
+				if (check == null || Common.isEmpty(check.getId())) {
+					return R.failed("校验服务器未返回，请联系管理员！！");
+				} else if (check.getIsTrue() == CommonConstants.ZERO_INT) {
 					return R.failed(check.getReason());
 				}
+			} else {
+				return R.failed("校验服务器未返回，请联系管理员！");
 			}
 			return R.ok();
 		}

yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties

@@ -5,3 +5,12 @@ dapr.upms.httpPort=3500
 dapr.upms.grpcPort=52000
 dapr.upms.metricsPort=9094
 
+#\u6D4B\u8BD5\u73AF\u5883
+dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
+#\u672C\u5730
+#dapr.check.appUrl=http://localhost:3502/v1.0/invoke/
+dapr.check.appId=yifu-check
+dapr.check.appPort=5022
+dapr.check.httpPort=3502
+dapr.check.grpcPort=52002
+dapr.check.metricsPort=9092
\ No newline at end of file