Merge branch 'master' into prod

sys-api-service/src/main/java/com/xy/service/AliSmsServiceImpl.java

@@ -41,6 +41,20 @@ public class AliSmsServiceImpl implements AliSmsService {
         return R.ok();
     }
 
+    @Override
+    public R sendCodeByUserInfo(SmsSendDTO smsSendDTO) {
+        String mobile = smsSendDTO.getMobile();
+        Integer scene = smsSendDTO.getScene();
+        Long userInfoId = smsSendDTO.getUserInfoId();
+        SmsSceneEnum smsSceneEnum = SmsSceneEnum.getCodeByScene(scene);
+        if (smsSceneEnum == null) {
+            throw new CommRuntimeException("发送场景有误！");
+        }
+        //发短信验证码
+        smsUtil.sendSmsCode(mobile, smsSceneEnum, String.valueOf(userInfoId));
+        return R.ok();
+    }
+
     @Override
     public R<Boolean> verifyCode(SmsDTO.Validation smsDTO) {
 

sys-api/src/main/java/com/xy/dto/SmsSendDTO.java

@@ -17,5 +17,8 @@ public class SmsSendDTO {
     @NotNull(message = "发送场景不能为空")
     private Integer scene;
 
+    @ApiModelProperty(value = "用户ID")
+    private Long userInfoId;
+
 
 }

sys-api/src/main/java/com/xy/enums/SmsSceneEnum.java

@@ -16,7 +16,10 @@ public enum SmsSceneEnum {
 
     B_WX_MINI_BIND(1, "B端设置 - 绑定微信小程序"),
     B_WX_MP_BIND(2, "B端设置 - 绑定微信公众号"),
-    B_ALIPAY_BIND(3, "B端设置 - 绑定支付宝");
+    B_ALIPAY_BIND(3, "B端设置 - 绑定支付宝"),
+    B_PAY_ACCOUNT_WX_CONFIG(4, "商户信息修改 - 微信收款号配置"),
+    B_PAY_ACCOUNT_ALIPAY_SCAN_CONFIG(5, "商户信息修改 - 支付宝扫码收款号配置"),
+    B_PAY_ACCOUNT_ALIPAY_FACE_CONFIG(6, "商户信息修改 - 支付刷脸收款号配置");
 
 
     /**

sys-api/src/main/java/com/xy/service/AliSmsService.java

@@ -15,6 +15,10 @@ public interface AliSmsService {
     @PostMapping("sendCode")
     R sendCode(@RequestBody @Validated SmsSendDTO smsSendDTO);
 
+
+    @PostMapping("sendCodeByUserInfo")
+    R sendCodeByUserInfo(@RequestBody @Validated SmsSendDTO smsSendDTO);
+
     /**
      * 验证码验证
      *

sys-sdk/src/main/java/com/xy/utils/LogUtils.java

@@ -114,7 +114,7 @@ public class LogUtils {
      *
      * @return
      */
-    private static String getIp() {
+    public static String getIp() {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String ipAddress;
         try {