Merge remote-tracking branch 'origin/feature-2022.06.27' into feature-2022.06.27

eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java

@@ -59,7 +59,7 @@ public class RedisConfig extends CachingConfigurerSupport {
 
     /**
      *  设置 redis 数据默认过期时间，默认2小时
-     *  设置@cacheable 序列化方式
+     *  设置//@Cacheable 序列化方式
      */
     @Bean
     public RedisCacheConfiguration redisCacheConfiguration(){

eladmin-system/src/main/java/me/zhengjie/appapi/controller/ApiBankController.java

@@ -312,7 +312,19 @@ public class ApiBankController extends BaseController {
 
 		return ResponseDTO.success(list);
 	}
-
+	@RequestMapping("/order/detail")
+	public ResponseDTO<?> getDetail(@RequestBody String json) {
+		JSONObject jsonObj = JSONObject.parseObject(json);
+		String orderId = jsonObj.getString("orderId");
+		if (StringUtils.isEmpty(orderId)) {
+			return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
+		}
+		OrderDto order = this.orderService.getOrderById(orderId);
+		if (order == null) {
+			return ResponseDTO.error(ResultCode.ORDER_DATA_NOT_EXIST);
+		}
+		return ResponseDTO.success(order);
+	}
 	// 得到公证书
 	@RequestMapping("/getNotarization")
 	public ResponseDTO<?> getNotarization(@RequestBody String json) {

eladmin-system/src/main/java/me/zhengjie/appapi/controller/MiniProgramController.java

@@ -6,6 +6,7 @@ import me.zhengjie.appapi.dto.OrderDto;
 import me.zhengjie.appapi.service.*;
 import me.zhengjie.appapi.tencent.h5face.SdkTest;
 import me.zhengjie.appapi.util.FileUploadUtil;
+import me.zhengjie.appapi.vo.OrderVo;
 import me.zhengjie.appapi.vo.SmsVo;
 import me.zhengjie.appapi.vo.UserVo;
 import me.zhengjie.base.ResponseDTO;
@@ -95,6 +96,16 @@ public class MiniProgramController {
 		}
 		return ResponseDTO.success(order);
 	}
+	@RequestMapping("/order/search")
+	public ResponseDTO<?> orderSearch( @RequestBody OrderVo order ) {
+		 
+		if (order == null) {
+			return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
+		}
+		 List<OrderDto> orders = this.apiService.getOrderByContion(order);
+		
+		return ResponseDTO.success(orders);
+	}
 
 	@RequestMapping("/live/verify")
 	public ResponseDTO<?> liveVerify(MultipartFile file, HttpServletRequest request) {

eladmin-system/src/main/java/me/zhengjie/appapi/entity/BorrowerEntity.java

@@ -39,6 +39,7 @@ public class BorrowerEntity extends Model<BorrowerEntity> implements Serializabl
 	/**
 	 * 借款合同编号
 	 */
+	@QueryWapper(value=QueryKeyword.LIKE )
 	@TableField("contract_no")
 	private String contractNo;
 

eladmin-system/src/main/java/me/zhengjie/appapi/entity/GuaranteeEntity.java

@@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
+import me.zhengjie.appapi.plus.QueryKeyword;
+import me.zhengjie.appapi.plus.QueryWapper;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -35,6 +39,7 @@ public class GuaranteeEntity implements Serializable {
     /**
      * 担保合同编号
      */
+    @QueryWapper(value=QueryKeyword.LIKE )
     @TableField("contract_no")
     private String contractNo;
 

eladmin-system/src/main/java/me/zhengjie/appapi/entity/MortgageEntity.java

@@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
+import me.zhengjie.appapi.plus.QueryKeyword;
+import me.zhengjie.appapi.plus.QueryWapper;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -35,6 +39,7 @@ public class MortgageEntity implements Serializable {
     /**
      * 抵押合同编号
      */
+    @QueryWapper(value=QueryKeyword.LIKE )
     @TableField("contract_no")
     private String contractNo;
 

eladmin-system/src/main/java/me/zhengjie/appapi/service/impl/ApiServiceImpl.java

@@ -139,6 +139,7 @@ public class ApiServiceImpl implements ApiService {
 		borrower.setUsername(user.getUserName());
 		borrower.setPhone(user.getPhone());
 		borrower.setBusinessNo(user.getBusinessNo());
+		borrower.setContractNo(user.getContractNo());
 		borrower.setStatus(user.getStatus());
 		QueryWrapper<BorrowerEntity> queryWrapper = QueryWrapperUtil.convertQuery(borrower);
 		List<BorrowerEntity> borrowers = borrowerService.list(queryWrapper);
@@ -152,6 +153,7 @@ public class ApiServiceImpl implements ApiService {
 		mortgage.setPhone(user.getPhone());
 		mortgage.setStatus(user.getStatus());
 		mortgage.setBusinessNo(user.getBusinessNo());
+		mortgage.setContractNo(user.getContractNo());
 		QueryWrapper<MortgageEntity> mortgageWrapper = QueryWrapperUtil.convertQuery(mortgage);
 		List<MortgageEntity> mortgages = mortgageService.list(mortgageWrapper);
 		if (user.getBusinessNo() == null && mortgages != null && mortgages.size() > 0) {
@@ -164,6 +166,7 @@ public class ApiServiceImpl implements ApiService {
 		guarantee.setPhone(user.getPhone());
 		guarantee.setStatus(user.getStatus());
 		guarantee.setBusinessNo(user.getBusinessNo());
+		guarantee.setContractNo(user.getContractNo());
 		QueryWrapper<GuaranteeEntity> guaranteeWrapper = QueryWrapperUtil.convertQuery(guarantee);
 		List<GuaranteeEntity> guarantees = guaranteeService.list(guaranteeWrapper);
 		if (user.getBusinessNo() == null && guarantees != null && guarantees.size() > 0) {

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/h5face/SdkTest.java

@@ -19,7 +19,8 @@ public class SdkTest {
 	final static String url = "https://www.baidu.com";
 	final static String resultType = "2";
 
-	public static JSONObject getFaceId(String webankAppId,String secret, String keyLicence,  String name, String idNo, String orderNo) throws Exception {
+	public static JSONObject getFaceId(String webankAppId, String secret, String keyLicence, String name, String idNo,
+			String orderNo) throws Exception {
 //		String webankAppId = AppConfigInfo.WEBANKAPPID;//"TIDAdW8e";
 //		String secret = AppConfigInfo.SECRET;//"34mhXRkury4DCFZpXCQ9E1fr7KUAPTiXTVac6H6e4pvxYMo5jl1m7sehQUqsmwsQ";
 		// 第一步先得到access_token
@@ -108,10 +109,15 @@ public class SdkTest {
 	}
 
 	public static void main(String[] args) throws Exception, Exception {
+		String webankAppId = "TIDAa18H";
+		String secret = "vyzhltzExvtpU3O0wiSveww6DVxQ3EvV5RGdM5U8Jpp2BoL059ahJ4U76jMSvouT";
+		String keyLicence = "Jpzb+BHO3aJ3FSjhsnXS43gHs20FSljKz0lthOlVhURvlePnisObmeO5EJjCXgZeZgo9KpJyADz4dcQREVAzuaxRPmhAx4ljpmZeVizNQWuxzLnDAGy8UgFzpAdCBemWrfTTt9f56JFRLdpmmMweyImHa4rDxLbdqqvXuiQLoaIvthbJLu3LO7mNscNkSn8xdhqqgIjX8DfroC99ykff8f7QTcK38iLjGQeI8sY79YY1a++Op5xpvfYZXm2Wdb6hI+rB+ndkWPNpPyP4f2m3/lkEvEMpoKOldQ7ebJQkTigDMvQ1pdBnYTrVVZKQgJ5nDSSVobYcxN2EZxeco9k/7A==";
+						//	 ZNjSJAs5nqb0OJR7SXGj8b8Jr8GZuhkIiLceBA1rp/UZ/X8nHbYzfNGkyhXLuTG82QzHIiNxixrzc7zWFcRyxiIIhglIxi0zZDD9nSQsXrHlMJMC3EUXarN9tp5QX0X2dS38gsi+F1TIigfHqxj39iX43wAO4KOfZekBIPNPA2Vb/AjlWnsTbOZCVwANXXwcKsCYiZJrbQlxGlxF9bfXEuhJgILJGQ2iT74wJ/Qn4qRraiyaYzi0Un44C24Y44pbYX4kEokvVQaPnClnAnMH98l8w0VIxPc2lH5io0ATpoPMoZGWKtICVPzrvpaMwjaPlyBzZ/qWwc5jeS+ySxwJyA==
 		String name = "杜婧闻";
 		String idNo = "420503198207231844";
 		String orderNo = "101648715083886";
-//		System.err.println(getFaceId(name, idNo, orderNo)); // getFaceId(name, idNo, orderNo);
+		System.err.println(getFaceId(webankAppId, secret, keyLicence, name, idNo, orderNo)); // getFaceId(name, idNo,
+																								// orderNo);
 		String str = "{\"code\":\"0\",\"msg\":\"请求成功\",\"bizSeqNo\":\"22040610001184432417073637629165\",\"result\":{\"bizSeqNo\":\"22040610001184432417073637629165\",\"transactionTime\":\"20220406170736\",\"orderNo\":\"101648715083886\",\"faceId\":\"tx0e0c771ae8700887fd9e60193cdd7b\",\"success\":false},\"transactionTime\":\"20220406170736\"}";
 
 		/*

eladmin-system/src/main/java/me/zhengjie/appapi/util/FileUploadUtil.java

@@ -248,7 +248,14 @@ public class FileUploadUtil {
 		String suffix = uploadFileName.substring(index);
 		String fileName = uuid + "_" + file.getFileType() + suffix;
 		file.setFileName(fileName);
-		String imagePath = filePath + "/" + fileName;
+		//判断是否有斜线 /结尾
+		String imagePath; 
+		if(filePath.endsWith("/")) {
+			imagePath= filePath +  fileName;
+		}else {
+			imagePath = filePath + "/" + fileName;
+		}
+		
 		try {
 			FileHandleVo fileHandlevo = new FileHandleVo();
 			fileHandlevo.setFilePath(imagePath);

eladmin-system/src/main/java/me/zhengjie/appapi/vo/FileVo.java

@@ -30,5 +30,5 @@ public class FileVo {
 	// 传输类型，8
 	private String fileType;
 	private String fileName;
-
+	private String imageId;
 }

eladmin-system/src/main/java/me/zhengjie/appapi/vo/OrderVo.java

@@ -16,10 +16,10 @@ public class OrderVo {
 	// 身份证号不能为空
 	private String idCode;
 	// 1.待公证 2待审核 3已签发 4已驳回
- 
 	private String status;
 	//业务流水
 	private String businessNo;
-
+	//合同编号
+	private String contractNo;
 
 }

eladmin-system/src/main/java/me/zhengjie/appapi/vo/UserVo.java

@@ -24,6 +24,8 @@ public class UserVo {
 	@ApiModelProperty(value = "1.待公证 2待审核 3已签发 4已驳回")
 	private String status;
 	
+	
+	
 	public String getUserName() {
 		return userName;
 	}

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/NotaryOrderController.java

@@ -196,7 +196,7 @@ public class NotaryOrderController {
     }
 
     @AnonymousPostMapping("/uploadNotarization")
-    public BaseResponse uploadNotarization(FileVo file) {
+    public BaseResponse uploadNotarization(@RequestBody FileVo file) {
         return notaryOrderService.uploadNotarization(file);
     }
 

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java

@@ -48,7 +48,7 @@ public class DataServiceImpl implements DataService {
      * @return /
      */
     @Override
-    @Cacheable(key = "'user:' + #p0.id")
+    //@Cacheable(key = "'user:' + #p0.id")
     public List<Long> getDeptIds(UserDto user) {
         // 用于存储部门id
         Set<Long> deptIds = new HashSet<>();

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java

@@ -88,7 +88,7 @@ public class DeptServiceImpl implements DeptService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    //@Cacheable(key = "'id:' + #p0")
     public DeptDto findById(Long id) {
         Dept dept = deptRepository.findById(id).orElseGet(Dept::new);
         ValidationUtil.isNull(dept.getId(),"Dept","id",id);

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java

@@ -74,7 +74,7 @@ public class DictDetailServiceImpl implements DictDetailService {
     }
 
     @Override
-    @Cacheable(key = "'name:' + #p0")
+    //@Cacheable(key = "'name:' + #p0")
     public List<DictDetailDto> getDictByName(String name) {
         return dictDetailMapper.toDto(dictDetailRepository.findByDictName(name));
     }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java

@@ -64,7 +64,7 @@ public class JobServiceImpl implements JobService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    //@Cacheable(key = "'id:' + #p0")
     public JobDto findById(Long id) {
         Job job = jobRepository.findById(id).orElseGet(Job::new);
         ValidationUtil.isNull(job.getId(),"Job","id",id);

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java

@@ -83,7 +83,7 @@ public class MenuServiceImpl implements MenuService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    //@Cacheable(key = "'id:' + #p0")
     public MenuDto findById(long id) {
         Menu menu = menuRepository.findById(id).orElseGet(Menu::new);
         ValidationUtil.isNull(menu.getId(),"Menu","id",id);
@@ -96,7 +96,7 @@ public class MenuServiceImpl implements MenuService {
      * @return /
      */
     @Override
-    @Cacheable(key = "'user:' + #p0")
+    //@Cacheable(key = "'user:' + #p0")
     public List<MenuDto> findByUser(Long currentUserId) {
         List<RoleSmallDto> roles = roleService.findByUsersId(currentUserId);
         Set<Long> roleIds = roles.stream().map(RoleSmallDto::getId).collect(Collectors.toSet());

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/NotaryOrderServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import me.zhengjie.appapi.config.AppConfigInfo;
 import me.zhengjie.appapi.entity.CityEntity;
+import me.zhengjie.appapi.entity.FileInfoEntity;
 import me.zhengjie.appapi.entity.ProvinceEntity;
 import me.zhengjie.appapi.entity.SysUserEntity;
 import me.zhengjie.appapi.entity.response.BaseResponse;
@@ -13,6 +14,7 @@ import me.zhengjie.appapi.entity.response.ResultData;
 import me.zhengjie.appapi.mapper.ICityDao;
 import me.zhengjie.appapi.mapper.IProvinceDao;
 import me.zhengjie.appapi.mapper.ISysUserDao;
+import me.zhengjie.appapi.service.FileInfoService;
 import me.zhengjie.appapi.service.OrderService;
 import me.zhengjie.appapi.service.impl.NotaryNoteServiceImpl;
 import me.zhengjie.appapi.util.*;
@@ -96,7 +98,10 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 	IProvinceDao provinceDao;
 	@Autowired
 	ICityDao cityDao;
-
+	
+	@Autowired
+	FileInfoService fileInfoService;
+	
 	@Override
 	public BaseResponse<List<NotaryOrderQueryRsp>> query(NotaryOrderQueryReq req) {
 		BaseResponse<List<NotaryOrderQueryRsp>> response = new BaseResponse<>();
@@ -667,13 +672,11 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 	@Transactional(rollbackFor = Exception.class)
 	public BaseResponse uploadNotarization(FileVo file) {
 		BaseResponse response = new BaseResponse<>();
-		String path = file.getBusinessNo()+ "/" + StatusEnum.StepStatusEnum.getType(file.getContractId()) + "/" ;
-		file.setFilePath(path);
-		String filePath = FileUploadUtil.upload(file);
+		FileInfoEntity fileInfoEntity=fileInfoService.getById(file.getImageId());
 		OrderFileEntity notaryOrderFile = new OrderFileEntity();
 		notaryOrderFile.setBusinessNo(file.getBusinessNo());
 		notaryOrderFile.setContractId(file.getContractId());
-		notaryOrderFile.setSignedPdfUrl(filePath);
+		notaryOrderFile.setSignedPdfUrl(fileInfoEntity.getPath());
 		notaryOrderFile.setCreateTime(new Date());
 		notaryOrderFile.setCreatorId(SecurityUtils.getCurrentUserId());
 		orderFileMapper.insert(notaryOrderFile);

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java

@@ -82,7 +82,7 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    //@Cacheable(key = "'id:' + #p0")
     @Transactional(rollbackFor = Exception.class)
     public RoleDto findById(long id) {
         Role role = roleRepository.findById(id).orElseGet(Role::new);
@@ -165,7 +165,7 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    @Cacheable(key = "'auth:' + #p0.id")
+    //@Cacheable(key = "'auth:' + #p0.id")
     public List<GrantedAuthority> mapToGrantedAuthorities(UserDto user) {
         Set<String> permissions = new HashSet<>();
         // 如果是管理员直接返回

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -253,7 +253,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    //@Cacheable(key = "'id:' + #p0")
     @Transactional(rollbackFor = Exception.class)
     public UserDto findById(long id) {
         User user = userRepository.findById(id).orElseGet(User::new);

eladmin-system/src/main/resources/config/application-prod.yml

@@ -163,10 +163,6 @@ app:
     domain: https://flowbb.show.xjrkj.com/
   push:
     port: 8089
-  tencent:
-    webankAppId: TIDAdW8e
-    secret: 34mhXRkury4DCFZpXCQ9E1fr7KUAPTiXTVac6H6e4pvxYMo5jl1m7sehQUqsmwsQ
-    keyLicence: ZNjSJAs5nqb0OJR7SXGj8b8Jr8GZuhkIiLceBA1rp/UZ/X8nHbYzfNGkyhXLuTG82QzHIiNxixrzc7zWFcRyxiIIhglIxi0zZDD9nSQsXrHlMJMC3EUXarN9tp5QX0X2dS38gsi+F1TIigfHqxj39iX43wAO4KOfZekBIPNPA2Vb/AjlWnsTbOZCVwANXXwcKsCYiZJrbQlxGlxF9bfXEuhJgILJGQ2iT74wJ/Qn4qRraiyaYzi0Un44C24Y44pbYX4kEokvVQaPnClnAnMH98l8w0VIxPc2lH5io0ATpoPMoZGWKtICVPzrvpaMwjaPlyBzZ/qWwc5jeS+ySxwJyA==    
   minio:
     accesskey: minioadmin
     secretkey: minioadmin
@@ -176,12 +172,12 @@ app:
 tencent:
   client:
     webankAppId: TIDAdW8e
-    secret: vyzhltzExvtpU3O0wiSveww6DVxQ3EvV5RGdM5U8Jpp2BoL059ahJ4U76jMSvouT
-    keyLicence: Jpzb+BHO3aJ3FSjhsnXS43gHs20FSljKz0lthOlVhURvlePnisObmeO5EJjCXgZeZgo9KpJyADz4dcQREVAzuaxRPmhAx4ljpmZeVizNQWuxzLnDAGy8UgFzpAdCBemWrfTTt9f56JFRLdpmmMweyImHa4rDxLbdqqvXuiQLoaIvthbJLu3LO7mNscNkSn8xdhqqgIjX8DfroC99ykff8f7QTcK38iLjGQeI8sY79YY1a++Op5xpvfYZXm2Wdb6hI+rB+ndkWPNpPyP4f2m3/lkEvEMpoKOldQ7ebJQkTigDMvQ1pdBnYTrVVZKQgJ5nDSSVobYcxN2EZxeco9k/7A==
+    secret: 34mhXRkury4DCFZpXCQ9E1fr7KUAPTiXTVac6H6e4pvxYMo5jl1m7sehQUqsmwsQ
+    keyLicence: ZNjSJAs5nqb0OJR7SXGj8b8Jr8GZuhkIiLceBA1rp/UZ/X8nHbYzfNGkyhXLuTG82QzHIiNxixrzc7zWFcRyxiIIhglIxi0zZDD9nSQsXrHlMJMC3EUXarN9tp5QX0X2dS38gsi+F1TIigfHqxj39iX43wAO4KOfZekBIPNPA2Vb/AjlWnsTbOZCVwANXXwcKsCYiZJrbQlxGlxF9bfXEuhJgILJGQ2iT74wJ/Qn4qRraiyaYzi0Un44C24Y44pbYX4kEokvVQaPnClnAnMH98l8w0VIxPc2lH5io0ATpoPMoZGWKtICVPzrvpaMwjaPlyBzZ/qWwc5jeS+ySxwJyA==
   bank:
     webankAppId: TIDAa18H
-    secret: FAeFRoz5YxQkMyf1g0nSk7DVo7LQNmdAjKWxvwlxh5phMdftGt0nxdeX0FKXd7kD
-    keyLicence: XMKMHERS8SLw5DiM/nnFm/dRVQZ31//VbBhHXiVHgrX1ztbjUAwCrvTut3GoBFRPT5ubNc91yapZpagyIYgqKIRevdiAs4l6yML5yDP9sRwiYwaB4nOEWYILmCldg8w+Vr7t75puP7ofWkn2B5c5vE4HksFS4kqzj1zF6Kxlh+yNTCECObvKiDJdNqcXJKl0Dht9jtc5JojGPFPXYBAuN0manuUxpSwl5wq1H/OOhZ9RrklAqFxie4Z5r4PhEbiBKE6FAgwCNcE4NKNbk7Tr1VgMnOn/R4IqYbKaNA2u7OYaGBmSKuBPG5hcRl72k6XMqTYZnP85CybfQ/fEthVkvA==
+    secret: vyzhltzExvtpU3O0wiSveww6DVxQ3EvV5RGdM5U8Jpp2BoL059ahJ4U76jMSvouT
+    keyLicence: Jpzb+BHO3aJ3FSjhsnXS43gHs20FSljKz0lthOlVhURvlePnisObmeO5EJjCXgZeZgo9KpJyADz4dcQREVAzuaxRPmhAx4ljpmZeVizNQWuxzLnDAGy8UgFzpAdCBemWrfTTt9f56JFRLdpmmMweyImHa4rDxLbdqqvXuiQLoaIvthbJLu3LO7mNscNkSn8xdhqqgIjX8DfroC99ykff8f7QTcK38iLjGQeI8sY79YY1a++Op5xpvfYZXm2Wdb6hI+rB+ndkWPNpPyP4f2m3/lkEvEMpoKOldQ7ebJQkTigDMvQ1pdBnYTrVVZKQgJ5nDSSVobYcxN2EZxeco9k/7A==
     
 xxl:
   job:

eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java

@@ -44,14 +44,14 @@ public class AliPayServiceImpl implements AliPayService {
     private final AliPayRepository alipayRepository;
 
     @Override
-    @Cacheable(key = "'config'")
+    //@Cacheable(key = "'config'")
     public AlipayConfig find() {
         Optional<AlipayConfig> alipayConfig = alipayRepository.findById(1L);
         return alipayConfig.orElseGet(AlipayConfig::new);
     }
 
     @Override
-    @CachePut(key = "'config'")
+//    @CachePut(key = "'config'")
     @Transactional(rollbackFor = Exception.class)
     public AlipayConfig config(AlipayConfig alipayConfig) {
         alipayConfig.setId(1L);

eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java

@@ -43,7 +43,7 @@ public class EmailServiceImpl implements EmailService {
     private final EmailRepository emailRepository;
 
     @Override
-    @CachePut(key = "'config'")
+//    @CachePut(key = "'config'")
     @Transactional(rollbackFor = Exception.class)
     public EmailConfig config(EmailConfig emailConfig, EmailConfig old) throws Exception {
         emailConfig.setId(1L);
@@ -55,7 +55,7 @@ public class EmailServiceImpl implements EmailService {
     }
 
     @Override
-    @Cacheable(key = "'config'")
+    //@Cacheable(key = "'config'")
     public EmailConfig find() {
         Optional<EmailConfig> emailConfig = emailRepository.findById(1L);
         return emailConfig.orElseGet(EmailConfig::new);

eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java

@@ -65,14 +65,14 @@ public class QiNiuServiceImpl implements QiNiuService {
     private Long maxSize;
 
     @Override
-    @Cacheable(key = "'config'")
+    //@Cacheable(key = "'config'")
     public QiniuConfig find() {
         Optional<QiniuConfig> qiniuConfig = qiNiuConfigRepository.findById(1L);
         return qiniuConfig.orElseGet(QiniuConfig::new);
     }
 
     @Override
-    @CachePut(key = "'config'")
+//    @CachePut(key = "'config'")
     @Transactional(rollbackFor = Exception.class)
     public QiniuConfig config(QiniuConfig qiniuConfig) {
         qiniuConfig.setId(1L);