update

edu-auth/edu-auth-server/pom.xml

@@ -75,5 +75,9 @@
 			<groupId>com.keao.edu</groupId>
 			<artifactId>edu-im-api</artifactId>
 		</dependency>
+      <dependency>
+          <groupId>mysql</groupId>
+          <artifactId>mysql-connector-java</artifactId>
+      </dependency>
   </dependencies>
 </project>

edu-auth/edu-auth-server/src/main/resources/application.yml

@@ -68,7 +68,7 @@ mybatis:
   mapperLocations: classpath:config/mybatis/*.xml
 
 swagger:
-  base-package: com.ym.mec.auth.web.controller
+  base-package: com.keao.edu.auth.web.controller
 
 #spring boot admin 相关配置
 management:

edu-cms/src/main/java/com/keao/edu/user/CmsServerApplication.java → edu-cms/src/main/java/com/keao/edu/cms/CmsServerApplication.java

@@ -1,5 +1,6 @@
-package com.keao.edu.user;
+package com.keao.edu.cms;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -15,7 +16,8 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.keao.edu")
-@ComponentScan(basePackages = {"com.keao.edu.user", "com.keao.edu.im", "com.keao.edu.auth", "com.keao.edu.common.config", "com.keao.edu.common.security" })
+@ComponentScan("com.keao.edu")
+@MapperScan("com.keao.edu.common.dal.dao")
 @Configuration
 @EnableSwagger2Doc
 public class CmsServerApplication {

edu-cms/src/main/java/com/keao/edu/user/config/ResourceServerConfig.java → edu-cms/src/main/java/com/keao/edu/cms/config/ResourceServerConfig.java

@@ -1,4 +1,4 @@
-package com.keao.edu.user.config;
+package com.keao.edu.cms.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

edu-cms/src/main/java/com/keao/edu/user/config/WebMvcConfig.java → edu-cms/src/main/java/com/keao/edu/cms/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package com.keao.edu.user.config;
+package com.keao.edu.cms.config;
 
 import java.util.ArrayList;
 import java.util.List;

edu-cms/src/main/java/com/keao/edu/user/controller/HelpCenterCatalogController.java → edu-cms/src/main/java/com/keao/edu/cms/controller/HelpCenterCatalogController.java

@@ -1,4 +1,4 @@
-package com.keao.edu.user.controller;
+package com.keao.edu.cms.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.keao.edu.user.dal.entity.HelpCenterCatalog;
-import com.keao.edu.user.service.HelpCenterCatalogService;
-import com.keao.edu.user.service.HelpCenterContentService;
+import com.keao.edu.cms.dal.entity.HelpCenterCatalog;
+import com.keao.edu.cms.service.HelpCenterCatalogService;
+import com.keao.edu.cms.service.HelpCenterContentService;
 import com.keao.edu.common.controller.BaseController;
 
 @RestController

edu-cms/src/main/java/com/keao/edu/user/controller/HelpCenterContentControlller.java → edu-cms/src/main/java/com/keao/edu/cms/controller/HelpCenterContentControlller.java

@@ -1,5 +1,6 @@
-package com.keao.edu.user.controller;
+package com.keao.edu.cms.controller;
 
+import com.keao.edu.cms.controller.queryinfo.HelpCenterContentQueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -14,10 +15,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.keao.edu.user.controller.queryinfo.HelpCenterContentQueryInfo;
-import com.keao.edu.user.dal.entity.HelpCenterContent;
-import com.keao.edu.user.service.HelpCenterCatalogService;
-import com.keao.edu.user.service.HelpCenterContentService;
+import com.keao.edu.cms.dal.entity.HelpCenterContent;
+import com.keao.edu.cms.service.HelpCenterCatalogService;
+import com.keao.edu.cms.service.HelpCenterContentService;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.page.PageInfo;
 

edu-cms/src/main/java/com/keao/edu/user/controller/NewsController.java → edu-cms/src/main/java/com/keao/edu/cms/controller/NewsController.java

@@ -1,5 +1,6 @@
-package com.keao.edu.user.controller;
+package com.keao.edu.cms.controller;
 
+import com.keao.edu.cms.controller.queryinfo.NewsInformationQueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -14,9 +15,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.keao.edu.user.controller.queryinfo.NewsInformationQueryInfo;
-import com.keao.edu.user.dal.entity.SysNewsInformation;
-import com.keao.edu.user.service.SysNewsInformationService;
+import com.keao.edu.cms.dal.entity.SysNewsInformation;
+import com.keao.edu.cms.service.SysNewsInformationService;
 import com.keao.edu.common.controller.BaseController;
 
 @RestController

edu-cms/src/main/java/com/keao/edu/user/controller/queryinfo/HelpCenterContentQueryInfo.java → edu-cms/src/main/java/com/keao/edu/cms/controller/queryinfo/HelpCenterContentQueryInfo.java

@@ -1,4 +1,4 @@
-package com.keao.edu.user.controller.queryinfo;
+package com.keao.edu.cms.controller.queryinfo;
 
 import io.swagger.annotations.ApiModelProperty;
 

edu-cms/src/main/java/com/keao/edu/user/controller/queryinfo/NewsInformationQueryInfo.java → edu-cms/src/main/java/com/keao/edu/cms/controller/queryinfo/NewsInformationQueryInfo.java

@@ -1,10 +1,10 @@
-package com.keao.edu.user.controller.queryinfo;
+package com.keao.edu.cms.controller.queryinfo;
 
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
-import com.keao.edu.user.dal.entity.NewsStatusEnum;
+import com.keao.edu.cms.dal.entity.NewsStatusEnum;
 import com.keao.edu.common.page.QueryInfo;
 
 public class NewsInformationQueryInfo extends QueryInfo {

edu-cms/src/main/java/com/keao/edu/user/dal/dao/HelpCenterCatalogDao.java → edu-cms/src/main/java/com/keao/edu/cms/dal/dao/HelpCenterCatalogDao.java

@@ -1,10 +1,10 @@
-package com.keao.edu.user.dal.dao;
+package com.keao.edu.cms.dal.dao;
 
 import java.util.List;
 
+import com.keao.edu.cms.dal.entity.HelpCenterCatalog;
 import org.apache.ibatis.annotations.Param;
 
-import com.keao.edu.user.dal.entity.HelpCenterCatalog;
 import com.keao.edu.common.dal.BaseDAO;
 
 public interface HelpCenterCatalogDao extends BaseDAO<Integer, HelpCenterCatalog> {

edu-cms/src/main/java/com/keao/edu/user/dal/dao/HelpCenterContentDao.java → edu-cms/src/main/java/com/keao/edu/cms/dal/dao/HelpCenterContentDao.java

@@ -1,8 +1,8 @@
-package com.keao.edu.user.dal.dao;
+package com.keao.edu.cms.dal.dao;
 
 import java.util.Map;
 
-import com.keao.edu.user.dal.entity.HelpCenterContent;
+import com.keao.edu.cms.dal.entity.HelpCenterContent;
 import com.keao.edu.common.dal.BaseDAO;
 
 public interface HelpCenterContentDao extends BaseDAO<Integer, HelpCenterContent> {

edu-cms/src/main/java/com/keao/edu/user/dal/dao/SysNewsInformationDao.java → edu-cms/src/main/java/com/keao/edu/cms/dal/dao/SysNewsInformationDao.java

@@ -1,9 +1,9 @@
-package com.keao.edu.user.dal.dao;
+package com.keao.edu.cms.dal.dao;
 
 import java.util.List;
 import java.util.Map;
 
-import com.keao.edu.user.dal.entity.SysNewsInformation;
+import com.keao.edu.cms.dal.entity.SysNewsInformation;
 import com.keao.edu.common.dal.BaseDAO;
 
 public interface SysNewsInformationDao extends BaseDAO<Long, SysNewsInformation> {

edu-cms/src/main/java/com/keao/edu/user/dal/entity/HelpCenterCatalog.java → edu-cms/src/main/java/com/keao/edu/cms/dal/entity/HelpCenterCatalog.java

@@ -1,4 +1,4 @@
-package com.keao.edu.user.dal.entity;
+package com.keao.edu.cms.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 

edu-cms/src/main/java/com/keao/edu/user/dal/entity/HelpCenterContent.java → edu-cms/src/main/java/com/keao/edu/cms/dal/entity/HelpCenterContent.java

@@ -1,4 +1,4 @@
-package com.keao.edu.user.dal.entity;
+package com.keao.edu.cms.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 

edu-cms/src/main/java/com/keao/edu/user/dal/entity/NewsStatusEnum.java → edu-cms/src/main/java/com/keao/edu/cms/dal/entity/NewsStatusEnum.java

@@ -1,4 +1,4 @@
-package com.keao.edu.user.dal.entity;
+package com.keao.edu.cms.dal.entity;
 
 import com.keao.edu.common.enums.BaseEnum;
 

edu-cms/src/main/java/com/keao/edu/user/dal/entity/SysNewsInformation.java → edu-cms/src/main/java/com/keao/edu/cms/dal/entity/SysNewsInformation.java

@@ -1,4 +1,4 @@
-package com.keao.edu.user.dal.entity;
+package com.keao.edu.cms.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

edu-cms/src/main/java/com/keao/edu/user/service/HelpCenterCatalogService.java → edu-cms/src/main/java/com/keao/edu/cms/service/HelpCenterCatalogService.java

@@ -1,8 +1,8 @@
-package com.keao.edu.user.service;
+package com.keao.edu.cms.service;
 
 import java.util.List;
 
-import com.keao.edu.user.dal.entity.HelpCenterCatalog;
+import com.keao.edu.cms.dal.entity.HelpCenterCatalog;
 import com.keao.edu.common.service.BaseService;
 
 public interface HelpCenterCatalogService extends BaseService<Integer, HelpCenterCatalog> {

edu-cms/src/main/java/com/keao/edu/user/service/HelpCenterContentService.java → edu-cms/src/main/java/com/keao/edu/cms/service/HelpCenterContentService.java

@@ -1,6 +1,6 @@
-package com.keao.edu.user.service;
+package com.keao.edu.cms.service;
 
-import com.keao.edu.user.dal.entity.HelpCenterContent;
+import com.keao.edu.cms.dal.entity.HelpCenterContent;
 import com.keao.edu.common.service.BaseService;
 
 public interface HelpCenterContentService extends BaseService<Integer,HelpCenterContent>{

edu-cms/src/main/java/com/keao/edu/user/service/SysNewsInformationService.java → edu-cms/src/main/java/com/keao/edu/cms/service/SysNewsInformationService.java

@@ -1,10 +1,10 @@
-package com.keao.edu.user.service;
+package com.keao.edu.cms.service;
 
 import java.util.List;
 import java.util.Map;
 
-import com.keao.edu.user.controller.queryinfo.NewsInformationQueryInfo;
-import com.keao.edu.user.dal.entity.SysNewsInformation;
+import com.keao.edu.cms.controller.queryinfo.NewsInformationQueryInfo;
+import com.keao.edu.cms.dal.entity.SysNewsInformation;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
 

edu-cms/src/main/java/com/keao/edu/user/service/impl/HelpCenterCatalogServiceImpl.java → edu-cms/src/main/java/com/keao/edu/cms/service/impl/HelpCenterCatalogServiceImpl.java

@@ -1,14 +1,14 @@
-package com.keao.edu.user.service.impl;
+package com.keao.edu.cms.service.impl;
 
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.keao.edu.user.dal.dao.HelpCenterCatalogDao;
-import com.keao.edu.user.dal.entity.HelpCenterCatalog;
-import com.keao.edu.user.service.HelpCenterCatalogService;
-import com.keao.edu.user.service.HelpCenterContentService;
+import com.keao.edu.cms.dal.dao.HelpCenterCatalogDao;
+import com.keao.edu.cms.dal.entity.HelpCenterCatalog;
+import com.keao.edu.cms.service.HelpCenterCatalogService;
+import com.keao.edu.cms.service.HelpCenterContentService;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 

edu-cms/src/main/java/com/keao/edu/user/service/impl/HelpCenterContentServiceImpl.java → edu-cms/src/main/java/com/keao/edu/cms/service/impl/HelpCenterContentServiceImpl.java

@@ -1,4 +1,4 @@
-package com.keao.edu.user.service.impl;
+package com.keao.edu.cms.service.impl;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,9 +6,9 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.keao.edu.user.dal.dao.HelpCenterContentDao;
-import com.keao.edu.user.dal.entity.HelpCenterContent;
-import com.keao.edu.user.service.HelpCenterContentService;
+import com.keao.edu.cms.dal.dao.HelpCenterContentDao;
+import com.keao.edu.cms.dal.entity.HelpCenterContent;
+import com.keao.edu.cms.service.HelpCenterContentService;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 

edu-cms/src/main/java/com/keao/edu/user/service/impl/SysNewsInformationServiceImpl.java → edu-cms/src/main/java/com/keao/edu/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -1,19 +1,19 @@
-package com.keao.edu.user.service.impl;
+package com.keao.edu.cms.service.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.keao.edu.cms.controller.queryinfo.NewsInformationQueryInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import com.keao.edu.user.controller.queryinfo.NewsInformationQueryInfo;
-import com.keao.edu.user.dal.dao.SysNewsInformationDao;
-import com.keao.edu.user.dal.entity.NewsStatusEnum;
-import com.keao.edu.user.dal.entity.SysNewsInformation;
-import com.keao.edu.user.service.SysNewsInformationService;
+import com.keao.edu.cms.dal.dao.SysNewsInformationDao;
+import com.keao.edu.cms.dal.entity.NewsStatusEnum;
+import com.keao.edu.cms.dal.entity.SysNewsInformation;
+import com.keao.edu.cms.service.SysNewsInformationService;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.page.QueryInfo;

edu-cms/src/main/resources/application.yml

@@ -7,7 +7,7 @@ server:
       directory: /var/logs
       file-date-format: -yyyy-MM-dd
       pattern: common
-      prefix: tomcat-user
+      prefix: tomcat-cms
       rename-on-rotate: false
       request-attributes-enabled: false
       rotate: true
@@ -22,13 +22,13 @@ eureka:
 
 spring:
   application:
-    name: user-server
+    name: cms-server
     
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    username: mec_dev
-    password: mec_dev
+    url: jdbc:mysql://47.99.212.176:3306/edu_saas_test?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    username: edu_saas
+    password: edu_saas
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver

edu-cms/src/main/resources/config/mybatis/HelpCenterCatalogMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.keao.edu.user.dal.dao.HelpCenterCatalogDao">
-	<resultMap id="HelpCenterCatalog" type="com.keao.edu.user.dal.entity.HelpCenterCatalog">
+<mapper namespace="com.keao.edu.cms.dal.dao.HelpCenterCatalogDao">
+	<resultMap id="HelpCenterCatalog" type="com.keao.edu.cms.dal.entity.HelpCenterCatalog">
 		<id column="id_" property="id" jdbcType="INTEGER" />
 		<result column="parent_id_" property="parentId" jdbcType="INTEGER" />
 		<result column="name_" property="text" jdbcType="VARCHAR" />
@@ -56,7 +56,7 @@
 		where id_ in #{ids}
 	</delete>
 	
-	<insert id="insert" parameterType="com.keao.edu.user.dal.entity.HelpCenterCatalog">
+	<insert id="insert" parameterType="com.keao.edu.cms.dal.entity.HelpCenterCatalog">
 		insert into help_center_catalog (id_, parent_id_, name_,
 		description_, create_on_, modify_on_,
 		order_,status_)
@@ -66,7 +66,7 @@
 		#{order,jdbcType=INTEGER},#{status,jdbcType=INTEGER})
 	</insert>
 	
-	<update id="update" parameterType="com.keao.edu.user.dal.entity.HelpCenterCatalog">
+	<update id="update" parameterType="com.keao.edu.cms.dal.entity.HelpCenterCatalog">
 		update help_center_catalog
 		<set>
 			<if test="parentId != null">

edu-cms/src/main/resources/config/mybatis/HelpCenterContentMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.keao.edu.user.dal.dao.HelpCenterContentDao">
-	<resultMap id="HelpCenterContent" type="com.keao.edu.user.dal.entity.HelpCenterContent">
+<mapper namespace="com.keao.edu.cms.dal.dao.HelpCenterContentDao">
+	<resultMap id="HelpCenterContent" type="com.keao.edu.cms.dal.entity.HelpCenterContent">
 		<id column="id_" property="id" jdbcType="INTEGER" />
 		<result column="title_" property="title" jdbcType="VARCHAR" />
 		<result column="create_on_" property="createOn" jdbcType="TIMESTAMP" />
@@ -10,14 +10,14 @@
 		<result column="order_" property="order" jdbcType="INTEGER" />
 		<result column="catalog_id_" property="catalogId" jdbcType="INTEGER" />
 		<association property="catalog" 
-			javaType="com.keao.edu.user.dal.entity.HelpCenterCatalog">
+			javaType="com.keao.edu.cms.dal.entity.HelpCenterCatalog">
 			<result column="catalog_id_" property="id" />
 			<result column="name_" property="text" />
 			<result column="parent_id_" property="parentId" />
 		</association>
 	</resultMap>
 
-	<resultMap id="HelpCenterContentBlobs" type="com.keao.edu.user.dal.entity.HelpCenterContent"
+	<resultMap id="HelpCenterContentBlobs" type="com.keao.edu.cms.dal.entity.HelpCenterContent"
 		extends="HelpCenterContent">
 		<result column="content_" property="content" jdbcType="LONGVARCHAR" />
 	</resultMap>
@@ -87,7 +87,7 @@
 		where catalog_id_ = #{catalogId,jdbcType=INTEGER}
 	</delete>
 
-	<insert id="insert" parameterType="com.keao.edu.user.dal.entity.HelpCenterContent">
+	<insert id="insert" parameterType="com.keao.edu.cms.dal.entity.HelpCenterContent">
 		insert into help_center_content
 		(id_, title_, catalog_id_,
 		create_on_, modify_on_, content_,status_,order_
@@ -100,7 +100,7 @@
 		)
 	</insert>
 
-	<update id="update" parameterType="com.keao.edu.user.dal.entity.HelpCenterContent">
+	<update id="update" parameterType="com.keao.edu.cms.dal.entity.HelpCenterContent">
 		update help_center_content
 		<set>
 			<if test="title != null">
@@ -128,7 +128,7 @@
 		where id_ = #{id,jdbcType=INTEGER}
 	</update>
 
-	<update id="updateBlobs" parameterType="com.keao.edu.user.dal.entity.HelpCenterContent">
+	<update id="updateBlobs" parameterType="com.keao.edu.cms.dal.entity.HelpCenterContent">
 		update help_center_content
 		set title_ = #{title,jdbcType=VARCHAR},
 		catalog_id_ =
@@ -144,7 +144,7 @@
 		where id_ = #{id,jdbcType=INTEGER}
 	</update>
 
-	<update id="updateByKey" parameterType="com.keao.edu.user.dal.entity.HelpCenterContent">
+	<update id="updateByKey" parameterType="com.keao.edu.cms.dal.entity.HelpCenterContent">
 		update help_center_content
 		set title_ = #{title,jdbcType=VARCHAR},
 		catalog_id_ =

edu-cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -4,9 +4,9 @@
 这个文件是自动生成的。
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
-<mapper namespace="com.keao.edu.user.dal.dao.SysNewsInformationDao">
+<mapper namespace="com.keao.edu.cms.dal.dao.SysNewsInformationDao">
 	
-	<resultMap type="com.keao.edu.user.dal.entity.SysNewsInformation" id="SysNewsInformation">
+	<resultMap type="com.keao.edu.cms.dal.entity.SysNewsInformation" id="SysNewsInformation">
 		<result column="id_" property="id" />
 		<result column="title_" property="title" />
 		<result column="content_" property="content" />
@@ -55,13 +55,13 @@
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.keao.edu.user.dal.entity.SysNewsInformation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+	<insert id="insert" parameterType="com.keao.edu.cms.dal.entity.SysNewsInformation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,type_,status_,create_time_,update_time_,link_url_,href_target_,order_,del_flag_,memo_,tenant_id_)
 		VALUES(#{id},#{title},#{content},#{coverImage},#{type},#{status, typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order},0,#{memo},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.keao.edu.user.dal.entity.SysNewsInformation">
+	<update id="update" parameterType="com.keao.edu.cms.dal.entity.SysNewsInformation">
 		UPDATE sys_news_information
 		<set>
 			<if test="status != null">

edu-im/edu-im-server/src/main/java/com/ym/SealClassApplication.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/SealClassApplication.java

@@ -1,4 +1,4 @@
-package com.ym;
+package com.keao.edu.im;
 
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
@@ -8,6 +8,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -17,8 +18,9 @@ import org.springframework.web.client.RestTemplate;
 @EnableAspectJAutoProxy
 @Slf4j
 @SpringBootApplication
-@EnableFeignClients("com.ym.mec")
-@MapperScan("com.ym.mec.biz.dal.dao")
+@EnableFeignClients("com.keao.edu")
+@MapperScan("com.keao.edu.common.dal.dao")
+@ComponentScan("com.keao.edu")
 @EnableScheduling
 @EnableDiscoveryClient
 @Configuration

edu-im/edu-im-server/src/main/java/com/ym/SealClassConfiguration.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/SealClassConfiguration.java

@@ -1,16 +1,14 @@
-package com.ym;
+package com.keao.edu.im;
 
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import com.ym.filter.GlobalExceptionHandlerAdvice;
+import com.keao.edu.im.filter.GlobalExceptionHandlerAdvice;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;

edu-im/edu-im-server/src/main/java/com/ym/common/ApiException.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/common/ApiException.java

@@ -1,4 +1,4 @@
-package com.ym.common;
+package com.keao.edu.im.common;
 
 /**
  * Created by weiqinxiao on 2019/2/26.

edu-im/edu-im-server/src/main/java/com/ym/common/BaseResponse.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/common/BaseResponse.java

@@ -1,9 +1,9 @@
-package com.ym.common;
+package com.keao.edu.im.common;
 
 import lombok.Getter;
 import lombok.Setter;
 
-import static com.ym.common.ErrorEnum.ERR_SUCCESS;
+import static com.keao.edu.im.common.ErrorEnum.ERR_SUCCESS;
 
 /**
  * Created by weiqinxiao on 2019/2/25.

edu-im/edu-im-server/src/main/java/com/ym/common/DisplayEnum.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/common/DisplayEnum.java

@@ -1,4 +1,4 @@
-package com.ym.common;
+package com.keao.edu.im.common;
 
 // Display 定义格式如下：
 // display://type=1?userId=xxx?uri=xxxxx

edu-im/edu-im-server/src/main/java/com/ym/common/ErrorEnum.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/common/ErrorEnum.java

@@ -1,4 +1,4 @@
-package com.ym.common;
+package com.keao.edu.im.common;
 
 import lombok.Getter;
 

edu-im/edu-im-server/src/main/java/com/ym/common/UserAgentTypeEnum.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/common/UserAgentTypeEnum.java

@@ -1,4 +1,4 @@
-package com.ym.common;
+package com.keao.edu.im.common;
 
 import lombok.AccessLevel;
 import lombok.Getter;

edu-im/edu-im-server/src/main/java/com/ym/config/IMProperties.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/config/IMProperties.java

@@ -1,4 +1,4 @@
-package com.ym.config;
+package com.keao.edu.im.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

edu-im/edu-im-server/src/main/java/com/ym/config/ResourceServerConfig.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/config/ResourceServerConfig.java

@@ -1,4 +1,4 @@
-package com.ym.config;
+package com.keao.edu.im.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;

edu-im/edu-im-server/src/main/java/com/ym/config/RoomProperties.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/config/RoomProperties.java

@@ -1,4 +1,4 @@
-package com.ym.config;
+package com.keao.edu.im.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

edu-im/edu-im-server/src/main/java/com/ym/config/WebMvcConfig.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package com.ym.config;
+package com.keao.edu.im.config;
 
 import java.io.IOException;
 import java.text.ParseException;

edu-im/edu-im-server/src/main/java/com/ym/config/WhiteBoardProperties.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/config/WhiteBoardProperties.java

@@ -1,4 +1,4 @@
-package com.ym.config;
+package com.keao.edu.im.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

edu-im/edu-im-server/src/main/java/com/ym/controller/BlackListController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/BlackListController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.UserService;
+import com.keao.edu.im.service.UserService;
 import io.rong.models.user.UserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

edu-im/edu-im-server/src/main/java/com/ym/controller/BlockController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/BlockController.java

@@ -1,4 +1,4 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
 import io.rong.models.user.UserModel;
 
@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.service.UserService;
+import com.keao.edu.im.service.UserService;
 
 /**
  * Created by weiqinxiao on 2019/2/25.

edu-im/edu-im-server/src/main/java/com/ym/controller/ChatroomController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/ChatroomController.java

@@ -1,7 +1,7 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.ChatroomService;
-import com.ym.service.MessageService;
+import com.keao.edu.im.service.ChatroomService;
+import com.keao.edu.im.service.MessageService;
 import io.rong.models.chatroom.ChatroomMember;
 import io.rong.models.chatroom.ChatroomModel;
 import io.rong.models.message.ChatroomMessage;

edu-im/edu-im-server/src/main/java/com/ym/controller/ConversationController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/ConversationController.java

@@ -1,4 +1,4 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
 import io.rong.models.conversation.ConversationModel;
 
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.keao.edu.common.controller.BaseController;
-import com.ym.service.GroupService;
+import com.keao.edu.im.service.GroupService;
 
 /**
  * Created by weiqinxiao on 2019/2/25.

edu-im/edu-im-server/src/main/java/com/ym/controller/DemotionController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/DemotionController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.ChatroomService;
+import com.keao.edu.im.service.ChatroomService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

edu-im/edu-im-server/src/main/java/com/ym/controller/DistributeController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/DistributeController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.ChatroomService;
+import com.keao.edu.im.service.ChatroomService;
 import io.rong.models.chatroom.ChatroomModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

edu-im/edu-im-server/src/main/java/com/ym/controller/GroupController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/GroupController.java

@@ -1,7 +1,7 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.GroupService;
-import com.ym.service.MessageService;
+import com.keao.edu.im.service.GroupService;
+import com.keao.edu.im.service.MessageService;
 import io.rong.models.group.GroupMember;
 import io.rong.models.group.GroupModel;
 import io.rong.models.group.UserGroup;

edu-im/edu-im-server/src/main/java/com/ym/controller/HereWhiteController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/HereWhiteController.java

@@ -1,4 +1,4 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.keao.edu.common.controller.BaseController;
-import com.ym.service.HereWhiteService;
+import com.keao.edu.im.service.HereWhiteService;
 
 @RestController
 @RequestMapping("/hereWhite")

edu-im/edu-im-server/src/main/java/com/ym/controller/HistoryController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/HistoryController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.MessageService;
+import com.keao.edu.im.service.MessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

edu-im/edu-im-server/src/main/java/com/ym/controller/KeepAliveController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/KeepAliveController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.ChatroomService;
+import com.keao.edu.im.service.ChatroomService;
 import io.rong.models.chatroom.ChatroomModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

edu-im/edu-im-server/src/main/java/com/ym/controller/MuteAllMembersController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/MuteAllMembersController.java

@@ -1,4 +1,4 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.service.GroupService;
+import com.keao.edu.im.service.GroupService;
 
 /**
  * Created by weiqinxiao on 2019/2/25.

edu-im/edu-im-server/src/main/java/com/ym/controller/MuteChatroomsController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/MuteChatroomsController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.UserService;
+import com.keao.edu.im.service.UserService;
 import io.rong.models.chatroom.ChatroomModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

edu-im/edu-im-server/src/main/java/com/ym/controller/MuteGroupsController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/MuteGroupsController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.UserService;
+import com.keao.edu.im.service.UserService;
 import io.rong.models.group.GroupModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

edu-im/edu-im-server/src/main/java/com/ym/controller/MuteMembersController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/MuteMembersController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.GroupService;
+import com.keao.edu.im.service.GroupService;
 import io.rong.models.group.GroupModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

edu-im/edu-im-server/src/main/java/com/ym/controller/MuteWhiteController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/MuteWhiteController.java

@@ -1,4 +1,4 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
 import io.rong.models.group.GroupModel;
 
@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.service.GroupService;
+import com.keao.edu.im.service.GroupService;
 
 /**
  * Created by weiqinxiao on 2019/2/25.

edu-im/edu-im-server/src/main/java/com/ym/controller/PrivateController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/PrivateController.java

@@ -1,4 +1,4 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
 import io.rong.messages.TxtMessage;
 import io.rong.models.message.PrivateMessage;
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.keao.edu.im.api.entity.ImPrivateMessage;
 import com.keao.edu.im.api.entity.ImTxtMessage;
-import com.ym.service.MessageService;
+import com.keao.edu.im.service.MessageService;
 
 /**
  * Created by weiqinxiao on 2019/2/25.

edu-im/edu-im-server/src/main/java/com/ym/controller/PushController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/PushController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.MessageService;
+import com.keao.edu.im.service.MessageService;
 import io.rong.models.push.BroadcastModel;
 import io.rong.models.push.PushModel;
 import org.springframework.beans.factory.annotation.Autowired;

edu-im/edu-im-server/src/main/java/com/ym/controller/RoomController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/RoomController.java

@@ -1,4 +1,4 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
 import java.util.List;
 
@@ -13,24 +13,24 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONObject;
 import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.ym.common.ApiException;
-import com.ym.common.BaseResponse;
-import com.ym.common.ErrorEnum;
-import com.ym.pojo.ChannelStateNotify;
-import com.ym.pojo.DeviceTypeEnum;
-import com.ym.pojo.PlayMidiMessageData;
-import com.ym.pojo.ReqChangeRole;
-import com.ym.pojo.ReqChangeUserRoleData;
-import com.ym.pojo.ReqDeviceControlData;
-import com.ym.pojo.ReqDisplayData;
-import com.ym.pojo.ReqMemberOnlineStatus;
-import com.ym.pojo.ReqSpeechData;
-import com.ym.pojo.ReqUpgradeRoleData;
-import com.ym.pojo.ReqUserData;
-import com.ym.pojo.ReqWhiteboardData;
-import com.ym.pojo.RoomResult;
-import com.ym.service.MessageService;
-import com.ym.service.RoomService;
+import com.keao.edu.im.common.ApiException;
+import com.keao.edu.im.common.BaseResponse;
+import com.keao.edu.im.common.ErrorEnum;
+import com.keao.edu.im.pojo.ChannelStateNotify;
+import com.keao.edu.im.pojo.DeviceTypeEnum;
+import com.keao.edu.im.pojo.PlayMidiMessageData;
+import com.keao.edu.im.pojo.ReqChangeRole;
+import com.keao.edu.im.pojo.ReqChangeUserRoleData;
+import com.keao.edu.im.pojo.ReqDeviceControlData;
+import com.keao.edu.im.pojo.ReqDisplayData;
+import com.keao.edu.im.pojo.ReqMemberOnlineStatus;
+import com.keao.edu.im.pojo.ReqSpeechData;
+import com.keao.edu.im.pojo.ReqUpgradeRoleData;
+import com.keao.edu.im.pojo.ReqUserData;
+import com.keao.edu.im.pojo.ReqWhiteboardData;
+import com.keao.edu.im.pojo.RoomResult;
+import com.keao.edu.im.service.MessageService;
+import com.keao.edu.im.service.RoomService;
 
 /**
  * Created by weiqinxiao on 2019/2/25.

edu-im/edu-im-server/src/main/java/com/ym/controller/SensitiveController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/SensitiveController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.ChatroomService;
+import com.keao.edu.im.service.ChatroomService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

edu-im/edu-im-server/src/main/java/com/ym/controller/SystemController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/SystemController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.MessageService;
+import com.keao.edu.im.service.MessageService;
 import io.rong.models.message.BroadcastMessage;
 import io.rong.models.message.SystemMessage;
 import io.rong.models.message.TemplateMessage;

edu-im/edu-im-server/src/main/java/com/ym/controller/TagController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/TagController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.UserService;
+import com.keao.edu.im.service.UserService;
 import io.rong.models.user.BatchTagModel;
 import io.rong.models.user.GetTagModel;
 import io.rong.models.user.TagModel;

edu-im/edu-im-server/src/main/java/com/ym/controller/UserController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/UserController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.UserService;
+import com.keao.edu.im.service.UserService;
 import io.rong.models.user.UserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

edu-im/edu-im-server/src/main/java/com/ym/controller/WhitelistController.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/WhitelistController.java

@@ -1,6 +1,6 @@
-package com.ym.controller;
+package com.keao.edu.im.controller;
 
-import com.ym.service.ChatroomService;
+import com.keao.edu.im.service.ChatroomService;
 import io.rong.models.chatroom.ChatroomModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

edu-im/edu-im-server/src/main/java/com/ym/dao/HereWhiteDao.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/dao/HereWhiteDao.java

@@ -1,6 +1,6 @@
-package com.ym.dao;
+package com.keao.edu.im.dao;
 
-import com.ym.pojo.HereWhite;
+import com.keao.edu.im.pojo.HereWhite;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

edu-im/edu-im-server/src/main/java/com/ym/dao/RoomDao.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/dao/RoomDao.java

@@ -1,14 +1,12 @@
-package com.ym.dao;
+package com.keao.edu.im.dao;
 
-import com.ym.pojo.Room;
+import com.keao.edu.im.pojo.Room;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.LockModeType;
 import java.util.List;
 
 /**

edu-im/edu-im-server/src/main/java/com/ym/dao/RoomMemberDao.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/dao/RoomMemberDao.java

@@ -1,6 +1,6 @@
-package com.ym.dao;
+package com.keao.edu.im.dao;
 
-import com.ym.pojo.RoomMember;
+import com.keao.edu.im.pojo.RoomMember;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.Modifying;

edu-im/edu-im-server/src/main/java/com/ym/dao/SpeechDao.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/dao/SpeechDao.java

@@ -1,6 +1,6 @@
-package com.ym.dao;
+package com.keao.edu.im.dao;
 
-import com.ym.pojo.ScheduledTaskInfo;
+import com.keao.edu.im.pojo.ScheduledTaskInfo;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 

edu-im/edu-im-server/src/main/java/com/ym/dao/UserDao.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/dao/UserDao.java

@@ -1,6 +1,6 @@
-package com.ym.dao;
+package com.keao.edu.im.dao;
 
-import com.ym.pojo.UserInfo;
+import com.keao.edu.im.pojo.UserInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.stereotype.Repository;

edu-im/edu-im-server/src/main/java/com/ym/dao/WhiteboardDao.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/dao/WhiteboardDao.java

@@ -1,6 +1,6 @@
-package com.ym.dao;
+package com.keao.edu.im.dao;
 
-import com.ym.pojo.Whiteboard;
+import com.keao.edu.im.pojo.Whiteboard;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

edu-im/edu-im-server/src/main/java/com/ym/filter/GlobalExceptionHandlerAdvice.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/filter/GlobalExceptionHandlerAdvice.java

@@ -1,12 +1,12 @@
-package com.ym.filter;
+package com.keao.edu.im.filter;
 
 /**
  * Created by weiqinxiao on 2019/2/26.
  */
 
