Commit 31c2b005 by huangjy

fixbug

parent d79799a8
...@@ -51,8 +51,8 @@ public class SysDictUtil { ...@@ -51,8 +51,8 @@ public class SysDictUtil {
if (CACHE.isEmpty()) { if (CACHE.isEmpty()) {
refresh(); refresh();
} }
DictionaryVo dictionaryVo = CACHE.get(RedisConst.DB_PLAT_DIC_PREFIX + code);
return CACHE.get(RedisConst.DB_PLAT_DIC_PREFIX + code).getValue(); return dictionaryVo == null ? "" : dictionaryVo.getValue();
} }
......
package com.makeit.module.controller.wechat.auth; package com.makeit.module.controller.wechat.auth;
import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.dto.LoginDTO; import com.makeit.common.dto.LoginDTO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.global.annotation.Action;
import com.makeit.module.admin.vo.plat.PlatUserLoginVO; import com.makeit.module.admin.vo.plat.PlatUserLoginVO;
import com.makeit.service.platform.auth.PlatUserService; import com.makeit.service.platform.auth.PlatUserService;
import com.makeit.service.wechat.PlatLoginWechatService; import com.makeit.service.wechat.PlatLoginWechatService;
import com.makeit.vo.platform.auth.PlatPersonDTOVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -27,10 +30,18 @@ public class PlatLoginWechatController { ...@@ -27,10 +30,18 @@ public class PlatLoginWechatController {
@Autowired @Autowired
private PlatLoginWechatService platLoginWechatService; private PlatLoginWechatService platLoginWechatService;
@Autowired
private PlatUserService platUserService;
@ApiOperation("登录") @ApiOperation("登录")
@PostMapping("login") @PostMapping("login")
public ApiResponseEntity<PlatUserLoginVO> login(@RequestBody LoginDTO loginDTO) { public ApiResponseEntity<PlatUserLoginVO> login(@RequestBody LoginDTO loginDTO) {
return ApiResponseUtils.success(platLoginWechatService.wechatLogin(loginDTO)); return ApiResponseUtils.success(platLoginWechatService.wechatLogin(loginDTO));
} }
@ApiOperation("详情")
@PostMapping("view")
public ApiResponseEntity<PlatPersonDTOVO> view(@RequestBody BaseIdDTO dto) {
return ApiResponseUtils.success(platUserService.viewPerson(dto.getId()));
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment