|
|
@@ -111,7 +111,7 @@ public class TechnologyArchivesService {
|
|
|
|
|
|
private final TechnologyArchives15Dao fifteenthDao;
|
|
|
|
|
|
- private final ArchiveConfig archiveData;
|
|
|
+ private final ArchiveConfig config;
|
|
|
|
|
|
@Autowired
|
|
|
public TechnologyArchivesService(TechnologyArchivesDao dao, TechnologyArchivesMainDao mainDao, RedisLikeService redisLikeService,
|
|
|
@@ -120,7 +120,7 @@ public class TechnologyArchivesService {
|
|
|
TechnologyArchives7Dao seventhDao, TechnologyArchives9Dao ninthDao, TechnologyArchives10Dao tenthDao,
|
|
|
TechnologyArchives12Dao twelfthDao, TechnologyArchives13Dao thirteenthDao, TechnologyArchives14Dao fourteenthDao,
|
|
|
TechnologyArchives8Dao eighthDao, TechnologyArchives11Dao eleventhDao, TechnologyArchives15Dao fifteenthDao
|
|
|
- ,ArchiveConfig archive) {
|
|
|
+ ,ArchiveConfig config) {
|
|
|
this.dao = dao;
|
|
|
this.mainDao = mainDao;
|
|
|
this.redisLikeService = redisLikeService;
|
|
|
@@ -139,7 +139,8 @@ public class TechnologyArchivesService {
|
|
|
this.eighthDao = eighthDao;
|
|
|
this.eleventhDao = eleventhDao;
|
|
|
this.fifteenthDao = fifteenthDao;
|
|
|
- this.archiveData = archive;
|
|
|
+ this.config = config;
|
|
|
+// config.getUploadImageCertificateImage();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -325,10 +326,10 @@ public class TechnologyArchivesService {
|
|
|
String uploadDir;
|
|
|
if (isProd) {
|
|
|
// uploadDir = "/mnt/uploadimage/certificateImage";
|
|
|
- uploadDir = archiveData.getUploadImageCertificateImage();
|
|
|
+ uploadDir = config.getUploadImageCertificateImage();
|
|
|
} else {
|
|
|
//Z为网络映射盘(172.16.32.197\ uploadimage)
|
|
|
-// uploadDir = archiveData.getUploadImageCertificateImage();
|
|
|
+// uploadDir = config.getUploadImageCertificateImage();
|
|
|
uploadDir = "Z:\\certificateImage";
|
|
|
}
|
|
|
JSONObject js = new JSONObject();
|
|
|
@@ -453,7 +454,7 @@ public class TechnologyArchivesService {
|
|
|
|
|
|
String uploadDir;
|
|
|
if (isProd) {
|
|
|
- uploadDir = archiveData.getUploadImageCertificateImage();
|
|
|
+ uploadDir = config.getUploadImageCertificateImage();
|
|
|
} else {
|
|
|
uploadDir = "Z:\\proImage";
|
|
|
}
|