-import com.ym.common.ApiException;
-import com.ym.common.BaseResponse;
-import com.ym.common.ErrorEnum;
+import com.keao.edu.im.common.ApiException;
+import com.keao.edu.im.common.BaseResponse;
+import com.keao.edu.im.common.ErrorEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.ConversionNotSupportedException;
 import org.springframework.beans.TypeMismatchException;

edu-im/edu-im-server/src/main/java/com/ym/http/HttpHelper.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/http/HttpHelper.java

@@ -1,7 +1,7 @@
-package com.ym.http;
+package com.keao.edu.im.http;
 
-import com.ym.config.IMProperties;
-import com.ym.utils.CodeUtil;
+import com.keao.edu.im.config.IMProperties;
+import com.keao.edu.im.utils.CodeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

edu-im/edu-im-server/src/main/java/com/ym/job/ScheduleManager.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/job/ScheduleManager.java

@@ -1,15 +1,15 @@
-package com.ym.job;
-
-import com.ym.common.ApiException;
-import com.ym.common.ErrorEnum;
-import com.ym.config.RoomProperties;
-import com.ym.config.WhiteBoardProperties;
-import com.ym.dao.RoomDao;
-import com.ym.dao.RoomMemberDao;
-import com.ym.mec.im.IMHelper;
-import com.ym.mec.im.message.TicketExpiredMessage;
-import com.ym.pojo.ScheduledTaskInfo;
-import com.ym.service.RoomService;
+package com.keao.edu.im.job;
+
+import com.keao.edu.im.common.ApiException;
+import com.keao.edu.im.common.ErrorEnum;
+import com.keao.edu.im.config.RoomProperties;
+import com.keao.edu.im.config.WhiteBoardProperties;
+import com.keao.edu.im.mec.im.IMHelper;
+import com.keao.edu.im.mec.im.message.TicketExpiredMessage;
+import com.keao.edu.im.pojo.ScheduledTaskInfo;
+import com.keao.edu.im.service.RoomService;
+import com.keao.edu.im.dao.RoomDao;
+import com.keao.edu.im.dao.RoomMemberDao;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.SchedulingConfigurer;

