Merge remote-tracking branch 'origin/master'

fs-service/src/main/resources/application-config-druid-cfryt.yml

@@ -62,6 +62,12 @@ watch:
 fs :
   commonApi: http://172.26.180.67:7771
   h5CommonApi: http://172.26.180.67:7771
+  jwt:
+    # 加密秘钥
+    secret: f4e2e52034348f86b6d81e581c19jeb4
+    # token有效时长，7天，单位秒
+    expire: 31536000
+    header: AppToken
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16

fs-service/src/main/resources/application-config-druid-gzzdy.yml

@@ -87,7 +87,7 @@ cloud_host:
 headerImg:
   imgUrl:
 ipad:
-  ipadUrl: http://ipad.dingdangtcm.cn
+  ipadUrl: http://175.178.218.55:8667
   aiApi: http://
   voiceApi: http://123.207.48.104:8009
   commonApi: http://123.207.48.104:7771

fs-user-app/src/main/java/com/fs/app/controller/course/CourseQwLoginController.java

@@ -119,7 +119,7 @@ public class CourseQwLoginController extends AppBaseController {
             if(user != null){
                 FsUser userMap = new FsUser();
                 userMap.setUserId(user.getUserId());
-                user.setMaOpenId(session.getOpenid());
+                userMap.setMaOpenId(session.getOpenid());
 //                userMap.setCourseMaOpenId(session.getOpenid());
                 userMap.setUpdateTime(new DateTime());
                 userService.updateFsUser(userMap);