From a1664efbefb313784e1920ffc8cfceda2a2ea1c8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 八月 2024 14:50:03 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/resources/application-pro.yml | 2 +-
server/admin/src/main/resources/application.yml | 2 +-
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 32 ++++++++++++++++----------------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/server/admin/src/main/resources/application.yml b/server/admin/src/main/resources/application.yml
index b1555f6..d1e194d 100644
--- a/server/admin/src/main/resources/application.yml
+++ b/server/admin/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumee
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index 2a74b67..7e2137b 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -290,10 +290,6 @@
if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
Users users = usersMapper.selectById(salesId);
Member member = memberMapper.selectById(userId);
- if(StringUtils.isNotBlank(member.getImgurl())){
- member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
- }
if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
//鏇存柊瀵艰喘缁戝畾淇℃伅
MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,memberMapper,users,member);
@@ -304,6 +300,10 @@
}
response.setUsers(users);
memberMapper.updateById(member);
+ }
+ if(StringUtils.isNotBlank(member.getImgurl())){
+ member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
}
}
List<String> stringList = new ArrayList<String>();
@@ -349,10 +349,6 @@
if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
Users users = usersMapper.selectById(salesId);
Member member = memberMapper.selectById(userId);
- if(StringUtils.isNotBlank(member.getImgurl())){
- member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
- }
if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,memberMapper,users,member);
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
@@ -362,6 +358,10 @@
}
response.setUsers(users);
memberMapper.updateById(member);
+ }
+ if(StringUtils.isNotBlank(member.getImgurl())){
+ member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
}
}
List<String> stringList = new ArrayList<String>();
@@ -401,10 +401,6 @@
if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
Users users = usersMapper.selectById(salesId);
Member member = memberMapper.selectById(userId);
- if(StringUtils.isNotBlank(member.getImgurl())){
- member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
- }
if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,memberMapper,users,member);
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
@@ -414,6 +410,10 @@
}
response.setUsers(users);
memberMapper.updateById(member);
+ }
+ if(StringUtils.isNotBlank(member.getImgurl())){
+ member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
}
}
List<String> stringList = new ArrayList<String>();
@@ -459,10 +459,6 @@
Users users = usersMapper.selectById(salesId);
Member member = memberMapper.selectById(userId);
if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
- if(StringUtils.isNotBlank(member.getImgurl())){
- member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
- }
MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,memberMapper,users,member);
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
@@ -472,6 +468,10 @@
response.setUsers(users);
memberMapper.updateById(member);
}
+ if(StringUtils.isNotBlank(member.getImgurl())){
+ member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
+ }
}
List<String> stringList = new ArrayList<String>();
if (StringUtils.isNotBlank(response.getCoverImage())) {
diff --git a/server/service/src/main/resources/application-pro.yml b/server/service/src/main/resources/application-pro.yml
index e93aa1c..1e1f4a5 100644
--- a/server/service/src/main/resources/application-pro.yml
+++ b/server/service/src/main/resources/application-pro.yml
@@ -2,7 +2,7 @@
# 鏁版嵁婧愰厤缃�
datasource:
url: jdbc:mysql://10.200.200.16:3306/zbom_youjia?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
- username: doumee
+ username: root
password: Zbom2020@rds
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
--
Gitblit v1.9.3