edu-im/edu-im-server/src/main/java/com/ym/job/ScheduledDelayTask.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/job/ScheduledDelayTask.java

@@ -1,6 +1,6 @@
-package com.ym.job;
+package com.keao.edu.im.job;
 
-import com.ym.pojo.ScheduledTaskInfo;
+import com.keao.edu.im.pojo.ScheduledTaskInfo;
 import lombok.Getter;
 import org.springframework.scheduling.config.FixedDelayTask;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/BaseMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/BaseMessage.java

@@ -1,4 +1,4 @@
-package com.ym.mec.im;
+package com.keao.edu.im.mec.im;
 
 import com.alibaba.fastjson.JSONObject;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/IMHelper.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/IMHelper.java

@@ -1,9 +1,9 @@
-package com.ym.mec.im;
+package com.keao.edu.im.mec.im;
 
 import com.alibaba.fastjson.JSON;
-import com.ym.http.HttpHelper;
-import com.ym.pojo.IMApiResultInfo;
-import com.ym.pojo.IMTokenInfo;
+import com.keao.edu.im.http.HttpHelper;
+import com.keao.edu.im.pojo.IMApiResultInfo;
+import com.keao.edu.im.pojo.IMTokenInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

edu-im/edu-im-server/src/main/java/com/ym/mec/im/message/ApplyForSpeechMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/message/ApplyForSpeechMessage.java

