Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cooleshow-user/user-teacher/pom.xml

.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-auth/auth-server/pom.xml

@@ -58,7 +58,7 @@
 			<groupId>com.yonge.cooleshow</groupId>
 			<artifactId>auth-api</artifactId>
 		</dependency>
-
+        <!--
 		<dependency>
 			<groupId>com.yonge.toolset</groupId>
 			<artifactId>audit-log</artifactId>
@@ -68,7 +68,7 @@
 					<groupId>org.freemarker</groupId>
 				</exclusion>
 			</exclusions>
-		</dependency>
+		</dependency>-->
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -80,4 +80,17 @@
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/AuthServerApplication.java

@@ -16,7 +16,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableFeignClients({"com.yonge.cooleshow"})
+@EnableFeignClients
 @MapperScan("com.yonge.cooleshow.auth.dal.dao")
 @ComponentScan(basePackages={"com.yonge.cooleshow", "com.yonge.toolset.log"})
 @Configuration

cooleshow-auth/auth-server/src/main/resources/application-dev.yml

@@ -0,0 +1,69 @@
+server:
+  port: 8088
+  #address: 127.0.0.1
+  #sessionTimeout: 30
+  servlet:
+    context-path: /cooleshow
+  tomcat:
+      uri-encoding: UTF-8
+
+spring:
+  application:
+    name: auth-server
+
+  datasource:
+    #url: jdbc:mysql://47.114.1.200:3306/mec_dev?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://localhost:3306/cooleshow_dev?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: 123456
+    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
+
+  #单节点redis
+  redis:
+    host: localhost
+    port: 6379
+    database: 0
+    password:
+    #timeout: 10000m
+
+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
+
+
+message:
+  debugMode: true

cooleshow-auth/auth-server/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-auth/auth-server/src/main/resources/application.yml

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

cooleshow-auth/auth-server/src/main/resources/bootstrap-dev.properties

@@ -1,16 +0,0 @@
-#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
-#spring.profiles.active=dev
-#\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=auth
-#\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-auth/auth-server/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,28 @@
+#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
+
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: localhost:8848
+        namespace: dev
+#      config:
+#        server-addr: localhost:8848
+#        namespace: dev
+#        group: DEFAULT_GROUP
+#        #prefix: admin
+#        file-extension: yaml
+#        refresh:
+#          enabled: true
+#        enabled: true

cooleshow-auth/auth-server/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-auth/auth-server/src/main/resources/logback-spring.xml

@@ -27,8 +27,8 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="WARN" />
-	<root level="WARN">
+	<logger name="com.yonge" level="INFO" />
+	<root level="INFO">
 		<appender-ref ref="stdout" />
 		<appender-ref ref="file" />
 	</root>

cooleshow-cms/pom.xml

@@ -1,26 +1,26 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-    <groupId>com.yonge.cooleshow</groupId>
-    <artifactId>cooleshow</artifactId>
-    <version>1.0</version>
-  </parent>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.yonge.cooleshow</groupId>
-  <artifactId>cooleshow-cms</artifactId>
-  <version>1.0</version>
-  <packaging>jar</packaging>
+	<parent>
+		<groupId>com.yonge.cooleshow</groupId>
+		<artifactId>cooleshow</artifactId>
+		<version>1.0</version>
+	</parent>
 
-  <name>cooleshow-cms</name>
-  <url>http://maven.apache.org</url>
+	<groupId>com.yonge.cooleshow</groupId>
+	<artifactId>cooleshow-cms</artifactId>
+	<version>1.0</version>
+	<packaging>jar</packaging>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+	<name>cooleshow-cms</name>
+	<url>http://maven.apache.org</url>
 
-  <dependencies>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
 
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
@@ -68,5 +68,18 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-  </dependencies>
+	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

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-gateway/gateway-web/pom.xml

@@ -56,4 +56,17 @@
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

cooleshow-im/im-server/pom.xml

@@ -1,26 +1,22 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.yonge.cooleshow</groupId>
-    <artifactId>cooleshow-im</artifactId>
-    <version>1.0</version>
-  </parent>
-  <groupId>com.yonge.cooleshow</groupId>
-  <artifactId>im-server</artifactId>
-  <version>1.0</version>
-  <name>im-server</name>
-  <url>http://maven.apache.org</url>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.yonge.cooleshow</groupId>
+		<artifactId>cooleshow-im</artifactId>
+		<version>1.0</version>
+	</parent>
+	<groupId>com.yonge.cooleshow</groupId>
+	<artifactId>im-server</artifactId>
+	<version>1.0</version>
+	<name>im-server</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
+	</dependencies>
+
 </project>

cooleshow-task/pom.xml

@@ -1,21 +1,22 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.yonge.cooleshow</groupId>
-    <artifactId>cooleshow</artifactId>
-    <version>1.0</version>
-  </parent>
-  <groupId>com.yonge.cooleshow</groupId>
-  <artifactId>cooleshow-task</artifactId>
-  <version>1.0</version>
-  <name>cooleshow-task</name>
-  <url>http://maven.apache.org</url>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <dependencies>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.yonge.cooleshow</groupId>
+		<artifactId>cooleshow</artifactId>
+		<version>1.0</version>
+	</parent>
+	<groupId>com.yonge.cooleshow</groupId>
+	<artifactId>cooleshow-task</artifactId>
+	<version>1.0</version>
+	<name>cooleshow-task</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
 
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
@@ -26,7 +27,7 @@
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>
@@ -36,25 +37,38 @@
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 		</dependency>
-		
+
 		<dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-        </dependency>
-        
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid-spring-boot-starter</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>com.spring4all</groupId>
 			<artifactId>swagger-spring-boot-starter</artifactId>
 		</dependency>
-		
-		<dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        
-        <dependency>
-        	<groupId>com.yonge.cooleshow</groupId>
-        	<artifactId>auth-api</artifactId>
-        </dependency>
-  </dependencies>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.yonge.cooleshow</groupId>
+			<artifactId>auth-api</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -0,0 +1,37 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/music")
+@Api(tags = "乐谱 web controller")
+public class MusicSheetController extends BaseController {
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private MusicSheetService musicSheetService;
+
+    @ApiOperation(value = "新增曲谱")
+    @RequestMapping("/sheet/create")
+    public Object create(@RequestBody MusicSheet musicSheet) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        musicSheet.setCreateBy(0L);
+        musicSheetService.insert(musicSheet);
+        return succeed();
+    }
+}

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,28 @@
+#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
+
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: localhost:8848 #ÅäÖÃNacosµØÖ·
+        namespace: dev
+      config:
+        server-addr: localhost:8848
+        namespace: dev
+        group: DEFAULT_GROUP
+        #prefix: admin
+        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/AlbumFavoriteDao.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.AlbumFavorite;
+
+public interface AlbumFavoriteDao extends BaseDAO<Long, AlbumFavorite> {
+
+	
+}

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/MusicFavoriteDao.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.MusicFavorite;
+
+public interface MusicFavoriteDao extends BaseDAO<Long, MusicFavorite> {
+
+	
+}

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/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/VideoLessonGroupDao.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.VideoLessonGroup;
+
+public interface VideoLessonGroupDao extends BaseDAO<Long, VideoLessonGroup> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonGroupDetailDao.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.VideoLessonGroupDetail;
+
+public interface VideoLessonGroupDetailDao extends BaseDAO<Long, VideoLessonGroupDetail> {
+
+	
+}

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/AlbumFavorite.java

