Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

CODE/smart-community/mq-message/src/main/java/com/community/huiju/common/code/impl/PhoneCodeImpl.java

@@ -1,74 +0,0 @@
-package com.community.huiju.common.code.impl;
-
-import com.community.commom.constant.Constant;
-import com.community.commom.utils.AccountValidatorUtil;
-import com.community.huiju.common.code.ICode;
-import com.community.huiju.common.code.cache.AppkeyCache;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 手机验证码
- * @author weiximei
- */
-@Service("phoneCodeImpl")
-@Slf4j
-public class PhoneCodeImpl implements ICode {
-
-    public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-
-    @Autowired
-    private RestTemplate restTemplate;
-
-    public OkHttpClient getClient() {
-        OkHttpClient client  = new OkHttpClient.Builder()
-                .connectTimeout(10, TimeUnit.SECONDS)
-                .writeTimeout(10,TimeUnit.SECONDS)
-                .readTimeout(20, TimeUnit.SECONDS)
-                .build();
-        return client;
-    }
-
-    @Override
-    public boolean sendCode(String phone, String code) {
-        boolean bool = false;
-
-        try {
-            String result = null;
-            OkHttpClient client = getClient();
-            RequestBody body = RequestBody.create(JSON, "{\"code\":\""+Constant.CODE+"\"," + "\"tel\":\""+phone+"\"," + "\"params\":[\""+code+"\"]}");
-            Request request = new Request.Builder()
-                    .url(Constant.REQUEST_URL)
-                    .post(body)
-                    .build();
-            Response response = client.newCall(request).execute();
-            if (response.isSuccessful()) {
-                result = response.body().string();
-            } else {
-                throw new IOException("Unexpected code " + response);
-            }
-
-
-
-            if ("发送成功".equals(result)) {
-                bool = true;
-                log.info("手机号 {} 验证码 {} 发送成功!",phone,code);
-            }else {
-                bool = false;
-                log.error("短信发送验证码失败!{}", result);
-            }
-        } catch (Exception e){
-            e.printStackTrace();
-            log.error("短信发送错误!",e);
-            bool = false;
-        }
-
-        return bool;
-    }
-}

CODE/smart-community/mq-message/src/main/java/com/community/huiju/runner/MqRunner.java

@@ -23,7 +23,8 @@ import javax.jms.Topic;
 @Component
 public class MqRunner implements ApplicationRunner {
 	
-	public static final String BROKER_URL = "failover:(tcp://192.168.0.122:61618)?timeout=2000";
+	//public static final String BROKER_URL = "failover:(tcp://192.168.0.122:61618)?timeout=2000";
+	public static final String BROKER_URL = "failover:(tcp://localhost:8087)?timeout=2000";
 	
 	public static final String TARGET = "openapi.acs.topic";