@@ -1,6 +1,6 @@
-package com.ym.mec.im.message;
+package com.keao.edu.im.mec.im.message;
 
-import com.ym.mec.im.BaseMessage;
+import com.keao.edu.im.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/message/AssistantTransferMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/message/AssistantTransferMessage.java

@@ -1,6 +1,6 @@
-package com.ym.mec.im.message;
+package com.keao.edu.im.mec.im.message;
 
-import com.ym.mec.im.BaseMessage;
+import com.keao.edu.im.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/message/ControlDeviceNotifyMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/message/ControlDeviceNotifyMessage.java

@@ -1,6 +1,6 @@
-package com.ym.mec.im.message;
+package com.keao.edu.im.mec.im.message;
 
-import com.ym.mec.im.BaseMessage;
+import com.keao.edu.im.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/message/DeviceStateChangedMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/message/DeviceStateChangedMessage.java

@@ -1,6 +1,6 @@
-package com.ym.mec.im.message;
+package com.keao.edu.im.mec.im.message;
 
-import com.ym.mec.im.BaseMessage;
+import com.keao.edu.im.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/message/DisplayMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/message/DisplayMessage.java

@@ -1,6 +1,6 @@
-package com.ym.mec.im.message;
+package com.keao.edu.im.mec.im.message;
 
