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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseDTO.java

@@ -57,7 +57,7 @@ public class WxEnterpriseDTO implements Serializable {
     
     private Integer contactFlag;
     
-    private String wxSecreKey;
+    private String wxSecretKey;
 
     private Date createTime;
 
@@ -289,13 +289,14 @@ public class WxEnterpriseDTO implements Serializable {
 		this.contactFlag = contactFlag;
 	}
 
-	public String getWxSecreKey() {
-		return wxSecreKey;
+	public String getWxSecretKey() {
+		return wxSecretKey;
 	}
 
-	public void setWxSecreKey(String wxSecreKey) {
-		this.wxSecreKey = wxSecreKey;
+	public void setWxSecretKey(String wxSecretKey) {
+		this.wxSecretKey = wxSecretKey;
 	}
 
+	
     
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWxEnterprise.java

@@ -56,7 +56,7 @@ public class TabHaobanWxEnterprise implements Serializable {
     
     private Integer contactFlag;
     
-    private String wxSecreKey;
+    private String wxSecretKey;
 
     private Date createTime;
 
@@ -288,13 +288,14 @@ public class TabHaobanWxEnterprise implements Serializable {
 		this.contactFlag = contactFlag;
 	}
 
-	public String getWxSecreKey() {
-		return wxSecreKey;
+	public String getWxSecretKey() {
+		return wxSecretKey;
 	}
 
-	public void setWxSecreKey(String wxSecreKey) {
-		this.wxSecreKey = wxSecreKey;
+	public void setWxSecretKey(String wxSecretKey) {
+		this.wxSecretKey = wxSecretKey;
 	}
+
     
     
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -64,7 +64,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		}
 		List<TabHaobanWxEnterpriseRelated> list = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterprise.getWxEnterpriseId());
 		
-		String unionIdJson = qywxUserApiService.getCorpSelfExternalUseridInfo(dto.getCorpid(), wxEnterprise.getWxSecreKey(), dto.getExternalUserid());
+		String unionIdJson = qywxUserApiService.getCorpSelfExternalUseridInfo(dto.getCorpid(), wxEnterprise.getWxSecretKey(), dto.getExternalUserid());
 				//getExternalUseridInfo(dto.getCorpid(), dto.getSuiteid(), dto.getExternalUserid());
 		log.info("【新增外部联系人回调】unionIdJson={}",JSON.toJSONString(unionIdJson));
 		String unionId = "";
@@ -89,7 +89,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		}
 		dto.setWxEnterpriseId(wxEnterprise.getWxEnterpriseId());
 		dto.setUnionid(unionId);
-		dto.setSuiteid(wxEnterprise.getWxSecreKey());
+		dto.setSuiteid(wxEnterprise.getWxSecretKey());
 		//this.getExternalUserUnionid(dto);
 		return memberUnionRelatedService.addMemberUnionidRelated(dto);
 	}
@@ -105,7 +105,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		if(wxEnterprise == null){
 			return ;
 		}
-		String externalUseridInfo = this.qywxUserApiService.getCorpSelfExternalUseridInfo(dto.getCorpid(), wxEnterprise.getWxSecreKey(), dto.getExternalUserid());
+		String externalUseridInfo = this.qywxUserApiService.getCorpSelfExternalUseridInfo(dto.getCorpid(), wxEnterprise.getWxSecretKey(), dto.getExternalUserid());
 		if(StringUtils.isNotBlank(externalUseridInfo)){
 			JSONObject jsonObject = JSON.parseObject(externalUseridInfo);
 			dto.setUnionid(jsonObject.getString("unionid"));