Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
RuoYi Vue
Commits
9e66ada9
Commit
9e66ada9
authored
Jun 24, 2023
by
RuoYi
Browse files
优化代码
parent
a63eec3b
Changes
7
Hide whitespace changes
Inline
Side-by-side
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
View file @
9e66ada9
package
com.ruoyi.common.core.domain
;
import
java.util.HashMap
;
import
java.util.Objects
;
import
com.ruoyi.common.constant.HttpStatus
;
import
com.ruoyi.common.utils.StringUtils
;
...
...
@@ -169,6 +170,36 @@ public class AjaxResult extends HashMap<String, Object>
return
new
AjaxResult
(
code
,
msg
,
null
);
}
/**
* 是否为成功消息
*
* @return 结果
*/
public
boolean
isSuccess
()
{
return
Objects
.
equals
(
HttpStatus
.
SUCCESS
,
this
.
get
(
CODE_TAG
));
}
/**
* 是否为警告消息
*
* @return 结果
*/
public
boolean
isWarn
()
{
return
Objects
.
equals
(
HttpStatus
.
WARN
,
this
.
get
(
CODE_TAG
));
}
/**
* 是否为错误消息
*
* @return 结果
*/
public
boolean
isError
()
{
return
Objects
.
equals
(
HttpStatus
.
ERROR
,
this
.
get
(
CODE_TAG
));
}
/**
* 方便链式调用
*
...
...
ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java
View file @
9e66ada9
...
...
@@ -66,7 +66,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
}
/**
* 获取类型 4(伪随机生成的)UUID 的静态工厂。
使用加密的本地线程伪随机数生成器生成该 UUID。
* 获取类型 4(伪随机生成的)UUID 的静态工厂。
*
* @return 随机生成的 {@code UUID}
*/
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
View file @
9e66ada9
...
...
@@ -5,6 +5,7 @@ import java.util.List;
import
java.util.Set
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.CollectionUtils
;
import
com.ruoyi.common.core.domain.entity.SysRole
;
import
com.ruoyi.common.core.domain.entity.SysUser
;
import
com.ruoyi.system.service.ISysMenuService
;
...
...
@@ -62,7 +63,7 @@ public class SysPermissionService
else
{
List
<
SysRole
>
roles
=
user
.
getRoles
();
if
(!
r
ol
es
.
isEmpty
()
&&
roles
.
size
()
>
1
)
if
(!
C
ol
lectionUtils
.
isEmpty
(
roles
)
)
{
// 多角色设置permissions属性,以便数据权限匹配权限
for
(
SysRole
role
:
roles
)
...
...
ruoyi-ui/src/components/DictTag/index.vue
View file @
9e66ada9
...
...
@@ -7,7 +7,7 @@
:key=
"item.value"
:index=
"index"
:class=
"item.raw.cssClass"
>
{{
item
.
label
+
'
'
}}
</span
>
{{
item
.
label
+
"
"
}}
</span
>
<el-tag
v-else
...
...
@@ -17,7 +17,7 @@
:type=
"item.raw.listClass == 'primary' ? '' : item.raw.listClass"
:class=
"item.raw.cssClass"
>
{{
item
.
label
+
'
'
}}
{{
item
.
label
+
"
"
}}
</el-tag>
</
template
>
</template>
...
...
@@ -49,39 +49,39 @@ export default {
},
computed
:
{
values
()
{
if
(
this
.
value
!==
null
&&
typeof
this
.
value
!==
'
undefined
'
)
{
if
(
this
.
value
!==
null
&&
typeof
this
.
value
!==
"
undefined
"
)
{
return
Array
.
isArray
(
this
.
value
)
?
this
.
value
:
[
String
(
this
.
value
)];
}
else
{
return
[];
}
},
unmatch
(){
unmatch
()
{
this
.
unmatchArray
=
[];
if
(
this
.
value
!==
null
&&
typeof
this
.
value
!==
'
undefined
'
)
{
if
(
this
.
value
!==
null
&&
typeof
this
.
value
!==
"
undefined
"
)
{
// 传入值为非数组
if
(
!
Array
.
isArray
(
this
.
value
)){
if
(
this
.
options
.
some
(
v
=>
v
.
value
==
this
.
value
))
return
false
;
if
(
!
Array
.
isArray
(
this
.
value
))
{
if
(
this
.
options
.
some
(
(
v
)
=>
v
.
value
==
this
.
value
))
return
false
;
this
.
unmatchArray
.
push
(
this
.
value
);
return
true
;
}
// 传入值为Array
this
.
value
.
forEach
(
item
=>
{
if
(
!
this
.
options
.
some
(
v
=>
v
.
value
==
item
))
this
.
unmatchArray
.
push
(
item
)
this
.
value
.
forEach
((
item
)
=>
{
if
(
!
this
.
options
.
some
((
v
)
=>
v
.
value
==
item
))
this
.
unmatchArray
.
push
(
item
);
});
return
true
;
}
// 没有value不显示
return
false
;
},
},
filters
:
{
handleArray
(
array
)
{
if
(
array
.
length
===
0
)
return
''
;
if
(
array
.
length
===
0
)
return
""
;
return
array
.
reduce
((
pre
,
cur
)
=>
{
return
pre
+
'
'
+
cur
;
return
pre
+
"
"
+
cur
;
})
}
,
}
}
};
</
script
>
...
...
ruoyi-ui/src/utils/generator/js.js
View file @
9e66ada9
import
{
isArray
}
from
'
util
'
import
{
exportDefault
,
titleCase
}
from
'
@/utils/index
'
import
{
trigger
}
from
'
./config
'
...
...
@@ -133,12 +132,12 @@ function buildRules(conf, ruleList) {
const
rules
=
[]
if
(
trigger
[
conf
.
tag
])
{
if
(
conf
.
required
)
{
const
type
=
isArray
(
conf
.
defaultValue
)
?
'
type:
\'
array
\'
,
'
:
''
let
message
=
isArray
(
conf
.
defaultValue
)
?
`请至少选择一个
${
conf
.
vModel
}
`
:
conf
.
placeholder
const
type
=
Array
.
isArray
(
conf
.
defaultValue
)
?
'
type:
\'
array
\'
,
'
:
''
let
message
=
Array
.
isArray
(
conf
.
defaultValue
)
?
`请至少选择一个
${
conf
.
vModel
}
`
:
conf
.
placeholder
if
(
message
===
undefined
)
message
=
`
${
conf
.
label
}
不能为空`
rules
.
push
(
`{ required: true,
${
type
}
message: '
${
message
}
', trigger: '
${
trigger
[
conf
.
tag
]}
' }`
)
}
if
(
conf
.
regList
&&
isArray
(
conf
.
regList
))
{
if
(
conf
.
regList
&&
Array
.
isArray
(
conf
.
regList
))
{
conf
.
regList
.
forEach
(
item
=>
{
if
(
item
.
pattern
)
{
rules
.
push
(
`{ pattern:
${
eval
(
item
.
pattern
)}
, message: '
${
item
.
message
}
', trigger: '
${
trigger
[
conf
.
tag
]}
' }`
)
...
...
ruoyi-ui/src/views/index.vue
View file @
9e66ada9
...
...
@@ -888,7 +888,7 @@
</div>
<div
class=
"body"
>
<img
src=
"http
s
://
oscimg.oschina.net/oscnet/up-d6695f82666e5018f715c41cb7ee60d3b73
.png"
src=
"http://
ruoyi.vip/images/pay
.png"
alt=
"donate"
width=
"100%"
/>
...
...
ruoyi-ui/vue.config.js
View file @
9e66ada9
...
...
@@ -90,9 +90,7 @@ module.exports = {
})
.
end
()
config
.
when
(
process
.
env
.
NODE_ENV
!==
'
development
'
,
config
=>
{
config
.
when
(
process
.
env
.
NODE_ENV
!==
'
development
'
,
config
=>
{
config
.
plugin
(
'
ScriptExtHtmlWebpackPlugin
'
)
.
after
(
'
html
'
)
...
...
@@ -101,36 +99,36 @@ module.exports = {
inline
:
/runtime
\.
.*
\.
js$/
}])
.
end
()
config
.
optimization
.
splitChunks
({
chunks
:
'
all
'
,
cacheGroups
:
{
libs
:
{
name
:
'
chunk-libs
'
,
test
:
/
[\\/]
node_modules
[\\/]
/
,
priority
:
10
,
chunks
:
'
initial
'
// only package third parties that are initially dependent
},
elementUI
:
{
name
:
'
chunk-elementUI
'
,
// split elementUI into a single package
priority
:
20
,
// the weight needs to be larger than libs and app or it will be packaged into libs or app
test
:
/
[\\/]
node_modules
[\\/]
_
?
element-ui
(
.*
)
/
// in order to adapt to cnpm
},
commons
:
{
name
:
'
chunk-commons
'
,
test
:
resolve
(
'
src/components
'
),
// can customize your rules
minChunks
:
3
,
// minimum common number
priority
:
5
,
reuseExistingChunk
:
true
}
config
.
optimization
.
splitChunks
({
chunks
:
'
all
'
,
cacheGroups
:
{
libs
:
{
name
:
'
chunk-libs
'
,
test
:
/
[\\/]
node_modules
[\\/]
/
,
priority
:
10
,
chunks
:
'
initial
'
// only package third parties that are initially dependent
},
elementUI
:
{
name
:
'
chunk-elementUI
'
,
// split elementUI into a single package
test
:
/
[\\/]
node_modules
[\\/]
_
?
element-ui
(
.*
)
/
,
// in order to adapt to cnpm
priority
:
20
,
// the weight needs to be larger than libs and app or it will be packaged into libs or app
},
commons
:
{
name
:
'
chunk-commons
'
,
test
:
resolve
(
'
src/components
'
),
// can customize your rules
minChunks
:
3
,
// minimum common number
priority
:
5
,
reuseExistingChunk
:
true
}
})
}
})
config
.
optimization
.
runtimeChunk
(
'
single
'
),
{
from
:
path
.
resolve
(
__dirname
,
'
./public/robots.txt
'
),
//防爬虫文件
to
:
'
./
'
//到根目录下
}
}
)
})
}
}
Write
Preview
Supports
Markdown
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