From c7d4515410393b638fda41b2b69f09baefc7fe7e Mon Sep 17 00:00:00 2001
From: nmy <849173236@qq.com>
Date: Sat, 9 Dec 2023 11:38:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../company/api/domain/BmCompanyInfo.java     |  3 +++
 .../impl/BmCompanyInfoServiceImpl.java        |  7 +++++-
 .../resources/mapper/BmCompanyInfoMapper.xml  |  2 +-
 .../zlpt/system/config/SmsComponent.java      | 19 +++++++++++-----
 .../src/main/resources/bootstrap.yml          | 22 +++++++++----------
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java
index 3da3a8c..6dbaa54 100644
--- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java
+++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java
@@ -228,5 +228,8 @@ public class BmCompanyInfo implements Serializable {
     @ApiModelProperty(value = "法人身份证国徽面", required = true)
     private String legalNationUrl;
 
+    //用户名
+    private String userName;
+
 
 }
\ No newline at end of file
diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java
index fa089fd..c3de65f 100644
--- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java
@@ -89,7 +89,12 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
     @Override
     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;
     }
 
     /**
diff --git a/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml b/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml
index 3477d1d..ceef7a8 100644
--- a/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml
+++ b/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml
@@ -429,7 +429,7 @@
 
 
   <select id="selectList" resultType="com.bonus.zlpt.company.api.domain.BmCompanyInfo">
-    select * from bm_company_info 
+    select * from bm_company_info
     <where>
       <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>
diff --git a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/config/SmsComponent.java b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/config/SmsComponent.java
index e6d017a..0c8442f 100644
--- a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/config/SmsComponent.java
+++ b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/config/SmsComponent.java
@@ -11,8 +11,10 @@ import lombok.Data;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,24 +28,29 @@ import java.util.Map;
 @Data
 @Component
 @Slf4j
+@ConfigurationProperties("tencent.sms")
 public class SmsComponent {
 
-    @Value("${tencent.sms.smsSdkAppId}")   // 注入参数值
+//    @Value("tencent.sms.sdkAppId")
     private String sdkAppId;
 
-    @Value("${tencent.sms.secretId}")
+//    @Value("tencent.sms.secretId")
     private String secretId;
 
-    @Value("${tencent.sms.keysecret}")
+//    @Value("tencent.sms.secretKey")
     private String secretKey;
 
-    @Value("${tencent.sms.signName}")
+//    @Value("tencent.sms.signName")
     private String signName;
 
-    @Value("${tencent.sms.templateId}")
+//    @Value("tencent.sms.templateCodeId")
+    private String templateCodeId;
+
+//    @Value("tencent.sms.templateCodeIds")
     private Map<Integer,String> templateCodeIds;
 
-    @Value("${tencent.sms.timeout}")
+
+//    @Value("tencent.sms.timeout")
     private Integer timeout;
 
     /**
diff --git a/zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml b/zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml
index 707339f..51c5bb9 100644
--- a/zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml
+++ b/zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml
@@ -11,11 +11,11 @@ tencent:
     # 短信应用ID
     smsSdkAppId: 1400874270
     # 短信签名内容
-    signName: 作业智慧管控系统小程序
+    signName: 南网机具租赁共享平台
     # 正文模板ID
     templateCodeIds:
-     1: 2014173
-     2: 2014506
+      1: 2014506
+      2: 2014173
     # 超时时间
     timeout: 1000
 
@@ -29,25 +29,25 @@ sms:
 
 
 # Spring
-spring: 
+spring:
   application:
     # 应用名称
     name: zlpt-system
   profiles:
     # 环境配置
-    active: zlpt_cloud_dev
+    active: zlpt_cloud_de
   cloud:
     nacos:
-      username: nacos
-      password: Bonus@admin123!
+      #      username: nacos
+      #      password: Bonus@admin123!
       discovery:
         # 服务注册地址
-        server-addr: 192.168.1.3:8848
-        namespace: zlpt_cloud_dev
+        server-addr: 10.40.92.74:8848
+        namespace: zlpt_cloud_de
       config:
         # 配置中心地址
-        server-addr: 192.168.1.3:8848
-        namespace: zlpt_cloud_dev
+        server-addr: 10.40.92.74:8848
+        namespace: zlpt_cloud_de
         # 配置文件格式
         file-extension: yml
         # 共享配置