Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
前端资源
RuoYi-Vue
提交
9fa3eac3
R
RuoYi-Vue
项目概览
前端资源
/
RuoYi-Vue
10 个月 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
RuoYi-Vue
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
9fa3eac3
编写于
5月 26, 2022
作者:
R
RuoYi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
升级fastjson到最新版2.0.4
上级
e320c50e
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
35 addition
and
38 deletion
+35
-38
pom.xml
pom.xml
+3
-3
ruoyi-common/pom.xml
ruoyi-common/pom.xml
+2
-2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
...in/java/com/ruoyi/common/core/domain/model/LoginUser.java
+1
-1
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
...uoyi/common/exception/file/InvalidExtensionException.java
+1
-1
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
...src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
+3
-2
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
.../src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+1
-1
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
.../ruoyi/framework/config/FastJson2JsonRedisSerializer.java
+9
-14
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
.../ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
+2
-2
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
...yi/framework/interceptor/impl/SameUrlDataInterceptor.java
+2
-2
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
...amework/security/handle/AuthenticationEntryPointImpl.java
+1
-1
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
...i/framework/security/handle/LogoutSuccessHandlerImpl.java
+1
-1
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
...java/com/ruoyi/generator/service/GenTableServiceImpl.java
+4
-4
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
...src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+5
-4
未找到文件。
pom.xml
浏览文件 @
9fa3eac3
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<kaptcha.version>
2.3.2
</kaptcha.version>
<kaptcha.version>
2.3.2
</kaptcha.version>
<mybatis-spring-boot.version>
2.2.2
</mybatis-spring-boot.version>
<mybatis-spring-boot.version>
2.2.2
</mybatis-spring-boot.version>
<pagehelper.boot.version>
1.4.1
</pagehelper.boot.version>
<pagehelper.boot.version>
1.4.1
</pagehelper.boot.version>
<fastjson.version>
1.2.83
</fastjson.version>
<fastjson.version>
2.0.4
</fastjson.version>
<oshi.version>
6.1.6
</oshi.version>
<oshi.version>
6.1.6
</oshi.version>
<commons.io.version>
2.11.0
</commons.io.version>
<commons.io.version>
2.11.0
</commons.io.version>
<commons.fileupload.version>
1.4
</commons.fileupload.version>
<commons.fileupload.version>
1.4
</commons.fileupload.version>
...
@@ -132,8 +132,8 @@
...
@@ -132,8 +132,8 @@
<!-- 阿里JSON解析器 -->
<!-- 阿里JSON解析器 -->
<dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<groupId>
com.alibaba
.fastjson2
</groupId>
<artifactId>
fastjson
</artifactId>
<artifactId>
fastjson
2
</artifactId>
<version>
${fastjson.version}
</version>
<version>
${fastjson.version}
</version>
</dependency>
</dependency>
...
...
ruoyi-common/pom.xml
浏览文件 @
9fa3eac3
...
@@ -61,8 +61,8 @@
...
@@ -61,8 +61,8 @@
<!-- 阿里JSON解析器 -->
<!-- 阿里JSON解析器 -->
<dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<groupId>
com.alibaba
.fastjson2
</groupId>
<artifactId>
fastjson
</artifactId>
<artifactId>
fastjson
2
</artifactId>
</dependency>
</dependency>
<!-- io常用工具类 -->
<!-- io常用工具类 -->
...
...
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
浏览文件 @
9fa3eac3
...
@@ -4,7 +4,7 @@ import java.util.Collection;
...
@@ -4,7 +4,7 @@ import java.util.Collection;
import
java.util.Set
;
import
java.util.Set
;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.security.core.userdetails.UserDetails
;
import
org.springframework.security.core.userdetails.UserDetails
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.alibaba.fastjson
2
.annotation.JSONField
;
import
com.ruoyi.common.core.domain.entity.SysUser
;
import
com.ruoyi.common.core.domain.entity.SysUser
;
/**
/**
...
...
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
浏览文件 @
9fa3eac3
...
@@ -18,7 +18,7 @@ public class InvalidExtensionException extends FileUploadException
...
@@ -18,7 +18,7 @@ public class InvalidExtensionException extends FileUploadException
public
InvalidExtensionException
(
String
[]
allowedExtension
,
String
extension
,
String
filename
)
public
InvalidExtensionException
(
String
[]
allowedExtension
,
String
extension
,
String
filename
)
{
{
super
(
"文件["
+
filename
+
"]后缀["
+
extension
+
"]不正确,请上传
["
+
Arrays
.
toString
(
allowedExtension
)
+
"]格式文件
"
);
super
(
"文件["
+
filename
+
"]后缀["
+
extension
+
"]不正确,请上传
"
+
Arrays
.
toString
(
allowedExtension
)
+
"格式
"
);
this
.
allowedExtension
=
allowedExtension
;
this
.
allowedExtension
=
allowedExtension
;
this
.
extension
=
extension
;
this
.
extension
=
extension
;
this
.
filename
=
filename
;
this
.
filename
=
filename
;
...
...
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
浏览文件 @
9fa3eac3
...
@@ -2,7 +2,8 @@ package com.ruoyi.common.utils.ip;
...
@@ -2,7 +2,8 @@ package com.ruoyi.common.utils.ip;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson2.JSON
;
import
com.alibaba.fastjson2.JSONObject
;
import
com.ruoyi.common.config.RuoYiConfig
;
import
com.ruoyi.common.config.RuoYiConfig
;
import
com.ruoyi.common.constant.Constants
;
import
com.ruoyi.common.constant.Constants
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.StringUtils
;
...
@@ -40,7 +41,7 @@ public class AddressUtils
...
@@ -40,7 +41,7 @@ public class AddressUtils
log
.
error
(
"获取地理位置异常 {}"
,
ip
);
log
.
error
(
"获取地理位置异常 {}"
,
ip
);
return
UNKNOWN
;
return
UNKNOWN
;
}
}
JSONObject
obj
=
JSON
Object
.
parseObject
(
rspStr
);
JSONObject
obj
=
JSON
.
parseObject
(
rspStr
);
String
region
=
obj
.
getString
(
"pro"
);
String
region
=
obj
.
getString
(
"pro"
);
String
city
=
obj
.
getString
(
"city"
);
String
city
=
obj
.
getString
(
"city"
);
return
String
.
format
(
"%s %s"
,
region
,
city
);
return
String
.
format
(
"%s %s"
,
region
,
city
);
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
浏览文件 @
9fa3eac3
...
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
...
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
import
org.springframework.validation.BindingResult
;
import
org.springframework.validation.BindingResult
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.servlet.HandlerMapping
;
import
org.springframework.web.servlet.HandlerMapping
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson
2
.JSON
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.core.domain.model.LoginUser
;
import
com.ruoyi.common.core.domain.model.LoginUser
;
import
com.ruoyi.common.enums.BusinessStatus
;
import
com.ruoyi.common.enums.BusinessStatus
;
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
浏览文件 @
9fa3eac3
package
com.ruoyi.framework.config
;
package
com.ruoyi.framework.config
;
import
com.alibaba.fastjson.JSON
;
import
java.nio.charset.Charset
;
import
com.alibaba.fastjson.serializer.SerializerFeature
;
import
com.fasterxml.jackson.databind.JavaType
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.type.TypeFactory
;
import
org.springframework.data.redis.serializer.RedisSerializer
;
import
org.springframework.data.redis.serializer.RedisSerializer
;
import
org.springframework.data.redis.serializer.SerializationException
;
import
org.springframework.data.redis.serializer.SerializationException
;
import
com.alibaba.fastjson.parser.ParserConfig
;
import
org.springframework.util.Assert
;
import
org.springframework.util.Assert
;
import
java.nio.charset.Charset
;
import
com.alibaba.fastjson2.JSON
;
import
com.alibaba.fastjson2.JSONReader
;
import
com.alibaba.fastjson2.JSONWriter
;
import
com.fasterxml.jackson.databind.JavaType
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.type.TypeFactory
;
/**
/**
* Redis使用FastJson序列化
* Redis使用FastJson序列化
...
@@ -25,11 +25,6 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
...
@@ -25,11 +25,6 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
private
Class
<
T
>
clazz
;
private
Class
<
T
>
clazz
;
static
{
ParserConfig
.
getGlobalInstance
().
setAutoTypeSupport
(
true
);
}
public
FastJson2JsonRedisSerializer
(
Class
<
T
>
clazz
)
public
FastJson2JsonRedisSerializer
(
Class
<
T
>
clazz
)
{
{
super
();
super
();
...
@@ -43,7 +38,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
...
@@ -43,7 +38,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
{
{
return
new
byte
[
0
];
return
new
byte
[
0
];
}
}
return
JSON
.
toJSONString
(
t
,
Serializer
Feature
.
WriteClassName
).
getBytes
(
DEFAULT_CHARSET
);
return
JSON
.
toJSONString
(
t
,
JSONWriter
.
Feature
.
WriteClassName
).
getBytes
(
DEFAULT_CHARSET
);
}
}
@Override
@Override
...
@@ -55,7 +50,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
...
@@ -55,7 +50,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
}
}
String
str
=
new
String
(
bytes
,
DEFAULT_CHARSET
);
String
str
=
new
String
(
bytes
,
DEFAULT_CHARSET
);
return
JSON
.
parseObject
(
str
,
clazz
);
return
JSON
.
parseObject
(
str
,
clazz
,
JSONReader
.
Feature
.
SupportAutoType
);
}
}
public
void
setObjectMapper
(
ObjectMapper
objectMapper
)
public
void
setObjectMapper
(
ObjectMapper
objectMapper
)
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
浏览文件 @
9fa3eac3
...
@@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletResponse;
...
@@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletResponse;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.method.HandlerMethod
;
import
org.springframework.web.method.HandlerMethod
;
import
org.springframework.web.servlet.HandlerInterceptor
;
import
org.springframework.web.servlet.HandlerInterceptor
;
import
com.alibaba.fastjson
.JSONObject
;
import
com.alibaba.fastjson
2.JSON
;
import
com.ruoyi.common.annotation.RepeatSubmit
;
import
com.ruoyi.common.annotation.RepeatSubmit
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.utils.ServletUtils
;
import
com.ruoyi.common.utils.ServletUtils
;
...
@@ -32,7 +32,7 @@ public abstract class RepeatSubmitInterceptor implements HandlerInterceptor
...
@@ -32,7 +32,7 @@ public abstract class RepeatSubmitInterceptor implements HandlerInterceptor
if
(
this
.
isRepeatSubmit
(
request
,
annotation
))
if
(
this
.
isRepeatSubmit
(
request
,
annotation
))
{
{
AjaxResult
ajaxResult
=
AjaxResult
.
error
(
annotation
.
message
());
AjaxResult
ajaxResult
=
AjaxResult
.
error
(
annotation
.
message
());
ServletUtils
.
renderString
(
response
,
JSON
Object
.
toJSONString
(
ajaxResult
));
ServletUtils
.
renderString
(
response
,
JSON
.
toJSONString
(
ajaxResult
));
return
false
;
return
false
;
}
}
}
}
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
浏览文件 @
9fa3eac3
...
@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletRequest;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
com.alibaba.fastjson
.JSONObject
;
import
com.alibaba.fastjson
2.JSON
;
import
com.ruoyi.common.annotation.RepeatSubmit
;
import
com.ruoyi.common.annotation.RepeatSubmit
;
import
com.ruoyi.common.constant.Constants
;
import
com.ruoyi.common.constant.Constants
;
import
com.ruoyi.common.core.redis.RedisCache
;
import
com.ruoyi.common.core.redis.RedisCache
;
...
@@ -50,7 +50,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
...
@@ -50,7 +50,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
// body参数为空,获取Parameter的数据
// body参数为空,获取Parameter的数据
if
(
StringUtils
.
isEmpty
(
nowParams
))
if
(
StringUtils
.
isEmpty
(
nowParams
))
{
{
nowParams
=
JSON
Object
.
toJSONString
(
request
.
getParameterMap
());
nowParams
=
JSON
.
toJSONString
(
request
.
getParameterMap
());
}
}
Map
<
String
,
Object
>
nowDataMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
nowDataMap
=
new
HashMap
<
String
,
Object
>();
nowDataMap
.
put
(
REPEAT_PARAMS
,
nowParams
);
nowDataMap
.
put
(
REPEAT_PARAMS
,
nowParams
);
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
浏览文件 @
9fa3eac3
...
@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletResponse;
...
@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletResponse;
import
org.springframework.security.core.AuthenticationException
;
import
org.springframework.security.core.AuthenticationException
;
import
org.springframework.security.web.AuthenticationEntryPoint
;
import
org.springframework.security.web.AuthenticationEntryPoint
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson
2
.JSON
;
import
com.ruoyi.common.constant.HttpStatus
;
import
com.ruoyi.common.constant.HttpStatus
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.utils.ServletUtils
;
import
com.ruoyi.common.utils.ServletUtils
;
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
浏览文件 @
9fa3eac3
...
@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.security.core.Authentication
;
import
org.springframework.security.core.Authentication
;
import
org.springframework.security.web.authentication.logout.LogoutSuccessHandler
;
import
org.springframework.security.web.authentication.logout.LogoutSuccessHandler
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson
2
.JSON
;
import
com.ruoyi.common.constant.Constants
;
import
com.ruoyi.common.constant.Constants
;
import
com.ruoyi.common.constant.HttpStatus
;
import
com.ruoyi.common.constant.HttpStatus
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.AjaxResult
;
...
...
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
浏览文件 @
9fa3eac3
...
@@ -21,8 +21,8 @@ import org.slf4j.LoggerFactory;
...
@@ -21,8 +21,8 @@ import org.slf4j.LoggerFactory;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson
2
.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson
2
.JSONObject
;
import
com.ruoyi.common.constant.Constants
;
import
com.ruoyi.common.constant.Constants
;
import
com.ruoyi.common.constant.GenConstants
;
import
com.ruoyi.common.constant.GenConstants
;
import
com.ruoyi.common.core.text.CharsetKit
;
import
com.ruoyi.common.core.text.CharsetKit
;
...
@@ -401,7 +401,7 @@ public class GenTableServiceImpl implements IGenTableService
...
@@ -401,7 +401,7 @@ public class GenTableServiceImpl implements IGenTableService
if
(
GenConstants
.
TPL_TREE
.
equals
(
genTable
.
getTplCategory
()))
if
(
GenConstants
.
TPL_TREE
.
equals
(
genTable
.
getTplCategory
()))
{
{
String
options
=
JSON
.
toJSONString
(
genTable
.
getParams
());
String
options
=
JSON
.
toJSONString
(
genTable
.
getParams
());
JSONObject
paramsObj
=
JSON
Object
.
parseObject
(
options
);
JSONObject
paramsObj
=
JSON
.
parseObject
(
options
);
if
(
StringUtils
.
isEmpty
(
paramsObj
.
getString
(
GenConstants
.
TREE_CODE
)))
if
(
StringUtils
.
isEmpty
(
paramsObj
.
getString
(
GenConstants
.
TREE_CODE
)))
{
{
throw
new
ServiceException
(
"树编码字段不能为空"
);
throw
new
ServiceException
(
"树编码字段不能为空"
);
...
@@ -485,7 +485,7 @@ public class GenTableServiceImpl implements IGenTableService
...
@@ -485,7 +485,7 @@ public class GenTableServiceImpl implements IGenTableService
*/
*/
public
void
setTableFromOptions
(
GenTable
genTable
)
public
void
setTableFromOptions
(
GenTable
genTable
)
{
{
JSONObject
paramsObj
=
JSON
Object
.
parseObject
(
genTable
.
getOptions
());
JSONObject
paramsObj
=
JSON
.
parseObject
(
genTable
.
getOptions
());
if
(
StringUtils
.
isNotNull
(
paramsObj
))
if
(
StringUtils
.
isNotNull
(
paramsObj
))
{
{
String
treeCode
=
paramsObj
.
getString
(
GenConstants
.
TREE_CODE
);
String
treeCode
=
paramsObj
.
getString
(
GenConstants
.
TREE_CODE
);
...
...
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
浏览文件 @
9fa3eac3
...
@@ -5,7 +5,8 @@ import java.util.HashSet;
...
@@ -5,7 +5,8 @@ import java.util.HashSet;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Set
;
import
org.apache.velocity.VelocityContext
;
import
org.apache.velocity.VelocityContext
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson2.JSON
;
import
com.alibaba.fastjson2.JSONObject
;
import
com.ruoyi.common.constant.GenConstants
;
import
com.ruoyi.common.constant.GenConstants
;
import
com.ruoyi.common.utils.DateUtils
;
import
com.ruoyi.common.utils.DateUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.StringUtils
;
...
@@ -75,7 +76,7 @@ public class VelocityUtils
...
@@ -75,7 +76,7 @@ public class VelocityUtils
public
static
void
setMenuVelocityContext
(
VelocityContext
context
,
GenTable
genTable
)
public
static
void
setMenuVelocityContext
(
VelocityContext
context
,
GenTable
genTable
)
{
{
String
options
=
genTable
.
getOptions
();
String
options
=
genTable
.
getOptions
();
JSONObject
paramsObj
=
JSON
Object
.
parseObject
(
options
);
JSONObject
paramsObj
=
JSON
.
parseObject
(
options
);
String
parentMenuId
=
getParentMenuId
(
paramsObj
);
String
parentMenuId
=
getParentMenuId
(
paramsObj
);
context
.
put
(
"parentMenuId"
,
parentMenuId
);
context
.
put
(
"parentMenuId"
,
parentMenuId
);
}
}
...
@@ -83,7 +84,7 @@ public class VelocityUtils
...
@@ -83,7 +84,7 @@ public class VelocityUtils
public
static
void
setTreeVelocityContext
(
VelocityContext
context
,
GenTable
genTable
)
public
static
void
setTreeVelocityContext
(
VelocityContext
context
,
GenTable
genTable
)
{
{
String
options
=
genTable
.
getOptions
();
String
options
=
genTable
.
getOptions
();
JSONObject
paramsObj
=
JSON
Object
.
parseObject
(
options
);
JSONObject
paramsObj
=
JSON
.
parseObject
(
options
);
String
treeCode
=
getTreecode
(
paramsObj
);
String
treeCode
=
getTreecode
(
paramsObj
);
String
treeParentCode
=
getTreeParentCode
(
paramsObj
);
String
treeParentCode
=
getTreeParentCode
(
paramsObj
);
String
treeName
=
getTreeName
(
paramsObj
);
String
treeName
=
getTreeName
(
paramsObj
);
...
@@ -381,7 +382,7 @@ public class VelocityUtils
...
@@ -381,7 +382,7 @@ public class VelocityUtils
public
static
int
getExpandColumn
(
GenTable
genTable
)
public
static
int
getExpandColumn
(
GenTable
genTable
)
{
{
String
options
=
genTable
.
getOptions
();
String
options
=
genTable
.
getOptions
();
JSONObject
paramsObj
=
JSON
Object
.
parseObject
(
options
);
JSONObject
paramsObj
=
JSON
.
parseObject
(
options
);
String
treeName
=
paramsObj
.
getString
(
GenConstants
.
TREE_NAME
);
String
treeName
=
paramsObj
.
getString
(
GenConstants
.
TREE_NAME
);
int
num
=
0
;
int
num
=
0
;
for
(
GenTableColumn
column
:
genTable
.
getColumns
())
for
(
GenTableColumn
column
:
genTable
.
getColumns
())
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录