-import com.ym.mec.im.BaseMessage;
+import com.keao.edu.im.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/message/MemberChangedMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/message/MemberChangedMessage.java

@@ -1,6 +1,6 @@
-package com.ym.mec.im.message;
+package com.keao.edu.im.mec.im.message;
 
-import com.ym.mec.im.BaseMessage;
+import com.keao.edu.im.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/message/RoleChangedMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/message/RoleChangedMessage.java

@@ -1,6 +1,6 @@
-package com.ym.mec.im.message;
+package com.keao.edu.im.mec.im.message;
 
-import com.ym.mec.im.BaseMessage;
+import com.keao.edu.im.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/message/SpeechResultMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/message/SpeechResultMessage.java

@@ -1,6 +1,6 @@
-package com.ym.mec.im.message;
+package com.keao.edu.im.mec.im.message;
 
-import com.ym.mec.im.BaseMessage;
+import com.keao.edu.im.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/message/TicketExpiredMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/message/TicketExpiredMessage.java

@@ -1,6 +1,6 @@
-package com.ym.mec.im.message;
+package com.keao.edu.im.mec.im.message;
 
-import com.ym.mec.im.BaseMessage;
+import com.keao.edu.im.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/message/TurnPageMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/message/TurnPageMessage.java

@@ -1,6 +1,6 @@
-package com.ym.mec.im.message;
+package com.keao.edu.im.mec.im.message;
 
