Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
info-publish-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
info-publish-platform
Commits
6e6104d4
Commit
6e6104d4
authored
Dec 12, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加皮肤同步
parent
83ff9217
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
info-publish-manager-ui/admin/vue.config.js
info-publish-manager-ui/admin/vue.config.js
+2
-1
info-publish-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinController.java
.../java/com/mortals/xhx/module/skin/web/SkinController.java
+0
-3
No files found.
info-publish-manager-ui/admin/vue.config.js
View file @
6e6104d4
...
@@ -18,7 +18,8 @@ module.exports = {
...
@@ -18,7 +18,8 @@ module.exports = {
proxy
:
{
proxy
:
{
"
/infopublish
"
:
{
"
/infopublish
"
:
{
//target: "http://test.office.com:11078",
//target: "http://test.office.com:11078",
target
:
'
http://8.136.255.30:1061
'
,
//target: 'http://8.136.255.30:1061',
target
:
'
http://192.168.0.252:1061
'
,
changeOrigin
:
true
,
changeOrigin
:
true
,
secure
:
false
,
secure
:
false
,
cookieDomainRewrite
:
"
localhost
"
,
cookieDomainRewrite
:
"
localhost
"
,
...
...
info-publish-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinController.java
View file @
6e6104d4
...
@@ -77,17 +77,14 @@ public class SkinController extends BaseCRUDJsonBodyMappingController<SkinServic
...
@@ -77,17 +77,14 @@ public class SkinController extends BaseCRUDJsonBodyMappingController<SkinServic
if
(
ObjectUtils
.
isEmpty
(
skinEntity
))
{
if
(
ObjectUtils
.
isEmpty
(
skinEntity
))
{
throw
new
AppException
(
"当前皮肤不存在!skinId:"
+
entity
.
getId
());
throw
new
AppException
(
"当前皮肤不存在!skinId:"
+
entity
.
getId
());
}
}
if
(
skinEntity
.
getUsed
()==
entity
.
getUsed
()&&
skinEntity
.
getUsed
()==
YesNoEnum
.
YES
.
getValue
()){
if
(
skinEntity
.
getUsed
()==
entity
.
getUsed
()&&
skinEntity
.
getUsed
()==
YesNoEnum
.
YES
.
getValue
()){
throw
new
AppException
(
"当前皮肤不能取消选择!"
);
throw
new
AppException
(
"当前皮肤不能取消选择!"
);
}
}
if
(
skinEntity
.
getUsed
()
==
YesNoEnum
.
YES
.
getValue
())
{
if
(
skinEntity
.
getUsed
()
==
YesNoEnum
.
YES
.
getValue
())
{
throw
new
AppException
(
"当前皮肤使用中!"
);
throw
new
AppException
(
"当前皮肤使用中!"
);
}
}
Rest
<
Void
>
usedRest
=
this
.
service
.
appUsed
(
skinEntity
,
getContext
());
Rest
<
Void
>
usedRest
=
this
.
service
.
appUsed
(
skinEntity
,
getContext
());
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"皮肤切换"
,
e
);
log
.
error
(
"皮肤切换"
,
e
);
return
Rest
.
fail
(
super
.
convertException
(
e
));
return
Rest
.
fail
(
super
.
convertException
(
e
));
...
...
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