From 6df7368f0faf5d27204cf29641672b23c1f920f5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 九月 2024 13:05:01 +0800
Subject: [PATCH] 最新版本
---
server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml | 23 +++++++++++------------
server/system_timer/src/main/resources/bootstrap-pro.yml | 6 +++---
server/visits/admin_timer/src/main/resources/bootstrap-pro.yml | 24 ++++++++++++------------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4 ++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 2 +-
5 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
index 7013a1d..fe9ee9f 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
@@ -10,20 +10,19 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
- config:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
- namespace: dmvisit_test
- username: nacos
- password: nacos
-# file-extension: yaml
-# group: dev
-# data-id: com.doumee.meeting.admin
+ # config:
+ # server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ # namespace: dmvisit
+ # username: nacos
+ # password: nacos
+ # file-extension: yaml
+ # group: dev
+ # data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit
username: nacos
- password: nacos
- # 瀹夊叏閰嶇疆
+ password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap-pro.yml b/server/system_timer/src/main/resources/bootstrap-pro.yml
index 6a95c65..fe9ee9f 100644
--- a/server/system_timer/src/main/resources/bootstrap-pro.yml
+++ b/server/system_timer/src/main/resources/bootstrap-pro.yml
@@ -10,7 +10,7 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
- namespace: dmvisit_test
+ server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
+ namespace: dmvisit
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml b/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
index f84b8c1..fe9ee9f 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
@@ -10,19 +10,19 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
-# config:
-# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
-# namespace: dmvisit
-# username: nacos
-# password: nacos
-# file-extension: yaml
-# group: dev
-# data-id: com.doumee.meeting.admin
+ # config:
+ # server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ # namespace: dmvisit
+ # username: nacos
+ # password: nacos
+ # file-extension: yaml
+ # group: dev
+ # data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
- namespace: dmvisit_test
+ server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
+ namespace: dmvisit
username: nacos
- password: nacos
+ password: nacos
\ No newline at end of file
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index 0b00a66..2353038 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -159,7 +159,7 @@
}
/**
- * 璁垮鏉ヨ閰嶇疆
+ * 鑾峰彇瀹夐槻骞冲彴绯荤粺鍏嶅瘑鑿滃崟璋冩暣鍦板潃
* @return
*/
@ApiOperation(value = "鑾峰彇瀹夐槻骞冲彴绯荤粺鍏嶅瘑鑿滃崟璋冩暣鍦板潃" )
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index a7ccd11..e352822 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -337,12 +337,14 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
}
if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+ .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
.eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
.eq(Member::getIsdeleted,Constants.ZERO)) >0){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNo()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
}
if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
.eq(Member::getPhone, member.getPhone())
+ .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
.eq(Member::getIsdeleted,Constants.ZERO) ) >0){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+member.getPhone()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
}
@@ -392,6 +394,7 @@
}
if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
.eq(Member::getPhone,member.getPhone())
+ .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
.eq(Member::getIsdeleted,Constants.ZERO)
.ne(Member::getId,member.getId())) >0){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+member.getPhone()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
@@ -406,6 +409,7 @@
if( !StringUtils.equals(model.getIdcardNo(),encrptNo) ){
if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
.eq(Member::getIdcardNo,encrptNo)
+ .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
.eq(Member::getIsdeleted,Constants.ZERO)
.ne(Member::getId,member.getId())) >0){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNoNew()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
--
Gitblit v1.9.3