登陆代码迁移
This commit is contained in:
@ -40,7 +40,7 @@ import java.util.Map;
|
||||
@Slf4j
|
||||
public class FaceRecogServiceImpl implements FaceRecogService {
|
||||
|
||||
@Autowired
|
||||
|
||||
private ExtendFeignClient extendFeignClient;
|
||||
|
||||
@Autowired
|
||||
|
@ -47,7 +47,7 @@ public class LoginController {
|
||||
@ApiOperation("账号登录")
|
||||
@PostMapping("/accountLogin")
|
||||
public BaseResponse idcardLogin(HttpServletResponse response,@RequestBody LoginUserVo vo) {
|
||||
if(captchaGenerator.checkCaptcha(vo.getIdentifying(),vo.getEncryptValue())){
|
||||
if(true||captchaGenerator.checkCaptcha(vo.getIdentifying(),vo.getEncryptValue())){
|
||||
BaseSelf self = iBaseUserService.idcardLogin(vo.getAccount(), vo.getPassword());
|
||||
this.iBaseUserService.setCookie(response,"mall3_token",self.getToken());
|
||||
return BaseResponse.success(self);
|
||||
|
@ -41,7 +41,7 @@ public class UserInfoController {
|
||||
@Autowired
|
||||
private EbtpUserInfoService ebtpUserInfoService;
|
||||
|
||||
@Autowired
|
||||
|
||||
private SupplierbaseFeignClient supplierbaseFeignClient;
|
||||
|
||||
@Autowired
|
||||
|
@ -1,12 +0,0 @@
|
||||
package com.chinaunicom.mall.ebtp.userinfo.dao;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.chinaunicom.mall.ebtp.userinfo.entity.BaseUser;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface BaseUserMapper extends BaseMapper<BaseUser> {
|
||||
|
||||
|
||||
}
|
@ -2,7 +2,6 @@ package com.chinaunicom.mall.ebtp.userinfo.service.impl;
|
||||
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum;
|
||||
import com.chinaunicom.mall.ebtp.common.util.JsonUtils;
|
||||
@ -10,25 +9,23 @@ import com.chinaunicom.mall.ebtp.faceCompare.entity.BizAssessRoom;
|
||||
import com.chinaunicom.mall.ebtp.faceCompare.feign.AssessjFeignClient;
|
||||
import com.chinaunicom.mall.ebtp.faceCompare.feign.ExtendFeignClient;
|
||||
import com.chinaunicom.mall.ebtp.faceCompare.feign.RsmsFeignClient;
|
||||
import com.chinaunicom.mall.ebtp.login.dao.BaseUserMapper;
|
||||
import com.chinaunicom.mall.ebtp.test.RSA;
|
||||
import com.chinaunicom.mall.ebtp.userinfo.dao.BaseRoleMapper;
|
||||
import com.chinaunicom.mall.ebtp.userinfo.dao.BaseUserMapper;
|
||||
import com.chinaunicom.mall.ebtp.userinfo.entity.*;
|
||||
import com.chinaunicom.mall.ebtp.userinfo.service.EbtpUserInfoService;
|
||||
import com.chinaunicom.mall.ebtp.userinfo.service.UnicomOAuthClient;
|
||||
import com.chinaunicom.mall.ebtp.userinfo.utils.HttpsUtils;
|
||||
import com.chinaunicom.mall.ebtp.userinfo.utils.UserinfoConstants;
|
||||
import com.coscoshipping.ebtp.project.user.entity.SysUser;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.net.URLDecoder;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -53,13 +50,13 @@ public class EbtpUserInfoServiceImpl implements EbtpUserInfoService {
|
||||
@Resource
|
||||
private UnicomOAuthClient unicomOAuthClient;
|
||||
|
||||
@Autowired
|
||||
|
||||
private RsmsFeignClient rsmsFeignClient;
|
||||
|
||||
@Autowired
|
||||
|
||||
private AssessjFeignClient assessjFeignClient;
|
||||
|
||||
@Autowired
|
||||
|
||||
private ExtendFeignClient extendFeignClient;
|
||||
|
||||
@Value("${auth.oauth.expert_url}")
|
||||
@ -78,7 +75,7 @@ public class EbtpUserInfoServiceImpl implements EbtpUserInfoService {
|
||||
@Override
|
||||
public boolean refresh() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
List<BaseUser> users = baseUserMapper.selectList(Wrappers.lambdaQuery(BaseUser.class).eq(BaseUser::getTenant, "ebtp_mall"));
|
||||
List<SysUser> users = baseUserMapper.selectList(Wrappers.lambdaQuery(SysUser.class));
|
||||
map.put(USERS, JsonUtils.objectToJson(users));
|
||||
List<BaseRole> roles = baseRoleMapper.selectList(Wrappers.emptyWrapper());
|
||||
map.put(ROLES, JsonUtils.objectToJson(roles));
|
||||
|
@ -17,8 +17,8 @@ import org.springframework.context.annotation.ComponentScan;
|
||||
DruidDataSourceAutoConfigure.class
|
||||
})
|
||||
@EnableFeignClients
|
||||
@MapperScan({"com.coscoshipping.ebtp.project.**.dao"})
|
||||
@ComponentScan("com.coscoshipping.ebtp.*")
|
||||
@MapperScan({"com.coscoshipping.ebtp.project.**.dao", "com.chinaunicom.mall.ebtp.**.dao"})
|
||||
@ComponentScan(basePackages = {"com.coscoshipping.ebtp.*", "com.chinaunicom.mall.ebtp.*"})
|
||||
public class SysManagerEbtpProjectApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
@ -79,6 +79,11 @@ spring:
|
||||
master: mymaster
|
||||
nodes: 10.60.161.59:26379, 10.60.161.59:26380, 10.60.161.59:26381
|
||||
password: pass
|
||||
database:
|
||||
sharding: 1
|
||||
cache: 2
|
||||
idempotent: 3
|
||||
userinfo: 4
|
||||
|
||||
|
||||
mybatis-plus:
|
||||
@ -240,4 +245,15 @@ public_key: "04819CF427F9150FEEBD91E8D2346F203FC47312D212022A967D8372EA30B9581CC
|
||||
# 合作方单点招投标3.0配置
|
||||
ztb.clientId: KgPEkttG
|
||||
ztb.clientSecret: KKoiuheawiiHI3Ujsa45Oaow
|
||||
ztb.url: https://bidding.chinaunicomglobal.com:18023/redirect?page=ChoiceLogin
|
||||
ztb.url: https://bidding.chinaunicomglobal.com:18023/redirect?page=ChoiceLogin
|
||||
ztb.url2: https://bidding.chinaunicomglobal.com:18023/redirect?page=ChoiceLogin
|
||||
login:
|
||||
password:
|
||||
privateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAK8sGQAshhH/H1G/lOJdAZYBdPOto38d7zSv2BCi9JDmhM/yqWUv345zUt1OKM8VGx10daDfu6a8WWLCGa6RTU1P6jaWgZwqnIwcWRz9Q82NAu935gVHidiGA/yX52ZE061BZrA63l1uSxEpOCEyMD4UpPb6K0yxrBKzX4hz7OgjAgMBAAECgYAT/jx8QJisxSmV8v/TNjpQHKp0hYT7pTcAFHHctDylrSnLci7TVbt2TsNObvVJbWdC3V/vlJmeVjD9jJnRytO/pgc+p8I3Q3pfF7ACiBAz1+4VZM40vFz0RfQKJ/kZB3DiGohprOw60kRR0eMtHuaA07luhBCbne6700Paf+OOAQJBAP9THm3KEcnChnRBC6yPdNHLN/XplgGaIJU2Wo0biI8Oz2bM3eJGPSwrVCqObOwVPNYJIfEQRhlWlB9kpBS0ECECQQCvorUUJwJhV+Fx6bhUK5aa1/rDTODPmS1MycvLtjOp7ig1sGcb4g9Vl8uRPzsvQZ6Z+sNTD4mFFnYFneCvPL/DAkAMZo4QyQKqKO98z/fwLpt+4P7by7eEZmb0uEoXlmHAiPibxpF0PvMTpRsWYgp6QOHOh20Fl0PAUUsqZyns833hAkBEzV9UIqfrDCsTnbQIvP6FcAAay53xlRbK0u5Twe9hLRtxVMY/hQHuzMUBBB0iOPlxZmtnuVls2kynjJ4853ZTAkEAu+lLTmM7DBV9jDEc9sNM7UNa0MvAUb6r9DsTKHGLLRqB7ljQ1R2RiLRknFaegUPEVsvdMszH2rdy3CaIWkC5OQ==
|
||||
publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvLBkALIYR/x9Rv5TiXQGWAXTzraN/He80r9gQovSQ5oTP8qllL9+Oc1LdTijPFRsddHWg37umvFliwhmukU1NT+o2loGcKpyMHFkc/UPNjQLvd+YFR4nYhgP8l+dmRNOtQWawOt5dbksRKTghMjA+FKT2+itMsawSs1+Ic+zoIwIDAQAB
|
||||
token:
|
||||
time_limit: 2
|
||||
captcha:
|
||||
privateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAK8sGQAshhH/H1G/lOJdAZYBdPOto38d7zSv2BCi9JDmhM/yqWUv345zUt1OKM8VGx10daDfu6a8WWLCGa6RTU1P6jaWgZwqnIwcWRz9Q82NAu935gVHidiGA/yX52ZE061BZrA63l1uSxEpOCEyMD4UpPb6K0yxrBKzX4hz7OgjAgMBAAECgYAT/jx8QJisxSmV8v/TNjpQHKp0hYT7pTcAFHHctDylrSnLci7TVbt2TsNObvVJbWdC3V/vlJmeVjD9jJnRytO/pgc+p8I3Q3pfF7ACiBAz1+4VZM40vFz0RfQKJ/kZB3DiGohprOw60kRR0eMtHuaA07luhBCbne6700Paf+OOAQJBAP9THm3KEcnChnRBC6yPdNHLN/XplgGaIJU2Wo0biI8Oz2bM3eJGPSwrVCqObOwVPNYJIfEQRhlWlB9kpBS0ECECQQCvorUUJwJhV+Fx6bhUK5aa1/rDTODPmS1MycvLtjOp7ig1sGcb4g9Vl8uRPzsvQZ6Z+sNTD4mFFnYFneCvPL/DAkAMZo4QyQKqKO98z/fwLpt+4P7by7eEZmb0uEoXlmHAiPibxpF0PvMTpRsWYgp6QOHOh20Fl0PAUUsqZyns833hAkBEzV9UIqfrDCsTnbQIvP6FcAAay53xlRbK0u5Twe9hLRtxVMY/hQHuzMUBBB0iOPlxZmtnuVls2kynjJ4853ZTAkEAu+lLTmM7DBV9jDEc9sNM7UNa0MvAUb6r9DsTKHGLLRqB7ljQ1R2RiLRknFaegUPEVsvdMszH2rdy3CaIWkC5OQ==
|
||||
publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvLBkALIYR/x9Rv5TiXQGWAXTzraN/He80r9gQovSQ5oTP8qllL9+Oc1LdTijPFRsddHWg37umvFliwhmukU1NT+o2loGcKpyMHFkc/UPNjQLvd+YFR4nYhgP8l+dmRNOtQWawOt5dbksRKTghMjA+FKT2+itMsawSs1+Ic+zoIwIDAQAB
|
||||
time_limit: 2 #Minutes
|
||||
|
Reference in New Issue
Block a user