Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

.gitignore

@@ -21,7 +21,7 @@ mvnw.cmd
 *.iws
 *.iml
 *.ipr
-toolset/codegen/src/main/resources/generateConfigration.xml
+/toolset/codegen/src/main/resources/generateConfigration.xml
 
 ### 忽略子模块的文件 ###
 **/*.ims
@@ -44,11 +44,11 @@ toolset/codegen/src/main/resources/generateConfigration.xml
 /nbdist/
 /.nb-gradle/
 
-.gitignore
+!.gitignore
 *.class
 .metadata
 target
 *.classpath
 .settings
 .project
-bin
+/bin/

cooleshow-common/src/main/java/com/yonge/cooleshow/common/dal/BaseDAO.java

@@ -39,6 +39,13 @@ public interface BaseDAO<PK extends Serializable, T>{
 	 * @return int
 	 */
 	public int delete(final PK id);
+
+    /**
+     * 删除对象
+     * @param bean
+     * @return
+     */
+    public int delete(T bean);
 	
 	/**
 	 * 写入实体对象

cooleshow-common/src/main/java/com/yonge/cooleshow/common/service/BaseService.java

@@ -40,6 +40,13 @@ public interface BaseService<PK extends Serializable, T> {
 	 */
 	public int delete(final PK id);
 
+    /**
+     * 删除对象
+     * @param bean
+     * @return
+     */
+    public int delete(T bean);
+
 	/**
 	 * 写入实体对象
 	 * @author pengdc

cooleshow-common/src/main/java/com/yonge/cooleshow/common/service/impl/BaseServiceImpl.java

@@ -70,6 +70,15 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 		return this.getDAO().delete(id);
 	}
 
+    /**
+     * 删除对象
+     * @param bean
+     * @return
+     */
+	public int delete(T bean){
+	    return this.getDAO().delete(bean);
+    }
+
 	/**
 	 * 写入实体对象
 	 * @param bean

cooleshow-user/user-admin/src/main/resources/application-dev.yml

@@ -0,0 +1,54 @@
+server:
+  port: 8080
+  #address: 127.0.0.1
+  #sessionTimeout: 30
+  servlet:
+    context-path: /cooleshow
+  tomcat:
+      uri-encoding: UTF-8
+
+spring:
+  datasource:
+    url: jdbc:mysql://47.114.1.200:3306/mec_dev?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: dayaDataOnline@2019
+    driver-class-name: com.mysql.jdbc.Driver
+    debug: false
+    #Druid#
+    name: test
+    #type: com.alibaba.druid.pool.DruidDataSource
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+
+
+mybatis:
+  typeAliasesPackage: com.yonge.cooleshow.biz.dal.entity
+  mapperLocations: classpath:config/mybatis/*.xml
+  #config-location: classpath:mybatis/mybatis-config.xml
+
+
+# e签宝电子签名
+eseal:
+  tsign:
+    projectid: 4438776254
+    projectSecret: a94cf63d6361084d232f345d71321691
+    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
+
+# 金山云OSS存储
+storage:
+  sso:
+    accessKeyID: AKLTtTeIbadpRG-pil4S0Q4m-Q
+    accessKeySecret: OB1HmNOfDNW95wHoxMkP6IPFZXormk2ngA800TkvKAw7ozhiJGRqrMnnV8ZrAU3WRQ==
+    endpoint: ks3-cn-beijing.ksyun.com
+    bucketName: daya

cooleshow-user/user-admin/src/main/resources/application-prod.yml

@@ -0,0 +1,54 @@
+server:
+  port: 9090
+  #address: 127.0.0.1
+  #sessionTimeout: 30
+  servlet:
+    context-path: /cooleshow
+  tomcat:
+    uri-encoding: UTF-8
+
+spring:
+  datasource:
+    url: jdbc:mysql://47.114.1.200:3306/mec_dev?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: dayaDataOnline@2019
+    driver-class-name: com.mysql.jdbc.Driver
+    debug: false
+    #Druid#
+    name: test
+    #type: com.alibaba.druid.pool.DruidDataSource
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+
+
+mybatis:
+  typeAliasesPackage: com.yonge.cooleshow.biz.dal.entity
+  mapperLocations: classpath:config/mybatis/*.xml
+  #config-location: classpath:mybatis/mybatis-config.xml
+
+
+# e签宝电子签名
+eseal:
+  tsign:
+    projectid: 4438776254
+    projectSecret: a94cf63d6361084d232f345d71321691
+    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
+
+# 金山云OSS存储
+storage:
+  sso:
+    accessKeyID: AKLTtTeIbadpRG-pil4S0Q4m-Q
+    accessKeySecret: OB1HmNOfDNW95wHoxMkP6IPFZXormk2ngA800TkvKAw7ozhiJGRqrMnnV8ZrAU3WRQ==
+    endpoint: ks3-cn-beijing.ksyun.com
+    bucketName: daya

cooleshow-user/user-admin/src/main/resources/application.yml

@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: dev

cooleshow-user/user-admin/src/main/resources/bootstrap-dev.properties

@@ -1,14 +0,0 @@
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.1.200:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=6f8374a9-598f-4889-bb17-476070ffb8de
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=admin
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

cooleshow-user/user-admin/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 47.114.1.200:8848
+        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        group: DEFAULT_GROUP
+        prefix: student
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-user/user-admin/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 47.114.1.200:8848
+        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        group: DEFAULT_GROUP
+        prefix: student
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/AlbumMusicRelateDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
+
+public interface AlbumMusicRelateDao extends BaseDAO<Long, AlbumMusicRelate> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicAlbumDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
+
+public interface MusicAlbumDao extends BaseDAO<Long, MusicAlbum> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicSheetAccompanimentDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
+
+public interface MusicSheetAccompanimentDao extends BaseDAO<Long, MusicSheetAccompaniment> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicSheetDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
+
+public interface MusicSheetDao extends BaseDAO<Long, MusicSheet> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicSheetPurchaseRecordDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord;
+
+public interface MusicSheetPurchaseRecordDao extends BaseDAO<Long, MusicSheetPurchaseRecord> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/StudentFavoriteAlbumDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum;
+
+public interface StudentFavoriteAlbumDao extends BaseDAO<Long, StudentFavoriteAlbum> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/StudentFavoriteMusicDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic;
+
+public interface StudentFavoriteMusicDao extends BaseDAO<Long, StudentFavoriteMusic> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.VideoLesson;
+
+public interface VideoLessonDao extends BaseDAO<Long, VideoLesson> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonDetailDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail;
+
+public interface VideoLessonDetailDao extends BaseDAO<Long, VideoLessonDetail> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonEvaluateDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
+
+public interface VideoLessonEvaluateDao extends BaseDAO<Long, VideoLessonEvaluate> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonPurchaseRecordDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
+
+public interface VideoLessonPurchaseRecordDao extends BaseDAO<Long, VideoLessonPurchaseRecord> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonStudyRecordDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord;
+
+public interface VideoLessonStudyRecordDao extends BaseDAO<Long, VideoLessonStudyRecord> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/AlbumMusicRelate.java

@@ -0,0 +1,82 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(album_music_relate):
+ */
+public class AlbumMusicRelate {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "专辑ID",required = false)
+	private Long albumId;
+	
+	@ApiModelProperty(value = "曲谱ID",required = false)
+	private Long musicSheetId;
+	
+	@ApiModelProperty(value = "排序号",required = false)
+	private Integer orderNum;
+	
+	@ApiModelProperty(value = "添加时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "添加人",required = false)
+	private Long createUser;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setAlbumId(Long albumId){
+		this.albumId = albumId;
+	}
+	
+	public Long getAlbumId(){
+		return this.albumId;
+	}
+			
+	public void setMusicSheetId(Long musicSheetId){
+		this.musicSheetId = musicSheetId;
+	}
+	
+	public Long getMusicSheetId(){
+		return this.musicSheetId;
+	}
+			
+	public void setOrderNum(Integer orderNum){
+		this.orderNum = orderNum;
+	}
+	
+	public Integer getOrderNum(){
+		return this.orderNum;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setCreateUser(Long createUser){
+		this.createUser = createUser;
+	}
+	
+	public Long getCreateUser(){
+		return this.createUser;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicAlbum.java

@@ -0,0 +1,159 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(music_album):
+ */
+public class MusicAlbum {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "专辑名称",required = false)
+	private String albumName;
+	
+	@ApiModelProperty(value = "专辑简介",required = false)
+	private String albumDesc;
+	
+	@ApiModelProperty(value = "专辑标签",required = false)
+	private String albumTag;
+	
+	@ApiModelProperty(value = "专辑封面图片URL",required = false)
+	private String albumCoverUrl;
+	
+	@ApiModelProperty(value = "专辑状态(0:草稿;1:启用;2:停用)",required = false)
+	private boolean albumStatus;
+	
+	@ApiModelProperty(value = "排序号",required = false)
+	private Integer orderNo;
+	
+	@ApiModelProperty(value = "是否热门专辑",required = false)
+	private boolean hotFlag;
+	
+	@ApiModelProperty(value = "是否置顶",required = false)
+	private boolean topFlag;
+	
+	@ApiModelProperty(value = "创建时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "创建人",required = false)
+	private Integer createUser;
+	
+	@ApiModelProperty(value = "更新时间",required = false)
+	private java.util.Date updateTime;
+	
+	@ApiModelProperty(value = "更新人",required = false)
+	private Integer updateUser;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setAlbumName(String albumName){
+		this.albumName = albumName;
+	}
+	
+	public String getAlbumName(){
+		return this.albumName;
+	}
+			
+	public void setAlbumDesc(String albumDesc){
+		this.albumDesc = albumDesc;
+	}
+	
+	public String getAlbumDesc(){
+		return this.albumDesc;
+	}
+			
+	public void setAlbumTag(String albumTag){
+		this.albumTag = albumTag;
+	}
+	
+	public String getAlbumTag(){
+		return this.albumTag;
+	}
+			
+	public void setAlbumCoverUrl(String albumCoverUrl){
+		this.albumCoverUrl = albumCoverUrl;
+	}
+	
+	public String getAlbumCoverUrl(){
+		return this.albumCoverUrl;
+	}
+			
+	public void setAlbumStatus(boolean albumStatus){
+		this.albumStatus = albumStatus;
+	}
+	
+	public boolean isAlbumStatus(){
+		return this.albumStatus;
+	}
+			
+	public void setOrderNo(Integer orderNo){
+		this.orderNo = orderNo;
+	}
+	
+	public Integer getOrderNo(){
+		return this.orderNo;
+	}
+			
+	public void setHotFlag(boolean hotFlag){
+		this.hotFlag = hotFlag;
+	}
+	
+	public boolean isHotFlag(){
+		return this.hotFlag;
+	}
+			
+	public void setTopFlag(boolean topFlag){
+		this.topFlag = topFlag;
+	}
+	
+	public boolean isTopFlag(){
+		return this.topFlag;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setCreateUser(Integer createUser){
+		this.createUser = createUser;
+	}
+	
+	public Integer getCreateUser(){
+		return this.createUser;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setUpdateUser(Integer updateUser){
+		this.updateUser = updateUser;
+	}
+	
+	public Integer getUpdateUser(){
+		return this.updateUser;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -0,0 +1,280 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(music_sheet):
+ */
+public class MusicSheet {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "曲谱名称",required = false)
+	private String musicName;
+	
+	@ApiModelProperty(value = "曲谱来源(0:平台;非0:老师ID)",required = false)
+	private Integer musicSource;
+	
+	@ApiModelProperty(value = "作曲人",required = false)
+	private String composer;
+	
+	@ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)",required = false)
+	private String musicInstrument;
+	
+	@ApiModelProperty(value = "曲谱音频文件类型(midi;mp3)",required = false)
+	private String audioType;
+	
+	@ApiModelProperty(value = "曲谱标签(可以是多个标签,用逗号分隔)",required = false)
+	private String musicTag;
+	
+	@ApiModelProperty(value = "默认播放速度",required = false)
+	private Integer playSpeed;
+	
+	@ApiModelProperty(value = "是否可以评测",required = false)
+	private boolean canEvaluate;
+	
+	@ApiModelProperty(value = "是否展示指法",required = false)
+	private boolean showFingering;
+	
+	@ApiModelProperty(value = "收费类型(0:免费;1:会员;2:单曲收费)",required = false)
+	private boolean chargeType;
+	
+	@ApiModelProperty(value = "审核状态",required = false)
+	private boolean auditStatus;
+	
+	@ApiModelProperty(value = "排序号",required = false)
+	private Integer orderNo;
+	
+	@ApiModelProperty(value = "是否置顶",required = false)
+	private boolean topFlag;
+	
+	@ApiModelProperty(value = "是否热门曲谱",required = false)
+	private boolean hotFlag;
+	
+	@ApiModelProperty(value = "曲谱价格(整数)",required = false)
+	private Integer musicPrice;
+	
+	@ApiModelProperty(value = "音频文件存储路径",required = false)
+	private String audioFileUrl;
+	
+	@ApiModelProperty(value = "XML文件存储路径",required = false)
+	private String xmlFileUrl;
+	
+	@ApiModelProperty(value = "MP3是否自带节拍器(0:不带;1:带节拍器)",required = false)
+	private boolean mp3HasBeat;
+	
+	@ApiModelProperty(value = "创建时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "创建人(老师或者是后台平台用户)",required = false)
+	private Integer createUser;
+	
+	@ApiModelProperty(value = "更新时间",required = false)
+	private java.util.Date updateTime;
+	
+	@ApiModelProperty(value = "更新人(老师或者是后台平台用户)",required = false)
+	private Integer updateUser;
+	
+	@ApiModelProperty(value = "备注",required = false)
+	private String remark;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setMusicName(String musicName){
+		this.musicName = musicName;
+	}
+	
+	public String getMusicName(){
+		return this.musicName;
+	}
+			
+	public void setMusicSource(Integer musicSource){
+		this.musicSource = musicSource;
+	}
+	
+	public Integer getMusicSource(){
+		return this.musicSource;
+	}
+			
+	public void setComposer(String composer){
+		this.composer = composer;
+	}
+	
+	public String getComposer(){
+		return this.composer;
+	}
+			
+	public void setMusicInstrument(String musicInstrument){
+		this.musicInstrument = musicInstrument;
+	}
+	
+	public String getMusicInstrument(){
+		return this.musicInstrument;
+	}
+			
+	public void setAudioType(String audioType){
+		this.audioType = audioType;
+	}
+	
+	public String getAudioType(){
+		return this.audioType;
+	}
+			
+	public void setMusicTag(String musicTag){
+		this.musicTag = musicTag;
+	}
+	
+	public String getMusicTag(){
+		return this.musicTag;
+	}
+			
+	public void setPlaySpeed(Integer playSpeed){
+		this.playSpeed = playSpeed;
+	}
+	
+	public Integer getPlaySpeed(){
+		return this.playSpeed;
+	}
+			
+	public void setCanEvaluate(boolean canEvaluate){
+		this.canEvaluate = canEvaluate;
+	}
+	
+	public boolean isCanEvaluate(){
+		return this.canEvaluate;
+	}
+			
+	public void setShowFingering(boolean showFingering){
+		this.showFingering = showFingering;
+	}
+	
+	public boolean isShowFingering(){
+		return this.showFingering;
+	}
+			
+	public void setChargeType(boolean chargeType){
+		this.chargeType = chargeType;
+	}
+	
+	public boolean isChargeType(){
+		return this.chargeType;
+	}
+			
+	public void setAuditStatus(boolean auditStatus){
+		this.auditStatus = auditStatus;
+	}
+	
+	public boolean isAuditStatus(){
+		return this.auditStatus;
+	}
+			
+	public void setOrderNo(Integer orderNo){
+		this.orderNo = orderNo;
+	}
+	
+	public Integer getOrderNo(){
+		return this.orderNo;
+	}
+			
+	public void setTopFlag(boolean topFlag){
+		this.topFlag = topFlag;
+	}
+	
+	public boolean isTopFlag(){
+		return this.topFlag;
+	}
+			
+	public void setHotFlag(boolean hotFlag){
+		this.hotFlag = hotFlag;
+	}
+	
+	public boolean isHotFlag(){
+		return this.hotFlag;
+	}
+			
+	public void setMusicPrice(Integer musicPrice){
+		this.musicPrice = musicPrice;
+	}
+	
+	public Integer getMusicPrice(){
+		return this.musicPrice;
+	}
+			
+	public void setAudioFileUrl(String audioFileUrl){
+		this.audioFileUrl = audioFileUrl;
+	}
+	
+	public String getAudioFileUrl(){
+		return this.audioFileUrl;
+	}
+			
+	public void setXmlFileUrl(String xmlFileUrl){
+		this.xmlFileUrl = xmlFileUrl;
+	}
+	
+	public String getXmlFileUrl(){
+		return this.xmlFileUrl;
+	}
+			
+	public void setMp3HasBeat(boolean mp3HasBeat){
+		this.mp3HasBeat = mp3HasBeat;
+	}
+	
+	public boolean isMp3HasBeat(){
+		return this.mp3HasBeat;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setCreateUser(Integer createUser){
+		this.createUser = createUser;
+	}
+	
+	public Integer getCreateUser(){
+		return this.createUser;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setUpdateUser(Integer updateUser){
+		this.updateUser = updateUser;
+	}
+	
+	public Integer getUpdateUser(){
+		return this.updateUser;
+	}
+			
+	public void setRemark(String remark){
+		this.remark = remark;
+	}
+	
+	public String getRemark(){
+		return this.remark;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheetAccompaniment.java

@@ -0,0 +1,82 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(music_sheet_accompaniment):
+ */
+public class MusicSheetAccompaniment {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "曲谱ID",required = false)
+	private Long musicId;
+	
+	@ApiModelProperty(value = "声部",required = false)
+	private String instrument;
+	
+	@ApiModelProperty(value = "MP3伴奏文件URL",required = false)
+	private String accompanimentUrl;
+	
+	@ApiModelProperty(value = "创建时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "创建人(老师或者是后台平台用户)",required = false)
+	private Long createUser;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setMusicId(Long musicId){
+		this.musicId = musicId;
+	}
+	
+	public Long getMusicId(){
+		return this.musicId;
+	}
+			
+	public void setInstrument(String instrument){
+		this.instrument = instrument;
+	}
+	
+	public String getInstrument(){
+		return this.instrument;
+	}
+			
+	public void setAccompanimentUrl(String accompanimentUrl){
+		this.accompanimentUrl = accompanimentUrl;
+	}
+	
+	public String getAccompanimentUrl(){
+		return this.accompanimentUrl;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setCreateUser(Long createUser){
+		this.createUser = createUser;
+	}
+	
+	public Long getCreateUser(){
+		return this.createUser;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheetPurchaseRecord.java

@@ -0,0 +1,104 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(music_sheet_purchase_record):
+ */
+public class MusicSheetPurchaseRecord {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "曲谱ID",required = false)
+	private Long musicSheetId;
+	
+	@ApiModelProperty(value = "老师ID",required = false)
+	private Long teacherId;
+	
+	@ApiModelProperty(value = "订单流水号",required = false)
+	private String orderNo;
+	
+	@ApiModelProperty(value = "学生ID",required = false)
+	private Long studentId;
+	
+	@ApiModelProperty(value = "购买时间",required = false)
+	private java.util.Date purchaseTime;
+	
+	@ApiModelProperty(value = "购买价格",required = false)
+	private Integer purchasePrice;
+	
+	@ApiModelProperty(value = "订单状态(1:已完成;0:取消)",required = false)
+	private boolean orderStatus;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setMusicSheetId(Long musicSheetId){
+		this.musicSheetId = musicSheetId;
+	}
+	
+	public Long getMusicSheetId(){
+		return this.musicSheetId;
+	}
+			
+	public void setTeacherId(Long teacherId){
+		this.teacherId = teacherId;
+	}
+	
+	public Long getTeacherId(){
+		return this.teacherId;
+	}
+			
+	public void setOrderNo(String orderNo){
+		this.orderNo = orderNo;
+	}
+	
+	public String getOrderNo(){
+		return this.orderNo;
+	}
+			
+	public void setStudentId(Long studentId){
+		this.studentId = studentId;
+	}
+	
+	public Long getStudentId(){
+		return this.studentId;
+	}
+			
+	public void setPurchaseTime(java.util.Date purchaseTime){
+		this.purchaseTime = purchaseTime;
+	}
+	
+	public java.util.Date getPurchaseTime(){
+		return this.purchaseTime;
+	}
+			
+	public void setPurchasePrice(Integer purchasePrice){
+		this.purchasePrice = purchasePrice;
+	}
+	
+	public Integer getPurchasePrice(){
+		return this.purchasePrice;
+	}
+			
+	public void setOrderStatus(boolean orderStatus){
+		this.orderStatus = orderStatus;
+	}
+	
+	public boolean isOrderStatus(){
+		return this.orderStatus;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/StudentFavoriteAlbum.java

@@ -0,0 +1,60 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(student_favorite_album):
+ */
+public class StudentFavoriteAlbum {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "学生ID",required = false)
+	private Long studentId;
+	
+	@ApiModelProperty(value = "专辑ID",required = false)
+	private Long albumId;
+	
+	@ApiModelProperty(value = "收藏时间",required = false)
+	private java.util.Date favoriteTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setStudentId(Long studentId){
+		this.studentId = studentId;
+	}
+	
+	public Long getStudentId(){
+		return this.studentId;
+	}
+			
+	public void setAlbumId(Long albumId){
+		this.albumId = albumId;
+	}
+	
+	public Long getAlbumId(){
+		return this.albumId;
+	}
+			
+	public void setFavoriteTime(java.util.Date favoriteTime){
+		this.favoriteTime = favoriteTime;
+	}
+	
+	public java.util.Date getFavoriteTime(){
+		return this.favoriteTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/StudentFavoriteMusic.java

@@ -0,0 +1,60 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(student_favorite_music):
+ */
+public class StudentFavoriteMusic {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "学生ID",required = false)
+	private Long studentId;
+	
+	@ApiModelProperty(value = "曲谱ID",required = false)
+	private Long sheetId;
+	
+	@ApiModelProperty(value = "收藏时间",required = false)
+	private java.util.Date favoriteTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setStudentId(Long studentId){
+		this.studentId = studentId;
+	}
+	
+	public Long getStudentId(){
+		return this.studentId;
+	}
+			
+	public void setSheetId(Long sheetId){
+		this.sheetId = sheetId;
+	}
+	
+	public Long getSheetId(){
+		return this.sheetId;
+	}
+			
+	public void setFavoriteTime(java.util.Date favoriteTime){
+		this.favoriteTime = favoriteTime;
+	}
+	
+	public java.util.Date getFavoriteTime(){
+		return this.favoriteTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLesson.java

@@ -0,0 +1,181 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(video_lesson):
+ */
+public class VideoLesson {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "课程名称",required = false)
+	private String lessonName;
+	
+	@ApiModelProperty(value = "课程声部",required = false)
+	private String lessonInstrument;
+	
+	@ApiModelProperty(value = "课程介绍",required = false)
+	private String lessonDesc;
+	
+	@ApiModelProperty(value = "课程价格",required = false)
+	private Integer lessonPrice;
+	
+	@ApiModelProperty(value = "课程封面图片URL",required = false)
+	private String lessonCoverUrl;
+	
+	@ApiModelProperty(value = "老师ID",required = false)
+	private Long teacherId;
+	
+	@ApiModelProperty(value = "课程节数",required = false)
+	private Integer lessonCount;
+	
+	@ApiModelProperty(value = "排序号",required = false)
+	private Integer orderNo;
+	
+	@ApiModelProperty(value = "课程标签",required = false)
+	private String lessonTag;
+	
+	@ApiModelProperty(value = "是否置顶",required = false)
+	private boolean topFlag;
+	
+	@ApiModelProperty(value = "是否热门课程",required = false)
+	private boolean hotFlag;
+	
+	@ApiModelProperty(value = "审核状态",required = false)
+	private boolean auditStatus;
+	
+	@ApiModelProperty(value = "创建时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "更新时间",required = false)
+	private java.util.Date updateTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setLessonName(String lessonName){
+		this.lessonName = lessonName;
+	}
+	
+	public String getLessonName(){
+		return this.lessonName;
+	}
+			
+	public void setLessonInstrument(String lessonInstrument){
+		this.lessonInstrument = lessonInstrument;
+	}
+	
+	public String getLessonInstrument(){
+		return this.lessonInstrument;
+	}
+			
+	public void setLessonDesc(String lessonDesc){
+		this.lessonDesc = lessonDesc;
+	}
+	
+	public String getLessonDesc(){
+		return this.lessonDesc;
+	}
+			
+	public void setLessonPrice(Integer lessonPrice){
+		this.lessonPrice = lessonPrice;
+	}
+	
+	public Integer getLessonPrice(){
+		return this.lessonPrice;
+	}
+			
+	public void setLessonCoverUrl(String lessonCoverUrl){
+		this.lessonCoverUrl = lessonCoverUrl;
+	}
+	
+	public String getLessonCoverUrl(){
+		return this.lessonCoverUrl;
+	}
+			
+	public void setTeacherId(Long teacherId){
+		this.teacherId = teacherId;
+	}
+	
+	public Long getTeacherId(){
+		return this.teacherId;
+	}
+			
+	public void setLessonCount(Integer lessonCount){
+		this.lessonCount = lessonCount;
+	}
+	
+	public Integer getLessonCount(){
+		return this.lessonCount;
+	}
+			
+	public void setOrderNo(Integer orderNo){
+		this.orderNo = orderNo;
+	}
+	
+	public Integer getOrderNo(){
+		return this.orderNo;
+	}
+			
+	public void setLessonTag(String lessonTag){
+		this.lessonTag = lessonTag;
+	}
+	
+	public String getLessonTag(){
+		return this.lessonTag;
+	}
+			
+	public void setTopFlag(boolean topFlag){
+		this.topFlag = topFlag;
+	}
+	
+	public boolean isTopFlag(){
+		return this.topFlag;
+	}
+			
+	public void setHotFlag(boolean hotFlag){
+		this.hotFlag = hotFlag;
+	}
+	
+	public boolean isHotFlag(){
+		return this.hotFlag;
+	}
+			
+	public void setAuditStatus(boolean auditStatus){
+		this.auditStatus = auditStatus;
+	}
+	
+	public boolean isAuditStatus(){
+		return this.auditStatus;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonDetail.java

@@ -0,0 +1,126 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(video_lesson_detail):
+ */
+public class VideoLessonDetail {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "课程ID",required = false)
+	private Long lessonId;
+	
+	@ApiModelProperty(value = "视频标题",required = false)
+	private String lessonTitle;
+	
+	@ApiModelProperty(value = "视频内容",required = false)
+	private String lessonContent;
+	
+	@ApiModelProperty(value = "视频文件URL",required = false)
+	private String videoUrl;
+	
+	@ApiModelProperty(value = "视频封面图片URL",required = false)
+	private String coverUrl;
+	
+	@ApiModelProperty(value = "排序号",required = false)
+	private Integer orderNum;
+	
+	@ApiModelProperty(value = "创建人(老师ID)",required = false)
+	private Long teacherId;
+	
+	@ApiModelProperty(value = "创建时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "更新时间",required = false)
+	private java.util.Date updateTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setLessonId(Long lessonId){
+		this.lessonId = lessonId;
+	}
+	
+	public Long getLessonId(){
+		return this.lessonId;
+	}
+			
+	public void setLessonTitle(String lessonTitle){
+		this.lessonTitle = lessonTitle;
+	}
+	
+	public String getLessonTitle(){
+		return this.lessonTitle;
+	}
+			
+	public void setLessonContent(String lessonContent){
+		this.lessonContent = lessonContent;
+	}
+	
+	public String getLessonContent(){
+		return this.lessonContent;
+	}
+			
+	public void setVideoUrl(String videoUrl){
+		this.videoUrl = videoUrl;
+	}
+	
+	public String getVideoUrl(){
+		return this.videoUrl;
+	}
+			
+	public void setCoverUrl(String coverUrl){
+		this.coverUrl = coverUrl;
+	}
+	
+	public String getCoverUrl(){
+		return this.coverUrl;
+	}
+			
+	public void setOrderNum(Integer orderNum){
+		this.orderNum = orderNum;
+	}
+	
+	public Integer getOrderNum(){
+		return this.orderNum;
+	}
+			
+	public void setTeacherId(Long teacherId){
+		this.teacherId = teacherId;
+	}
+	
+	public Long getTeacherId(){
+		return this.teacherId;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonEvaluate.java

@@ -0,0 +1,71 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(video_lesson_evaluate):
+ */
+public class VideoLessonEvaluate {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "视频课明细ID",required = false)
+	private Long videoItemId;
+	
+	@ApiModelProperty(value = "学生ID",required = false)
+	private Long studentId;
+	
+	@ApiModelProperty(value = "评价内容",required = false)
+	private String content;
+	
+	@ApiModelProperty(value = "评价时间",required = false)
+	private java.util.Date evaluateTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setVideoItemId(Long videoItemId){
+		this.videoItemId = videoItemId;
+	}
+	
+	public Long getVideoItemId(){
+		return this.videoItemId;
+	}
+			
+	public void setStudentId(Long studentId){
+		this.studentId = studentId;
+	}
+	
+	public Long getStudentId(){
+		return this.studentId;
+	}
+			
+	public void setContent(String content){
+		this.content = content;
+	}
+	
+	public String getContent(){
+		return this.content;
+	}
+			
+	public void setEvaluateTime(java.util.Date evaluateTime){
+		this.evaluateTime = evaluateTime;
+	}
+	
+	public java.util.Date getEvaluateTime(){
+		return this.evaluateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonPurchaseRecord.java

@@ -0,0 +1,93 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(video_lesson_purchase_record):
+ */
+public class VideoLessonPurchaseRecord {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "视频课ID",required = false)
+	private Long lessonId;
+	
+	@ApiModelProperty(value = "学生ID",required = false)
+	private Long studentId;
+	
+	@ApiModelProperty(value = "购买时间",required = false)
+	private java.util.Date purchaseTime;
+	
+	@ApiModelProperty(value = "支付金额",required = false)
+	private Integer payMoney;
+	
+	@ApiModelProperty(value = "订单流水号",required = false)
+	private String orderNo;
+	
+	@ApiModelProperty(value = "订单状态",required = false)
+	private boolean orderStatus;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setLessonId(Long lessonId){
+		this.lessonId = lessonId;
+	}
+	
+	public Long getLessonId(){
+		return this.lessonId;
+	}
+			
+	public void setStudentId(Long studentId){
+		this.studentId = studentId;
+	}
+	
+	public Long getStudentId(){
+		return this.studentId;
+	}
+			
+	public void setPurchaseTime(java.util.Date purchaseTime){
+		this.purchaseTime = purchaseTime;
+	}
+	
+	public java.util.Date getPurchaseTime(){
+		return this.purchaseTime;
+	}
+			
+	public void setPayMoney(Integer payMoney){
+		this.payMoney = payMoney;
+	}
+	
+	public Integer getPayMoney(){
+		return this.payMoney;
+	}
+			
+	public void setOrderNo(String orderNo){
+		this.orderNo = orderNo;
+	}
+	
+	public String getOrderNo(){
+		return this.orderNo;
+	}
+			
+	public void setOrderStatus(boolean orderStatus){
+		this.orderStatus = orderStatus;
+	}
+	
+	public boolean isOrderStatus(){
+		return this.orderStatus;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonStudyRecord.java

@@ -0,0 +1,93 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(video_lesson_study_record):
+ */
+public class VideoLessonStudyRecord {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "视频课ID",required = false)
+	private Long lessonId;
+	
+	@ApiModelProperty(value = "视频ID",required = false)
+	private Long videoId;
+	
+	@ApiModelProperty(value = "学生ID",required = false)
+	private Long studentId;
+	
+	@ApiModelProperty(value = "是否学完",required = false)
+	private boolean lessonFinished;
+	
+	@ApiModelProperty(value = "学习开始时间",required = false)
+	private java.util.Date startTime;
+	
+	@ApiModelProperty(value = "学习完成时间",required = false)
+	private java.util.Date finishTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setLessonId(Long lessonId){
+		this.lessonId = lessonId;
+	}
+	
+	public Long getLessonId(){
+		return this.lessonId;
+	}
+			
+	public void setVideoId(Long videoId){
+		this.videoId = videoId;
+	}
+	
+	public Long getVideoId(){
+		return this.videoId;
+	}
+			
+	public void setStudentId(Long studentId){
+		this.studentId = studentId;
+	}
+	
+	public Long getStudentId(){
+		return this.studentId;
+	}
+			
+	public void setLessonFinished(boolean lessonFinished){
+		this.lessonFinished = lessonFinished;
+	}
+	
+	public boolean isLessonFinished(){
+		return this.lessonFinished;
+	}
+			
+	public void setStartTime(java.util.Date startTime){
+		this.startTime = startTime;
+	}
+	
+	public java.util.Date getStartTime(){
+		return this.startTime;
+	}
+			
+	public void setFinishTime(java.util.Date finishTime){
+		this.finishTime = finishTime;
+	}
+	
+	public java.util.Date getFinishTime(){
+		return this.finishTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/AlbumMusicRelateService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface AlbumMusicRelateService extends BaseService<Long, AlbumMusicRelate> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/MusicAlbumService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface MusicAlbumService extends BaseService<Long, MusicAlbum> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/MusicSheetAccompanimentService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface MusicSheetAccompanimentService extends BaseService<Long, MusicSheetAccompaniment> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/MusicSheetPurchaseRecordService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface MusicSheetPurchaseRecordService extends BaseService<Long, MusicSheetPurchaseRecord> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/MusicSheetService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface MusicSheetService extends BaseService<Long, MusicSheet> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/StudentFavoriteAlbumService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface StudentFavoriteAlbumService extends BaseService<Long, StudentFavoriteAlbum> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/StudentFavoriteMusicService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface StudentFavoriteMusicService extends BaseService<Long, StudentFavoriteMusic> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VideoLessonDetailService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface VideoLessonDetailService extends BaseService<Long, VideoLessonDetail> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VideoLessonEvaluateService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface VideoLessonEvaluateService extends BaseService<Long, VideoLessonEvaluate> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VideoLessonPurchaseRecordService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface VideoLessonPurchaseRecordService extends BaseService<Long, VideoLessonPurchaseRecord> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VideoLessonService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLesson;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface VideoLessonService extends BaseService<Long, VideoLesson> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VideoLessonStudyRecordService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface VideoLessonStudyRecordService extends BaseService<Long, VideoLessonStudyRecord> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/AlbumMusicRelateServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
+import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
+import com.yonge.cooleshow.biz.dal.dao.AlbumMusicRelateDao;
+
+@Service
+public class AlbumMusicRelateServiceImpl extends BaseServiceImpl<Long, AlbumMusicRelate>  implements AlbumMusicRelateService {
+	
+	@Autowired
+	private AlbumMusicRelateDao albumMusicRelateDao;
+
+	@Override
+	public BaseDAO<Long, AlbumMusicRelate> getDAO() {
+		return albumMusicRelateDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicAlbumServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
+import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
+import com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao;
+
+@Service
+public class MusicAlbumServiceImpl extends BaseServiceImpl<Long, MusicAlbum>  implements MusicAlbumService {
+	
+	@Autowired
+	private MusicAlbumDao musicAlbumDao;
+
+	@Override
+	public BaseDAO<Long, MusicAlbum> getDAO() {
+		return musicAlbumDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetAccompanimentServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetAccompanimentService;
+import com.yonge.cooleshow.biz.dal.dao.MusicSheetAccompanimentDao;
+
+@Service
+public class MusicSheetAccompanimentServiceImpl extends BaseServiceImpl<Long, MusicSheetAccompaniment>  implements MusicSheetAccompanimentService {
+	
+	@Autowired
+	private MusicSheetAccompanimentDao musicSheetAccompanimentDao;
+
+	@Override
+	public BaseDAO<Long, MusicSheetAccompaniment> getDAO() {
+		return musicSheetAccompanimentDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetPurchaseRecordServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetPurchaseRecordService;
+import com.yonge.cooleshow.biz.dal.dao.MusicSheetPurchaseRecordDao;
+
+@Service
+public class MusicSheetPurchaseRecordServiceImpl extends BaseServiceImpl<Long, MusicSheetPurchaseRecord>  implements MusicSheetPurchaseRecordService {
+	
+	@Autowired
+	private MusicSheetPurchaseRecordDao musicSheetPurchaseRecordDao;
+
+	@Override
+	public BaseDAO<Long, MusicSheetPurchaseRecord> getDAO() {
+		return musicSheetPurchaseRecordDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
+
+@Service
+public class MusicSheetServiceImpl extends BaseServiceImpl<Long, MusicSheet>  implements MusicSheetService {
+	
+	@Autowired
+	private MusicSheetDao musicSheetDao;
+
+	@Override
+	public BaseDAO<Long, MusicSheet> getDAO() {
+		return musicSheetDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentFavoriteAlbumServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum;
+import com.yonge.cooleshow.biz.dal.service.StudentFavoriteAlbumService;
+import com.yonge.cooleshow.biz.dal.dao.StudentFavoriteAlbumDao;
+
+@Service
+public class StudentFavoriteAlbumServiceImpl extends BaseServiceImpl<Long, StudentFavoriteAlbum>  implements StudentFavoriteAlbumService {
+	
+	@Autowired
+	private StudentFavoriteAlbumDao studentFavoriteAlbumDao;
+
+	@Override
+	public BaseDAO<Long, StudentFavoriteAlbum> getDAO() {
+		return studentFavoriteAlbumDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentFavoriteMusicServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic;
+import com.yonge.cooleshow.biz.dal.service.StudentFavoriteMusicService;
+import com.yonge.cooleshow.biz.dal.dao.StudentFavoriteMusicDao;
+
+@Service
+public class StudentFavoriteMusicServiceImpl extends BaseServiceImpl<Long, StudentFavoriteMusic>  implements StudentFavoriteMusicService {
+	
+	@Autowired
+	private StudentFavoriteMusicDao studentFavoriteMusicDao;
+
+	@Override
+	public BaseDAO<Long, StudentFavoriteMusic> getDAO() {
+		return studentFavoriteMusicDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonDetailServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonDetailService;
+import com.yonge.cooleshow.biz.dal.dao.VideoLessonDetailDao;
+
+@Service
+public class VideoLessonDetailServiceImpl extends BaseServiceImpl<Long, VideoLessonDetail>  implements VideoLessonDetailService {
+	
+	@Autowired
+	private VideoLessonDetailDao videoLessonDetailDao;
+
+	@Override
+	public BaseDAO<Long, VideoLessonDetail> getDAO() {
+		return videoLessonDetailDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonEvaluateServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonEvaluateService;
+import com.yonge.cooleshow.biz.dal.dao.VideoLessonEvaluateDao;
+
+@Service
+public class VideoLessonEvaluateServiceImpl extends BaseServiceImpl<Long, VideoLessonEvaluate>  implements VideoLessonEvaluateService {
+	
+	@Autowired
+	private VideoLessonEvaluateDao videoLessonEvaluateDao;
+
+	@Override
+	public BaseDAO<Long, VideoLessonEvaluate> getDAO() {
+		return videoLessonEvaluateDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonPurchaseRecordServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonPurchaseRecordService;
+import com.yonge.cooleshow.biz.dal.dao.VideoLessonPurchaseRecordDao;
+
+@Service
+public class VideoLessonPurchaseRecordServiceImpl extends BaseServiceImpl<Long, VideoLessonPurchaseRecord>  implements VideoLessonPurchaseRecordService {
+	
+	@Autowired
+	private VideoLessonPurchaseRecordDao videoLessonPurchaseRecordDao;
+
+	@Override
+	public BaseDAO<Long, VideoLessonPurchaseRecord> getDAO() {
+		return videoLessonPurchaseRecordDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLesson;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonService;
+import com.yonge.cooleshow.biz.dal.dao.VideoLessonDao;
+
+@Service
+public class VideoLessonServiceImpl extends BaseServiceImpl<Long, VideoLesson>  implements VideoLessonService {
+	
+	@Autowired
+	private VideoLessonDao videoLessonDao;
+
+	@Override
+	public BaseDAO<Long, VideoLesson> getDAO() {
+		return videoLessonDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonStudyRecordServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonStudyRecordService;
+import com.yonge.cooleshow.biz.dal.dao.VideoLessonStudyRecordDao;
+
+@Service
+public class VideoLessonStudyRecordServiceImpl extends BaseServiceImpl<Long, VideoLessonStudyRecord>  implements VideoLessonStudyRecordService {
+	
+	@Autowired
+	private VideoLessonStudyRecordDao videoLessonStudyRecordDao;
+
+	@Override
+	public BaseDAO<Long, VideoLessonStudyRecord> getDAO() {
+		return videoLessonStudyRecordDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/AlbumMusicRelateMapper.xml

@@ -0,0 +1,114 @@
+<?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.yonge.cooleshow.biz.dal.dao.AlbumMusicRelateDao">
+
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate">
+        <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="album_id_" jdbcType="BIGINT" property="albumId" />
+        <result column="music_sheet_id_" jdbcType="BIGINT" property="musicSheetId" />
+        <result column="order_num_" jdbcType="TINYINT" property="orderNum" />
+        <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="create_user_" jdbcType="BIGINT" property="createUser" />
+    </resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM album_music_relate WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM album_music_relate ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        insert into album_music_relate
+        (album_id_,music_sheet_id_,order_num_,create_time_,create_user_)
+        values
+        (#{albumId},#{musicSheetId},#{orderNum},sysdate(),#{createUser})
+    </insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate">
+		UPDATE album_music_relate
+        <set>
+            <if test="albumId != null">
+                album_id_ = #{albumId},
+            </if>
+            <if test="musicSheetId != null">
+                music_sheet_id_ = #{musicSheetId},
+            </if>
+            <if test="orderNum != null">
+                order_num_ = #{orderNum},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="createUser != null">
+                create_user_ = #{createUser},
+            </if>
+        </set>
+        where id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM album_music_relate WHERE id_ = #{id} 
+	</delete>
+
+    <delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate">
+        delete from album_music_relate
+        where 1=1
+        <if test="albumId != null and albumId != ''">
+            and album_id_ = #{albumId}
+        </if>
+        <if test="musicSheetId != null and musicSheetId != ''">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="orderNum != null and orderNum != ''">
+            and order_num_ = #{orderNum}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createUser != null and createUser != ''">
+            and create_user_ = #{createUser}
+        </if>
+    </delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM album_music_relate ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM album_music_relate
+	</select>
+
+    <select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate" resultMap="BaseResultMap">
+        select *
+        from album_music_relate
+        where 1=1
+        <if test="albumId != null">
+            and album_id_ = #{albumId}
+        </if>
+        <if test="musicSheetId != null">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="orderNum != null">
+            and order_num_ = #{orderNum}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createUser != null">
+            and create_user_ = #{createUser}
+        </if>
+    </select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml

@@ -0,0 +1,184 @@
+<?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.yonge.cooleshow.biz.dal.dao.MusicAlbumDao">
+
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.MusicAlbum">
+        <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="album_name_" jdbcType="VARCHAR" property="albumName" />
+        <result column="album_desc_" jdbcType="VARCHAR" property="albumDesc" />
+        <result column="album_tag_" jdbcType="VARCHAR" property="albumTag" />
+        <result column="album_cover_url_" jdbcType="VARCHAR" property="albumCoverUrl" />
+        <result column="album_status_" jdbcType="TINYINT" property="albumStatus" />
+        <result column="order_no_" jdbcType="INTEGER" property="orderNo" />
+        <result column="hot_flag_" jdbcType="TINYINT" property="hotFlag" />
+        <result column="top_flag_" jdbcType="TINYINT" property="topFlag" />
+        <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="create_user_" jdbcType="INTEGER" property="createUser" />
+        <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="update_user_" jdbcType="INTEGER" property="updateUser" />
+    </resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM music_album WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM music_album ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicAlbum" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        insert into music_album
+        (album_name_,album_desc_,album_tag_,album_cover_url_,album_status_,order_no_,hot_flag_,top_flag_,create_time_,create_user_,update_time_,update_user_)
+        values
+        (#{albumName},#{albumDesc},#{albumTag},#{albumCoverUrl},#{albumStatus},#{orderNo},#{hotFlag},#{topFlag},sysdate(),#{createUser},#{updateTime},#{updateUser})
+    </insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicAlbum">
+		UPDATE music_album
+        <set>
+        <if test="albumName != null and albumName != ''">
+            album_name_ = #{albumName},
+        </if>
+        <if test="albumDesc != null and albumDesc != ''">
+            album_desc_ = #{albumDesc},
+        </if>
+        <if test="albumTag != null and albumTag != ''">
+            album_tag_ = #{albumTag},
+        </if>
+        <if test="albumCoverUrl != null and albumCoverUrl != ''">
+            album_cover_url_ = #{albumCoverUrl},
+        </if>
+        <if test="albumStatus != null">
+            album_status_ = #{albumStatus},
+        </if>
+        <if test="orderNo != null">
+            order_no_ = #{orderNo},
+        </if>
+        <if test="hotFlag != null">
+            hot_flag_ = #{hotFlag},
+        </if>
+        <if test="topFlag != null">
+            top_flag_ = #{topFlag},
+        </if>
+        <if test="createTime != null">
+            create_time_ = #{createTime},
+        </if>
+        <if test="createUser != null">
+            create_user_ = #{createUser},
+        </if>
+        <if test="updateTime != null">
+            update_time_ = #{updateTime},
+        </if>
+        <if test="updateUser != null">
+            update_user_ = #{updateUser},
+        </if>
+        </set>
+        WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_album WHERE id_ = #{id} 
+	</delete>
+
+    <delete id="delete" parameterType="MusicAlbum">
+        delete from music_album
+        where 1=1
+        <if test="albumName != null and albumName != ''">
+            and album_name_ = #{albumName}
+        </if>
+        <if test="albumDesc != null and albumDesc != ''">
+            and album_desc_ = #{albumDesc}
+        </if>
+        <if test="albumTag != null and albumTag != ''">
+            and album_tag_ = #{albumTag}
+        </if>
+        <if test="albumCoverUrl != null and albumCoverUrl != ''">
+            and album_cover_url_ = #{albumCoverUrl}
+        </if>
+        <if test="albumStatus != null and albumStatus != ''">
+            and album_status_ = #{albumStatus}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="hotFlag != null and hotFlag != ''">
+            and hot_flag_ = #{hotFlag}
+        </if>
+        <if test="topFlag != null and topFlag != ''">
+            and top_flag_ = #{topFlag}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createUser != null and createUser != ''">
+            and create_user_ = #{createUser}
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            and update_time_ = #{updateTime}
+        </if>
+        <if test="updateUser != null and updateUser != ''">
+            and update_user_ = #{updateUser}
+        </if>
+    </delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM music_album ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_album
+	</select>
+
+    <select id="findList" parameterType="MusicAlbum" resultMap="BaseResultMap">
+        select *
+        from music_album
+        where 1=1
+        <if test="albumName != null and albumName != ''">
+            and album_name_ = #{albumName}
+        </if>
+        <if test="albumDesc != null and albumDesc != ''">
+            and album_desc_ = #{albumDesc}
+        </if>
+        <if test="albumTag != null and albumTag != ''">
+            and album_tag_ = #{albumTag}
+        </if>
+        <if test="albumCoverUrl != null and albumCoverUrl != ''">
+            and album_cover_url_ = #{albumCoverUrl}
+        </if>
+        <if test="albumStatus != null">
+            and album_status_ = #{albumStatus}
+        </if>
+        <if test="orderNo != null">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="hotFlag != null">
+            and hot_flag_ = #{hotFlag}
+        </if>
+        <if test="topFlag != null">
+            and top_flag_ = #{topFlag}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createUser != null">
+            and create_user_ = #{createUser}
+        </if>
+        <if test="updateTime != null">
+            and update_time_ = #{updateTime}
+        </if>
+        <if test="updateUser != null">
+            and update_user_ = #{updateUser}
+        </if>
+    </select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetAccompanimentMapper.xml

@@ -0,0 +1,114 @@
+<?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.yonge.cooleshow.biz.dal.dao.MusicSheetAccompanimentDao">
+
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
+        <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="music_id_" jdbcType="BIGINT" property="musicId" />
+        <result column="instrument_" jdbcType="VARCHAR" property="instrument" />
+        <result column="accompaniment_url_" jdbcType="VARCHAR" property="accompanimentUrl" />
+        <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="create_user_" jdbcType="BIGINT" property="createUser" />
+    </resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM music_sheet_accompaniment WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM music_sheet_accompaniment ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        insert into music_sheet_accompaniment
+        (music_id_,instrument_,accompaniment_url_,create_time_,create_user_)
+        values
+        (#{musicId},#{instrument},#{accompanimentUrl},sysdate(),#{createUser})
+    </insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
+		UPDATE music_sheet_accompaniment
+        <set>
+            <if test="musicId != null">
+                music_id_ = #{musicId},
+            </if>
+            <if test="instrument != null and instrument != ''">
+                instrument_ = #{instrument},
+            </if>
+            <if test="accompanimentUrl != null and accompanimentUrl != ''">
+                accompaniment_url_ = #{accompanimentUrl},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="createUser != null">
+                create_user_ = #{createUser},
+            </if>
+        </set>
+       WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_sheet_accompaniment WHERE id_ = #{id} 
+	</delete>
+
+    <delete id="delete" parameterType="MusicSheetAccompaniment">
+        delete from music_sheet_accompaniment
+        where 1=1
+        <if test="musicId != null and musicId != ''">
+            and music_id_ = #{musicId}
+        </if>
+        <if test="instrument != null and instrument != ''">
+            and instrument_ = #{instrument}
+        </if>
+        <if test="accompanimentUrl != null and accompanimentUrl != ''">
+            and accompaniment_url_ = #{accompanimentUrl}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createUser != null and createUser != ''">
+            and create_user_ = #{createUser}
+        </if>
+    </delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM music_sheet_accompaniment ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_sheet_accompaniment
+	</select>
+
+    <select id="findList" parameterType="MusicSheetAccompaniment" resultMap="BaseResultMap">
+        select *
+        from music_sheet_accompaniment
+        where 1=1
+        <if test="musicId != null">
+            and music_id_ = #{musicId}
+        </if>
+        <if test="instrument != null and instrument != ''">
+            and instrument_ = #{instrument}
+        </if>
+        <if test="accompanimentUrl != null and accompanimentUrl != ''">
+            and accompaniment_url_ = #{accompanimentUrl}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createUser != null">
+            and create_user_ = #{createUser}
+        </if>
+    </select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -0,0 +1,295 @@
+<?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.yonge.cooleshow.biz.dal.dao.MusicSheetDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicSheet" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="music_name_" property="musicName" />
+		<result column="music_source_" property="musicSource" />
+		<result column="composer_" property="composer" />
+		<result column="music_instrument_" property="musicInstrument" />
+		<result column="audio_type_" property="audioType" />
+		<result column="music_tag_" property="musicTag" />
+		<result column="play_speed_" property="playSpeed" />
+		<result column="can_evaluate_" property="canEvaluate" />
+		<result column="show_fingering_" property="showFingering" />
+		<result column="charge_type_" property="chargeType" />
+		<result column="audit_status_" property="auditStatus" />
+		<result column="order_no_" property="orderNo" />
+		<result column="top_flag_" property="topFlag" />
+		<result column="hot_flag_" property="hotFlag" />
+		<result column="music_price_" property="musicPrice" />
+		<result column="audio_file_url_" property="audioFileUrl" />
+		<result column="xml_file_url_" property="xmlFileUrl" />
+		<result column="mp3_has_beat_" property="mp3HasBeat" />
+		<result column="create_time_" property="createTime" />
+		<result column="create_user_" property="createUser" />
+		<result column="update_time_" property="updateTime" />
+		<result column="update_user_" property="updateUser" />
+		<result column="remark_" property="remark" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM music_sheet WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM music_sheet ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheet" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        insert into music_sheet
+        (music_name_,music_source_,composer_,music_instrument_,audio_type_,music_tag_,play_speed_,can_evaluate_,show_fingering_,charge_type_,audit_status_,order_no_,top_flag_,hot_flag_,music_price_,audio_file_url_,xml_file_url_,mp3_has_beat_,create_time_,create_user_,update_time_,update_user_,remark_)
+        values
+        (#{musicName},#{musicSource},#{composer},#{musicInstrument},#{audioType},#{musicTag},#{playSpeed},#{canEvaluate},#{showFingering},#{chargeType},#{auditStatus},#{orderNo},#{topFlag},#{hotFlag},#{musicPrice},#{audioFileUrl},#{xmlFileUrl},#{mp3HasBeat},sysdate(),#{createUser},#{updateTime},#{updateUser},#{remark})
+    </insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheet">
+		UPDATE music_sheet
+        <set>
+        <if test="musicName != null and musicName != ''">
+            music_name_ = #{musicName},
+        </if>
+        <if test="musicSource != null">
+            music_source_ = #{musicSource},
+        </if>
+        <if test="composer != null and composer != ''">
+            composer_ = #{composer},
+        </if>
+        <if test="musicInstrument != null and musicInstrument != ''">
+            music_instrument_ = #{musicInstrument},
+        </if>
+        <if test="audioType != null and audioType != ''">
+            audio_type_ = #{audioType},
+        </if>
+        <if test="musicTag != null and musicTag != ''">
+            music_tag_ = #{musicTag},
+        </if>
+        <if test="playSpeed != null">
+            play_speed_ = #{playSpeed},
+        </if>
+        <if test="canEvaluate != null">
+            can_evaluate_ = #{canEvaluate},
+        </if>
+        <if test="showFingering != null">
+            show_fingering_ = #{showFingering},
+        </if>
+        <if test="chargeType != null">
+            charge_type_ = #{chargeType},
+        </if>
+        <if test="auditStatus != null">
+            audit_status_ = #{auditStatus},
+        </if>
+        <if test="orderNo != null">
+            order_no_ = #{orderNo},
+        </if>
+        <if test="topFlag != null">
+            top_flag_ = #{topFlag},
+        </if>
+        <if test="hotFlag != null">
+            hot_flag_ = #{hotFlag},
+        </if>
+        <if test="musicPrice != null">
+            music_price_ = #{musicPrice},
+        </if>
+        <if test="audioFileUrl != null and audioFileUrl != ''">
+            audio_file_url_ = #{audioFileUrl},
+        </if>
+        <if test="xmlFileUrl != null and xmlFileUrl != ''">
+            xml_file_url_ = #{xmlFileUrl},
+        </if>
+        <if test="mp3HasBeat != null">
+            mp3_has_beat_ = #{mp3HasBeat},
+        </if>
+        <if test="createTime != null">
+            create_time_ = #{createTime},
+        </if>
+        <if test="createUser != null">
+            create_user_ = #{createUser},
+        </if>
+        <if test="updateTime != null">
+            update_time_ = #{updateTime},
+        </if>
+        <if test="updateUser != null">
+            update_user_ = #{updateUser},
+        </if>
+        <if test="remark != null and remark != ''">
+            remark_ = #{remark},
+        </if>
+        </set>
+        WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_sheet WHERE id_ = #{id} 
+	</delete>
+
+    <delete id="delete" parameterType="MusicSheet">
+        delete from music_sheet
+        where 1=1
+        <if test="musicName != null and musicName != ''">
+            and music_name_ = #{musicName}
+        </if>
+        <if test="musicSource != null and musicSource != ''">
+            and music_source_ = #{musicSource}
+        </if>
+        <if test="composer != null and composer != ''">
+            and composer_ = #{composer}
+        </if>
+        <if test="musicInstrument != null and musicInstrument != ''">
+            and music_instrument_ = #{musicInstrument}
+        </if>
+        <if test="audioType != null and audioType != ''">
+            and audio_type_ = #{audioType}
+        </if>
+        <if test="musicTag != null and musicTag != ''">
+            and music_tag_ = #{musicTag}
+        </if>
+        <if test="playSpeed != null and playSpeed != ''">
+            and play_speed_ = #{playSpeed}
+        </if>
+        <if test="canEvaluate != null and canEvaluate != ''">
+            and can_evaluate_ = #{canEvaluate}
+        </if>
+        <if test="showFingering != null and showFingering != ''">
+            and show_fingering_ = #{showFingering}
+        </if>
+        <if test="chargeType != null and chargeType != ''">
+            and charge_type_ = #{chargeType}
+        </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            and audit_status_ = #{auditStatus}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="topFlag != null and topFlag != ''">
+            and top_flag_ = #{topFlag}
+        </if>
+        <if test="hotFlag != null and hotFlag != ''">
+            and hot_flag_ = #{hotFlag}
+        </if>
+        <if test="musicPrice != null and musicPrice != ''">
+            and music_price_ = #{musicPrice}
+        </if>
+        <if test="audioFileUrl != null and audioFileUrl != ''">
+            and audio_file_url_ = #{audioFileUrl}
+        </if>
+        <if test="xmlFileUrl != null and xmlFileUrl != ''">
+            and xml_file_url_ = #{xmlFileUrl}
+        </if>
+        <if test="mp3HasBeat != null and mp3HasBeat != ''">
+            and mp3_has_beat_ = #{mp3HasBeat}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createUser != null and createUser != ''">
+            and create_user_ = #{createUser}
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            and update_time_ = #{updateTime}
+        </if>
+        <if test="updateUser != null and updateUser != ''">
+            and update_user_ = #{updateUser}
+        </if>
+        <if test="remark != null and remark != ''">
+            and remark_ = #{remark}
+        </if>
+    </delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM music_sheet ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_sheet
+	</select>
+
+    <select id="findList" parameterType="MusicSheet" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from music_sheet
+        where 1=1
+        <if test="musicName != null and musicName != ''">
+            and music_name_ = #{musicName}
+        </if>
+        <if test="musicSource != null">
+            and music_source_ = #{musicSource}
+        </if>
+        <if test="composer != null and composer != ''">
+            and composer_ = #{composer}
+        </if>
+        <if test="musicInstrument != null and musicInstrument != ''">
+            and music_instrument_ = #{musicInstrument}
+        </if>
+        <if test="audioType != null and audioType != ''">
+            and audio_type_ = #{audioType}
+        </if>
+        <if test="musicTag != null and musicTag != ''">
+            and music_tag_ = #{musicTag}
+        </if>
+        <if test="playSpeed != null">
+            and play_speed_ = #{playSpeed}
+        </if>
+        <if test="canEvaluate != null">
+            and can_evaluate_ = #{canEvaluate}
+        </if>
+        <if test="showFingering != null">
+            and show_fingering_ = #{showFingering}
+        </if>
+        <if test="chargeType != null">
+            and charge_type_ = #{chargeType}
+        </if>
+        <if test="auditStatus != null">
+            and audit_status_ = #{auditStatus}
+        </if>
+        <if test="orderNo != null">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="topFlag != null">
+            and top_flag_ = #{topFlag}
+        </if>
+        <if test="hotFlag != null">
+            and hot_flag_ = #{hotFlag}
+        </if>
+        <if test="musicPrice != null">
+            and music_price_ = #{musicPrice}
+        </if>
+        <if test="audioFileUrl != null and audioFileUrl != ''">
+            and audio_file_url_ = #{audioFileUrl}
+        </if>
+        <if test="xmlFileUrl != null and xmlFileUrl != ''">
+            and xml_file_url_ = #{xmlFileUrl}
+        </if>
+        <if test="mp3HasBeat != null">
+            and mp3_has_beat_ = #{mp3HasBeat}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createUser != null">
+            and create_user_ = #{createUser}
+        </if>
+        <if test="updateTime != null">
+            and update_time_ = #{updateTime}
+        </if>
+        <if test="updateUser != null">
+            and update_user_ = #{updateUser}
+        </if>
+        <if test="remark != null and remark != ''">
+            and remark_ = #{remark}
+        </if>
+    </select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetPurchaseRecordMapper.xml

@@ -0,0 +1,135 @@
+<?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.yonge.cooleshow.biz.dal.dao.MusicSheetPurchaseRecordDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="music_sheet_id_" property="musicSheetId" />
+		<result column="teacher_id_" property="teacherId" />
+		<result column="order_no_" property="orderNo" />
+		<result column="student_id_" property="studentId" />
+		<result column="purchase_time_" property="purchaseTime" />
+		<result column="purchase_price_" property="purchasePrice" />
+		<result column="order_status_" property="orderStatus" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM music_sheet_purchase_record WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM music_sheet_purchase_record ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        insert into music_sheet_purchase_record
+        (music_sheet_id_,teacher_id_,order_no_,student_id_,purchase_time_,purchase_price_,order_status_)
+        values
+        (#{musicSheetId},#{teacherId},#{orderNo},#{studentId},#{purchaseTime},#{purchasePrice},#{orderStatus})
+    </insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord">
+		UPDATE music_sheet_purchase_record
+        <set>
+        <if test="musicSheetId != null">
+            music_sheet_id_ = #{musicSheetId},
+        </if>
+        <if test="teacherId != null">
+            teacher_id_ = #{teacherId},
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            order_no_ = #{orderNo},
+        </if>
+        <if test="studentId != null">
+            student_id_ = #{studentId},
+        </if>
+        <if test="purchaseTime != null">
+            purchase_time_ = #{purchaseTime},
+        </if>
+        <if test="purchasePrice != null">
+            purchase_price_ = #{purchasePrice},
+        </if>
+        <if test="orderStatus != null">
+            order_status_ = #{orderStatus},
+        </if>
+        </set>
+        WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_sheet_purchase_record WHERE id_ = #{id} 
+	</delete>
+
+    <delete id="delete" parameterType="MusicSheetPurchaseRecord">
+        delete from music_sheet_purchase_record
+        where 1=1
+        <if test="musicSheetId != null and musicSheetId != ''">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="teacherId != null and teacherId != ''">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="purchaseTime != null and purchaseTime != ''">
+            and purchase_time_ = #{purchaseTime}
+        </if>
+        <if test="purchasePrice != null and purchasePrice != ''">
+            and purchase_price_ = #{purchasePrice}
+        </if>
+        <if test="orderStatus != null and orderStatus != ''">
+            and order_status_ = #{orderStatus}
+        </if>
+    </delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM music_sheet_purchase_record ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_sheet_purchase_record
+	</select>
+
+    <select id="findList" parameterType="MusicSheetPurchaseRecord" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from music_sheet_purchase_record
+        where 1=1
+        <if test="musicSheetId != null">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="teacherId != null">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="purchaseTime != null">
+            and purchase_time_ = #{purchaseTime}
+        </if>
+        <if test="purchasePrice != null">
+            and purchase_price_ = #{purchasePrice}
+        </if>
+        <if test="orderStatus != null">
+            and order_status_ = #{orderStatus}
+        </if>
+    </select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentFavoriteAlbumMapper.xml

@@ -0,0 +1,95 @@
+<?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.yonge.cooleshow.biz.dal.dao.StudentFavoriteAlbumDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="student_id_" property="studentId" />
+		<result column="album_id_" property="albumId" />
+		<result column="favorite_time_" property="favoriteTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM student_favorite_album WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM student_favorite_album ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        insert into student_favorite_album
+        (student_id_,album_id_,favorite_time_)
+        values
+        (#{studentId},#{albumId},#{favoriteTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum">
+		UPDATE student_favorite_album
+        <set>
+        <if test="studentId != null">
+            student_id_ = #{studentId},
+        </if>
+        <if test="albumId != null">
+            album_id_ = #{albumId},
+        </if>
+        <if test="favoriteTime != null">
+            favorite_time_ = #{favoriteTime},
+        </if>
+        </set>
+        WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM student_favorite_album WHERE id_ = #{id} 
+	</delete>
+
+    <delete id="delete" parameterType="StudentFavoriteAlbum">
+        delete from student_favorite_album
+        where 1=1
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="albumId != null and albumId != ''">
+            and album_id_ = #{albumId}
+        </if>
+        <if test="favoriteTime != null and favoriteTime != ''">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+    </delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM student_favorite_album ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM student_favorite_album
+	</select>
+
+    <select id="findList" parameterType="StudentFavoriteAlbum" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from student_favorite_album
+        where 1=1
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="albumId != null">
+            and album_id_ = #{albumId}
+        </if>
+        <if test="favoriteTime != null">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+    </select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentFavoriteMusicMapper.xml

@@ -0,0 +1,95 @@
+<?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.yonge.cooleshow.biz.dal.dao.StudentFavoriteMusicDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="student_id_" property="studentId" />
+		<result column="sheet_id_" property="sheetId" />
+		<result column="favorite_time_" property="favoriteTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM student_favorite_music WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM student_favorite_music ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        insert into student_favorite_music
+        (student_id_,sheet_id_,favorite_time_)
+        values
+        (#{studentId},#{sheetId},#{favoriteTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic">
+        update student_favorite_music
+        <set>
+            <if test="studentId != null">
+                student_id_ = #{studentId},
+            </if>
+            <if test="sheetId != null">
+                sheet_id_ = #{sheetId},
+            </if>
+            <if test="favoriteTime != null">
+                favorite_time_ = #{favoriteTime},
+            </if>
+        </set>
+        where id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM student_favorite_music WHERE id_ = #{id} 
+	</delete>
+
+    <delete id="delete" parameterType="StudentFavoriteMusic">
+        delete from student_favorite_music
+        where 1=1
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="sheetId != null and sheetId != ''">
+            and sheet_id_ = #{sheetId}
+        </if>
+        <if test="favoriteTime != null and favoriteTime != ''">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+    </delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM student_favorite_music ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM student_favorite_music
+	</select>
+
+    <select id="findList" parameterType="StudentFavoriteMusic" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from student_favorite_music
+        where 1=1
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="sheetId != null">
+            and sheet_id_ = #{sheetId}
+        </if>
+        <if test="favoriteTime != null">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+    </select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonDetailMapper.xml

@@ -0,0 +1,123 @@
+<?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.yonge.cooleshow.biz.dal.dao.VideoLessonDetailDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="lesson_id_" property="lessonId" />
+		<result column="lesson_title_" property="lessonTitle" />
+		<result column="lesson_content_" property="lessonContent" />
+		<result column="video_url_" property="videoUrl" />
+		<result column="cover_url_" property="coverUrl" />
+		<result column="order_num_" property="orderNum" />
+		<result column="teacher_id_" property="teacherId" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM video_lesson_detail WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM video_lesson_detail ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        insert into video_lesson_detail
+        (lesson_id_,lesson_title_,lesson_content_,video_url_,cover_url_,order_num_,teacher_id_,create_time_,update_time_)
+        values
+        (#{lessonId},#{lessonTitle},#{lessonContent},#{videoUrl},#{coverUrl},#{orderNum},#{teacherId},sysdate(),#{updateTime})
+    </insert>
+	
+	<!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="VideoLessonDetail">
+        update video_lesson_detail
+        <set>
+            <if test="lessonId != null">
+                lesson_id_ = #{lessonId},
+            </if>
+            <if test="lessonTitle != null and lessonTitle != ''">
+                lesson_title_ = #{lessonTitle},
+            </if>
+            <if test="lessonContent != null and lessonContent != ''">
+                lesson_content_ = #{lessonContent},
+            </if>
+            <if test="videoUrl != null and videoUrl != ''">
+                video_url_ = #{videoUrl},
+            </if>
+            <if test="coverUrl != null and coverUrl != ''">
+                cover_url_ = #{coverUrl},
+            </if>
+            <if test="orderNum != null">
+                order_num_ = #{orderNum},
+            </if>
+            <if test="teacherId != null">
+                teacher_id_ = #{teacherId},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+        </set>
+        where id_ = #{id}
+    </update>
+
+    <select id="findList" parameterType="VideoLessonDetail" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson_detail
+        where 1=1
+        <if test="lessonId != null">
+            and lesson_id_ = #{lessonId}
+        </if>
+        <if test="lessonTitle != null and lessonTitle != ''">
+            and lesson_title_ = #{lessonTitle}
+        </if>
+        <if test="lessonContent != null and lessonContent != ''">
+            and lesson_content_ = #{lessonContent}
+        </if>
+        <if test="videoUrl != null and videoUrl != ''">
+            and video_url_ = #{videoUrl}
+        </if>
+        <if test="coverUrl != null and coverUrl != ''">
+            and cover_url_ = #{coverUrl}
+        </if>
+        <if test="orderNum != null">
+            and order_num_ = #{orderNum}
+        </if>
+        <if test="teacherId != null">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="updateTime != null">
+            and update_time_ = #{updateTime}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM video_lesson_detail WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM video_lesson_detail ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM video_lesson_detail
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonEvaluateMapper.xml

@@ -0,0 +1,104 @@
+<?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.yonge.cooleshow.biz.dal.dao.VideoLessonEvaluateDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="video_item_id_" property="videoItemId" />
+		<result column="student_id_" property="studentId" />
+		<result column="content_" property="content" />
+		<result column="evaluate_time_" property="evaluateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM video_lesson_evaluate WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM video_lesson_evaluate ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="VideoLessonEvaluate">
+        insert into video_lesson_evaluate
+        (video_item_id_,student_id_,content_,evaluate_time_)
+        values
+        (#{videoItemId},#{studentId},#{content},#{evaluateTime})
+    </insert>
+
+    <update id="update" parameterType="VideoLessonEvaluate">
+        update video_lesson_evaluate
+        <set>
+            <if test="videoItemId != null">
+                video_item_id_ = #{videoItemId},
+            </if>
+            <if test="studentId != null">
+                student_id_ = #{studentId},
+            </if>
+            <if test="content != null and content != ''">
+                content_ = #{content},
+            </if>
+            <if test="evaluateTime != null">
+                evaluate_time_ = #{evaluateTime},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="VideoLessonEvaluate" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson_evaluate
+        where 1=1
+        <if test="videoItemId != null">
+            and video_item_id_ = #{videoItemId}
+        </if>
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="content != null and content != ''">
+            and content_ = #{content}
+        </if>
+        <if test="evaluateTime != null">
+            and evaluate_time_ = #{evaluateTime}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM video_lesson_evaluate WHERE id_ = #{id} 
+	</delete>
+
+    <delete id="delete" parameterType="VideoLessonEvaluate">
+        delete from video_lesson_evaluate
+        where 1=1
+        <if test="videoItemId != null and videoItemId != ''">
+            and video_item_id_ = #{videoItemId}
+        </if>
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="content != null and content != ''">
+            and content_ = #{content}
+        </if>
+        <if test="evaluateTime != null and evaluateTime != ''">
+            and evaluate_time_ = #{evaluateTime}
+        </if>
+    </delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM video_lesson_evaluate ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM video_lesson_evaluate
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonMapper.xml

@@ -0,0 +1,157 @@
+<?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.yonge.cooleshow.biz.dal.dao.VideoLessonDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLesson" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="lesson_name_" property="lessonName" />
+		<result column="lesson_instrument_" property="lessonInstrument" />
+		<result column="lesson_desc_" property="lessonDesc" />
+		<result column="lesson_price_" property="lessonPrice" />
+		<result column="lesson_cover_url_" property="lessonCoverUrl" />
+		<result column="teacher_id_" property="teacherId" />
+		<result column="lesson_count_" property="lessonCount" />
+		<result column="order_no_" property="orderNo" />
+		<result column="lesson_tag_" property="lessonTag" />
+		<result column="top_flag_" property="topFlag" />
+		<result column="hot_flag_" property="hotFlag" />
+		<result column="audit_status_" property="auditStatus" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM video_lesson WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM video_lesson ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="VideoLesson">
+        insert into video_lesson
+        (lesson_name_,lesson_instrument_,lesson_desc_,lesson_price_,lesson_cover_url_,teacher_id_,lesson_count_,order_no_,lesson_tag_,top_flag_,hot_flag_,audit_status_,create_time_,update_time_)
+        values
+        (#{lessonName},#{lessonInstrument},#{lessonDesc},#{lessonPrice},#{lessonCoverUrl},#{teacherId},#{lessonCount},#{orderNo},#{lessonTag},#{topFlag},#{hotFlag},#{auditStatus},sysdate(),#{updateTime})
+    </insert>
+
+    <update id="update" parameterType="VideoLesson">
+        update video_lesson
+        <set>
+            <if test="lessonName != null and lessonName != ''">
+                lesson_name_ = #{lessonName},
+            </if>
+            <if test="lessonInstrument != null and lessonInstrument != ''">
+                lesson_instrument_ = #{lessonInstrument},
+            </if>
+            <if test="lessonDesc != null and lessonDesc != ''">
+                lesson_desc_ = #{lessonDesc},
+            </if>
+            <if test="lessonPrice != null">
+                lesson_price_ = #{lessonPrice},
+            </if>
+            <if test="lessonCoverUrl != null and lessonCoverUrl != ''">
+                lesson_cover_url_ = #{lessonCoverUrl},
+            </if>
+            <if test="teacherId != null">
+                teacher_id_ = #{teacherId},
+            </if>
+            <if test="lessonCount != null">
+                lesson_count_ = #{lessonCount},
+            </if>
+            <if test="orderNo != null">
+                order_no_ = #{orderNo},
+            </if>
+            <if test="lessonTag != null and lessonTag != ''">
+                lesson_tag_ = #{lessonTag},
+            </if>
+            <if test="topFlag != null">
+                top_flag_ = #{topFlag},
+            </if>
+            <if test="hotFlag != null">
+                hot_flag_ = #{hotFlag},
+            </if>
+            <if test="auditStatus != null">
+                audit_status_ = #{auditStatus},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+        </set>
+        where id_ = #{id}
+    </update>
+
+    <select id="findList" parameterType="VideoLesson" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson
+        where 1=1
+        <if test="lessonName != null and lessonName != ''">
+            and lesson_name_ = #{lessonName}
+        </if>
+        <if test="lessonInstrument != null and lessonInstrument != ''">
+            and lesson_instrument_ = #{lessonInstrument}
+        </if>
+        <if test="lessonDesc != null and lessonDesc != ''">
+            and lesson_desc_ = #{lessonDesc}
+        </if>
+        <if test="lessonPrice != null">
+            and lesson_price_ = #{lessonPrice}
+        </if>
+        <if test="lessonCoverUrl != null and lessonCoverUrl != ''">
+            and lesson_cover_url_ = #{lessonCoverUrl}
+        </if>
+        <if test="teacherId != null">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="lessonCount != null">
+            and lesson_count_ = #{lessonCount}
+        </if>
+        <if test="orderNo != null">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="lessonTag != null and lessonTag != ''">
+            and lesson_tag_ = #{lessonTag}
+        </if>
+        <if test="topFlag != null">
+            and top_flag_ = #{topFlag}
+        </if>
+        <if test="hotFlag != null">
+            and hot_flag_ = #{hotFlag}
+        </if>
+        <if test="auditStatus != null">
+            and audit_status_ = #{auditStatus}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="updateTime != null">
+            and update_time_ = #{updateTime}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM video_lesson WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM video_lesson ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM video_lesson
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonPurchaseRecordMapper.xml

@@ -0,0 +1,124 @@
+<?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.yonge.cooleshow.biz.dal.dao.VideoLessonPurchaseRecordDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="lesson_id_" property="lessonId" />
+		<result column="student_id_" property="studentId" />
+		<result column="purchase_time_" property="purchaseTime" />
+		<result column="pay_money_" property="payMoney" />
+		<result column="order_no_" property="orderNo" />
+		<result column="order_status_" property="orderStatus" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM video_lesson_purchase_record WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM video_lesson_purchase_record ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="VideoLessonPurchaseRecord">
+        insert into video_lesson_purchase_record
+        (lesson_id_,student_id_,purchase_time_,pay_money_,order_no_,order_status_)
+        values
+        (#{lessonId},#{studentId},#{purchaseTime},#{payMoney},#{orderNo},#{orderStatus})
+    </insert>
+
+    <update id="update" parameterType="VideoLessonPurchaseRecord">
+        update video_lesson_purchase_record
+        <set>
+            <if test="lessonId != null">
+                lesson_id_ = #{lessonId},
+            </if>
+            <if test="studentId != null">
+                student_id_ = #{studentId},
+            </if>
+            <if test="purchaseTime != null">
+                purchase_time_ = #{purchaseTime},
+            </if>
+            <if test="payMoney != null">
+                pay_money_ = #{payMoney},
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                order_no_ = #{orderNo},
+            </if>
+            <if test="orderStatus != null">
+                order_status_ = #{orderStatus},
+            </if>
+        </set>
+        where id_ = #{id}
+    </update>
+
+    <select id="findList" parameterType="VideoLessonPurchaseRecord" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson_purchase_record
+        where 1=1
+        <if test="lessonId != null">
+            and lesson_id_ = #{lessonId}
+        </if>
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="purchaseTime != null">
+            and purchase_time_ = #{purchaseTime}
+        </if>
+        <if test="payMoney != null">
+            and pay_money_ = #{payMoney}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="orderStatus != null">
+            and order_status_ = #{orderStatus}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM video_lesson_purchase_record WHERE id_ = #{id} 
+	</delete>
+
+    <delete id="delete" parameterType="VideoLessonPurchaseRecord">
+        delete from video_lesson_purchase_record
+        where 1=1
+        <if test="lessonId != null and lessonId != ''">
+            and lesson_id_ = #{lessonId}
+        </if>
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="purchaseTime != null and purchaseTime != ''">
+            and purchase_time_ = #{purchaseTime}
+        </if>
+        <if test="payMoney != null and payMoney != ''">
+            and pay_money_ = #{payMoney}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="orderStatus != null and orderStatus != ''">
+            and order_status_ = #{orderStatus}
+        </if>
+    </delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM video_lesson_purchase_record ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM video_lesson_purchase_record
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonStudyRecordMapper.xml

@@ -0,0 +1,123 @@
+<?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.yonge.cooleshow.biz.dal.dao.VideoLessonStudyRecordDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="lesson_id" property="lessonId" />
+		<result column="video_id_" property="videoId" />
+		<result column="student_id_" property="studentId" />
+		<result column="lesson_finished_" property="lessonFinished" />
+		<result column="start_time_" property="startTime" />
+		<result column="finish_time_" property="finishTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM video_lesson_study_record WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM video_lesson_study_record ORDER BY id_
+	</select>
+
+    <delete id="delete" parameterType="VideoLessonStudyRecord">
+        delete from video_lesson_study_record
+        where 1=1
+        <if test="lessonId != null and lessonId != ''">
+            and lesson_id = #{lessonId}
+        </if>
+        <if test="videoId != null and videoId != ''">
+            and video_id_ = #{videoId}
+        </if>
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="lessonFinished != null and lessonFinished != ''">
+            and lesson_finished_ = #{lessonFinished}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            and start_time_ = #{startTime}
+        </if>
+        <if test="finishTime != null and finishTime != ''">
+            and finish_time_ = #{finishTime}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="VideoLessonStudyRecord">
+        insert into video_lesson_study_record
+        (lesson_id,video_id_,student_id_,lesson_finished_,start_time_,finish_time_)
+        values
+        (#{lessonId},#{videoId},#{studentId},#{lessonFinished},#{startTime},#{finishTime})
+    </insert>
+
+    <update id="update" parameterType="VideoLessonStudyRecord">
+        update video_lesson_study_record
+        <set>
+            <if test="lessonId != null">
+                lesson_id = #{lessonId},
+            </if>
+            <if test="videoId != null">
+                video_id_ = #{videoId},
+            </if>
+            <if test="studentId != null">
+                student_id_ = #{studentId},
+            </if>
+            <if test="lessonFinished != null">
+                lesson_finished_ = #{lessonFinished},
+            </if>
+            <if test="startTime != null">
+                start_time_ = #{startTime},
+            </if>
+            <if test="finishTime != null">
+                finish_time_ = #{finishTime},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="VideoLessonStudyRecord" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson_study_record
+        where 1=1
+        <if test="lessonId != null">
+            and lesson_id = #{lessonId}
+        </if>
+        <if test="videoId != null">
+            and video_id_ = #{videoId}
+        </if>
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="lessonFinished != null">
+            and lesson_finished_ = #{lessonFinished}
+        </if>
+        <if test="startTime != null">
+            and start_time_ = #{startTime}
+        </if>
+        <if test="finishTime != null">
+            and finish_time_ = #{finishTime}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM video_lesson_study_record WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM video_lesson_study_record ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM video_lesson_study_record
+	</select>
+</mapper>

cooleshow-user/user-student/src/main/resources/application-dev.yml

@@ -0,0 +1,54 @@
+server:
+  port: 8080
+  #address: 127.0.0.1
+  #sessionTimeout: 30
+  servlet:
+    context-path: /cooleshow
+  tomcat:
+      uri-encoding: UTF-8
+
+spring:
+  datasource:
+    url: jdbc:mysql://47.114.1.200:3306/mec_dev?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: dayaDataOnline@2019
+    driver-class-name: com.mysql.jdbc.Driver
+    debug: false
+    #Druid#
+    name: test
+    #type: com.alibaba.druid.pool.DruidDataSource
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+
+
+mybatis:
+  typeAliasesPackage: com.yonge.cooleshow.biz.dal.entity
+  mapperLocations: classpath:config/mybatis/*.xml
+  #config-location: classpath:mybatis/mybatis-config.xml
+
+
+# e签宝电子签名
+eseal:
+  tsign:
+    projectid: 4438776254
+    projectSecret: a94cf63d6361084d232f345d71321691
+    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
+
+# 金山云OSS存储
+storage:
+  sso:
+    accessKeyID: AKLTtTeIbadpRG-pil4S0Q4m-Q
+    accessKeySecret: OB1HmNOfDNW95wHoxMkP6IPFZXormk2ngA800TkvKAw7ozhiJGRqrMnnV8ZrAU3WRQ==
+    endpoint: ks3-cn-beijing.ksyun.com
+    bucketName: daya

cooleshow-user/user-student/src/main/resources/application-prod.yml

@@ -0,0 +1,54 @@
+server:
+  port: 9090
+  #address: 127.0.0.1
+  #sessionTimeout: 30
+  servlet:
+    context-path: /cooleshow
+  tomcat:
+    uri-encoding: UTF-8
+
+spring:
+  datasource:
+    url: jdbc:mysql://47.114.1.200:3306/mec_dev?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: dayaDataOnline@2019
+    driver-class-name: com.mysql.jdbc.Driver
+    debug: false
+    #Druid#
+    name: test
+    #type: com.alibaba.druid.pool.DruidDataSource
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+
+
+mybatis:
+  typeAliasesPackage: com.yonge.cooleshow.biz.dal.entity
+  mapperLocations: classpath:config/mybatis/*.xml
+  #config-location: classpath:mybatis/mybatis-config.xml
+
+
+# e签宝电子签名
+eseal:
+  tsign:
+    projectid: 4438776254
+    projectSecret: a94cf63d6361084d232f345d71321691
+    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
+
+# 金山云OSS存储
+storage:
+  sso:
+    accessKeyID: AKLTtTeIbadpRG-pil4S0Q4m-Q
+    accessKeySecret: OB1HmNOfDNW95wHoxMkP6IPFZXormk2ngA800TkvKAw7ozhiJGRqrMnnV8ZrAU3WRQ==
+    endpoint: ks3-cn-beijing.ksyun.com
+    bucketName: daya

cooleshow-user/user-student/src/main/resources/application.yml

@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: dev

cooleshow-user/user-student/src/main/resources/bootstrap-dev.properties

@@ -1,14 +0,0 @@
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.1.200:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=6f8374a9-598f-4889-bb17-476070ffb8de
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=student
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

cooleshow-user/user-student/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 47.114.1.200:8848
+        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        group: DEFAULT_GROUP
+        prefix: student
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-user/user-student/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 47.114.1.200:8848
+        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        group: DEFAULT_GROUP
+        prefix: student
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-user/user-teacher/src/main/resources/application-dev.yml

@@ -0,0 +1,54 @@
+server:
+  port: 8080
+  #address: 127.0.0.1
+  #sessionTimeout: 30
+  servlet:
+    context-path: /cooleshow
+  tomcat:
+      uri-encoding: UTF-8
+
+spring:
+  datasource:
+    url: jdbc:mysql://47.114.1.200:3306/mec_dev?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: dayaDataOnline@2019
+    driver-class-name: com.mysql.jdbc.Driver
+    debug: false
+    #Druid#
+    name: test
+    #type: com.alibaba.druid.pool.DruidDataSource
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+
+
+mybatis:
+  typeAliasesPackage: com.yonge.cooleshow.biz.dal.entity
+  mapperLocations: classpath:config/mybatis/*.xml
+  #config-location: classpath:mybatis/mybatis-config.xml
+
+
+# e签宝电子签名
+eseal:
+  tsign:
+    projectid: 4438776254
+    projectSecret: a94cf63d6361084d232f345d71321691
+    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
+
+# 金山云OSS存储
+storage:
+  sso:
+    accessKeyID: AKLTtTeIbadpRG-pil4S0Q4m-Q
+    accessKeySecret: OB1HmNOfDNW95wHoxMkP6IPFZXormk2ngA800TkvKAw7ozhiJGRqrMnnV8ZrAU3WRQ==
+    endpoint: ks3-cn-beijing.ksyun.com
+    bucketName: daya

cooleshow-user/user-teacher/src/main/resources/application-prod.yml

@@ -0,0 +1,54 @@
+server:
+  port: 9090
+  #address: 127.0.0.1
+  #sessionTimeout: 30
+  servlet:
+    context-path: /cooleshow
+  tomcat:
+    uri-encoding: UTF-8
+
+spring:
+  datasource:
+    url: jdbc:mysql://47.114.1.200:3306/mec_dev?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: dayaDataOnline@2019
+    driver-class-name: com.mysql.jdbc.Driver
+    debug: false
+    #Druid#
+    name: test
+    #type: com.alibaba.druid.pool.DruidDataSource
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+
+
+mybatis:
+  typeAliasesPackage: com.yonge.cooleshow.biz.dal.entity
+  mapperLocations: classpath:config/mybatis/*.xml
+  #config-location: classpath:mybatis/mybatis-config.xml
+
+
+# e签宝电子签名
+eseal:
+  tsign:
+    projectid: 4438776254
+    projectSecret: a94cf63d6361084d232f345d71321691
+    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
+
+# 金山云OSS存储
+storage:
+  sso:
+    accessKeyID: AKLTtTeIbadpRG-pil4S0Q4m-Q
+    accessKeySecret: OB1HmNOfDNW95wHoxMkP6IPFZXormk2ngA800TkvKAw7ozhiJGRqrMnnV8ZrAU3WRQ==
+    endpoint: ks3-cn-beijing.ksyun.com
+    bucketName: daya

cooleshow-user/user-teacher/src/main/resources/application.yml

@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: dev

cooleshow-user/user-teacher/src/main/resources/bootstrap-dev.properties

@@ -1,14 +0,0 @@
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.1.200:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=6f8374a9-598f-4889-bb17-476070ffb8de
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=teacher
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

cooleshow-user/user-teacher/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 47.114.1.200:8848
+        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        group: DEFAULT_GROUP
+        prefix: student
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-user/user-teacher/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 47.114.1.200:8848
+        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        group: DEFAULT_GROUP
+        prefix: student
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

toolset/codegen/src/main/java/com/yonge/toolset/crud/core/generator/ModuleGenerateIntrospector.java

@@ -121,13 +121,14 @@ public class ModuleGenerateIntrospector {
 		params.put("insertSQL", insertSQL);
 		if (StringUtils.isNotBlank(criteria)) {
 			// 修改
-			String updateSQL = "UPDATE " + tableName + " <set>\n<if test=\"";
+			String updateSQL = "UPDATE " + tableName + " \n<set>\n<if test=\"";
 			for (Entry<String, String> entry : fieldPropMapping.entrySet()) {
 				updateSQL += entry.getValue() + " != null\">\n" + (entry.getKey() + " = #{" + entry.getValue() + "},\n</if>\n<if test=\"");
 			}
 			// 删除最后一个“，”
 			updateSQL = updateSQL.substring(0, updateSQL.length() - 10);
-			updateSQL += ("</set> WHERE " + criteria);
+			updateSQL += ("</set>");
+            updateSQL += (" WHERE " + criteria);
 			params.put("updateSQL", updateSQL);
 			// 根据主键查询
 			String querySingleSQL = queryBaseSQL + " WHERE " + criteria;

toolset/codegen/src/main/resources/template/dao.ftl

@@ -1,7 +1,7 @@
 [#ftl]
 package ${daoPackageName};
 
-import com.yonge.cooleshow.common.dal.BaseDAO
+import com.yonge.cooleshow.common.dal.BaseDAO;
 import ${pojoFullClassName};
 
 public interface ${className}Dao [#if paramType??]extends BaseDAO<${paramType}, ${className}>[/#if] {

toolset/codegen/src/main/resources/template/sqlmap.ftl

@@ -7,7 +7,7 @@
 -->
 <mapper namespace="${namespace}">
 	
-	<resultMap type="${fullClassName}" id="${alias}">
+	<resultMap type="${fullClassName}" id="BaseResultMap">
 	[#list columns as col]
 		<result column="${col.fieldName}" property="${col.propertyName}" />
 	[/#list]
@@ -15,23 +15,18 @@
 	
 	[#if querySingleSQL??]
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="${alias}" [#if paramType??]parameterType="${paramType}"[/#if]>
+	<select id="get" resultMap="BaseResultMap" [#if paramType??]parameterType="${paramType}"[/#if]>
 		${querySingleSQL}
 	</select>
 	[/#if]
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="${alias}">
+	<select id="findAll" resultMap="BaseResultMap">
 		${queryFullSQL}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="${fullClassName}" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
 		${insertSQL}
 	</insert>
 	
@@ -51,7 +46,7 @@
 	
 	[#if queryPage??]
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="${alias}" parameterType="map">
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
 		${queryPage}
 	</select>
 	[/#if]