咨询模块及IM模块调整

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/MsgRecordMapper.xml

@@ -23,7 +23,7 @@
     <select id="selectMsgRecordList" resultType="com.renkang.consultation.entity.MsgRecord">
         select
         <include refid="MsgRecordColumns"/>
-        from im_msg_record_all a
+        from QH_CON_IM_MSG_ALL a
         <where>
             and a.del_flag = '0' and status = 1
             <if test="fromAccount != null  and fromAccount != ''">

health-im/health-im-api/src/main/java/com/renkang/im/entity/ImGroupSyncRecord.java

@@ -25,7 +25,7 @@ import java.util.Date;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(value = "im_group_sync_record")
+@TableName(value = "QH_CON_IM_GRP_SYNC")
 public class ImGroupSyncRecord implements Serializable {
     private static final long serialVersionUID = 1L;
     /**

health-im/health-im-api/src/main/java/com/renkang/im/entity/ImMsgRecordAll.java

@@ -23,7 +23,7 @@ import java.util.Date;
  * @Version: V1.0
  */
 @Data
-@TableName("im_msg_record_all")
+@TableName("QH_CON_IM_MSG_ALL")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @Schema(title = "im_msg_record_all对象", description = "im_msg_record_all")

health-im/health-im-start/src/main/java/com/renkang/HealthIMCloudApplication.java

@@ -2,9 +2,10 @@ package com.renkang;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
-@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"})
+@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"},exclude = QuartzAutoConfiguration.class)
 @EnableFeignClients(basePackages = {"org.jeecg", "com.renkang"})
 public class HealthIMCloudApplication {
 

health-im/health-im-start/src/main/resources/application.yml

@@ -8,6 +8,8 @@ spring:
       - optional:nacos:jeecg.yaml
       - optional:nacos:${spring.application.name}-${PROFILE_NAME}.yaml
   cloud:
+    inetutils:
+      preferred-networks: 192.168
     nacos:
       server-addr: ${NACOS_SERVER_ADDR}
       username: ${NACOS_USERNAME:nacos}
@@ -21,7 +23,7 @@ spring:
         password: ${spring.cloud.nacos.password}
       discovery:
         enabled: true
-        namespace: ${NACOS_NAMESPACE:}
+        namespace: ${NACOS_NAMESPACE_DISCOVERY:}
         group: ${NACOS_GROUP:DEFAULT_GROUP}
         server-addr: ${spring.cloud.nacos.server-addr}
         username: ${spring.cloud.nacos.username}

health-im/health-im-start/src/main/resources/实体类对应的DDLsql/im_msg_record_all.sql

@@ -1,17 +0,0 @@
--- ceishi.im_msg_record_all definition
-
-CREATE TABLE `im_msg_record_all`
-(
-    `id`           varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-    `groupId`      varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '群组ID',
-    `from_account` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发送者账号',
-    `to_account`   varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '接受者账号',
-    `sendtime`     datetime                                                      DEFAULT NULL COMMENT '发送时间',
-    `msgtype`      varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '消息类型 1单聊 2群聊',
-    `msgcontent`   varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '消息内容',
-    `contenttype`  varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '消息元素类别；目前支持的消息对象包括：TIMTextElem(文本消息)，TIMLocationElem(位置消息)，TIMFaceElem(表情消息)，TIMCustomElem(自定义消息)，TIMSoundElem(语音消息)，TIMImageElem(图像消息)，TIMFileElem(文件消息)，TIMVideoFileElem(视频消息)',
-    `msgseq`       bigint                                                        NOT NULL COMMENT '消息序列',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_0900_ai_ci COMMENT ='IM消息表';