From 74e6bcec42905ef97b1875e3e1786f2003f575d0 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 31 Aug 2021 16:08:14 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java | 5 +++++
src/main/java/org/springblade/common/constant/FtpConstant.java | 20 ++++++++++----------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/common/constant/FtpConstant.java b/src/main/java/org/springblade/common/constant/FtpConstant.java
index 76fcd0d..ece23ae 100644
--- a/src/main/java/org/springblade/common/constant/FtpConstant.java
+++ b/src/main/java/org/springblade/common/constant/FtpConstant.java
@@ -8,22 +8,22 @@
/**
* sql connect
*/
- String sql_connect_dev = "jdbc:mysql://223.82.109.183:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true";
+ //String sql_connect_dev = "jdbc:mysql://223.82.109.183:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true";
/**
* sql connect
*/
- //String sql_connect_dev = "jdbc:mysql://localhost:2083/zhbaw";
+ String sql_connect_dev = "jdbc:mysql://localhost:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true";
/**
* ftp服务器IP地址
*/
- String ftpHost_dev = "192.168.0.105";
+ //String ftpHost_dev = "192.168.0.105";
/**
* ftp服务器IP地址
*/
- //String ftpHost_dev = "172.19.1.30";
+ String ftpHost_dev = "172.19.1.30";
/**
* ftp服务器端口
@@ -44,17 +44,17 @@
/**
* ftp服务器路径
*/
- //String ftpPath = "yly/anbao/";
- String ftpPath = "anbao/";
+ String ftpPath = "yly/anbao/";
+ //String ftpPath = "anbao/";
/**
* 本地路径
*/
- //String localPath = "/home/zhongsong/anbao/";
- String localPath = "D:\\anbao\\";
+ String localPath = "/home/zhongsong/anbao/";
+ //String localPath = "D:\\anbao\\";
//minio内网ip
- //String ip = "http://47.49.21.216:9000";
- String ip = "http://223.82.109.183:2081";
+ String ip = "http://47.49.21.216:9000";
+ //String ip = "http://223.82.109.183:2081";
}
diff --git a/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java b/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
index 3a0a965..f54b226 100644
--- a/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
+++ b/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
@@ -25,6 +25,7 @@
import org.springblade.modules.social.mapper.SocialMapper;
import org.springblade.modules.social.service.ISocialService;
import org.springblade.modules.social.vo.SocialVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -38,6 +39,9 @@
*/
@Service
public class SocialServiceImpl extends ServiceImpl<SocialMapper, Social> implements ISocialService {
+
+
+
@Override
public IPage<SocialVO> selectSocialPage(IPage<SocialVO> page, SocialVO social) {
return page.setRecords(baseMapper.selectSocialPage(page, social));
@@ -48,6 +52,7 @@
data.forEach(SocialExcel -> {
Social social = Objects.requireNonNull(BeanUtil.copy(SocialExcel, Social.class));
social.setDeptid(deptid);
+ this.upSoil(social.getCardid());
this.save(social);
});
}
--
Gitblit v1.9.3