Merge remote-tracking branch 'origin/master' into develop-QA

blade-common/src/main/java/org/springblade/common/cache/CacheNames.java

@@ -32,6 +32,31 @@ package org.springblade.common.cache;
  */
 public interface CacheNames {
 
+	//region 系统缓存
+	/**
+	 * 验证码key
+	 */
+	String CAPTCHA_KEY = "blade:auth::blade:captcha:";
+
+	/**
+	 * 账号失败key
+	 */
+	String ACCOUNT_FAIL_KEY = "blade:lock::account:fail:";
+
+	/**
+	 * IP失败key
+	 */
+	String IP_FAIL_KEY = "blade:lock::ip:fail:";
+	//endregion
+
+	//region 业务缓存
+	/**
+	 * 基础信息缓存
+	 */
+	String BASIC = "mes:basic:";
+
+	//endregion
+
 	/**
 	 * 返回拼接后的key
 	 *
@@ -55,19 +80,4 @@ public interface CacheNames {
 		return tenantId.concat(":").concat(cacheKey).concat(cacheKeyValue);
 	}
 
-	/**
-	 * 验证码key
-	 */
-	String CAPTCHA_KEY = "blade:auth::blade:captcha:";
-
-	/**
-	 * 账号失败key
-	 */
-	String ACCOUNT_FAIL_KEY = "blade:lock::account:fail:";
-
-	/**
-	 * IP失败key
-	 */
-	String IP_FAIL_KEY = "blade:lock::ip:fail:";
-
 }

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

@@ -14,9 +14,9 @@ public interface LauncherConstant {
      */
 //	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
 	// 生产环境
-//	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
+	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
 	// 测试环境
-	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
+//	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
 
     /**
      * nacos 用户名

blade-ops/pom.xml

@@ -14,7 +14,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>blade-admin</module>
+<!--        <module>blade-admin</module>-->
         <module>blade-develop</module>
         <module>blade-job</module>
         <module>blade-log</module>

blade-service-api/blade-desk-api/pom.xml

@@ -24,6 +24,10 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-excel</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource-api</artifactId>

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/cache/WorkCenterCache.java

@@ -0,0 +1,39 @@
+package org.springblade.desk.basic.cache;
+
+import org.springblade.common.cache.CacheNames;
+import org.springblade.core.cache.utils.CacheUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.desk.basic.feign.IWorkCenterClient;
+import org.springblade.desk.basic.pojo.entity.WorkCenter;
+
+/**
+ * 系统缓存
+ *
+ * @author Chill
+ */
+public class WorkCenterCache {
+	private static final String WORK_CENTER_CACHE_ID = "workCenter:id:";
+
+	private static IWorkCenterClient workCenterClient;
+
+	private static IWorkCenterClient getWorkCenterClient() {
+		if (workCenterClient == null) {
+			workCenterClient = SpringUtil.getBean(IWorkCenterClient.class);
+		}
+		return workCenterClient;
+	}
+
+	/**
+	 * 获取用户
+	 *
+	 * @param workCenterId 作业中心id
+	 * @return
+	 */
+	public static WorkCenter getById(Long workCenterId) {
+		return CacheUtil.get(CacheNames.BASIC, WORK_CENTER_CACHE_ID, workCenterId, () -> {
+			R<WorkCenter> result = getWorkCenterClient().getById(workCenterId);
+			return result.getData();
+		});
+	}
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/feign/IWorkCenterClient.java

@@ -0,0 +1,57 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.basic.feign;
+
+
+import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.tool.api.R;
+import org.springblade.desk.basic.pojo.entity.WorkCenter;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 作业中心 Feign接口类
+ *
+ * @author lqk
+ */
+@FeignClient(
+	value = AppConstant.APPLICATION_DESK_NAME
+)
+public interface IWorkCenterClient {
+
+	String API_PREFIX = "/feign/workCenter";
+	String GET_BY_ID = API_PREFIX + "/getById";
+
+	/**
+	 * 根据id获取作业中心
+	 *
+	 * @param workCenterId 作业中心id
+	 * @return
+	 */
+	@GetMapping(GET_BY_ID)
+	R<WorkCenter> getById(@RequestParam("id") Long workCenterId);
+}