Merge remote-tracking branch 'origin/master' into xinghong-dev

xiaogang

2023-07-19 0ed29a9b6e7cdeeea5f736d5cbe196849b4f22f7

 service-user/src/main/java/com/java110/user/api/UserLoginApi.java

@@ -2,14 +2,13 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.user.UserDto;
import com.java110.dto.userLogin.UserLoginDto;
import com.java110.po.userLogin.UserLoginPo;
import com.java110.dto.user.UserLoginDto;
import com.java110.po.user.UserLoginPo;
import com.java110.user.bmo.userLogin.IDeleteUserLoginBMO;
import com.java110.user.bmo.userLogin.IGetUserLoginBMO;
import com.java110.user.bmo.userLogin.ISaveUserLoginBMO;
import com.java110.user.bmo.userLogin.IUpdateUserLoginBMO;
import com.java110.utils.cache.CommonCache;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
@@ -124,19 +123,19 @@
    @RequestMapping(value = "/getUserInfoByHcCode", method = RequestMethod.GET)
    public ResponseEntity<String> getUserInfoByHcCode(@RequestParam(value = "hcCode") String hcCode) {
        UserDto userDto = null;
        String env = MappingCache.getValue("HC_ENV");
        if ("DEV".equals(env) || "TEST".equals(env)) {
            userDto = new UserDto();
            userDto.setUserId("1000000020021010001");
            userDto.setUserName("吴学文");
            userDto.setAddress("青海省西宁市城中区申宁路");
            userDto.setAge(30);
            userDto.setEmail("928255095@qq.com");
            userDto.setName("吴学文");
            userDto.setSex("1");
            userDto.setTel("18909711443");
            return ResultVo.createResponseEntity(userDto);
        }
//        String env = MappingCache.getValue("HC_ENV");
//        if ("DEV".equals(env) || "TEST".equals(env)) {
//            userDto = new UserDto();
//            userDto.setUserId("1000000020021010001");
//            userDto.setUserName("吴学文");
//            userDto.setAddress("青海省西宁市城中区申宁路");
//            userDto.setAge(30);
//            userDto.setEmail("928255095@qq.com");
//            userDto.setName("吴学文");
//            userDto.setSex("1");
//            userDto.setTel("18909711443");
//            return ResultVo.createResponseEntity(userDto);
//        }
        String userInfoStr = CommonCache.getAndRemoveValue(hcCode);
        userDto = JSONObject.parseObject(userInfoStr, UserDto.class);
        return ResultVo.createResponseEntity(userDto);