@@ -0,0 +1,71 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(album_favorite):
+ */
+public class AlbumFavorite {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "用户ID(目前只是学生ID)",required = false)
+	private Long userId;
+	
+	@ApiModelProperty(value = "专辑ID",required = false)
+	private Long albumId;
+	
+	@ApiModelProperty(value = "收藏时间",required = false)
+	private java.util.Date favoriteTime;
+	
+	@ApiModelProperty(value = "是否收藏",required = false)
+	private boolean favoriteFlag;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setUserId(Long userId){
+		this.userId = userId;
+	}
+	
+	public Long getUserId(){
+		return this.userId;
+	}
+			
+	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;
+	}
+			
+	public void setFavoriteFlag(boolean favoriteFlag){
+		this.favoriteFlag = favoriteFlag;
+	}
+	
+	public boolean isFavoriteFlag(){
+		return this.favoriteFlag;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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 sortNumber;
+	
+	@ApiModelProperty(value = "添加时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "添加人",required = false)
+	private Long createBy;
+	
+	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 setSortNumber(Integer sortNumber){
+		this.sortNumber = sortNumber;
+	}
+	
+	public Integer getSortNumber(){
+		return this.sortNumber;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setCreateBy(Long createBy){
+		this.createBy = createBy;
+	}
+	
+	public Long getCreateBy(){
+		return this.createBy;
+	}
+			
+	@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 = "专辑状态(1:启用;0:停用)",required = false)
+	private boolean albumStatus;
+	
+	@ApiModelProperty(value = "排序号",required = false)
+	private Integer sortNumber;
+	
+	@ApiModelProperty(value = "是否热门专辑(1:是;0:否)",required = false)
+	private boolean hotFlag;
+	
+	@ApiModelProperty(value = "是否置顶(1:是;0:否)",required = false)
+	private boolean topFlag;
+	
+	@ApiModelProperty(value = "创建时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "创建人",required = false)
+	private Long createBy;
+	
+	@ApiModelProperty(value = "更新时间",required = false)
+	private java.util.Date updateTime;
+	
+	@ApiModelProperty(value = "更新人",required = false)
+	private Long updateBy;
+	
+	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 setSortNumber(Integer sortNumber){
+		this.sortNumber = sortNumber;
+	}
+	
+	public Integer getSortNumber(){
+		return this.sortNumber;
+	}
+			
+	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 setCreateBy(Long createBy){
+		this.createBy = createBy;
+	}
+	
+	public Long getCreateBy(){
+		return this.createBy;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setUpdateBy(Long updateBy){
+		this.updateBy = updateBy;
+	}
+	
+	public Long getUpdateBy(){
+		return this.updateBy;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,71 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(music_favorite):
+ */
+public class MusicFavorite {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "用户ID(目前只是学生ID)",required = false)
+	private Long userId;
+	
+	@ApiModelProperty(value = "曲谱ID",required = false)
+	private Long musicSheetId;
+	
+	@ApiModelProperty(value = "收藏时间",required = false)
+	private java.util.Date favoriteTime;
+	
+	@ApiModelProperty(value = "是否收藏(1:收藏;0:取消收藏)",required = false)
+	private boolean favoriteFlag;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setUserId(Long userId){
+		this.userId = userId;
+	}
+	
+	public Long getUserId(){
+		return this.userId;
+	}
+			
+	public void setMusicSheetId(Long musicSheetId){
+		this.musicSheetId = musicSheetId;
+	}
+	
+	public Long getMusicSheetId(){
+		return this.musicSheetId;
+	}
+			
+	public void setFavoriteTime(java.util.Date favoriteTime){
+		this.favoriteTime = favoriteTime;
+	}
+	
+	public java.util.Date getFavoriteTime(){
+		return this.favoriteTime;
+	}
+			
+	public void setFavoriteFlag(boolean favoriteFlag){
+		this.favoriteFlag = favoriteFlag;
+	}
+	
+	public boolean isFavoriteFlag(){
+		return this.favoriteFlag;
+	}
+			
+	@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 musicSheetName;
+	
+	@ApiModelProperty(value = "曲谱来源(0:平台;非0:老师ID)",required = false)
+	private Long userId;
+	
+	@ApiModelProperty(value = "作曲人",required = false)
+	private String composer;
+	
+	@ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)",required = false)
+	private String musicSubject;
+	
+	@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 = "是否可以评测(0:否;1:是)",required = false)
+	private boolean canEvaluate;
+	
+	@ApiModelProperty(value = "是否展示指法(0:否;1:是)",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 sortNumber;
+	
+	@ApiModelProperty(value = "是否置顶(0:否;1:是)",required = false)
+	private boolean topFlag;
+	
+	@ApiModelProperty(value = "是否热门曲谱(0:否;1:是)",required = false)
+	private boolean hotFlag;
+	
+	@ApiModelProperty(value = "曲谱价格",required = false)
+	private java.math.BigDecimal musicPrice;
+	
+	@ApiModelProperty(value = "音频文件存储路径",required = false)
+	private String audioFileUrl;
+	
+	@ApiModelProperty(value = "XML文件存储路径",required = false)
+	private String xmlFileUrl;
+	
+	@ApiModelProperty(value = "是否自带节拍器(0:否;1:是)",required = false)
+	private boolean hasBeat;
+	
+	@ApiModelProperty(value = "创建时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "创建人(老师或者是后台平台用户)",required = false)
+	private Long createBy;
+	
+	@ApiModelProperty(value = "更新时间",required = false)
+	private java.util.Date updateTime;
+	
+	@ApiModelProperty(value = "更新人(老师或者是后台平台用户)",required = false)
+	private Long updateBy;
+	
+	@ApiModelProperty(value = "备注",required = false)
+	private String remark;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setMusicSheetName(String musicSheetName){
+		this.musicSheetName = musicSheetName;
+	}
+	
+	public String getMusicSheetName(){
+		return this.musicSheetName;
+	}
+			
+	public void setUserId(Long userId){
+		this.userId = userId;
+	}
+	
+	public Long getUserId(){
+		return this.userId;
+	}
+			
+	public void setComposer(String composer){
+		this.composer = composer;
+	}
+	
+	public String getComposer(){
+		return this.composer;
+	}
+			
+	public void setMusicSubject(String musicSubject){
+		this.musicSubject = musicSubject;
+	}
+	
+	public String getMusicSubject(){
+		return this.musicSubject;
+	}
+			
+	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 setSortNumber(Integer sortNumber){
+		this.sortNumber = sortNumber;
+	}
+	
+	public Integer getSortNumber(){
+		return this.sortNumber;
+	}
+			
+	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(java.math.BigDecimal musicPrice){
+		this.musicPrice = musicPrice;
+	}
+	
+	public java.math.BigDecimal 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 setHasBeat(boolean hasBeat){
+		this.hasBeat = hasBeat;
+	}
+	
+	public boolean isHasBeat(){
+		return this.hasBeat;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setCreateBy(Long createBy){
+		this.createBy = createBy;
+	}
+	
+	public Long getCreateBy(){
+		return this.createBy;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setUpdateBy(Long updateBy){
+		this.updateBy = updateBy;
+	}
+	
+	public Long getUpdateBy(){
+		return this.updateBy;
+	}
+			
+	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,93 @@
+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 musicSheetId;
+	
+	@ApiModelProperty(value = "声部",required = false)
+	private String musicSubject;
+	
+	@ApiModelProperty(value = "MP3原声音频文件URL",required = false)
+	private String audioFileUrl;
+	
+	@ApiModelProperty(value = "排序号",required = false)
+	private Integer sortNumber;
+	
+	@ApiModelProperty(value = "创建时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "创建人(老师或者是后台平台用户)",required = false)
+	private Long createBy;
+	
+	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 setMusicSubject(String musicSubject){
+		this.musicSubject = musicSubject;
+	}
+	
+	public String getMusicSubject(){
+		return this.musicSubject;
+	}
+			
+	public void setAudioFileUrl(String audioFileUrl){
+		this.audioFileUrl = audioFileUrl;
+	}
+	
+	public String getAudioFileUrl(){
+		return this.audioFileUrl;
+	}
+			
+	public void setSortNumber(Integer sortNumber){
+		this.sortNumber = sortNumber;
+	}
+	
+	public Integer getSortNumber(){
+		return this.sortNumber;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setCreateBy(Long createBy){
+		this.createBy = createBy;
+	}
+	
+	public Long getCreateBy(){
+		return this.createBy;
+	}
+			
+	@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 java.math.BigDecimal 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(java.math.BigDecimal purchasePrice){
+		this.purchasePrice = purchasePrice;
+	}
+	
+	public java.math.BigDecimal 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/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 videoId;
+	
+	@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 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 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/VideoLessonGroup.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_group):
+ */
+public class VideoLessonGroup {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "课程名称",required = false)
+	private String lessonName;
+	
+	@ApiModelProperty(value = "课程声部",required = false)
+	private String lessonSubject;
+	
+	@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 sortNumber;
+	
+	@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 setLessonSubject(String lessonSubject){
+		this.lessonSubject = lessonSubject;
+	}
+	
+	public String getLessonSubject(){
+		return this.lessonSubject;
+	}
+			
+	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 setSortNumber(Integer sortNumber){
+		this.sortNumber = sortNumber;
+	}
+	
+	public Integer getSortNumber(){
+		return this.sortNumber;
+	}
+			
+	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/VideoLessonGroupDetail.java

@@ -0,0 +1,148 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(video_lesson_group_detail):
+ */
+public class VideoLessonGroupDetail {
+
+	@ApiModelProperty(value = "主键",required = false)
+	private Long id;
+	
+	@ApiModelProperty(value = "课程组ID",required = false)
+	private Long videoLessonGroupId;
+	
+	@ApiModelProperty(value = "视频标题",required = false)
+	private String videoTitle;
+	
+	@ApiModelProperty(value = "视频内容",required = false)
+	private String videoContent;
+	
+	@ApiModelProperty(value = "视频文件URL",required = false)
+	private String videoUrl;
+	
+	@ApiModelProperty(value = "视频封面图片URL",required = false)
+	private String coverUrl;
+	
+	@ApiModelProperty(value = "是否收费(1:收费;0:免费)",required = false)
+	private boolean chargeFlag;
+	
+	@ApiModelProperty(value = "排序号",required = false)
+	private Integer sortNumber;
+	
+	@ApiModelProperty(value = "创建人(老师ID)",required = false)
+	private Long teacherId;
+	
+	@ApiModelProperty(value = "创建时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "更新人",required = false)
+	private Long updateBy;
+	
+	@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 setVideoLessonGroupId(Long videoLessonGroupId){
+		this.videoLessonGroupId = videoLessonGroupId;
+	}
+	
+	public Long getVideoLessonGroupId(){
+		return this.videoLessonGroupId;
+	}
+			
+	public void setVideoTitle(String videoTitle){
+		this.videoTitle = videoTitle;
+	}
+	
+	public String getVideoTitle(){
+		return this.videoTitle;
+	}
+			
+	public void setVideoContent(String videoContent){
+		this.videoContent = videoContent;
+	}
+	
+	public String getVideoContent(){
+		return this.videoContent;
+	}
+			
+	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 setChargeFlag(boolean chargeFlag){
+		this.chargeFlag = chargeFlag;
+	}
+	
+	public boolean isChargeFlag(){
+		return this.chargeFlag;
+	}
+			
+	public void setSortNumber(Integer sortNumber){
+		this.sortNumber = sortNumber;
+	}
+	
+	public Integer getSortNumber(){
+		return this.sortNumber;
+	}
+			
+	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 setUpdateBy(Long updateBy){
+		this.updateBy = updateBy;
+	}
+	
+	public Long getUpdateBy(){
+		return this.updateBy;
+	}
+			
+	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/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 videoLessonGroupId;
+	
+	@ApiModelProperty(value = "学生ID",required = false)
+	private Long studentId;
+	
+	@ApiModelProperty(value = "购买时间",required = false)
+	private java.util.Date purchaseTime;
+	
+	@ApiModelProperty(value = "支付金额",required = false)
+	private java.math.BigDecimal payMoney;
+	
+	@ApiModelProperty(value = "订单流水号",required = false)
+	private String orderNo;
+	
+	@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 setVideoLessonGroupId(Long videoLessonGroupId){
+		this.videoLessonGroupId = videoLessonGroupId;
+	}
+	
+	public Long getVideoLessonGroupId(){
+		return this.videoLessonGroupId;
+	}
+			
+	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(java.math.BigDecimal payMoney){
+		this.payMoney = payMoney;
+	}
+	
+	public java.math.BigDecimal 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 videoLessonGroupId;
+	
+	@ApiModelProperty(value = "视频ID",required = false)
+	private Long videoId;
+	
+	@ApiModelProperty(value = "学生ID",required = false)
+	private Long studentId;
+	
+	@ApiModelProperty(value = "是否学完(1:是;0:否)",required = false)
+	private boolean finishFlag;
+	
+	@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 setVideoLessonGroupId(Long videoLessonGroupId){
+		this.videoLessonGroupId = videoLessonGroupId;
+	}
+	
+	public Long getVideoLessonGroupId(){
+		return this.videoLessonGroupId;
+	}
+			
+	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 setFinishFlag(boolean finishFlag){
+		this.finishFlag = finishFlag;
+	}
+	
+	public boolean isFinishFlag(){
+		return this.finishFlag;
+	}
+			
+	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/AlbumFavoriteService.java

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

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/MusicFavoriteService.java

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

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/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/VideoLessonGroupDetailService.java

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

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

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

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/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/AlbumFavoriteServiceImpl.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.AlbumFavorite;
+import com.yonge.cooleshow.biz.dal.service.AlbumFavoriteService;
+import com.yonge.cooleshow.biz.dal.dao.AlbumFavoriteDao;
+
+@Service
+public class AlbumFavoriteServiceImpl extends BaseServiceImpl<Long, AlbumFavorite>  implements AlbumFavoriteService {
+	
+	@Autowired
+	private AlbumFavoriteDao albumFavoriteDao;
+
+	@Override
+	public BaseDAO<Long, AlbumFavorite> getDAO() {
+		return albumFavoriteDao;
+	}
+	
+}

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/MusicFavoriteServiceImpl.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.MusicFavorite;
+import com.yonge.cooleshow.biz.dal.service.MusicFavoriteService;
+import com.yonge.cooleshow.biz.dal.dao.MusicFavoriteDao;
+
+@Service
+public class MusicFavoriteServiceImpl extends BaseServiceImpl<Long, MusicFavorite>  implements MusicFavoriteService {
+	
+	@Autowired
+	private MusicFavoriteDao musicFavoriteDao;
+
+	@Override
+	public BaseDAO<Long, MusicFavorite> getDAO() {
+		return musicFavoriteDao;
+	}
+	
+}

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/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/VideoLessonGroupDetailServiceImpl.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.VideoLessonGroupDetail;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
+import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDetailDao;
+
+@Service
+public class VideoLessonGroupDetailServiceImpl extends BaseServiceImpl<Long, VideoLessonGroupDetail>  implements VideoLessonGroupDetailService {
+	
+	@Autowired
+	private VideoLessonGroupDetailDao videoLessonGroupDetailDao;
+
+	@Override
+	public BaseDAO<Long, VideoLessonGroupDetail> getDAO() {
+		return videoLessonGroupDetailDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupServiceImpl.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.VideoLessonGroup;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
+import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao;
+
+@Service
+public class VideoLessonGroupServiceImpl extends BaseServiceImpl<Long, VideoLessonGroup>  implements VideoLessonGroupService {
+	
+	@Autowired
+	private VideoLessonGroupDao videoLessonGroupDao;
+
+	@Override
+	public BaseDAO<Long, VideoLessonGroup> getDAO() {
+		return videoLessonGroupDao;
+	}
+	
+}

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

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 type="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="album_id_" property="albumId" />
+		<result column="music_sheet_id_" property="musicSheetId" />
+		<result column="sort_number_" property="sortNumber" />
+		<result column="create_time_" property="createTime" />
+		<result column="create_by_" property="createBy" />
+	</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>
+	
+	<!-- 向数据库增加一条记录 -->
+    <delete id="delete" parameterType="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="sortNumber != null and sortNumber != ''">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createBy != null and createBy != ''">
+            and create_by_ = #{createBy}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="AlbumMusicRelate">
+        insert into album_music_relate
+        (album_id_,music_sheet_id_,sort_number_,create_time_,create_by_)
+        values
+        (#{albumId},#{musicSheetId},#{sortNumber},sysdate(),#{createBy})
+    </insert>
+
+    <update id="update" parameterType="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="sortNumber != null">
+                sort_number_ = #{sortNumber},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="createBy != null">
+                create_by_ = #{createBy},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="AlbumMusicRelate" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        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="sortNumber != null">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createBy != null">
+            and create_by_ = #{createBy}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM album_music_relate WHERE id_ = #{id} 
+	</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>
+</mapper>

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

@@ -0,0 +1,183 @@
+<?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 type="com.yonge.cooleshow.biz.dal.entity.MusicAlbum" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="album_name_" property="albumName" />
+		<result column="album_desc_" property="albumDesc" />
+		<result column="album_tag_" property="albumTag" />
+		<result column="album_cover_url_" property="albumCoverUrl" />
+		<result column="album_status_" property="albumStatus" />
+		<result column="sort_number_" property="sortNumber" />
+		<result column="hot_flag_" property="hotFlag" />
+		<result column="top_flag_" property="topFlag" />
+		<result column="create_time_" property="createTime" />
+		<result column="create_by_" property="createBy" />
+		<result column="update_time_" property="updateTime" />
+		<result column="update_by_" property="updateBy" />
+	</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>
+
+    <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="sortNumber != null and sortNumber != ''">
+            and sort_number_ = #{sortNumber}
+        </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="createBy != null and createBy != ''">
+            and create_by_ = #{createBy}
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            and update_time_ = #{updateTime}
+        </if>
+        <if test="updateBy != null and updateBy != ''">
+            and update_by_ = #{updateBy}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="MusicAlbum">
+        insert into music_album
+        (album_name_,album_desc_,album_tag_,album_cover_url_,album_status_,sort_number_,hot_flag_,top_flag_,create_time_,create_by_,update_time_,update_by_)
+        values
+        (#{albumName},#{albumDesc},#{albumTag},#{albumCoverUrl},#{albumStatus},#{sortNumber},#{hotFlag},#{topFlag},sysdate(),#{createBy},#{updateTime},#{updateBy})
+    </insert>
+
+    <update id="update" parameterType="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="sortNumber != null">
+                sort_number_ = #{sortNumber},
+            </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="createBy != null">
+                create_by_ = #{createBy},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="updateBy != null">
+                update_by_ = #{updateBy},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="MusicAlbum" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        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="sortNumber != null">
+            and sort_number_ = #{sortNumber}
+        </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="createBy != null">
+            and create_by_ = #{createBy}
+        </if>
+        <if test="updateTime != null">
+            and update_time_ = #{updateTime}
+        </if>
+        <if test="updateBy != null">
+            and update_by_ = #{updateBy}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_album WHERE id_ = #{id} 
+	</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>
+</mapper>

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

@@ -0,0 +1,103 @@
+<?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.MusicFavoriteDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicFavorite" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="user_id_" property="userId" />
+		<result column="music_sheet_id_" property="musicSheetId" />
+		<result column="favorite_time_" property="favoriteTime" />
+		<result column="favorite_flag_" property="favoriteFlag" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM music_favorite WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM music_favorite ORDER BY id_
+	</select>
+
+    <delete id="delete" parameterType="MusicFavorite">
+        delete from music_favorite
+        where 1=1
+        <if test="userId != null and userId != ''">
+            and user_id_ = #{userId}
+        </if>
+        <if test="musicSheetId != null and musicSheetId != ''">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="favoriteTime != null and favoriteTime != ''">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+        <if test="favoriteFlag != null and favoriteFlag != ''">
+            and favorite_flag_ = #{favoriteFlag}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="MusicFavorite">
+        insert into music_favorite
+        (user_id_,music_sheet_id_,favorite_time_,favorite_flag_)
+        values
+        (#{userId},#{musicSheetId},#{favoriteTime},#{favoriteFlag})
+    </insert>
+
+    <update id="update" parameterType="MusicFavorite">
+        update music_favorite
+        <set>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="musicSheetId != null">
+                music_sheet_id_ = #{musicSheetId},
+            </if>
+            <if test="favoriteTime != null">
+                favorite_time_ = #{favoriteTime},
+            </if>
+            <if test="favoriteFlag != null">
+                favorite_flag_ = #{favoriteFlag},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="MusicFavorite" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from music_favorite
+        where 1=1
+        <if test="userId != null">
+            and user_id_ = #{userId}
+        </if>
+        <if test="musicSheetId != null">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="favoriteTime != null">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+        <if test="favoriteFlag != null">
+            and favorite_flag_ = #{favoriteFlag}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_favorite WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM music_favorite ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_favorite
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetAccompanimentMapper.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.MusicSheetAccompanimentDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="music_sheet_id_" property="musicSheetId" />
+		<result column="music_subject_" property="musicSubject" />
+		<result column="audio_file_url_" property="audioFileUrl" />
+		<result column="sort_number_" property="sortNumber" />
+		<result column="create_time_" property="createTime" />
+		<result column="create_by_" property="createBy" />
+	</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>
+
+    <delete id="delete" parameterType="MusicSheetAccompaniment">
+        delete from music_sheet_accompaniment
+        where 1=1
+        <if test="musicSheetId != null and musicSheetId != ''">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="musicSubject != null and musicSubject != ''">
+            and music_subject_ = #{musicSubject}
+        </if>
+        <if test="audioFileUrl != null and audioFileUrl != ''">
+            and audio_file_url_ = #{audioFileUrl}
+        </if>
+        <if test="sortNumber != null and sortNumber != ''">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createBy != null and createBy != ''">
+            and create_by_ = #{createBy}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="MusicSheetAccompaniment">
+        insert into music_sheet_accompaniment
+        (music_sheet_id_,music_subject_,audio_file_url_,sort_number_,create_time_,create_by_)
+        values
+        (#{musicSheetId},#{musicSubject},#{audioFileUrl},#{sortNumber},sysdate(),#{createBy})
+    </insert>
+
+    <update id="update" parameterType="MusicSheetAccompaniment">
+        update music_sheet_accompaniment
+        <set>
+            <if test="musicSheetId != null">
+                music_sheet_id_ = #{musicSheetId},
+            </if>
+            <if test="musicSubject != null and musicSubject != ''">
+                music_subject_ = #{musicSubject},
+            </if>
+            <if test="audioFileUrl != null and audioFileUrl != ''">
+                audio_file_url_ = #{audioFileUrl},
+            </if>
+            <if test="sortNumber != null">
+                sort_number_ = #{sortNumber},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="createBy != null">
+                create_by_ = #{createBy},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="MusicSheetAccompaniment" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from music_sheet_accompaniment
+        where 1=1
+        <if test="musicSheetId != null">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="musicSubject != null and musicSubject != ''">
+            and music_subject_ = #{musicSubject}
+        </if>
+        <if test="audioFileUrl != null and audioFileUrl != ''">
+            and audio_file_url_ = #{audioFileUrl}
+        </if>
+        <if test="sortNumber != null">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createBy != null">
+            and create_by_ = #{createBy}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_sheet_accompaniment WHERE id_ = #{id} 
+	</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>
+</mapper>

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

@@ -0,0 +1,293 @@
+<?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_sheet_name_" property="musicSheetName" />
+		<result column="user_id_" property="userId" />
+		<result column="composer_" property="composer" />
+		<result column="music_subject_" property="musicSubject" />
+		<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="sort_number_" property="sortNumber" />
+		<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="has_beat_" property="hasBeat" />
+		<result column="create_time_" property="createTime" />
+		<result column="create_by_" property="createBy" />
+		<result column="update_time_" property="updateTime" />
+		<result column="update_by_" property="updateBy" />
+		<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>
+
+    <delete id="delete" parameterType="MusicSheet">
+        delete from music_sheet
+        where 1=1
+        <if test="musicSheetName != null and musicSheetName != ''">
+            and music_sheet_name_ = #{musicSheetName}
+        </if>
+        <if test="userId != null and userId != ''">
+            and user_id_ = #{userId}
+        </if>
+        <if test="composer != null and composer != ''">
+            and composer_ = #{composer}
+        </if>
+        <if test="musicSubject != null and musicSubject != ''">
+            and music_subject_ = #{musicSubject}
+        </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="sortNumber != null and sortNumber != ''">
+            and sort_number_ = #{sortNumber}
+        </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="hasBeat != null and hasBeat != ''">
+            and has_beat_ = #{hasBeat}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createBy != null and createBy != ''">
+            and create_by_ = #{createBy}
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            and update_time_ = #{updateTime}
+        </if>
+        <if test="updateBy != null and updateBy != ''">
+            and update_by_ = #{updateBy}
+        </if>
+        <if test="remark != null and remark != ''">
+            and remark_ = #{remark}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="MusicSheet">
+        insert into music_sheet
+        (music_sheet_name_,user_id_,composer_,music_subject_,audio_type_,music_tag_,play_speed_,can_evaluate_,show_fingering_,charge_type_,audit_status_,sort_number_,top_flag_,hot_flag_,music_price_,audio_file_url_,xml_file_url_,has_beat_,create_time_,create_by_,update_time_,update_by_,remark_)
+        values
+        (#{musicSheetName},#{userId},#{composer},#{musicSubject},#{audioType},#{musicTag},#{playSpeed},#{canEvaluate},#{showFingering},#{chargeType},#{auditStatus},#{sortNumber},#{topFlag},#{hotFlag},#{musicPrice},#{audioFileUrl},#{xmlFileUrl},#{hasBeat},sysdate(),#{createBy},#{updateTime},#{updateBy},#{remark})
+    </insert>
+
+    <update id="update" parameterType="MusicSheet">
+        update music_sheet
+        <set>
+            <if test="musicSheetName != null and musicSheetName != ''">
+                music_sheet_name_ = #{musicSheetName},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="composer != null and composer != ''">
+                composer_ = #{composer},
+            </if>
+            <if test="musicSubject != null and musicSubject != ''">
+                music_subject_ = #{musicSubject},
+            </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="sortNumber != null">
+                sort_number_ = #{sortNumber},
+            </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="hasBeat != null">
+                has_beat_ = #{hasBeat},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="createBy != null">
+                create_by_ = #{createBy},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="updateBy != null">
+                update_by_ = #{updateBy},
+            </if>
+            <if test="remark != null and remark != ''">
+                remark_ = #{remark},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="MusicSheet" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from music_sheet
+        where 1=1
+        <if test="musicSheetName != null and musicSheetName != ''">
+            and music_sheet_name_ = #{musicSheetName}
+        </if>
+        <if test="userId != null">
+            and user_id_ = #{userId}
+        </if>
+        <if test="composer != null and composer != ''">
+            and composer_ = #{composer}
+        </if>
+        <if test="musicSubject != null and musicSubject != ''">
+            and music_subject_ = #{musicSubject}
+        </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="sortNumber != null">
+            and sort_number_ = #{sortNumber}
+        </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="hasBeat != null">
+            and has_beat_ = #{hasBeat}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createBy != null">
+            and create_by_ = #{createBy}
+        </if>
+        <if test="updateTime != null">
+            and update_time_ = #{updateTime}
+        </if>
+        <if test="updateBy != null">
+            and update_by_ = #{updateBy}
+        </if>
+        <if test="remark != null and remark != ''">
+            and remark_ = #{remark}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_sheet WHERE id_ = #{id} 
+	</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>
+</mapper>

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

@@ -0,0 +1,133 @@
+<?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>
+
+    <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>
+
+    <insert id="insert" parameterType="MusicSheetPurchaseRecord">
+        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="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>
+
+    <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>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_sheet_purchase_record WHERE id_ = #{id} 
+	</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>
+</mapper>

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

@@ -0,0 +1,103 @@
+<?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_id_" property="videoId" />
+		<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>
+
+    <delete id="delete" parameterType="VideoLessonEvaluate">
+        delete from video_lesson_evaluate
+        where 1=1
+        <if test="videoId != null and videoId != ''">
+            and video_id_ = #{videoId}
+        </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>
+
+    <insert id="insert" parameterType="VideoLessonEvaluate">
+        insert into video_lesson_evaluate
+        (video_id_,student_id_,content_,evaluate_time_)
+        values
+        (#{videoId},#{studentId},#{content},#{evaluateTime})
+    </insert>
+
+    <update id="update" parameterType="VideoLessonEvaluate">
+        update video_lesson_evaluate
+        <set>
+            <if test="videoId != null">
+                video_id_ = #{videoId},
+            </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="videoId != null">
+            and video_id_ = #{videoId}
+        </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>
+	
+	<!-- 分页查询 -->
+	<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/VideoLessonGroupDetailMapper.xml

@@ -0,0 +1,173 @@
+<?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.VideoLessonGroupDetailDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="video_lesson_group_id_" property="videoLessonGroupId" />
+		<result column="video_title_" property="videoTitle" />
+		<result column="video_content_" property="videoContent" />
+		<result column="video_url_" property="videoUrl" />
+		<result column="cover_url_" property="coverUrl" />
+		<result column="charge_flag_" property="chargeFlag" />
+		<result column="sort_number_" property="sortNumber" />
+		<result column="teacher_id_" property="teacherId" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_by_" property="updateBy" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM video_lesson_group_detail WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM video_lesson_group_detail ORDER BY id_
+	</select>
+
+    <delete id="delete" parameterType="VideoLessonGroupDetail">
+        delete from video_lesson_group_detail
+        where 1=1
+        <if test="videoLessonGroupId != null and videoLessonGroupId != ''">
+            and video_lesson_group_id_ = #{videoLessonGroupId}
+        </if>
+        <if test="videoTitle != null and videoTitle != ''">
+            and video_title_ = #{videoTitle}
+        </if>
+        <if test="videoContent != null and videoContent != ''">
+            and video_content_ = #{videoContent}
+        </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="chargeFlag != null and chargeFlag != ''">
+            and charge_flag_ = #{chargeFlag}
+        </if>
+        <if test="sortNumber != null and sortNumber != ''">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="teacherId != null and teacherId != ''">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="updateBy != null and updateBy != ''">
+            and update_by_ = #{updateBy}
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            and update_time_ = #{updateTime}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="VideoLessonGroupDetail">
+        insert into video_lesson_group_detail
+        (video_lesson_group_id_,video_title_,video_content_,video_url_,cover_url_,charge_flag_,sort_number_,teacher_id_,create_time_,update_by_,update_time_)
+        values
+        (#{videoLessonGroupId},#{videoTitle},#{videoContent},#{videoUrl},#{coverUrl},#{chargeFlag},#{sortNumber},#{teacherId},sysdate(),#{updateBy},#{updateTime})
+    </insert>
+
+    <update id="update" parameterType="VideoLessonGroupDetail">
+        update video_lesson_group_detail
+        <set>
+            <if test="videoLessonGroupId != null">
+                video_lesson_group_id_ = #{videoLessonGroupId},
+            </if>
+            <if test="videoTitle != null and videoTitle != ''">
+                video_title_ = #{videoTitle},
+            </if>
+            <if test="videoContent != null and videoContent != ''">
+                video_content_ = #{videoContent},
+            </if>
+            <if test="videoUrl != null and videoUrl != ''">
+                video_url_ = #{videoUrl},
+            </if>
+            <if test="coverUrl != null and coverUrl != ''">
+                cover_url_ = #{coverUrl},
+            </if>
+            <if test="chargeFlag != null">
+                charge_flag_ = #{chargeFlag},
+            </if>
+            <if test="sortNumber != null">
+                sort_number_ = #{sortNumber},
+            </if>
+            <if test="teacherId != null">
+                teacher_id_ = #{teacherId},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateBy != null">
+                update_by_ = #{updateBy},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="VideoLessonGroupDetail" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson_group_detail
+        where 1=1
+        <if test="videoLessonGroupId != null">
+            and video_lesson_group_id_ = #{videoLessonGroupId}
+        </if>
+        <if test="videoTitle != null and videoTitle != ''">
+            and video_title_ = #{videoTitle}
+        </if>
+        <if test="videoContent != null and videoContent != ''">
+            and video_content_ = #{videoContent}
+        </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="chargeFlag != null">
+            and charge_flag_ = #{chargeFlag}
+        </if>
+        <if test="sortNumber != null">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="teacherId != null">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="updateBy != null">
+            and update_by_ = #{updateBy}
+        </if>
+        <if test="updateTime != null">
+            and update_time_ = #{updateTime}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM video_lesson_group_detail WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM video_lesson_group_detail ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM video_lesson_group_detail
+	</select>
+</mapper>

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

@@ -0,0 +1,203 @@
+<?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.VideoLessonGroupDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="lesson_name_" property="lessonName" />
+		<result column="lesson_subject_" property="lessonSubject" />
+		<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="sort_number_" property="sortNumber" />
+		<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_group WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM video_lesson_group ORDER BY id_
+	</select>
+
+    <delete id="delete" parameterType="VideoLessonGroup">
+        delete from video_lesson_group
+        where 1=1
+        <if test="lessonName != null and lessonName != ''">
+            and lesson_name_ = #{lessonName}
+        </if>
+        <if test="lessonSubject != null and lessonSubject != ''">
+            and lesson_subject_ = #{lessonSubject}
+        </if>
+        <if test="lessonDesc != null and lessonDesc != ''">
+            and lesson_desc_ = #{lessonDesc}
+        </if>
+        <if test="lessonPrice != null and lessonPrice != ''">
+            and lesson_price_ = #{lessonPrice}
+        </if>
+        <if test="lessonCoverUrl != null and lessonCoverUrl != ''">
+            and lesson_cover_url_ = #{lessonCoverUrl}
+        </if>
+        <if test="teacherId != null and teacherId != ''">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="lessonCount != null and lessonCount != ''">
+            and lesson_count_ = #{lessonCount}
+        </if>
+        <if test="sortNumber != null and sortNumber != ''">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="lessonTag != null and lessonTag != ''">
+            and lesson_tag_ = #{lessonTag}
+        </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="auditStatus != null and auditStatus != ''">
+            and audit_status_ = #{auditStatus}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            and update_time_ = #{updateTime}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="VideoLessonGroup">
+        insert into video_lesson_group
+        (lesson_name_,lesson_subject_,lesson_desc_,lesson_price_,lesson_cover_url_,teacher_id_,lesson_count_,sort_number_,lesson_tag_,top_flag_,hot_flag_,audit_status_,create_time_,update_time_)
+        values
+        (#{lessonName},#{lessonSubject},#{lessonDesc},#{lessonPrice},#{lessonCoverUrl},#{teacherId},#{lessonCount},#{sortNumber},#{lessonTag},#{topFlag},#{hotFlag},#{auditStatus},sysdate(),#{updateTime})
+    </insert>
+
+    <update id="update" parameterType="VideoLessonGroup">
+        update video_lesson_group
+        <set>
+            <if test="lessonName != null and lessonName != ''">
+                lesson_name_ = #{lessonName},
+            </if>
+            <if test="lessonSubject != null and lessonSubject != ''">
+                lesson_subject_ = #{lessonSubject},
+            </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="sortNumber != null">
+                sort_number_ = #{sortNumber},
+            </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="VideoLessonGroup" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson_group
+        where 1=1
+        <if test="lessonName != null and lessonName != ''">
+            and lesson_name_ = #{lessonName}
+        </if>
+        <if test="lessonSubject != null and lessonSubject != ''">
+            and lesson_subject_ = #{lessonSubject}
+        </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="sortNumber != null">
+            and sort_number_ = #{sortNumber}
+        </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_group WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM video_lesson_group ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM video_lesson_group
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonPurchaseRecordMapper.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.VideoLessonPurchaseRecordDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="video_lesson_group_id_" property="videoLessonGroupId" />
+		<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>
+
+    <delete id="delete" parameterType="VideoLessonPurchaseRecord">
+        delete from video_lesson_purchase_record
+        where 1=1
+        <if test="videoLessonGroupId != null and videoLessonGroupId != ''">
+            and video_lesson_group_id_ = #{videoLessonGroupId}
+        </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>
+
+    <insert id="insert" parameterType="VideoLessonPurchaseRecord">
+        insert into video_lesson_purchase_record
+        (video_lesson_group_id_,student_id_,purchase_time_,pay_money_,order_no_,order_status_)
+        values
+        (#{videoLessonGroupId},#{studentId},#{purchaseTime},#{payMoney},#{orderNo},#{orderStatus})
+    </insert>
+
+    <update id="update" parameterType="VideoLessonPurchaseRecord">
+        update video_lesson_purchase_record
+        <set>
+            <if test="videoLessonGroupId != null">
+                video_lesson_group_id_ = #{videoLessonGroupId},
+            </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="videoLessonGroupId != null">
+            and video_lesson_group_id_ = #{videoLessonGroupId}
+        </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>
+	
+	<!-- 分页查询 -->
+	<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="video_lesson_group_id_" property="videoLessonGroupId" />
+		<result column="video_id_" property="videoId" />
+		<result column="student_id_" property="studentId" />
+		<result column="finish_flag_" property="finishFlag" />
+		<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="videoLessonGroupId != null and videoLessonGroupId != ''">
+            and video_lesson_group_id_ = #{videoLessonGroupId}
+        </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="finishFlag != null and finishFlag != ''">
+            and finish_flag_ = #{finishFlag}
+        </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
+        (video_lesson_group_id_,video_id_,student_id_,finish_flag_,start_time_,finish_time_)
+        values
+        (#{videoLessonGroupId},#{videoId},#{studentId},#{finishFlag},#{startTime},#{finishTime})
+    </insert>
+
+    <update id="update" parameterType="VideoLessonStudyRecord">
+        update video_lesson_study_record
+        <set>
+            <if test="videoLessonGroupId != null">
+                video_lesson_group_id_ = #{videoLessonGroupId},
+            </if>
+            <if test="videoId != null">
+                video_id_ = #{videoId},
+            </if>
+            <if test="studentId != null">
+                student_id_ = #{studentId},
+            </if>
+            <if test="finishFlag != null">
+                finish_flag_ = #{finishFlag},
+            </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="videoLessonGroupId != null">
+            and video_lesson_group_id_ = #{videoLessonGroupId}
+        </if>
+        <if test="videoId != null">
+            and video_id_ = #{videoId}
+        </if>
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="finishFlag != null">
+            and finish_flag_ = #{finishFlag}
+        </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/pom.xml

@@ -70,13 +70,17 @@
 			<version>1.6.2</version>
 		</dependency>
 	</dependencies>
-
+	
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 </project>

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/pom.xml

@@ -64,6 +64,25 @@
             <artifactId>user-biz</artifactId>
         </dependency>
 
+		<dependency>
+			<groupId>com.github.whvcse</groupId>
+			<artifactId>easy-captcha</artifactId>
+			<version>1.6.2</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
         <dependency>
             <groupId>com.github.whvcse</groupId>
             <artifactId>easy-captcha</artifactId>

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/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]