Browse Source

AI配置修改

zyp 1 day ago
parent
commit
d2bfbba4fa

+ 1 - 0
fs-service/src/main/java/com/fs/common/param/LoginParam.java

@@ -14,4 +14,5 @@ public class LoginParam implements Serializable {
     private String rawData;
     private String signature;
     private String appId;
+    private Integer authType;
 }

+ 0 - 48
fs-user-app/src/main/java/com/fs/app/controller/UserCourseComplaintController.java

@@ -1,48 +0,0 @@
-package com.fs.app.controller;
-
-import com.fs.app.annotation.Login;
-import com.fs.common.core.domain.R;
-import com.fs.course.param.UserCourseComplaintRecordParam;
-import com.fs.course.service.IFsUserCourseComplaintRecordService;
-import com.fs.course.service.IFsUserCourseComplaintTypeService;
-import com.fs.course.vo.FsUserCourseComplaintTypeListVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@Api("看课投诉相关接口")
-@RestController
-@RequestMapping("/app/user/complaint")
-public class UserCourseComplaintController extends AppBaseController {
-
-    @Autowired
-    private IFsUserCourseComplaintTypeService fsUserCourseComplaintTypeService;
-
-    @Autowired
-    private IFsUserCourseComplaintRecordService fsUserCourseComplaintRecordService;
-
-    @Login
-    @ApiOperation("获取投诉类型")
-    @GetMapping("/getTypeTree")
-    public R getTypeTree() {
-        List<FsUserCourseComplaintTypeListVO> allComplaintTypeTree = fsUserCourseComplaintTypeService.getAllComplaintTypeTree();
-        return R.ok().put("data", allComplaintTypeTree);
-    }
-
-    @Login
-    @ApiOperation("提交反馈记录")
-    @PostMapping("/record")
-    public R submitRecord(@RequestBody UserCourseComplaintRecordParam param) {
-        param.setUserId(Long.parseLong(getUserId()));
-        int i = fsUserCourseComplaintRecordService.submitRecord(param);
-        if (i > 0) {
-            return R.ok();
-        } else {
-            return R.error();
-        }
-    }
-
-}

+ 2 - 14
fs-user-app/src/main/java/com/fs/app/controller/WxUserController.java

@@ -95,8 +95,8 @@ public class WxUserController extends AppBaseController{
         if (StringUtils.isBlank(param.getCode())) {
             return R.error("code不存在");
         }
-        FsSysConfig con = configUtil.getSysConfig();
-        final WxMaService wxService = WxMaConfiguration.getMaService(con.getAppid());
+//        FsSysConfig con = configUtil.getSysConfig();
+        final WxMaService wxService = WxMaConfiguration.getMaService(param.getAppId());
         try {
             WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
             this.logger.info(session.getSessionKey());
@@ -117,8 +117,6 @@ public class WxUserController extends AppBaseController{
             if(user==null){
                 //新用户
                 String phoneNumber = phoneNoInfo.getPhoneNumber();
-
-
                 //查询手机号是否存在,如果存在,更新
                 FsUser checkPhone=userService.selectFsUserByPhone(encryptPhone(phoneNumber));
                 if (checkPhone==null){
@@ -171,16 +169,6 @@ public class WxUserController extends AppBaseController{
             map.put("token",token);
             user.setPhone(encryptPhone(phoneNoInfo.getPhoneNumber()));
             map.put("user",user);
-            FsUserLoginLog log = new FsUserLoginLog();
-            log.setCode(param.getCode());
-            log.setLoginJson(JSON.toJSONString(param));
-//            log.setUserRegisterJson(JSON.toJSONString(jsonMap));
-            log.setStatus(1);
-            log.setUserId(user.getUserId());
-            log.setPhone(user.getPhone());
-            log.setMaOpenId(user.getMaOpenId());
-            log.setCreateTime(DateUtils.getNowDate());
-            fsUserLoginLogMapper.insertFsUserLoginLog(log);
             return R.ok(map);
         } catch (WxErrorException e) {
             //this.logger.error(e.getMessage(), e);