Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo
Commits
3ae4bd21
Commit
3ae4bd21
authored
Nov 15, 2016
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #12210
parent
a8a46ff5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
13 deletions
+17
-13
src/main/java/org/b3log/solo/processor/console/AdminConsole.java
...n/java/org/b3log/solo/processor/console/AdminConsole.java
+3
-2
src/main/java/org/b3log/solo/processor/console/PreferenceConsole.java
...a/org/b3log/solo/processor/console/PreferenceConsole.java
+6
-6
src/main/webapp/js/admin/article.js
src/main/webapp/js/admin/article.js
+3
-3
src/main/webapp/js/admin/preference.js
src/main/webapp/js/admin/preference.js
+5
-2
No files found.
src/main/java/org/b3log/solo/processor/console/AdminConsole.java
View file @
3ae4bd21
...
@@ -69,7 +69,7 @@ import org.json.JSONObject;
...
@@ -69,7 +69,7 @@ import org.json.JSONObject;
* Admin console render processing.
* Admin console render processing.
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.3.2.
9, Aug 10
, 2016
* @version 1.3.2.
10, Nov 15
, 2016
* @since 0.4.1
* @since 0.4.1
*/
*/
@RequestProcessor
@RequestProcessor
...
@@ -169,7 +169,8 @@ public class AdminConsole {
...
@@ -169,7 +169,8 @@ public class AdminConsole {
final
Auth
auth
=
Auth
.
create
(
qiniu
.
optString
(
Option
.
ID_C_QINIU_ACCESS_KEY
),
final
Auth
auth
=
Auth
.
create
(
qiniu
.
optString
(
Option
.
ID_C_QINIU_ACCESS_KEY
),
qiniu
.
optString
(
Option
.
ID_C_QINIU_SECRET_KEY
));
qiniu
.
optString
(
Option
.
ID_C_QINIU_SECRET_KEY
));
final
String
uploadToken
=
auth
.
uploadToken
(
qiniu
.
optString
(
Option
.
ID_C_QINIU_BUCKET
));
final
String
uploadToken
=
auth
.
uploadToken
(
qiniu
.
optString
(
Option
.
ID_C_QINIU_BUCKET
),
null
,
3600
*
6
,
null
);
dataModel
.
put
(
"qiniuUploadToken"
,
uploadToken
);
dataModel
.
put
(
"qiniuUploadToken"
,
uploadToken
);
dataModel
.
put
(
Option
.
ID_C_QINIU_DOMAIN
,
qiniu
.
optString
(
Option
.
ID_C_QINIU_DOMAIN
));
dataModel
.
put
(
Option
.
ID_C_QINIU_DOMAIN
,
qiniu
.
optString
(
Option
.
ID_C_QINIU_DOMAIN
));
}
catch
(
final
Exception
e
)
{
}
catch
(
final
Exception
e
)
{
...
...
src/main/java/org/b3log/solo/processor/console/PreferenceConsole.java
View file @
3ae4bd21
...
@@ -47,7 +47,7 @@ import org.json.JSONObject;
...
@@ -47,7 +47,7 @@ import org.json.JSONObject;
* Preference console request processing.
* Preference console request processing.
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.2.0.
8, Nov 20, 2015
* @version 1.2.0.
9, Nov 15, 2016
* @since 0.4.0
* @since 0.4.0
*/
*/
@RequestProcessor
@RequestProcessor
...
@@ -437,7 +437,7 @@ public class PreferenceConsole {
...
@@ -437,7 +437,7 @@ public class PreferenceConsole {
}
}
preferenceMgmtService
.
updatePreference
(
preference
);
preferenceMgmtService
.
updatePreference
(
preference
);
final
Cookie
cookie
=
new
Cookie
(
Skin
.
SKIN
,
preference
.
getString
(
Skin
.
SKIN_DIR_NAME
));
final
Cookie
cookie
=
new
Cookie
(
Skin
.
SKIN
,
preference
.
getString
(
Skin
.
SKIN_DIR_NAME
));
cookie
.
setPath
(
"/"
);
cookie
.
setPath
(
"/"
);
response
.
addCookie
(
cookie
);
response
.
addCookie
(
cookie
);
...
@@ -542,10 +542,10 @@ public class PreferenceConsole {
...
@@ -542,10 +542,10 @@ public class PreferenceConsole {
try
{
try
{
final
JSONObject
requestJSONObject
=
Requests
.
parseRequestJSONObject
(
request
,
response
);
final
JSONObject
requestJSONObject
=
Requests
.
parseRequestJSONObject
(
request
,
response
);
final
String
accessKey
=
requestJSONObject
.
optString
(
Option
.
ID_C_QINIU_ACCESS_KEY
);
final
String
accessKey
=
requestJSONObject
.
optString
(
Option
.
ID_C_QINIU_ACCESS_KEY
)
.
trim
()
;
final
String
secretKey
=
requestJSONObject
.
optString
(
Option
.
ID_C_QINIU_SECRET_KEY
);
final
String
secretKey
=
requestJSONObject
.
optString
(
Option
.
ID_C_QINIU_SECRET_KEY
)
.
trim
()
;
String
domain
=
requestJSONObject
.
optString
(
Option
.
ID_C_QINIU_DOMAIN
);
String
domain
=
requestJSONObject
.
optString
(
Option
.
ID_C_QINIU_DOMAIN
)
.
trim
()
;
final
String
bucket
=
requestJSONObject
.
optString
(
Option
.
ID_C_QINIU_BUCKET
);
final
String
bucket
=
requestJSONObject
.
optString
(
Option
.
ID_C_QINIU_BUCKET
)
.
trim
()
;
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
...
src/main/webapp/js/admin/article.js
View file @
3ae4bd21
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
*
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.3.5.
5, Nov 9
, 2016
* @version 1.3.5.
6, Nov 15
, 2016
*/
*/
admin
.
article
=
{
admin
.
article
=
{
currentEditorType
:
''
,
currentEditorType
:
''
,
...
@@ -462,7 +462,7 @@ admin.article = {
...
@@ -462,7 +462,7 @@ admin.article = {
done
:
function
(
e
,
data
)
{
done
:
function
(
e
,
data
)
{
var
qiniuKey
=
data
.
result
.
key
;
var
qiniuKey
=
data
.
result
.
key
;
if
(
!
qiniuKey
)
{
if
(
!
qiniuKey
)
{
alert
(
"
Upload error
"
);
alert
(
"
Upload error
, please check Qiniu configurations
"
);
return
;
return
;
}
}
...
@@ -471,7 +471,7 @@ admin.article = {
...
@@ -471,7 +471,7 @@ admin.article = {
+
qiniu
.
qiniuDomain
+
qiniuKey
+
'
)</div>
'
);
+
qiniu
.
qiniuDomain
+
qiniuKey
+
'
)</div>
'
);
},
},
fail
:
function
(
e
,
data
)
{
fail
:
function
(
e
,
data
)
{
alert
(
"
Upload error
:
"
+
data
.
errorThrown
);
alert
(
"
Upload error
, please check Qiniu configurations [
"
+
data
.
errorThrown
+
"
]
"
);
}
}
}).
on
(
'
fileuploadprocessalways
'
,
function
(
e
,
data
)
{
}).
on
(
'
fileuploadprocessalways
'
,
function
(
e
,
data
)
{
var
currentFile
=
data
.
files
[
data
.
index
];
var
currentFile
=
data
.
files
[
data
.
index
];
...
...
src/main/webapp/js/admin/preference.js
View file @
3ae4bd21
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
*
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.2.1.
9, Nov 20, 2015
* @version 1.2.1.
10, Nov 15, 2016
*/
*/
/* preference 相关操作 */
/* preference 相关操作 */
...
@@ -278,8 +278,11 @@ admin.preference = {
...
@@ -278,8 +278,11 @@ admin.preference = {
cache
:
false
,
cache
:
false
,
data
:
JSON
.
stringify
(
requestJSONObject
),
data
:
JSON
.
stringify
(
requestJSONObject
),
success
:
function
(
result
,
textStatus
)
{
success
:
function
(
result
,
textStatus
)
{
if
(
result
.
sc
)
{
window
.
location
.
reload
();
}
$
(
"
#tipMsg
"
).
text
(
result
.
msg
);
$
(
"
#tipMsg
"
).
text
(
result
.
msg
);
$
(
"
#loadMsg
"
).
text
(
""
);
$
(
"
#loadMsg
"
).
text
(
""
);
}
}
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment