bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev

This commit is contained in:
sxu 2023-12-09 12:58:07 +08:00
parent 6a1174c58f 6599ea248a
commit 5bf3aa0cab
5 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java
View File

@ -228,5 +228,8 @@ public class BmCompanyInfo implements Serializable {
@ApiModelProperty(value = "法人身份证国徽面", required = true) @ApiModelProperty(value = "法人身份证国徽面", required = true)
private String legalNationUrl; private String legalNationUrl;
//用户名
private String userName;
} }

7
zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java
View File

@ -89,7 +89,12 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
@Override @Override
public List<BmCompanyInfo> selectList(BmCompanyDto bmCompanyDto) { public List<BmCompanyInfo> selectList(BmCompanyDto bmCompanyDto) {
return bmCompanyInfoMapper.selectList(bmCompanyDto); List<BmCompanyInfo> bmCompanyInfos = bmCompanyInfoMapper.selectList(bmCompanyDto);
for (BmCompanyInfo bmCompanyInfo : bmCompanyInfos) {
SysUser data = remoteUserService.selectUserById(bmCompanyInfo.getAuditor().longValue()).getData();
bmCompanyInfo.setUserName(data.getUserName());
}
return bmCompanyInfos;
} }
/** /**

2
zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml
View File

@ -429,7 +429,7 @@
<select id="selectList" resultType="com.bonus.zlpt.company.api.domain.BmCompanyInfo"> <select id="selectList" resultType="com.bonus.zlpt.company.api.domain.BmCompanyInfo">
select * from bm_company_info select * from bm_company_info
<where> <where>
<if test="companyName != null and companyName != ''">and company_name LIKE CONCAT('%', #{companyName}, '%')</if> <if test="companyName != null and companyName != ''">and company_name LIKE CONCAT('%', #{companyName}, '%')</if>
<if test="creditCode != null and creditCode != ''">and credit_code LIKE CONCAT('%', #{creditCode}, '%')</if> <if test="creditCode != null and creditCode != ''">and credit_code LIKE CONCAT('%', #{creditCode}, '%')</if>

19
zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/config/SmsComponent.java
View File

@ -11,8 +11,10 @@ import lombok.Data;
import lombok.ToString; import lombok.ToString;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -26,24 +28,29 @@ import java.util.Map;
@Data @Data
@Component @Component
@Slf4j @Slf4j
@ConfigurationProperties("tencent.sms")
public class SmsComponent { public class SmsComponent {
@Value("${tencent.sms.smsSdkAppId}") // 注入参数值 // @Value("tencent.sms.sdkAppId")
private String sdkAppId; private String sdkAppId;
@Value("${tencent.sms.secretId}") // @Value("tencent.sms.secretId")
private String secretId; private String secretId;
@Value("${tencent.sms.keysecret}") // @Value("tencent.sms.secretKey")
private String secretKey; private String secretKey;
@Value("${tencent.sms.signName}") // @Value("tencent.sms.signName")
private String signName; private String signName;
@Value("${tencent.sms.templateId}") // @Value("tencent.sms.templateCodeId")
private String templateCodeId;
// @Value("tencent.sms.templateCodeIds")
private Map<Integer,String> templateCodeIds; private Map<Integer,String> templateCodeIds;
@Value("${tencent.sms.timeout}")
// @Value("tencent.sms.timeout")
private Integer timeout; private Integer timeout;
/** /**

22
zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml
View File

@ -11,11 +11,11 @@ tencent:
# 短信应用ID # 短信应用ID
smsSdkAppId: 1400874270 smsSdkAppId: 1400874270
# 短信签名内容 # 短信签名内容
signName: 作业智慧管控系统小程序 signName: 南网机具租赁共享平台
# 正文模板ID # 正文模板ID
templateCodeIds: templateCodeIds:
1: 2014173 1: 2014506
2: 2014506 2: 2014173
# 超时时间 # 超时时间
timeout: 1000 timeout: 1000
@ -29,25 +29,25 @@ sms:
# Spring # Spring
spring: spring:
application: application:
# 应用名称 # 应用名称
name: zlpt-system name: zlpt-system
profiles: profiles:
# 环境配置 # 环境配置
active: zlpt_cloud_dev active: zlpt_cloud_de
cloud: cloud:
nacos: nacos:
username: nacos # username: nacos
password: Bonus@admin123! # password: Bonus@admin123!
discovery: discovery:
# 服务注册地址 # 服务注册地址
server-addr: 192.168.1.3:8848 server-addr: 10.40.92.74:8848
namespace: zlpt_cloud_dev namespace: zlpt_cloud_de
config: config:
# 配置中心地址 # 配置中心地址
server-addr: 192.168.1.3:8848 server-addr: 10.40.92.74:8848
namespace: zlpt_cloud_dev namespace: zlpt_cloud_de
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置