Browse Source

更换依赖仓库,去掉无用依赖、更改nacos配置、修改readme

liyuan 2 weeks ago
parent
commit
6dfb65a66f
21 changed files with 83 additions and 107 deletions
  1. 3 11
      README.md
  2. 0 6
      blade-auth/pom.xml
  3. 17 19
      blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java
  4. 2 2
      blade-common/pom.xml
  5. 2 2
      blade-ops/blade-flow/pom.xml
  6. 3 3
      blade-ops/blade-flow/src/main/java/org/springblade/flow/business/controller/WorkController.java
  7. 1 1
      blade-ops/blade-flow/src/main/java/org/springblade/flow/business/service/FlowBusinessService.java
  8. 3 4
      blade-ops/blade-flow/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
  9. 2 2
      blade-service/blade-desk/pom.xml
  10. 3 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/controller/CheckController.java
  11. 1 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/service/ILeaveService.java
  12. 3 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java
  13. 2 2
      blade-service/blade-system/pom.xml
  14. 8 8
      blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
  15. 2 2
      blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java
  16. 2 1
      blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
  17. 1 1
      blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
  18. 4 12
      blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
  19. 4 4
      blade-service/pom.xml
  20. BIN
      doc/nacos/gubersail.zip
  21. 20 18
      pom.xml

+ 3 - 11
README.md

@@ -2,7 +2,7 @@
 
 * JDK8
 * mysql5.7.44
-* maven3.6.3
+* maven3.8+
 * redis
 * nacos2.0+
 
@@ -35,23 +35,15 @@
 ### 本地settings 文件新增配置
 ```
  		<server>
-		  <id>blade-release</id>
+		  <id>bladex</id>
 		  <configuration>
 			<httpHeaders>
 			  <property>
 				<name>Authorization</name>
-				<value>token ff240b8cc5339db525ee937c48f5ea9f926681fa</value>
+				<value>token bbedf1f0e4496fa61b6a4688ba47fe622f228d02</value>
 			  </property>
 			</httpHeaders>
 		  </configuration>
 		</server>
-		<server>
-            <id>echepei-release</id>
-            <username>project</username>
-            <password>maven@tb2025</password>
-        </server>  
-        <activeProfiles>  
-            <activeProfile>echepei-release</activeProfile>  
-        </activeProfiles>  
 ```
 > mirror 中添加 !echepei-release,!bladex 

+ 0 - 6
blade-auth/pom.xml

@@ -85,12 +85,6 @@
             <groupId>com.github.whvcse</groupId>
             <artifactId>easy-captcha</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-payment-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
         <!-- 链路追踪、服务监控 -->
         <!--<dependency>
             <groupId>org.springblade</groupId>

+ 17 - 19
blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -11,8 +11,6 @@ import org.springblade.common.cache.CacheNames;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
-import org.springblade.pay.tonglianPayment.entity.Parameters;
-import org.springblade.pay.tonglianPayment.fegin.IPaymentClient;
 import org.springblade.system.entity.Tenant;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
@@ -49,7 +47,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 	private final BladeRedis bladeRedis;
 	private final IWxUnionIdOpenIdClient wxUnionIdOpenIdClient;
 
-	private final IPaymentClient paymentClient;
+//	private final IPaymentClient paymentClient;
 
 	@Override
 	@SneakyThrows
@@ -78,7 +76,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 			//判断是否是小程序登录
 			if (ObjectUtils.isNotNull(appletsId)) {
 				//通过小程序appId查到租户信息
-				R<Parameters> parametersR = paymentClient.getByAppId(appletsId);
+/*				R<Parameters> parametersR = paymentClient.getByAppId(appletsId);
 				if (!parametersR.isSuccess()) {
 					throw new UsernameNotFoundException("未查到租户信息");
 				}
@@ -91,10 +89,10 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 					if ("wx0a0feca24b695636".equals(appletsId)) {
 						throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND);
 					}
-					/*User user1 = userClient.loginByAccount(null, username, null, tenant.getData().getTenantId());
+					*//*User user1 = userClient.loginByAccount(null, username, null, tenant.getData().getTenantId());
 					if (ObjectUtils.isNotNull(user1.getUserType()) && 4 != user1.getUserType()) {
 						throw new UsernameNotFoundException(TokenUtil.USER_NOT_FORBIDDEN);
-					}*/
+					}*//*
 					//用户不存在,注册用户
 					User saveUser = new User();
 					saveUser.setOpenId(openId);
@@ -120,7 +118,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 						throw new UsernameNotFoundException(result.getMsg());
 					}
 					user = saveUser;
-				}
+				}*/
 
 			} else {
 				user = userClient.loginByAccount(username, null, "2", null, null);
@@ -222,7 +220,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 				Long corpId = null;
 				String corpName = "";
 				String corpAddress = "";
-				if (ObjectUtils.isNotNull(user.getId())) {
+/*				if (ObjectUtils.isNotNull(user.getId())) {
 					R<Map<String, String>> r = paymentClient.getCorpDesc(user.getId(), user.getTenantId());
 					if (r.isSuccess()) {
 						if (ObjectUtils.isNotNull(r.getData().get("corpId"))) {
@@ -231,7 +229,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 						corpName = r.getData().get("corpName");
 						corpAddress = r.getData().get("corpAddress");
 					}
-				}
+				}*/
 				return new BladeUserDetails(user1.getId(),
 					user1.getTenantId(), StringPool.EMPTY, user1.getName(), user1.getRealName(), user1.getDeptId(), user1.getPostId(), user1.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user1.getAvatar(), TokenUtil.DEFAULT_AVATAR),
 					user1.getAccount(), AuthConstant.ENCRYPT + user1.getPassword(), userInfo.getDetail(), true, true, true, true,
@@ -314,16 +312,16 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 				Long corpId = null;
 				String corpName = "";
 				String corpAddress = "";
-				if (ObjectUtils.isNotNull(user.getId())) {
-					R<Map<String, String>> r = paymentClient.getCorpDesc(user.getId(), user.getTenantId());
-					if (r.isSuccess()) {
-						if (ObjectUtils.isNotNull(r.getData().get("corpId"))) {
-							corpId = Long.parseLong(r.getData().get("corpId"));
-						}
-						corpName = r.getData().get("corpName");
-						corpAddress = r.getData().get("corpAddress");
-					}
-				}
+//				if (ObjectUtils.isNotNull(user.getId())) {
+//					R<Map<String, String>> r = paymentClient.getCorpDesc(user.getId(), user.getTenantId());
+//					if (r.isSuccess()) {
+//						if (ObjectUtils.isNotNull(r.getData().get("corpId"))) {
+//							corpId = Long.parseLong(r.getData().get("corpId"));
+//						}
+//						corpName = r.getData().get("corpName");
+//						corpAddress = r.getData().get("corpAddress");
+//					}
+//				}
 				return new BladeUserDetails(user.getId(),
 					user.getTenantId(), StringPool.EMPTY, user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR),
 					username, AuthConstant.ENCRYPT + user.getPassword(), userInfo.getDetail(), true, true, true, true,

+ 2 - 2
blade-common/pom.xml

@@ -84,11 +84,11 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>com.apigwclient</groupId>
             <artifactId>apigwclient</artifactId>
             <version>2.0</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

+ 2 - 2
blade-ops/blade-flow/pom.xml

@@ -68,12 +68,12 @@
             <artifactId>flowable-json-converter</artifactId>
             <version>${flowable.version}</version>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-project-api</artifactId>
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-desk</artifactId>

+ 3 - 3
blade-ops/blade-flow/src/main/java/org/springblade/flow/business/controller/WorkController.java

@@ -129,16 +129,16 @@ public class WorkController {
 		return R.success("删除任务成功");
 	}
 
-	/**
+/*	*//**
 	 * 审核完成任务
 	 *
 	 * @param flow 请假信息
-	 */
+	 *//*
 	@PostMapping("checkCompleteTask")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "完成任务", notes = "传入流程信息")
 	public R checkCompleteTask(@ApiParam("任务信息") @RequestBody BladeFlow flow) {
 		return R.status(flowBusinessService.checkCompleteTask(flow));
-	}
+	}*/
 
 }

+ 1 - 1
blade-ops/blade-flow/src/main/java/org/springblade/flow/business/service/FlowBusinessService.java

@@ -62,5 +62,5 @@ public interface FlowBusinessService {
 	 * @param leave 请假信息
 	 * @return boolean
 	 */
-	boolean checkCompleteTask(BladeFlow leave);
+	// boolean checkCompleteTask(BladeFlow leave);
 }

+ 3 - 4
blade-ops/blade-flow/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java

@@ -26,7 +26,6 @@ import org.springblade.flow.core.entity.BladeFlow;
 import org.springblade.flow.core.utils.TaskUtil;
 import org.springblade.flow.engine.constant.FlowEngineConstant;
 import org.springblade.flow.engine.utils.FlowCache;
