兼容appId

epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java

@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
  */
 @Component
 public class CustomerAppWxServiceUtil implements ApplicationRunner {
-	private Logger logger = LogManager.getLogger(CustomerAppWxServiceUtil.class);
+	private static Logger logger = LogManager.getLogger(CustomerAppWxServiceUtil.class);
 
 	/**
 	 * 过期时长为30分钟，单位：秒
@@ -58,10 +58,7 @@ public class CustomerAppWxServiceUtil implements ApplicationRunner {
 
 	private static Map<String, WxMaService> maServices = Maps.newHashMap();
 
-	private void initWxMa() {
-
-	}
-	public WxMaService getWxMaService(String appId) {
+	public static WxMaService getWxMaService(String appId) {
 		WxMaService wxMaService = maServices.get(appId);
 		if (wxMaService == null){
 			logger.error("getMaService appId:{} is not config from customer_app",appId);
@@ -90,7 +87,7 @@ public class CustomerAppWxServiceUtil implements ApplicationRunner {
 		try {
 			Result<List<CustomerAppDTO>> configAllAppResult = operCrmOpenFeignClient.getConfigAllApp();
 			logger.info("initWxMa operCrmOpenFeignClient.getConfigAllApp result:{}", JSON.toJSONString(configAllAppResult));
-			if (configAllAppResult == null || configAllAppResult.success()){
+			if (configAllAppResult == null || !configAllAppResult.success()){
 				logger.info("initWxMa operCrmOpenFeignClient.getConfigAllApp fail");
 				return;
 			}

epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java

@@ -67,8 +67,6 @@ public class LoginServiceImpl implements LoginService {
 
 	@Autowired
 	private OperAccessOpenFeignClient operAccessOpenFeignClient;
-	@Autowired
-	private CustomerAppWxServiceUtil customerAppWxServiceUtil;
 
 	/**
 	 * 居民端微信小程序登录
@@ -116,7 +114,11 @@ public class LoginServiceImpl implements LoginService {
 		WxMaJscode2SessionResult wxMaJscode2SessionResult = null;
 		try {
 			if (StringUtils.isNotBlank(appId)){
-				wxMaJscode2SessionResult = customerAppWxServiceUtil.getWxMaService(appId).jsCode2SessionInfo(wxCode);
+				WxMaService wxMaService = CustomerAppWxServiceUtil.getWxMaService(appId);
+				if (wxMaService == null){
+					throw new RenException("解析微信用户信息失败");
+				}
+				wxMaJscode2SessionResult = wxMaService.jsCode2SessionInfo(wxCode);
 			}else{
 				if (LoginConstant.APP_GOV.equals(app)) {
 					wxMaJscode2SessionResult = wxMaServiceUtils.govWxMaService().jsCode2SessionInfo(wxCode);
@@ -146,7 +148,7 @@ public class LoginServiceImpl implements LoginService {
 			ValidatorUtils.validateEntity(formDTO, ResiWxPhoneFormDTO.AddUserInternalGroup.class);
 			WxMaService wxMaService = null;
 			if (StringUtils.isNotBlank(formDTO.getAppId())){
-				wxMaService = customerAppWxServiceUtil.getWxMaService(formDTO.getAppId());
+				wxMaService = CustomerAppWxServiceUtil.getWxMaService(formDTO.getAppId());
 			}else{
 				wxMaService = wxMaServiceUtils.resiWxMaService();
 			}