Merge branch 'Test' into 'master'

Test







See merge request !29

mooctest-user-server/pom.xml

@@ -50,6 +50,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
             <version>1.3.8.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -68,6 +74,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-redis</artifactId>
             <version>1.3.8.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.session</groupId>
@@ -133,6 +145,10 @@
                     <groupId>org.jboss.logging</groupId>
                     <artifactId>jboss-logging-annotations</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!--<dependency>-->
@@ -173,6 +189,10 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/configure/CustomSessionDefaultRedisSerializer.java

@@ -2,7 +2,6 @@ package cn.iselab.mooctest.user.configure;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
 
 /**
@@ -10,7 +9,7 @@ import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
  * @Author: xuexb
  * @CreateDate: 19-1-28$ 下午4:36$
  */
-public class CustomSessionDefaultRedisSerializer extends GenericJackson2JsonRedisSerializer {
+public class CustomSessionDefaultRedisSerializer extends JdkSerializationRedisSerializer {
     private static final Logger LOG = LoggerFactory.getLogger(CustomSessionDefaultRedisSerializer.class);
 
     @Override

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/util/WechatUtil.java

@@ -28,7 +28,7 @@ public class WechatUtil {
 
     public static Token getToken(String appId, String appSecret, String code) {
         Token token = new Token();
-        LOG.info("to get the token");
+        LOG.info("Ready to get the token");
         String result="";
         try {
             String url = token_url.replace("APPID", appId).replace("SECRET", appSecret).replace("CODE", code);
@@ -38,7 +38,7 @@ public class WechatUtil {
         }
         JSONObject object=new JSONObject(result);
         try {
-            System.out.println(object);
+            LOG.info(object.toString());
             token.setAccessToken(object.getString("access_token"));
             token.setExpiresIn(object.getInt("expires_in"));
             token.setRefresh_token(object.getString("refresh_token"));

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/impl/WechatLogicImpl.java

@@ -44,9 +44,10 @@ public class WechatLogicImpl extends BaseLogic implements WechatLogic {
 
     @Override
     public UserWechatDTO getUserByCode(String code){
+        LOG.info(String.format("CODE: %s", code));
         UserWechatDTO dto=new UserWechatDTO();
         Token token=wechatConfiguration.getToken(code);
-        LOG.info(token.getOpenId());
+        LOG.info(String.format("OPENID: %s",token.getOpenId()));
         WechatUserInfoDTO userInfo= WechatUtil.getWxUser(token.getAccessToken(),token.getOpenId());
         LOG.info(userInfo.getUnionid());
         UserWechat wechat=wechatService.findByUnionId(userInfo.getUnionid());