Merge remote-tracking branch 'origin/master'

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

cooleshow-auth/auth-server/pom.xml

@@ -58,8 +58,7 @@
 			<groupId>com.yonge.cooleshow</groupId>
 			<artifactId>auth-api</artifactId>
 		</dependency>
-        <!--
-		<dependency>
+        <dependency>
 			<groupId>com.yonge.toolset</groupId>
 			<artifactId>audit-log</artifactId>
 			<exclusions>
@@ -68,7 +67,7 @@
 					<groupId>org.freemarker</groupId>
 				</exclusion>
 			</exclusions>
-		</dependency>-->
+		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -87,10 +86,6 @@
 				<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/resources/application-dev.yml

@@ -1,69 +0,0 @@
-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

@@ -1,54 +0,0 @@
-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

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

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

@@ -1,54 +0,0 @@
-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

@@ -1,54 +0,0 @@
-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

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

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

@@ -1,54 +0,0 @@
-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

@@ -1,54 +0,0 @@
-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

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

cooleshow-user/user-teacher/pom.xml

@@ -69,6 +69,11 @@
 			<artifactId>easy-captcha</artifactId>
 			<version>1.6.2</version>
 		</dependency>
+        <dependency>
+            <groupId>com.github.whvcse</groupId>
+            <artifactId>easy-captcha</artifactId>
+            <version>1.6.2</version>
+        </dependency>
 	</dependencies>
 
 	<build>
@@ -77,25 +82,6 @@
 				<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>
-            <version>1.6.2</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>

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

@@ -1,54 +0,0 @@
-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

@@ -1,54 +0,0 @@
-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

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

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

@@ -5,7 +5,7 @@ spring:
         server-addr: 47.114.1.200:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
-        prefix: student
+        prefix: teacher
         file-extension: yaml
         refresh:
           enabled: true

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

@@ -5,7 +5,7 @@ spring:
         server-addr: 47.114.1.200:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
-        prefix: student
+        prefix: teacher
         file-extension: yaml
         refresh:
           enabled: true