Merge branch 'develop-new' of http://git.dayaedu.com/yonge/cooleshow into test

cooleshow-auth/auth-api/pom.xml

@@ -34,10 +34,6 @@
 			<artifactId>cooleshow-common</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.yonge.cooleshow</groupId>
-			<artifactId>cooleshow-common</artifactId>
-		</dependency>
-		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-openfeign-core</artifactId>
 			<version>2.1.1.RELEASE</version>

cooleshow-auth/auth-server/pom.xml

@@ -125,18 +125,18 @@
             <groupId>com.vdurmont</groupId>
             <artifactId>emoji-java</artifactId>
         </dependency>
-        <!-- redisson -->
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>${redisson.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.yonge.cooleshow</groupId>
             <artifactId>cooleshow-api</artifactId>
             <version>1.0</version>
             <scope>compile</scope>
         </dependency>
+        <!-- redisson -->
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>${redisson.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/config/WebSecurityConfig.java

@@ -69,7 +69,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 				//.exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and()// 当未登录访问资源时
 				// 请求授权
 				.authorizeRequests()// 不需要权限认证的url
-				.antMatchers("/usernameLogin","/smsLogin", "/refreshToken",
+				.antMatchers("/usernameLogin","/smsLogin", "/refreshToken", "/*/usernameLogin", "/*/smsLogin",
 						"/getQRLoginCode","/pollingQRLoginCode","/v2/api-docs").permitAll()// 任何请求
 				.anyRequest()// 需要身份认证
 				.authenticated().and()// 关闭跨站请求防护

cooleshow-auth/auth-server/src/main/resources/logback-dev.xml

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

cooleshow-auth/auth-server/src/main/resources/logback-spring.xml

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

cooleshow-auth/auth-server/src/main/resources/logback-test.xml

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

cooleshow-common/pom.xml

@@ -25,21 +25,21 @@
 			<artifactId>toolset-base</artifactId>
 			<version>1.0</version>
 		</dependency>
+		<!-- redisson -->
+		<dependency>
+			<groupId>org.redisson</groupId>
+			<artifactId>redisson-spring-boot-starter</artifactId>
+			<version>${redisson.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>com.yonge.toolset</groupId>
 			<artifactId>utils</artifactId>
 		</dependency>
 		<!-- Redis缓存整合开始 -->
-		<dependency>
+		<!--<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>io.lettuce</groupId>
-					<artifactId>lettuce-core</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+		</dependency>-->
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>

cooleshow-websocket/pom.xml

@@ -13,7 +13,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <redisson.version>3.16.4</redisson.version>
     </properties>
 
     <dependencies>
@@ -68,11 +67,11 @@
         </dependency>
 
         <!-- redisson -->
-        <dependency>
+<!--        <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
             <version>${redisson.version}</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

pom.xml

@@ -21,7 +21,7 @@
 		<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
 		<zipkin.version>2.12.2</zipkin.version>
 		<google.zxing.version>3.4.0</google.zxing.version>
-		<redisson.version>3.16.4</redisson.version>
+		<redisson.version>3.11.5</redisson.version>
 		<maven.test.skip>true</maven.test.skip>
 	</properties>
 
@@ -235,6 +235,13 @@
                 <version>1.3.70</version>
             </dependency>
 
+			<!-- redisson -->
+			<dependency>
+				<groupId>org.redisson</groupId>
+				<artifactId>redisson-spring-boot-starter</artifactId>
+				<version>${redisson.version}</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 

toolset/toolset-payment/pom.xml

@@ -14,7 +14,6 @@
     <name>toolset-payment</name>
 
     <properties>
-        <redisson.version>3.16.4</redisson.version>
         <binarywang.weixin.java.version>4.1.0</binarywang.weixin.java.version>
     </properties>