1、

blade-auth/src/main/resources/application-test.yml

@@ -8,13 +8,13 @@ spring:
     url: ${blade.datasource.test.url}
     username: ${blade.datasource.test.username}
     password: ${blade.datasource.test.password}
-  cloud:
-    nacos:
-      config:
-        server-addr: 10.0.0.1:8848
-      discovery:
-        server-addr: 10.0.0.1:8848
-        ip: 10.0.0.1
+#  cloud:
+#    nacos:
+#      config:
+#        server-addr: 10.0.0.1:8848
+#      discovery:
+#        server-addr: 10.0.0.1:8848
+#        ip: 10.0.0.1
 
 #第三方登陆
 social:

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -53,7 +53,7 @@ public interface LauncherConstant {
 	/**
 	 * nacos test 地址
 	 */
-	String NACOS_TEST_ADDR = "10.0.0.1:8848";
+	String NACOS_TEST_ADDR = "192.168.111.61:8848";
 
 	/**
 	 * sentinel dev 地址

blade-common/src/main/java/org/springblade/common/utils/CommonUtil.java

@@ -16,6 +16,11 @@
  */
 package org.springblade.common.utils;
 
+import lombok.SneakyThrows;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
 /**
  * 通用工具类
  *
@@ -23,4 +28,7 @@ package org.springblade.common.utils;
  */
 public class CommonUtil {
 
+//	public static String uploadFile(MultipartFile file){
+////		MinioOssBuilder
+//	}
 }

blade-gateway/src/main/resources/application-test.yml

@@ -1,8 +1,8 @@
-spring:
-  cloud:
-    nacos:
-      config:
-        server-addr: 10.0.0.1:8848
-      discovery:
-        server-addr: 10.0.0.1:8848
-        ip: 10.0.0.1
+#spring:
+#  cloud:
+#    nacos:
+#      config:
+#        server-addr: 10.0.0.1:8848
+#      discovery:
+#        server-addr: 10.0.0.1:8848
+#        ip: 10.0.0.1

blade-ops/blade-log/src/main/resources/application-test.yml

@@ -7,10 +7,10 @@ spring:
     url: ${blade.datasource.test.url}
     username: ${blade.datasource.test.username}
     password: ${blade.datasource.test.password}
-  cloud:
-    nacos:
-      config:
-        server-addr: 10.0.0.1:8848
-      discovery:
-        server-addr: 10.0.0.1:8848
-        ip: 10.0.0.9
+#  cloud:
+#    nacos:
+#      config:
+#        server-addr: 10.0.0.1:8848
+#      discovery:
+#        server-addr: 10.0.0.1:8848
+#        ip: 10.0.0.9

blade-ops/blade-resource/src/main/resources/application-dev.yml

@@ -5,13 +5,13 @@ spring:
     username: ${blade.datasource.dev.username}
     password: ${blade.datasource.dev.password}
 
-oss:
-  enabled: ${oss.enabled}
-  name: ${oss.name}
-  tenant-mode: ${oss.tenant-mode}
-  endpoint: ${oss.endpoint}
-  access-key: ${oss.access-key}
-  secret-key: ${oss.secret-key}
-  bucket-name: ${oss.bucket-name}
-  return-path: ${oss.return-path}
+#oss:
+#  enabled: ${oss.enabled}
+#  name: ${oss.name}
+#  tenant-mode: ${oss.tenant-mode}
+#  endpoint: ${oss.endpoint}
+#  access-key: ${oss.access-key}
+#  secret-key: ${oss.secret-key}
+#  bucket-name: ${oss.bucket-name}
+#  return-path: ${oss.return-path}
 

blade-ops/blade-resource/src/main/resources/application-test.yml

@@ -4,13 +4,13 @@ spring:
     url: ${blade.datasource.test.url}
     username: ${blade.datasource.test.username}
     password: ${blade.datasource.test.password}
-  cloud:
-    nacos:
-      config:
-        server-addr: 10.0.0.1:8848
-      discovery:
-        server-addr: 10.0.0.1:8848
-        ip: 10.0.0.1
+#  cloud:
+#    nacos:
+#      config:
+#        server-addr: 10.0.0.1:8848
+#      discovery:
+#        server-addr: 10.0.0.1:8848
+#        ip: 10.0.0.1
 
 oss:
   enabled: ${oss.enabled}

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -23,6 +23,7 @@ import org.springblade.system.dto.MyTenantDTO;
 import org.springblade.system.entity.*;
 import org.springblade.system.vo.MenuVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -266,7 +267,7 @@ public interface ISysClient {
 	@PostMapping(TENANT_ROMOVE)
 	R<Boolean> removeTenant(@RequestParam String ids);
 
-	@GetMapping(TENANT_GETLIST)
+	@PostMapping(TENANT_GETLIST)
 	R<BladePage<Tenant>> getTenantList(@RequestBody MyTenantDTO myTenantDTO);
 
 	/**

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java

@@ -146,7 +146,7 @@ public class ISysClientFallback implements ISysClient {
 
 	@Override
 	public R<BladePage<Tenant>> getTenantList(MyTenantDTO myTenantDTO) {
-		return null;
+		return R.fail("获取数据失败");
 	}
 
 	@Override

blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java

@@ -32,6 +32,7 @@ import org.springblade.system.entity.*;
 import org.springblade.system.service.*;
 import org.springblade.system.vo.MenuVO;
 import org.springblade.system.wrapper.MenuWrapper;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -197,7 +198,7 @@ public class SysClient implements ISysClient {
 	}
 
 	@Override
-	@GetMapping(TENANT_GETLIST)
+	@PostMapping(TENANT_GETLIST)
 	public R<BladePage<Tenant>> getTenantList(@RequestBody MyTenantDTO myTenantDTO) {
 		QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(myTenantDTO);
 		IPage<Tenant> pages = tenantService.page(Condition.getPage(myTenantDTO.getQuery()), (!AuthUtil.getUser().getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, AuthUtil.getUser().getTenantId()) : queryWrapper);

blade-service/blade-system/src/main/resources/application-test.yml

@@ -8,10 +8,10 @@ spring:
     url: ${blade.datasource.test.url}
     username: ${blade.datasource.test.username}
     password: ${blade.datasource.test.password}
-  cloud:
-    nacos:
-      config:
-        server-addr: 10.0.0.1:8848
-      discovery:
-        server-addr: 10.0.0.1:8848
-        ip: 10.0.0.1
+#  cloud:
+#    nacos:
+#      config:
+#        server-addr: 10.0.0.1:8848
+#      discovery:
+#        server-addr: 10.0.0.1:8848
+#        ip: 10.0.0.1

blade-service/blade-user/src/main/java/org/springblade/system/user/wrapper/UserWrapper.java

@@ -47,7 +47,12 @@ public class UserWrapper extends BaseEntityWrapper<User, UserVO> {
 		List<String> roleName = SysCache.getRoleNames(user.getRoleId());
 		List<String> deptName = SysCache.getDeptNames(user.getDeptId());
 		List<String> postName = SysCache.getPostNames(user.getPostId());
-		userVO.setTenantName(tenant.getTenantName());
+		try{
+			userVO.setTenantName(tenant.getTenantName());
+		}catch (Exception e){
+			e.printStackTrace();
+			System.out.println(user);
+		}
 		userVO.setRoleName(Func.join(roleName));
 		userVO.setDeptName(Func.join(deptName));
 		userVO.setPostName(Func.join(postName));

blade-service/blade-user/src/main/resources/application-test.yml

@@ -8,10 +8,10 @@ spring:
     url: ${blade.datasource.test.url}
     username: ${blade.datasource.test.username}
     password: ${blade.datasource.test.password}
-  cloud:
-    nacos:
-      config:
-        server-addr: 10.0.0.1:8848
-      discovery:
-        server-addr: 10.0.0.1:8848
-        ip: 10.0.0.1
+#  cloud:
+#    nacos:
+#      config:
+#        server-addr: 10.0.0.1:8848
+#      discovery:
+#        server-addr: 10.0.0.1:8848
+#        ip: 10.0.0.1