|
@@ -91,6 +91,8 @@ import java.util.stream.Stream;
|
|
@Api(tags = "机构相关接口")
|
|
@Api(tags = "机构相关接口")
|
|
@RequestMapping("${$rmp.ctr.basic}/org")
|
|
@RequestMapping("${$rmp.ctr.basic}/org")
|
|
public class OrgController extends ControllerSupport {
|
|
public class OrgController extends ControllerSupport {
|
|
|
|
+
|
|
|
|
+ private final static long LOG_FILE_CACHE_AGE=2592000L;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
OrgCache orgCache;
|
|
OrgCache orgCache;
|
|
@@ -1353,7 +1355,7 @@ public class OrgController extends ControllerSupport {
|
|
FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
|
|
FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
|
|
env.setFileSuffix(fileSuffix);
|
|
env.setFileSuffix(fileSuffix);
|
|
env.setRootOrgId(orgEntity.getRootId().toString());
|
|
env.setRootOrgId(orgEntity.getRootId().toString());
|
|
- YunPathInfo pi = FileStorageUtil.saveFile("orgLogo", env, storeLocation, null);
|
|
|
|
|
|
+ YunPathInfo pi = FileStorageUtil.saveFile("orgLogo", env, storeLocation, null,LOG_FILE_CACHE_AGE);
|
|
String url = pi.getUrl();
|
|
String url = pi.getUrl();
|
|
|
|
|
|
OrgPropertyEntity logoFileUrlEntity = orgPropertyRepo.findByOrgIdAndKeyId(orgId,
|
|
OrgPropertyEntity logoFileUrlEntity = orgPropertyRepo.findByOrgIdAndKeyId(orgId,
|
|
@@ -1426,7 +1428,7 @@ public class OrgController extends ControllerSupport {
|
|
FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
|
|
FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
|
|
env.setFileSuffix(fileSuffix);
|
|
env.setFileSuffix(fileSuffix);
|
|
env.setRootOrgId(orgEntity.getRootId().toString());
|
|
env.setRootOrgId(orgEntity.getRootId().toString());
|
|
- YunPathInfo pi = FileStorageUtil.saveFile("client_bg_picture", env, storeLocation, null);
|
|
|
|
|
|
+ YunPathInfo pi = FileStorageUtil.saveFile("client_bg_picture", env, storeLocation, null,LOG_FILE_CACHE_AGE);
|
|
String url = pi.getUrl();
|
|
String url = pi.getUrl();
|
|
|
|
|
|
OrgPropertyEntity logoFileUrlEntity = orgPropertyRepo.findByOrgIdAndKeyId(orgId,
|
|
OrgPropertyEntity logoFileUrlEntity = orgPropertyRepo.findByOrgIdAndKeyId(orgId,
|
|
@@ -1607,7 +1609,7 @@ public class OrgController extends ControllerSupport {
|
|
FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
|
|
FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
|
|
env.setFileSuffix(fileSuffix);
|
|
env.setFileSuffix(fileSuffix);
|
|
env.setRootOrgId(orgEntity.getRootId().toString());
|
|
env.setRootOrgId(orgEntity.getRootId().toString());
|
|
- YunPathInfo pi = FileStorageUtil.saveFile("orgLogo", env, storeLocation, null);
|
|
|
|
|
|
+ YunPathInfo pi = FileStorageUtil.saveFile("orgLogo", env, storeLocation, null,LOG_FILE_CACHE_AGE);
|
|
String url = pi.getUrl();
|
|
String url = pi.getUrl();
|
|
|
|
|
|
OrgPropertyEntity logoFileUrlEntity = orgPropertyRepo.findByOrgIdAndKeyId(orgId,
|
|
OrgPropertyEntity logoFileUrlEntity = orgPropertyRepo.findByOrgIdAndKeyId(orgId,
|