-import org.springblade.project.feign.IProjectItemClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ public class FlowBusinessServiceImpl implements FlowBusinessService {
 
 	private final TaskService taskService;
 	private final HistoryService historyService;
-	private final IProjectItemClient projectItemClient;
+//	private final IProjectItemClient projectItemClient;
 	private final IProcessLeaveClient processClient;
 
 	@Override
@@ -255,7 +254,7 @@ public class FlowBusinessServiceImpl implements FlowBusinessService {
 		return true;
 	}
 
-	@Override
+/*	@Override
 	@GlobalTransactional
 	@Transactional(rollbackFor = Exception.class)
 	public boolean checkCompleteTask(BladeFlow flow) {
@@ -316,7 +315,7 @@ public class FlowBusinessServiceImpl implements FlowBusinessService {
 		// 完成任务
 		taskService.complete(taskId, variables);
 		return true;
-	}
+	}*/
 
 	/**
 	 * 构建流程

+ 2 - 2
blade-service/blade-desk/pom.xml

@@ -55,12 +55,12 @@
             <groupId>com.qiniu</groupId>
             <artifactId>qiniu-java-sdk</artifactId>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-project-api</artifactId>
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-transaction</artifactId>

+ 3 - 3
blade-service/blade-desk/src/main/java/org/springblade/desk/controller/CheckController.java

@@ -38,14 +38,14 @@ public class CheckController extends BladeController implements CacheNames {
 		return R.data(detail);
 	}
 
-	/**
+/*	*//**
 	 * 新增或修改
 	 *
 	 * @param leave 请假信息
-	 */
+	 *//*
 	@PostMapping("start-process")
 	public R startProcess(@RequestBody ProcessLeave leave) {
 		return R.status(leaveService.startCheckProcess(leave));
-	}
+	}*/
 
 }

+ 1 - 1
blade-service/blade-desk/src/main/java/org/springblade/desk/service/ILeaveService.java

@@ -25,6 +25,6 @@ public interface ILeaveService extends BaseService<ProcessLeave> {
 	 * @param check
 	 * @return boolean
 	 */
-	boolean startCheckProcess(ProcessLeave check);
+//	boolean startCheckProcess(ProcessLeave check);
 
 }

+ 3 - 5
blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java

@@ -20,8 +20,6 @@ import org.springblade.flow.core.entity.BladeFlow;
 import org.springblade.flow.core.feign.IFlowClient;
 import org.springblade.flow.core.utils.FlowUtil;
 import org.springblade.flow.core.utils.TaskUtil;
-import org.springblade.project.entity.ServiceProjectItem;
-import org.springblade.project.feign.IProjectItemClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -37,7 +35,7 @@ public class LeaveServiceImpl extends BaseServiceImpl<LeaveMapper, ProcessLeave>
 
 	private final IFlowClient flowClient;
 
-	private final IProjectItemClient projectItemClient;
+//	private final IProjectItemClient projectItemClient;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -69,7 +67,7 @@ public class LeaveServiceImpl extends BaseServiceImpl<LeaveMapper, ProcessLeave>
 		return true;
 	}
 
-	@Override
+/*	@Override
 	@GlobalTransactional
 	@Transactional
 	public boolean startCheckProcess(ProcessLeave check) {
@@ -110,6 +108,6 @@ public class LeaveServiceImpl extends BaseServiceImpl<LeaveMapper, ProcessLeave>
 			updateById(check);
 		}
 		return true;
-	}
+	}*/
 
 }

+ 2 - 2
blade-service/blade-system/pom.xml

@@ -42,12 +42,12 @@
             <artifactId>blade-resource-api</artifactId>
             <version>2.8.2.RELEASE</version>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-los-api</artifactId>
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <build>

