⚡ 一点微不足道的优化

pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java

@@ -4,6 +4,7 @@ import com.pig4cloud.pigx.admin.api.feign.RemoteTokenService;
 import com.pig4cloud.pigx.common.core.constant.CommonConstants;
 import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
 import com.pig4cloud.pigx.common.core.util.R;
+import com.pig4cloud.pigx.common.core.util.RetOps;
 import lombok.RequiredArgsConstructor;
 import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
 import org.springframework.stereotype.Component;
@@ -24,11 +25,12 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
 
 	@Override
 	public String getUsername(String token) {
-		R<Map<String, Object>> result = tokenService.queryToken(token, SecurityConstants.FROM_IN);
-		if (CommonConstants.SUCCESS.equals(result.getCode())) {
-			return (String) result.getData().get("username");
-		}
-		return null;
+		// @formatter:off
+		return RetOps.of(tokenService.queryToken(token, SecurityConstants.FROM_IN))
+				.getDataIf(RetOps.CODE_SUCCESS)
+				.map(o -> (String)o.get("username"))
+				.orElse(null);
+		// @formatter:off
 	}
 
 	@Override

pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java

@@ -4,6 +4,7 @@ import com.google.common.collect.Maps;
 import com.pig4cloud.pigx.admin.api.feign.RemoteTenantService;
 import com.pig4cloud.pigx.common.core.constant.CacheConstants;
 import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
+import com.pig4cloud.pigx.common.core.util.RetOps;
 import com.pig4cloud.pigx.common.data.tenant.TenantBroker;
 import com.pig4cloud.pigx.mp.entity.WxAccount;
 import com.pig4cloud.pigx.mp.handler.*;
@@ -23,6 +24,8 @@ import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 
 import javax.annotation.PostConstruct;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -85,8 +88,14 @@ public class WxMpInitConfigRunner {
 	public void initServices() {
 		// 获取全部租户 遍历所有租户对应的公众号列表
 		List<WxAccount> accountList = new ArrayList<>();
-		tenantService.list(SecurityConstants.FROM_IN).getData().forEach(
-				tenant -> TenantBroker.runAs(tenant.getId(), (id) -> accountList.addAll(accountService.list())));
+		// @formatter:off
+		RetOps.of(tenantService.list(SecurityConstants.FROM_IN))
+				.getData()
+				.orElseGet(Collections::emptyList)
+				.forEach(
+						tenant -> TenantBroker.runAs(tenant.getId(), (id) -> accountList.addAll(accountService.list()))
+				);
+		// @formatter:on
 
 		mpServices = accountList.stream().map(a -> {
 			WxMpInRedisConfigStorage configStorage = new WxMpInRedisConfigStorage(redisTemplate);