Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/feign/ConfigFeign.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 //@FeignClient(value = "${auth.serviceId}",configuration = {})
 @FeignClient("xx-app")
 public interface ConfigFeign {
-    @RequestMapping(value = "/cofig/types/{types}",method = RequestMethod.GET)
+    @RequestMapping(value = "/cofig/app/unauth/types",method = RequestMethod.GET)
     public ObjectRestResponse<Cofig> getAllByType(String types);
 
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/SmsService.java

@@ -21,6 +21,7 @@ import com.github.wxiaoqi.security.common.util.RandomUtil;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 
@@ -45,6 +46,9 @@ public class SmsService {
    public JSONObject  smsCode(String mobile){
        String code = RandomUtil.getRandomStr(6);// 6位短信验证码
        try {
+           if(StringUtils.isNotBlank(mobile)){
+               mobile=mobile.replace(" ", "");
+           }
            code=sendSms(mobile,code);
            return JsonResultUtil.createSuccessResultWithObj(code);
        } catch (ClientException e) {
@@ -83,7 +87,7 @@ public class SmsService {
         //request.setOutId("yourOutId");
         //hint 此处可能会抛出异常，注意catch
         SendSmsResponse sendSmsResponse = acsClient.getAcsResponse(request);
-        log.info("短信接口返回的数据----------------");
+        log.info("短信接口返回的数据----------------mobile======"+mobile+"----code===="+code);
         log.info("Code=" + sendSmsResponse.getCode());
         log.info("Message=" + sendSmsResponse.getMessage());
         log.info("RequestId=" + sendSmsResponse.getRequestId());
@@ -131,7 +135,7 @@ public class SmsService {
     public static void main(String[] args) throws ClientException, InterruptedException {
         SmsService SmsService=new SmsService();
         //发短信
-        String response = SmsService.sendSms("13612688539","123456");
+        String response = SmsService.sendSms("15521075918","123456");
         /*System.out.println("短信接口返回的数据----------------");
         System.out.println("Code=" + response.getCode());
         System.out.println("Message=" + response.getMessage());