+ 8 - 8
blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -89,7 +89,7 @@ public class DeptController extends BladeController {
 	})
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "懒加载列表", notes = "传入dept")
-	@PreAuth(AuthConstant.PERMIT_ALL)
+	@PreAuth("permitAll()")
 	public R<List<DeptVO>> lazyList(@ApiIgnore @RequestParam Map<String, Object> dept, Long parentId, BladeUser bladeUser) {
 		List<DeptVO> list = deptService.lazyList(bladeUser.getTenantId(), parentId, dept);
 		if (CollectionUtils.isEmpty(list)) {
@@ -119,7 +119,7 @@ public class DeptController extends BladeController {
 	 * 顶级部门列表
 	 */
 	@GetMapping("/top-list")
-	@PreAuth(AuthConstant.PERMIT_ALL)
+	@PreAuth("permitAll()")
 	public R<List<DeptVO>> topList(Dept dept) {
 		LambdaQueryWrapper<Dept> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(dept.getDeptCategory()), Dept::getDeptCategory, dept.getDeptCategory())
@@ -141,7 +141,7 @@ public class DeptController extends BladeController {
 	@GetMapping("/tree")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "树形结构", notes = "树形结构")
-	@PreAuth(AuthConstant.PERMIT_ALL)
+	@PreAuth("permitAll()")
 	public R<List<DeptVO>> tree(String tenantId, BladeUser bladeUser) {
 		List<DeptVO> tree = deptService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()));
 		return R.data(tree);
@@ -153,7 +153,7 @@ public class DeptController extends BladeController {
 	@GetMapping("/lazy-tree")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
-	@PreAuth(AuthConstant.PERMIT_ALL)
+	@PreAuth("permitAll()")
 	public R<List<DeptVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
 		List<DeptVO> tree = deptService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
 		return R.data(tree);
@@ -165,7 +165,7 @@ public class DeptController extends BladeController {
 	@GetMapping("/treeUser")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "角色和部门树形结构", notes = "树形结构")
-	@PreAuth(AuthConstant.PERMIT_ALL)
+	@PreAuth("permitAll()")
 	public R<List<DeptVO>> treeUser(BladeUser bladeUser) {
 		List<DeptVO> tree = deptService.treeUser(Func.toStrWithEmpty(AuthUtil.getTenantId(), bladeUser.getTenantId()));
 		return R.data(tree);
@@ -202,7 +202,7 @@ public class DeptController extends BladeController {
 	/**
 	 * 下拉数据源
 	 */
-	@PreAuth(AuthConstant.PERMIT_ALL)
+	@PreAuth("permitAll()")
 	@GetMapping("/select")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "下拉数据源", notes = "传入id集合")
@@ -215,7 +215,7 @@ public class DeptController extends BladeController {
 	 * 当前用户所属公司
 	 */
 	@GetMapping("/userDept")
-	@PreAuth(AuthConstant.PERMIT_ALL)
+	@PreAuth("permitAll()")
 	public R<Dept> topList() {
 		Dept dept = deptService.getById(AuthUtil.getDeptId());
 		if (ObjectUtil.isEmpty(dept)) {
@@ -228,7 +228,7 @@ public class DeptController extends BladeController {
 	 * 顶级部门列表
 	 */
 	@GetMapping("/deptList")
-	@PreAuth(AuthConstant.PERMIT_ALL)
+	@PreAuth("permitAll()")
 	public R<List<DeptVO>> deptList(Dept dept) {
 		List<Dept> list = deptService.list(new LambdaQueryWrapper<Dept>()
 			.eq(ObjectUtil.isNotEmpty(dept.getDeptCategory()), Dept::getDeptCategory, dept.getDeptCategory())

+ 2 - 2
blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java

@@ -80,7 +80,7 @@ public class RoleController extends BladeController {
 	@GetMapping("/tree")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "树形结构", notes = "树形结构")
-	@PreAuth(AuthConstant.PERMIT_ALL)
+	@PreAuth("permitAll()")
 	public R<List<RoleVO>> tree(String tenantId, BladeUser bladeUser) {
 		List<RoleVO> tree = roleService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()));
 		return R.data(tree);
@@ -139,7 +139,7 @@ public class RoleController extends BladeController {
 	/**
 	 * 下拉数据源
 	 */
-	@PreAuth(AuthConstant.PERMIT_ALL)
+	@PreAuth("permitAll()")
 	@GetMapping("/select")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "下拉数据源", notes = "传入id集合")

+ 2 - 1
blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java

@@ -187,7 +187,8 @@ public class TenantController extends BladeController {
 	@GetMapping("/copyData")
 	@ApiOperation(value = "复制数据")
 	public R info(String tenantId, String tenantIdCopy, String type) {
-		return tenantService.copyData(tenantId, tenantIdCopy, type);
+		return null;
+		// return tenantService.copyData(tenantId, tenantIdCopy, type);
 	}
 
 

+ 1 - 1
blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java

@@ -59,7 +59,7 @@ public interface ITenantService extends BaseService<Tenant> {
 	 */
 	boolean setting(Integer accountNumber, Date expireTime, String ids);
 
-	R copyData(String tenantId, String tenantIdCopy, String type);
+	//R copyData(String tenantId, String tenantIdCopy, String type);
 
 	List<Tenant> getTenantList(String tenantId);
 }

+ 4 - 12
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java

@@ -17,13 +17,6 @@ import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.DesUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.los.basic.business.entity.BusinessType;
-import org.springblade.los.basic.cur.entity.BCurrency;
-import org.springblade.los.basic.reports.entity.Reports;
-import org.springblade.los.billno.entity.BusinessBillNo;
-import org.springblade.los.check.entity.LosAuditPaths;
-import org.springblade.los.check.entity.LosAuditPathsActs;
-import org.springblade.los.feign.ILosClient;
 import org.springblade.resource.feign.IOssClient;
 import org.springblade.system.cache.ParamCache;
 import org.springblade.system.entity.*;
@@ -62,7 +55,6 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 	private final IDictBizService dictBizService;
 	private final IUserClient userClient;
 	private final IOssClient ossClient;
-	private final ILosClient losClient;
 	private final IParamServiceService paramServiceService;
 
 	@Override
@@ -197,7 +189,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 		return true;
 	}
 
-	@Override
+/*	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R copyData(String tenantId, String tenantIdCopy, String type) {
 		Dept dept = deptService.selectDept(tenantIdCopy);
@@ -352,14 +344,14 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 			paramServiceService.saveBatch(roleLinkedList);
 		}
 		return R.data("操作成功");
-	}
+	}*/
 
 	@Override
 	public List<Tenant> getTenantList(String tenantId) {
 		return baseMapper.getTenantList(tenantId);
 	}
 
-	private void recursionLosAuditPathsActs(String tenantId, String tenantIdCopy, Long oldParentId, Long newParentId, Dept dept) {
+/*	private void recursionLosAuditPathsActs(String tenantId, String tenantIdCopy, Long oldParentId, Long newParentId, Dept dept) {
 		LosAuditPathsActs losAuditPathsActs = new LosAuditPathsActs();
 		losAuditPathsActs.setTenantId(tenantId);
 		losAuditPathsActs.setPathId(oldParentId);
@@ -379,7 +371,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 			losAuditPathsActsList.add(item);
 		}
 		losClient.addLosAuditPathsActsList(losAuditPathsActsList);
-	}
+	}*/
 
 	private String getTenantId(List<String> codes) {
 		String code = tenantId.generate();

+ 4 - 4
blade-service/pom.xml

@@ -25,7 +25,7 @@
     </modules>
 
     <dependencies>
-        <dependency>
+<!--        <dependency>
             <groupId>com.jdy.v7sdk</groupId>
             <artifactId>kernel</artifactId>
             <version>0.0.1</version>
@@ -34,13 +34,13 @@
             <groupId>com.jdy.v7sdk</groupId>
             <artifactId>sdkauth</artifactId>
             <version>0.0.1</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>tea-util</artifactId>
             <version>0.2.13</version>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>com.jdy.v7sdk.business</groupId>
             <artifactId>fi</artifactId>
             <version>0.0.1</version>
@@ -54,7 +54,7 @@
             <groupId>com.jdy.v7sdk.business</groupId>
             <artifactId>scm</artifactId>
             <version>0.0.1</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>tea</artifactId>

BIN
doc/nacos/gubersail.zip


+ 20 - 18
pom.xml

@@ -176,38 +176,40 @@
     <repositories>
         <repository>
             <id>aliyun-repos</id>
-            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
+            <name>Aliyun Public Repository</name>
+            <url>https://maven.aliyun.com/repository/public</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
         </repository>
         <repository>
-            <id>blade-release</id>
-            <name>Release Repository</name>
-            <url>http://nexus.bladex.vip/repository/maven-releases/</url>
-        </repository>
-
-
-        <repository>
-            <id>echepei-release</id>
-            <url>http://nexus.echepei.com:9111/repository/echepei-central/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
+            <id>bladex</id>
+            <name>BladeX Release Repository</name>
+            <url>https://center.javablade.com/api/packages/blade/maven</url>
         </repository>
     </repositories>
-
     <pluginRepositories>
         <pluginRepository>
             <id>aliyun-plugin</id>
-            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
+            <name>Aliyun Public Plugin</name>
+            <url>https://maven.aliyun.com/repository/public</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
 
+    <distributionManagement>
+        <repository>
+            <id>bladex</id>
+            <name>BladeX Release Repository</name>
+            <url>https://center.javablade.com/api/packages/blade/maven</url>
+        </repository>
+        <snapshotRepository>
+            <id>bladex</id>
+            <name>BladeX Snapshot Repository</name>
+            <url>https://center.javablade.com/api/packages/blade/maven</url>
+        </snapshotRepository>
+    </distributionManagement>
+
 </project>