|
|
@@ -37,20 +37,12 @@ public class BaseController {
|
|
|
@Value(value = "${static.host}")
|
|
|
private String staticHost = null;
|
|
|
|
|
|
- @Value(value = "${avatar.host}")
|
|
|
- private String avatarHost = null;
|
|
|
-
|
|
|
- @Value(value = "${upload.path}")
|
|
|
- private String uploadPath = null;
|
|
|
+ @Value(value = "${rd.static.host}")
|
|
|
+ private String rdStaticHost = null;
|
|
|
|
|
|
- @Value(value = "${upload.private.path}")
|
|
|
- private String uploadPrivatePath = null;
|
|
|
|
|
|
- @Value(value = "${accessKey}")
|
|
|
- private String accessKey = null;
|
|
|
-
|
|
|
- @Value(value = "${accessSecret}")
|
|
|
- private String accessSecret = null;
|
|
|
+ @Value(value = "${avatar.host}")
|
|
|
+ private String avatarHost = null;
|
|
|
|
|
|
@Value(value = "${portal.host}")
|
|
|
private String portalHost = null;
|
|
|
@@ -123,6 +115,7 @@ public class BaseController {
|
|
|
public void prepareModel(HttpServletRequest request, Model model) {
|
|
|
model.addAttribute("staticDomain", avatarHost);
|
|
|
model.addAttribute("staticHost", staticHost);
|
|
|
+ model.addAttribute("rdStaticHost", rdStaticHost);
|
|
|
model.addAttribute("avatarHost", avatarHost);
|
|
|
model.addAttribute("avatarUploadHost", avatarUploadHost);
|
|
|
model.addAttribute("portalHost", portalHost);
|