Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
UPHRH-lms-service
Commits
00c11765
Commit
00c11765
authored
2 years ago
by
BharathwajShankar
Browse files
Options
Download
Patches
Plain Diff
LR-278 - CLONE - File URL is not having new cname changes fix
parent
fda152b7
master
bootcamp
helmchart
release-5.0.1
release-5.0.2
release-5.1.0
release-5.2.0
release-5.2.1
release-5.3.0
release-5.3.1
release-5.4.0
release-5.3.1_RC1
release-5.3.0_RC1
release-5.2.0_RC2
release-5.2.0_RC1
release-5.1.0_RC2
release-5.1.0_RC1
release-5.0.1_RC3
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
course-mw/course-actors-common/src/main/java/org/sunbird/learner/actors/qrcodedownload/QRCodeDownloadManagementActor.java
+2
-2
.../actors/qrcodedownload/QRCodeDownloadManagementActor.java
course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/JsonKey.java
+4
-0
...src/main/java/org/sunbird/common/models/util/JsonKey.java
course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/resources/externalresource.properties
+1
-0
...ommon-util/src/main/resources/externalresource.properties
with
7 additions
and
2 deletions
+7
-2
course-mw/course-actors-common/src/main/java/org/sunbird/learner/actors/qrcodedownload/QRCodeDownloadManagementActor.java
+
2
−
2
View file @
00c11765
...
...
@@ -235,8 +235,8 @@ public class QRCodeDownloadManagementActor extends BaseActor {
//TODO Resolve it and store. Assuming dial code db will have the template url with data migration script
String
templateUrl
=
(
String
)
listOfMap
.
get
(
0
).
get
(
"url"
);
//replace template url with the actual cloud url
if
(
templateUrl
.
contains
(
getConfigValue
(
CLOUD
_STORE_BASE_PATH
_PLACEHOLDER
)))
templateUrl
=
templateUrl
.
replace
(
getConfigValue
(
CLOUD
_STORE_BASE_PATH
_PLACEHOLDER
),
getConfigValue
(
CLOUD_STORE_BASE_PATH
));
if
(
templateUrl
.
contains
(
getConfigValue
(
DIAL
_STOR
AG
E_BASE_PATH
)))
templateUrl
=
templateUrl
.
replace
(
getConfigValue
(
DIAL
_STOR
AG
E_BASE_PATH
),
getConfigValue
(
CLOUD_STORE_BASE_PATH
));
return
templateUrl
;
}
}
...
...
This diff is collapsed.
Click to expand it.
course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/JsonKey.java
+
4
−
0
View file @
00c11765
...
...
@@ -3,6 +3,8 @@ package org.sunbird.common.models.util;
import
java.util.Arrays
;
import
java.util.List
;
import
static
org
.
sunbird
.
common
.
models
.
util
.
ProjectUtil
.
getConfigValue
;
/**
* This class will contains all the key related to request and response.
*
...
...
@@ -790,6 +792,8 @@ public final class JsonKey {
public
static
final
String
CLOUD_FOLDER_CONTENT
=
"sunbird_cloud_content_folder"
;
public
static
final
String
CLOUD_STORE_BASE_PATH
=
"cloud_storage_base_url"
;
public
static
final
String
CLOUD_STORE_BASE_PATH_PLACEHOLDER
=
"cloud_store_base_path_placeholder"
;
public
static
final
String
DIAL_STORAGE_BASE_PATH
=
getConfigValue
(
"cloud_storage_base_url"
)
+
"/"
+
getConfigValue
(
"cloud_storage_dial_bucketname"
);
public
static
final
String
TO_URL
=
"toUrl"
;
public
static
final
String
TTL
=
"ttl"
;
public
static
final
String
TEXTBOOK_TOC_CSV_TTL
=
"sunbird_texbook_toc_csv_ttl"
;
...
...
This diff is collapsed.
Click to expand it.
course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/resources/externalresource.properties
+
1
−
0
View file @
00c11765
...
...
@@ -207,4 +207,5 @@ sunbird_msg_91_auth=
sunbird_api_mgr_base_url
=
https://dev.sunbirded.org/api
enrollment_list_size
=
1000
cloud_storage_base_url
=
https://sunbirddev.blob.core.windows.net
cloud_storage_dial_bucketname
=
dial
cloud_store_base_path_placeholder
=
$CLOUD_BASE_PATH
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets