add

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

@@ -65,7 +65,7 @@ spring:
         min-idle: 1
 
 mybatis:
-  mapperLocations: classpath:config/mybatis/*.xml
+  mapperLocations: classpath:config/config/*.xml
 
 swagger:
   base-package: 'com.keao.edu.auth.web.controller'
@@ -92,4 +92,4 @@ message:
 
 auth:
   sysconfig:
-    tenantId: 1
+    tenantId: 1

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

@@ -48,7 +48,7 @@ spring:
     
 
 mybatis:
-    mapperLocations: classpath:config/mybatis/*.xml
+    mapperLocations: classpath:config/config/*.xml
     
 swagger:
   base-package: com.keao.edu.cms.controller
@@ -76,4 +76,4 @@ management:
 
 ribbon:  
     ReadTimeout: 60000  
-    ConnectTimeout: 60000
+    ConnectTimeout: 60000

edu-datasource/src/main/java/com/keao/edu/datasource/DataSourceConfig.java

@@ -20,7 +20,7 @@ import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 
 @EnableTransactionManagement
 @Configuration
-@MapperScan("com.keao.edu.*.dal.dao")
+@MapperScan("com.keao.edu.*.dao")
 public class DataSourceConfig {
 
 	@Bean("master")
@@ -47,7 +47,7 @@ public class DataSourceConfig {
 		// 配置动态数据源，如果没有将 dynamicDataSource 作为数据源则不能实现切换
 		sqlSessionFactoryBean.setDataSource(dynamicDataSource());
 		sqlSessionFactoryBean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:config/mybatis/*.xml"));
-		sqlSessionFactoryBean.setTypeAliasesPackage("com.keao.edu.*.dal.entity,com.keao.edu.*.entity");
+		sqlSessionFactoryBean.setTypeAliasesPackage("com.keao.edu.*.entity");
 
 		return sqlSessionFactoryBean;
 	}

edu-datasource/src/main/java/com/keao/edu/datasource/dal/dao/DatabaseSourceDao.java → edu-datasource/src/main/java/com/keao/edu/datasource/dao/DatabaseSourceDao.java

@@ -1,9 +1,9 @@
-package com.keao.edu.datasource.dal.dao;
+package com.keao.edu.datasource.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.datasource.dal.entity.DatabaseSource;
+import com.keao.edu.datasource.entity.DatabaseSource;
 
 public interface DatabaseSourceDao extends BaseDAO<Integer, DatabaseSource> {
 
 	
-}
+}

edu-datasource/src/main/java/com/keao/edu/datasource/dal/entity/DatabaseSource.java → edu-datasource/src/main/java/com/keao/edu/datasource/entity/DatabaseSource.java

@@ -1,4 +1,4 @@
-package com.keao.edu.datasource.dal.entity;
+package com.keao.edu.datasource.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

edu-datasource/src/main/java/com/keao/edu/datasource/service/DatabaseSourceService.java

@@ -1,8 +1,8 @@
 package com.keao.edu.datasource.service;
 
 import com.keao.edu.common.service.BaseService;
-import com.keao.edu.datasource.dal.entity.DatabaseSource;
+import com.keao.edu.datasource.entity.DatabaseSource;
 
 public interface DatabaseSourceService extends BaseService<Integer, DatabaseSource> {
 
-}
+}

edu-datasource/src/main/java/com/keao/edu/datasource/service/impl/DatabaseSourceServiceImpl.java

@@ -15,8 +15,8 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.datasource.DynamicRoutingDataSource;
-import com.keao.edu.datasource.dal.dao.DatabaseSourceDao;
-import com.keao.edu.datasource.dal.entity.DatabaseSource;
+import com.keao.edu.datasource.dao.DatabaseSourceDao;
+import com.keao.edu.datasource.entity.DatabaseSource;
 import com.keao.edu.datasource.service.DatabaseSourceService;
 
 @Service
@@ -65,4 +65,4 @@ public class DatabaseSourceServiceImpl extends BaseServiceImpl<Integer, Database
 		dynamicDataSource.afterPropertiesSet();
 	}
 
-}
+}

edu-datasource/src/main/resources/config/mybatis/DatabaseSourceMapper.xml

@@ -1,9 +1,9 @@
 <?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.datasource.dal.dao.DatabaseSourceDao">
+<mapper namespace="com.keao.edu.datasource.dao.DatabaseSourceDao">
 
-	<resultMap type="com.keao.edu.datasource.dal.entity.DatabaseSource"
+	<resultMap type="com.keao.edu.datasource.entity.DatabaseSource"
 		id="DatabaseSource">
 		<result column="id_" property="id" />
 		<result column="tenant_id_" property="tenantId" />
@@ -30,7 +30,7 @@
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.keao.edu.datasource.dal.entity.DatabaseSource"
+	<insert id="insert" parameterType="com.keao.edu.datasource.entity.DatabaseSource"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
@@ -40,7 +40,7 @@
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.keao.edu.datasource.dal.entity.DatabaseSource">
+	<update id="update" parameterType="com.keao.edu.datasource.entity.DatabaseSource">
 		UPDATE database_source
 		<set>
 			<if test="driver != null">

edu-im/edu-im-server/src/main/resources/logback-spring.xml

@@ -27,10 +27,10 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="DEBUG" />
+	<logger name="com.keao.edu" level="DEBUG" />
 	<root level="DEBUG">
 		<appender-ref ref="stdout" />
 		<appender-ref ref="file" />
 	</root>
 
-</configuration>
+</configuration>

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

@@ -68,7 +68,7 @@ spring:
       min-idle: 0
 
 mybatis:
-  mapperLocations: classpath:config/mybatis/*.xml
+  mapperLocations: classpath:config/config/*.xml
 
 task:
   configLocation: classpath:config/properties/quartz.properties
@@ -90,4 +90,4 @@ swagger:
 
 ribbon:
   ReadTimeout: 60000
-  ConnectTimeout: 60000
+  ConnectTimeout: 60000

edu-task/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="INFO" />
+	<logger name="com.keao.edu" level="INFO" />
 
 	<!--开发环境:打印控制台 -->
 	<springProfile name="dev">
@@ -52,4 +52,4 @@
 		</root>
 	</springProfile>
 
-</configuration>
+</configuration>

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/SysConfigDao.java

@@ -10,7 +10,7 @@ public interface SysConfigDao extends BaseDAO<Long, SysConfig> {
      * @Author: Joburgess
      * @Date: 2019/10/9
      * @params [paramName]
-     * @return com.ym.mec.biz.dal.entity.SysConfig
+     * @return com.keao.edu.biz.dal.entity.SysConfig
      * @describe 根据配置名称获取配置信息
      */
     SysConfig findByParamName(String paramName);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/SysConfigService.java

@@ -7,7 +7,7 @@ import com.keao.edu.common.service.BaseService;
 public interface SysConfigService extends BaseService<Long, SysConfig> {
 
     /**
-     * @return com.ym.mec.biz.dal.entity.SysConfig
+     * @return com.keao.edu.biz.dal.entity.SysConfig
      * @params paramName
      * @describe 根据配置名称获取配置信息
      */

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

@@ -64,7 +64,7 @@ spring:
         #连接池中的最小空闲连接
         min-idle: 1
 
-    
+
 
 mybatis:
     mapperLocations: classpath:config/mybatis/*.xml
@@ -95,4 +95,4 @@ ribbon:
     ConnectTimeout: 60000
 
 message:
-  debugMode: true
+  debugMode: true

edu-user/edu-user-server/src/main/resources/config.mybatis/ExamSongMapper.xml → edu-user/edu-user-server/src/main/resources/config/mybatis/ExamSongMapper.xml

@@ -12,7 +12,7 @@
 		<result column="song_author_" property="songAuthor" />
 		<result column="subject_list_" property="subjectList" />
 		<result column="level_list_" property="levelList" />
-		<result column="type_" property="type"  typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="type_" property="type"  typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="file_url_list_" property="fileUrlList" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
@@ -31,7 +31,7 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamSong" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO exam_song (id_,song_name_,song_author_,subject_list_,level_list_,type_,file_url_list_,create_time_,update_time_)
-		VALUES(#{id},#{songName},#{songAuthor},#{subjectList},#{levelList},#{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{fileUrlList},NOW(),NOW())
+		VALUES(#{id},#{songName},#{songAuthor},#{subjectList},#{levelList},#{type, typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{fileUrlList},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -54,7 +54,7 @@
 				song_author_ = #{songAuthor},
 			</if>
 			<if test="type != null">
-				type_ = #{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+				type_ = #{type, typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="songName != null">
 				song_name_ = #{songName},

edu-user/edu-user-server/src/main/resources/config.mybatis/SubjectMapper.xml → edu-user/edu-user-server/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -14,7 +14,7 @@
         <result column="img_" property="img"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -39,7 +39,7 @@
         UPDATE subject
         <set>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                del_flag_ = #{delFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="parentSubjectId != null">
                 parent_subject_id_ = #{parentSubjectId},
@@ -107,7 +107,7 @@
                 AND tenant_id_ = #{tenantId}
             </if>
             <if test="delFlag != null">
-                AND del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+                AND del_flag_ = #{delFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
             </if>
         </where>
     </sql>

edu-user/edu-user-server/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="DEBUG" />
+	<logger name="com.keao.edu" level="DEBUG" />
 
 	<!--开发环境:打印控制台 -->
 		<root level="DEBUG">
@@ -35,4 +35,4 @@
 			<appender-ref ref="file" />
 		</root>
 
-</configuration>
+</configuration>