|
@@ -65,13 +65,13 @@ public class CourseQwLoginController extends AppBaseController {
|
|
|
@PostMapping("/courseLogin")
|
|
|
@Transactional
|
|
|
public R courseLogin(@RequestBody LoginParam param) {
|
|
|
- logger.info("小程序看课登录 {}",param);
|
|
|
-
|
|
|
+ logger.info("小程序看课登录 参数: {}",JSON.toJSON(param));
|
|
|
SysConfig sysConfig3 = sysConfigMapper.selectConfigByConfigKey("courseMa.config");
|
|
|
List<CourseMaConfig> courseMaConfigs = JSON.parseArray(sysConfig3.getConfigValue(), CourseMaConfig.class);
|
|
|
if (courseMaConfigs.isEmpty()){
|
|
|
return R.error("小程序配置为空");
|
|
|
}
|
|
|
+ logger.info("小程序配置: {}",JSON.toJSON(sysConfig3));
|
|
|
// 根据appId匹配配置
|
|
|
CourseMaConfig matchedConfig = courseMaConfigs.stream()
|
|
|
.filter(config -> param.getAppId().equals(config.getAppid()))
|
|
@@ -110,7 +110,7 @@ public class CourseQwLoginController extends AppBaseController {
|
|
|
if(user != null){
|
|
|
FsUser userMap = new FsUser();
|
|
|
userMap.setUserId(user.getUserId());
|
|
|
- userMap.setCourseMaOpenId(session.getOpenid());
|
|
|
+// userMap.setCourseMaOpenId(session.getOpenid());
|
|
|
userMap.setUpdateTime(new DateTime());
|
|
|
userService.updateFsUser(userMap);
|
|
|
}
|
|
@@ -120,7 +120,7 @@ public class CourseQwLoginController extends AppBaseController {
|
|
|
user.setNickName("微信用户");
|
|
|
user.setAvatar("https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230725/a848605591384ec29d49773dd58d9345.jpg");
|
|
|
user.setStatus(1);
|
|
|
- user.setCourseMaOpenId(session.getOpenid());
|
|
|
+// user.setCourseMaOpenId(session.getOpenid());
|
|
|
user.setUnionId(session.getUnionid());
|
|
|
user.setCreateTime(new Date());
|
|
|
userService.insertFsUser(user);
|
|
@@ -137,7 +137,7 @@ public class CourseQwLoginController extends AppBaseController {
|
|
|
map.put("user", user);
|
|
|
map.put("isNew", isNewUser);
|
|
|
|
|
|
- logger.info("【点播{}登录】:{}", logName, user.getUserId());
|
|
|
+ logger.info("zyp \n 【点播{}登录】:{}", logName, user.getUserId());
|
|
|
return R.ok(map);
|
|
|
} catch (WxErrorException e){
|
|
|
logger.error("{}授权失败:{}", logName, e.getMessage(), e);
|