Merge remote-tracking branch 'origin/V3.0.0' into V3.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MonitoringServiceImpl.java

@@ -94,7 +94,7 @@ public class MonitoringServiceImpl implements IMonitoringService {
 //
 //        String result = HKOpenApi.getMonitoryPoint(parMap);
 //        // String url = "rtsp://vipgz1.idcfengye.com:10004/realplay://#cameraUuid#:SUB:";
-//        String url = "rtsp://222.190.241.190:556/realplay://#cameraUuid#:SUB:";
+//        String url = "rtsp://222.190.241.190:16656/realplay://#cameraUuid#:SUB:";
 //        JSONArray cameraList = JSONObject.parseObject(result).getJSONObject("data").getJSONArray("list");
 //        List<String> urlList = new ArrayList<String>();
 //        for (Object cameraMap : cameraList){

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -1018,7 +1018,7 @@ public class SocialServiceImpl implements SocialServiceI {
     public ResponseBean findUsedDetailsReply(Integer transactionId, UserElement userElement, String order, Integer pageNum, Integer pageSize, Integer type) {
         ResponseBean responseBean = new ResponseBean();
         //拿到当前帖子的创建人
-        TpTransaction tpTransaction= tpTransactionMapper.getById(transactionId);
+        TpTransaction tpTransaction= tpTransactionMapper.selectByPrimaryKey(transactionId,userElement.getCommunityId());
 
         PageHelper.startPage(pageNum, pageSize, "create_date " + order);
         //房间号

CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKConstant.java

@@ -34,7 +34,7 @@ public class HKConstant {
    // public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
     //  public static final String OPENAPI_IP_PORT_HTTPS = "http://192.168.0.122";
     //public static final String OPENAPI_IP_PORT_HTTP = "http://huiju.ngrok.xiaomiqiu.cn";
-    public static final String OPENAPI_IP_PORT_HTTP = "http://222.190.241.190:888";
+    public static final String OPENAPI_IP_PORT_HTTP = "http://222.190.241.190:16680";
     // public static final String OPENAPI_IP_PORT_HTTP = "192.168.10.200";
 
     /**

CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKOpenApi.java

@@ -1011,7 +1011,7 @@ public class HKOpenApi {
         parUser.put("secret", "64a1f32d53784ce2a34bd81822db1b91");
         parUser.put("appkey", "b4434b13");
         parUser.put("opUserUuid", "5b2eb534696b11e89c2e438f92627767");
-        parUser.put("openapi_ip_port_http", "http://222.190.241.190:888");
+        parUser.put("openapi_ip_port_http", "http://222.190.241.190:16680");
         System.out.println(HKOpenApi.addUser(parUser));
     }
     /**

CODE/smart-community/hardware-server/src/main/java/com/community/huiju/base/api/hk/HKConstant.java

@@ -34,7 +34,7 @@ public class HKConstant {
    // public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
     //  public static final String OPENAPI_IP_PORT_HTTPS = "http://192.168.0.122";
     //public static final String OPENAPI_IP_PORT_HTTP = "http://huiju.ngrok.xiaomiqiu.cn";
-    public static final String OPENAPI_IP_PORT_HTTP = "http://222.190.241.190:888";
+    public static final String OPENAPI_IP_PORT_HTTP = "http://222.190.241.190:16680";
     // public static final String OPENAPI_IP_PORT_HTTP = "192.168.10.200";
 
     /**

CODE/smart-community/hardware-server/src/main/java/com/community/huiju/base/api/hk/HKOpenApi.java

@@ -1010,7 +1010,7 @@ public class HKOpenApi {
         parUser.put("secret", "64a1f32d53784ce2a34bd81822db1b91");
         parUser.put("appkey", "b4434b13");
         parUser.put("opUserUuid", "5b2eb534696b11e89c2e438f92627767");
-        parUser.put("openapi_ip_port_http", "http://222.190.241.190:888");
+        parUser.put("openapi_ip_port_http", "http://222.190.241.190:16680");
         System.out.println(HKOpenApi.addUser(parUser));
     }
     /**