Merge remote-tracking branch 'origin/master'

adminapi/src/main/java/tech/glinfo/enbao/config/MyActiveMqConfig.java

+package tech.glinfo.enbao.config;
+
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
+import org.springframework.jms.config.JmsListenerContainerFactory;
+import tech.glinfo.enbao.common.contants.AppContants;
+
+import javax.jms.ConnectionFactory;
+import javax.jms.Queue;
+import javax.jms.Topic;
+
+@Configuration
+public class MyActiveMqConfig {
+    @Bean
+    public Queue sendQueue() {
+        return new ActiveMQQueue(AppContants.RECEIVE_QUEUE);
+    }
+    @Bean
+    public Queue sendPushQueue() {
+        return new ActiveMQQueue(AppContants.PUSH_QUEUE);
+    }
+    @Bean
+    public Topic sendTopic(){
+        return new ActiveMQTopic(AppContants.SEND_TOPIC);
+    }
+    @Bean
+    public Topic websocketTopic(){
+        return new ActiveMQTopic(AppContants.WEBSOCKET_TOPIC);
+    }
+    @Bean
+    public Topic socketioTopic(){
+        return new ActiveMQTopic(AppContants.SOCKETIO_TOPIC);
+    }
+
+    //Topic模式
+    @Bean
+    public JmsListenerContainerFactory<?> jmsListenerContainerTopic(ConnectionFactory connectionFactory) {
+        DefaultJmsListenerContainerFactory bean = new DefaultJmsListenerContainerFactory();
+        bean.setPubSubDomain(true);
+        bean.setConnectionFactory(connectionFactory);
+        return bean;
+    }
+    //Queue模式
+    @Bean
+    public JmsListenerContainerFactory<?> jmsListenerContainerQueue(ConnectionFactory connectionFactory) {
+        DefaultJmsListenerContainerFactory bean = new DefaultJmsListenerContainerFactory();
+        bean.setConnectionFactory(connectionFactory);
+        return bean;
+    }
+}
\ No newline at end of file

adminapi/src/main/resources/application-test.yml

@@ -3,9 +3,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://127.0.0.1:3306/glinfo?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-            username: enbao
-            password: Enbao!2#
+            url: jdbc:mysql://172.19.211.95:3306/glinfo?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+            username: glinfo
+            password: Glinfo#123
             initial-size: 10
             max-active: 100
             min-idle: 10

appapi/src/main/java/tech/glinfo/enbao/modules/sh/dto/ShFamilyDto.java

@@ -14,6 +14,8 @@ public class ShFamilyDto {
 
     private Integer id;
 
+    private Integer userId;
+
     private String name;
 
     private Integer room;

appapi/src/main/java/tech/glinfo/enbao/modules/sh/dto/ShFamilyMemberDto.java

@@ -14,4 +14,6 @@ public class ShFamilyMemberDto {
     private String nickname;
 
     private Integer isAdmin;
+
+    private Integer status;
 }

appapi/src/main/resources/application-dev.yml

@@ -85,7 +85,7 @@ logging:
     level:
         root: info
         tech.glinfo: debug
-    path: ./logs/appapi
+    path: ./logs/glinfoapi
     file: appapi.log
 
 virtdevice:

appapi/src/main/resources/application-local.yml

@@ -85,7 +85,7 @@ logging:
     level:
         root: info
         tech.glinfo: debug
-    path: ./logs/appapi
+    path: ./logs/glinfoapi
     file: appapi.log
 
 virtdevice:

appapi/src/main/resources/application-prod.yml

@@ -87,7 +87,7 @@ logging:
     level:
         root: info
         tech.glinfo: debug
-    path: ./logs/appapi
+    path: ./logs/glinfoapi
     file: appapi.log
 
 virtdevice:

appapi/src/main/resources/application-test.yml

@@ -87,7 +87,7 @@ logging:
     level:
         root: info
         tech.glinfo: debug
-    path: ./logs/appapi
+    path: ./logs/glinfoapi
     file: appapi.log
 
 virtdevice:

appapi/src/main/resources/mapper/sh/OtherShFamilyDao.xml

@@ -6,6 +6,7 @@
     <resultMap id="familyResultMap" type="tech.glinfo.enbao.modules.sh.dto.ShFamilyDto">
         <result column="id" property="id"/>
         <result column="name" property="name"/>
+        <result column="user_id" property="userId"/>
         <result column="room" property="room"/>
         <collection property="members" ofType="tech.glinfo.enbao.modules.sh.dto.ShFamilyMemberDto" columnPrefix="item_">
             <result column="id" property="id"/>
@@ -33,7 +34,7 @@
     </resultMap>
 
     <select id="familyInfo" resultMap="familyResultMap">
-        SELECT a.id, a.name, (SELECT COUNT(c.id) FROM sh_family_room c WHERE a.id = c.family_id) room,
+        SELECT a.id, a.name, a.user_id, (SELECT COUNT(c.id) FROM sh_family_room c WHERE a.id = c.family_id) room,
             b.id item_id,
             d.nickname item_nickname,
             b.is_admin item_is_admin,