-import com.ym.mec.im.BaseMessage;
+import com.keao.edu.im.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/message/UpgradeRoleMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/message/UpgradeRoleMessage.java

@@ -1,6 +1,6 @@
-package com.ym.mec.im.message;
+package com.keao.edu.im.mec.im.message;
 
-import com.ym.mec.im.BaseMessage;
+import com.keao.edu.im.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

edu-im/edu-im-server/src/main/java/com/ym/mec/im/message/WhiteboardMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/message/WhiteboardMessage.java

@@ -1,6 +1,6 @@
-package com.ym.mec.im.message;
+package com.keao.edu.im.mec.im.message;
 
-import com.ym.mec.im.BaseMessage;
+import com.keao.edu.im.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

edu-im/edu-im-server/src/main/java/com/ym/pojo/ActionEnum.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/ActionEnum.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 /**
  * Created by weiqinxiao on 2019/3/19.

edu-im/edu-im-server/src/main/java/com/ym/pojo/ChannelStateNotify.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/ChannelStateNotify.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 import java.util.ArrayList;
 import java.util.List;

edu-im/edu-im-server/src/main/java/com/ym/pojo/ControlDeviceTaskInfo.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/ControlDeviceTaskInfo.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 import lombok.Data;
 

edu-im/edu-im-server/src/main/java/com/ym/pojo/CustomGroupMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/CustomGroupMessage.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 import com.alibaba.fastjson.JSONObject;
 import io.rong.models.message.GroupMessage;

edu-im/edu-im-server/src/main/java/com/ym/pojo/CustomMessage.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/CustomMessage.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 import io.rong.messages.BaseMessage;
 import org.apache.commons.lang3.StringUtils;

edu-im/edu-im-server/src/main/java/com/ym/pojo/DeviceTypeEnum.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/DeviceTypeEnum.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 /**
  * Created by weiqinxiao on 2019/3/19.

edu-im/edu-im-server/src/main/java/com/ym/pojo/HereWhite.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/HereWhite.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 import lombok.Getter;
 import lombok.Setter;

edu-im/edu-im-server/src/main/java/com/ym/pojo/IMApiResultInfo.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/IMApiResultInfo.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 import lombok.Data;
 

edu-im/edu-im-server/src/main/java/com/ym/pojo/IMTokenInfo.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/IMTokenInfo.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 import lombok.Data;
 

edu-im/edu-im-server/src/main/java/com/ym/pojo/Member.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/Member.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 import com.alibaba.fastjson.JSONObject;
 

edu-im/edu-im-server/src/main/java/com/ym/pojo/PlayMidiMessageData.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/PlayMidiMessageData.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 import lombok.Data;
 

edu-im/edu-im-server/src/main/java/com/ym/pojo/ReqChangeRole.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/ReqChangeRole.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 import lombok.Data;
 

edu-im/edu-im-server/src/main/java/com/ym/pojo/ReqChangeUserRoleData.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/ReqChangeUserRoleData.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 import lombok.Data;
 

edu-im/edu-im-server/src/main/java/com/ym/pojo/ReqDeviceControlData.java → edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/ReqDeviceControlData.java

@@ -1,4 +1,4 @@
-package com.ym.pojo;
+package com.keao.edu.im.pojo;
 
 import lombok.Data;