Compare commits
45 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
42a572fca9 | ||
|
|
2529d983c7 | ||
|
|
7d9e8b1a7d | ||
|
|
b1c36a6bb8 | ||
|
|
a552bb2d5b | ||
|
|
566a2e3dea | ||
|
|
852194ead9 | ||
|
|
4601ef6138 | ||
|
|
010fac9d20 | ||
|
|
65adf59de8 | ||
|
|
a90052d7f2 | ||
|
|
2cb41b3027 | ||
|
|
a92dd966da | ||
|
|
4dced67956 | ||
|
|
eaf53cf9fa | ||
|
|
ef41c51275 | ||
|
|
a839cb37b1 | ||
|
|
9aa8c2d4df | ||
|
|
8e9f183ec1 | ||
|
|
ce50c1b0c4 | ||
|
|
15464721dd | ||
|
|
248da5a7b1 | ||
|
|
dfaf327072 | ||
|
|
5da7c7849b | ||
|
|
1d3540eef4 | ||
|
|
1befd0dfb9 | ||
|
|
e0c6d3e254 | ||
|
|
de21959a80 | ||
|
|
ce58a079b3 | ||
|
|
8a7846d01e | ||
|
|
5190815458 | ||
|
|
135e48008d | ||
|
|
abe4e4be27 | ||
|
|
51d1c11425 | ||
|
|
572b529cf3 | ||
|
|
bcebcdedc6 | ||
|
|
fe0022afe8 | ||
|
|
bbc82d5d3c | ||
|
|
676ffb6bb2 | ||
|
|
76ae202f04 | ||
|
|
4c81fe0a39 | ||
|
|
1d49082735 | ||
|
|
81b8cc7fe0 | ||
|
|
7cfc0059cb | ||
|
|
476fccbfe9 |
27
README.md
27
README.md
@@ -6,8 +6,8 @@
|
||||
<p align="center">
|
||||
<a href="https://jeesite.com/docs/upgrade/" target="__blank"><img alt="JeeSite-V4.3" src="https://img.shields.io/badge/JeeSite-V4.3-success.svg"></a>
|
||||
<a href="https://jeesite.com/docs/feature/" target="__blank"><img alt="SpringBoot-2.5" src="https://img.shields.io/badge/SpringBoot-2.5-blue.svg"></a>
|
||||
<a href="https://gitee.com/thinkgem/jeesite4/stargazers" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite4/badge/star.svg?theme=dark"></img></a>
|
||||
<a href="https://gitee.com/thinkgem/jeesite4/members" target="__blank"><img alt="fork" src="https://gitee.com/thinkgem/jeesite4/badge/fork.svg?theme=dark"></img></a>
|
||||
<a href="https://gitee.com/thinkgem/jeesite4/stargazers" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite4/badge/star.svg?theme=dark"></a>
|
||||
<a href="https://gitee.com/thinkgem/jeesite4/members" target="__blank"><img alt="fork" src="https://gitee.com/thinkgem/jeesite4/badge/fork.svg?theme=dark"></a>
|
||||
</p>
|
||||
|
||||
## 技术交流
|
||||
@@ -45,20 +45,21 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
|
||||
|
||||
**发展至今 JeeSite 平台架构已经非常稳定，JeeSite 是一个专业的平台，是一个让你使用放心的平台。**
|
||||
|
||||
### v4 架构特点、安全方面等等的优势：<http://jeesite.com/docs/feature/>
|
||||
### v4 架构特点、安全方面等等的优势：<https://jeesite.com/docs/feature/>
|
||||
|
||||
## 技术选型
|
||||
|
||||
* 主框架：Spring Boot 2.5、Spring Framework 5.3、Apache Shiro 1.7、J2Cache
|
||||
* 持久层：Apache MyBatis 3.5、Hibernate Validator 6.1、Alibaba Druid 1.2
|
||||
* 主框架：Spring Boot 2.5、Spring Framework 5.3、Apache Shiro 1.8、J2Cache
|
||||
* 持久层：Apache MyBatis 3.5、Hibernate Validator 6.2、Alibaba Druid 1.2
|
||||
* 视图层：Spring MVC 5.3、Beetl 3.3（替换JSP）、Bootstrap 3.3、AdminLTE 2.4
|
||||
* 前端组件：jQuery 3.5、jqGrid 4.7、layer 3.1、zTree 3.5、jquery validation
|
||||
* 前端组件：jQuery 3.5、jqGrid 4.7、layer 3.1、zTree 3.5、jQuery Validation
|
||||
* 支持 IE9 及以上版本及其他所有现代浏览器，如：谷歌浏览器、火狐浏览器、国产浏览器 等
|
||||
* 工作流引擎：Flowable 6.6、符合 BPMN 规范、在线流程设计器、中国式流程、退回、撤回、自由流
|
||||
* 技术选型（详细）：<http://jeesite.com/docs/technology/>
|
||||
|
||||
## 更多介绍
|
||||
|
||||
* 内置功能：<http://jeesite.com/docs/function/>
|
||||
* 内置功能：<https://jeesite.com/docs/function/>
|
||||
* 目录结构：<https://jeesite.com/docs/catalog/>
|
||||
* 架构特点：<https://jeesite.com/docs/feature/>
|
||||
* 开发规范：<https://jeesite.com/docs/standard/>
|
||||
@@ -88,12 +89,12 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
|
||||
4. 执行脚本：`/web/bin/init-data.bat` 初始化数据库
|
||||
5. 执行脚本：`/web/bin/run-tomcat.bat` 启动服务即可
|
||||
6. 浏览器访问：<http://127.0.0.1:8980/js/> 账号 system 密码 admin
|
||||
7. 部署常见问题：<http://jeesite.com/docs/faq/>
|
||||
7. 部署常见问题：<https://jeesite.com/docs/faq/>
|
||||
|
||||
### 开发环境部署
|
||||
|
||||
1. 部署运行文档：<http://jeesite.com/docs/install-deploy/>
|
||||
2. 部署常见问题：<http://jeesite.com/docs/faq/>
|
||||
1. 部署运行文档：<https://jeesite.com/docs/install-deploy/>
|
||||
2. 部署常见问题：<https://jeesite.com/docs/faq/>
|
||||
|
||||
## 技术文章
|
||||
|
||||
@@ -120,6 +121,7 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
|
||||
* 在线作业调度：<https://jeesite.com/docs/job/>
|
||||
* 消息推送：<https://jeesite.com/docs/msg-push-use/>
|
||||
* 手机端框架：<https://jeesite.com/docs/uniapp/>
|
||||
* 统一认证服务：<https://jeesite.com/docs/oauth2-server/>
|
||||
|
||||
## 云服务架构
|
||||
|
||||
@@ -145,8 +147,7 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
|
||||
## 技术服务与支持
|
||||
|
||||
* 没有资金的支撑就很难得到发展，特别是一个好的产品，如果 JeeSite 帮助了您，请为我们点赞。支持我们，您可以得到一些回报，有了这些我们会把公益事业做的更好，回报社区和社会，请给我们一些动力吧，在此非常感谢已支持我们的朋友！
|
||||
* **联系方式（官方商务）QQ：[1766571055](http://wpa.qq.com/msgrd?v=3&uin=1766571055&site=qq&menu=yes)、[1928733133](http://wpa.qq.com/msgrd?v=3&uin=1928733133&site=qq&menu=yes)**
|
||||
* 技术支持服务网页：<http://s.jeesite.com>
|
||||
* **联系我们**：请访问技术支持服务页面：<https://jeesite.com/docs/support/>
|
||||
|
||||
## 今后如何升级？
|
||||
|
||||
@@ -154,7 +155,7 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
|
||||
|
||||
如果您修改了依赖模块代码，也没关系，这时你需要利用 Git 版本控制工具，与官方仓库代码进行同步，合并代码即可。
|
||||
|
||||
每个版本升级，我们都会附带详细更新日志：<http://jeesite.com/docs/upgrade/>。
|
||||
每个版本升级，我们都会附带详细更新日志：<https://jeesite.com/docs/upgrade/>。
|
||||
|
||||
在这里，你可以看到 JeeSite 新增哪些新功能和改进，在每个版本下都有对应升级方法。
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
@echo off
|
||||
rem /**
|
||||
rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
rem * No deletion without permission, or be held responsible to law.
|
||||
rem *
|
||||
rem * Author: ThinkGem@163.com
|
||||
rem */
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#!/bin/sh
|
||||
# /**
|
||||
# * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
# * No deletion without permission, or be held responsible to law.
|
||||
# *
|
||||
# * Author: ThinkGem@163.com
|
||||
# *
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
@echo off
|
||||
rem /**
|
||||
rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
rem * No deletion without permission, or be held responsible to law.
|
||||
rem *
|
||||
rem * Author: ThinkGem@163.com
|
||||
rem */
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#!/bin/sh
|
||||
# /**
|
||||
# * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
# * No deletion without permission, or be held responsible to law.
|
||||
# *
|
||||
# * Author: ThinkGem@163.com
|
||||
# *
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>com.jeesite</groupId>
|
||||
<artifactId>jeesite-parent</artifactId>
|
||||
<version>4.3.0-SNAPSHOT</version>
|
||||
<version>4.3.1-SNAPSHOT</version>
|
||||
<relativePath>../parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.callback;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.codec;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.codec;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.codec;
|
||||
|
||||
|
||||
@@ -269,7 +269,8 @@ public class EncodeUtils {
|
||||
value = sb.toString();
|
||||
}
|
||||
if (logger.isInfoEnabled() && !value.equals(oriValue)){
|
||||
logger.info("xssFilter: {} <=<=<= {}", value, text);
|
||||
logger.info("xssFilter: {} <=<=<= {} source: {}", value, text,
|
||||
request != null ? request.getRequestURL() : StringUtils.EMPTY);
|
||||
}
|
||||
return value;
|
||||
}
|
||||
@@ -301,7 +302,7 @@ public class EncodeUtils {
|
||||
value = matcher.replaceAll(StringUtils.EMPTY);
|
||||
}
|
||||
if (logger.isWarnEnabled() && !value.equals(text)){
|
||||
logger.info("sqlFilter: {} <=<=<= {}", value, text);
|
||||
logger.info("sqlFilter: {} <=<=<= {} source: {}", value, text, source);
|
||||
return StringUtils.EMPTY;
|
||||
}
|
||||
return value;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.codec;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.codec;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.collect;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.collect;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.collect;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.exec;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.idgen;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.idgen;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.image;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.image;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.image;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.io;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.io;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.io;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.io;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.io;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.lang;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.lang;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.lang;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.lang;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.lang;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.lang;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.mapper;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.mapper;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.msg;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.network;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.reflect;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.utils.excel;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.utils.excel;
|
||||
|
||||
@@ -8,6 +9,7 @@ import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
@@ -202,6 +204,16 @@ public class ExcelExport implements Closeable{
|
||||
*/
|
||||
public void createSheet(String sheetName, String title, Class<?> cls, Type type, String... groups){
|
||||
this.annotationList = ListUtils.newArrayList();
|
||||
// Get constructor annotation
|
||||
Constructor<?>[] cs = cls.getConstructors();
|
||||
for (Constructor<?> c : cs) {
|
||||
ExcelFields efs = c.getAnnotation(ExcelFields.class);
|
||||
if (efs != null && efs.value() != null){
|
||||
for (ExcelField ef : efs.value()){
|
||||
addAnnotation(annotationList, ef, c, type, groups);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Get annotation field
|
||||
Field[] fs = cls.getDeclaredFields();
|
||||
for (Field f : fs){
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.utils.excel;
|
||||
|
||||
@@ -8,6 +9,7 @@ import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
@@ -354,6 +356,16 @@ public class ExcelImport implements Closeable {
|
||||
@SuppressWarnings("unchecked")
|
||||
public <E> List<E> getDataList(Class<E> cls, MethodCallback exceptionCallback, String... groups) throws Exception{
|
||||
List<Object[]> annotationList = ListUtils.newArrayList();
|
||||
// Get constructor annotation
|
||||
Constructor<?>[] cs = cls.getConstructors();
|
||||
for (Constructor<?> c : cs) {
|
||||
ExcelFields efs = c.getAnnotation(ExcelFields.class);
|
||||
if (efs != null && efs.value() != null){
|
||||
for (ExcelField ef : efs.value()){
|
||||
addAnnotation(annotationList, ef, c, Type.IMPORT, groups);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Get annotation field
|
||||
Field[] fs = cls.getDeclaredFields();
|
||||
for (Field f : fs){
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.utils.excel;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.utils.excel;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.utils.excel.annotation;
|
||||
|
||||
@@ -15,7 +16,7 @@ import com.jeesite.common.utils.excel.fieldtype.FieldType;
|
||||
* @author ThinkGem
|
||||
* @version 2020-3-5
|
||||
*/
|
||||
@Target({ElementType.METHOD, ElementType.FIELD, ElementType.TYPE})
|
||||
@Target({ElementType.METHOD, ElementType.FIELD})
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface ExcelField {
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.utils.excel.annotation;
|
||||
|
||||
@@ -13,7 +14,7 @@ import java.lang.annotation.Target;
|
||||
* @author ThinkGem
|
||||
* @version 2016-11-9
|
||||
*/
|
||||
@Target({ElementType.METHOD, ElementType.FIELD, ElementType.TYPE})
|
||||
@Target({ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR})
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface ExcelFields {
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.utils.excel.fieldtype;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.utils.excel.fieldtype;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.web;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.web.http;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.web.http;
|
||||
|
||||
@@ -21,6 +22,7 @@ import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import com.fasterxml.jackson.databind.util.JSONPObject;
|
||||
import com.jeesite.common.codec.EncodeUtils;
|
||||
import com.jeesite.common.collect.MapUtils;
|
||||
import com.jeesite.common.io.PropertiesUtils;
|
||||
import com.jeesite.common.lang.ExceptionUtils;
|
||||
@@ -253,7 +255,8 @@ public class ServletUtils {
|
||||
}
|
||||
}
|
||||
if (response != null){
|
||||
response.setContentType(MediaType.APPLICATION_JSON_VALUE+";charset=UTF-8");
|
||||
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
|
||||
response.setCharacterEncoding(EncodeUtils.UTF_8);
|
||||
}
|
||||
if (object == null) {
|
||||
object = resultMap;
|
||||
@@ -362,10 +365,10 @@ public class ServletUtils {
|
||||
if (type == null && StringUtils.isBlank(response.getContentType())){
|
||||
if ((StringUtils.startsWith(string, "{") && StringUtils.endsWith(string, "}"))
|
||||
|| (StringUtils.startsWith(string, "[") && StringUtils.endsWith(string, "]"))){
|
||||
type = MediaType.APPLICATION_JSON_VALUE+";charset=UTF-8";
|
||||
type = MediaType.APPLICATION_JSON_VALUE;
|
||||
}else if (StringUtils.startsWith(string, "<") && StringUtils.endsWith(string, ">")){
|
||||
if (StringUtils.startsWith(string, "<!DOCTYPE")){
|
||||
type = MediaType.TEXT_HTML_VALUE+";charset=UTF-8";
|
||||
type = MediaType.TEXT_HTML_VALUE;
|
||||
}else{
|
||||
type = MediaType.APPLICATION_XML_VALUE;
|
||||
}
|
||||
@@ -375,6 +378,7 @@ public class ServletUtils {
|
||||
}
|
||||
if (type != null) {
|
||||
response.setContentType(type);
|
||||
response.setCharacterEncoding(EncodeUtils.UTF_8);
|
||||
}
|
||||
response.getWriter().print(string);
|
||||
} catch (IOException e) {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.common.web.http;
|
||||
|
||||
|
||||
@@ -85,9 +85,9 @@ ul.ztree.zTreeDragUL {margin:0;padding:0;position:absolute;width:auto;height:aut
|
||||
.ztree li span.button.chk.checkbox_false_disable:before,
|
||||
.ztree li span.button.chk.checkbox_false_full_focus:before {content:"\f096";}
|
||||
.ztree li span.button.chk.checkbox_true_part:before,
|
||||
.ztree li span.button.chk.checkbox_true_part_focus:before,
|
||||
.ztree li span.button.chk.checkbox_true_part_focus:before {content:"\f14a";}
|
||||
.ztree li span.button.chk.checkbox_false_part:before,
|
||||
.ztree li span.button.chk.checkbox_false_part_focus:before {content:"\f14a";}
|
||||
.ztree li span.button.chk.checkbox_false_part_focus:before {content:"\f096";}
|
||||
.ztree li span.button.chk.radio_true_full:before,
|
||||
.ztree li span.button.chk.radio_true_disable:before,
|
||||
.ztree li span.button.chk.radio_true_full_focus:before {content:"\f05d";}
|
||||
|
||||
@@ -92,8 +92,8 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
|
||||
.layui-layer-page .layui-layer-content{position:relative; overflow:auto;}
|
||||
.layui-layer-page .layui-layer-btn,.layui-layer-iframe .layui-layer-btn{padding-top:10px;}
|
||||
.layui-layer-nobg{background:none;}
|
||||
.layui-layer-iframe{transition:top 0.2s ease-in-out;}
|
||||
.layui-layer-iframe iframe{display: block; width: 100%; border-radius: 3px; transition:height 0.2s ease-in-out;}
|
||||
.layui-layer-iframe iframe{display: block; width: 100%; border-radius: 3px;}
|
||||
/* .layui-layer-iframe, .layui-layer-iframe iframe {transition:top 0.2s ease-in-out;} 去掉动画IE下效果不好 */
|
||||
|
||||
.layui-layer-loading{border-radius:100%; background:none; box-shadow:none; border:none;}
|
||||
.layui-layer-loading .layui-layer-content{width:60px; height:24px; background:url(loading-0.gif) no-repeat;}
|
||||
|
||||
@@ -5377,7 +5377,10 @@ S2.define('select2/core',[
|
||||
} else {
|
||||
if (/*key === KEYS.ENTER || */key === KEYS.SPACE || // ThinkGem 去掉回车后打开下拉框，解决jqgrid回车获取下一个输入框按键冲突
|
||||
(key === KEYS.DOWN && evt.altKey)) {
|
||||
self.open();
|
||||
|
||||
if (!this.options.get('disabled')){ // 修正禁用的时候，按空格可弹窗下拉框问题
|
||||
self.open();
|
||||
}
|
||||
|
||||
evt.preventDefault();
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.test;
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
@echo off
|
||||
rem /**
|
||||
rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
rem * No deletion without permission, or be held responsible to law.
|
||||
rem *
|
||||
rem * Author: ThinkGem@163.com
|
||||
rem */
|
||||
@@ -15,5 +16,4 @@ cd ..
|
||||
call mvn clean deploy -Dmaven.test.skip=true -Pdeploy
|
||||
|
||||
cd bin
|
||||
cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
|
||||
pause
|
||||
@@ -1,6 +1,7 @@
|
||||
@echo off
|
||||
rem /**
|
||||
rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
rem * No deletion without permission, or be held responsible to law.
|
||||
rem *
|
||||
rem * Author: ThinkGem@163.com
|
||||
rem */
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
@echo off
|
||||
rem /**
|
||||
rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
rem * No deletion without permission, or be held responsible to law.
|
||||
rem *
|
||||
rem * Author: ThinkGem@163.com
|
||||
rem */
|
||||
@@ -15,5 +16,4 @@ cd ..
|
||||
call mvn clean install -Dmaven.test.skip=true -Ppackage
|
||||
|
||||
cd bin
|
||||
cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
|
||||
pause
|
||||
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>com.jeesite</groupId>
|
||||
<artifactId>jeesite-parent</artifactId>
|
||||
<version>4.3.0-SNAPSHOT</version>
|
||||
<version>4.3.1-SNAPSHOT</version>
|
||||
<relativePath>../../parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
@@ -27,16 +27,7 @@
|
||||
<artifactId>jeesite-module-core</artifactId>
|
||||
<version>${project.parent.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 全文搜索引擎 Lucene -->
|
||||
<!-- <dependency> <groupId>com.jeesite</groupId> <artifactId>jeesite-plugin-lucene</artifactId>
|
||||
<version>${project.parent.version}</version> </dependency> -->
|
||||
|
||||
<!-- 静态资源-ECharts图表 -->
|
||||
<!-- <dependency> <groupId>com.jeesite</groupId> <artifactId>jeesite-plugin-echarts</artifactId>
|
||||
<version>${project.parent.version}</version> </dependency> -->
|
||||
|
||||
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.dao;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.dao;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.dao;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.dao;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.dao;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.dao;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.dao;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.dao;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.dao;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.dao;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.dao;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.db;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.entity;
|
||||
|
||||
@@ -8,7 +9,7 @@ import java.util.Date;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.jeesite.common.entity.BaseEntity;
|
||||
@@ -115,7 +116,7 @@ public class Article extends DataEntity<Article> {
|
||||
this.category = category;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 50, message = "模块类型长度不能超过 50 个字符")
|
||||
@Size(min = 0, max = 50, message = "模块类型长度不能超过 50 个字符")
|
||||
public String getModuleType() {
|
||||
return moduleType;
|
||||
}
|
||||
@@ -125,7 +126,7 @@ public class Article extends DataEntity<Article> {
|
||||
}
|
||||
|
||||
@NotBlank(message = "内容标题不能为空")
|
||||
@Length(min = 0, max = 255, message = "内容标题长度不能超过 255 个字符")
|
||||
@Size(min = 0, max = 255, message = "内容标题长度不能超过 255 个字符")
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
@@ -134,7 +135,7 @@ public class Article extends DataEntity<Article> {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1000, message = "外部链接长度不能超过 1000 个字符")
|
||||
@Size(min = 0, max = 1000, message = "外部链接长度不能超过 1000 个字符")
|
||||
public String getHref() {
|
||||
return href;
|
||||
}
|
||||
@@ -143,7 +144,7 @@ public class Article extends DataEntity<Article> {
|
||||
this.href = href;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 50, message = "标题颜色长度不能超过 50 个字符")
|
||||
@Size(min = 0, max = 50, message = "标题颜色长度不能超过 50 个字符")
|
||||
public String getColor() {
|
||||
return color;
|
||||
}
|
||||
@@ -152,7 +153,7 @@ public class Article extends DataEntity<Article> {
|
||||
this.color = color;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1000, message = "内容图片长度不能超过 1000 个字符")
|
||||
@Size(min = 0, max = 1000, message = "内容图片长度不能超过 1000 个字符")
|
||||
public String getImage() {
|
||||
return image;
|
||||
}
|
||||
@@ -161,7 +162,7 @@ public class Article extends DataEntity<Article> {
|
||||
this.image = image;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 500, message = "关键字长度不能超过 500 个字符")
|
||||
@Size(min = 0, max = 500, message = "关键字长度不能超过 500 个字符")
|
||||
public String getKeywords() {
|
||||
return keywords;
|
||||
}
|
||||
@@ -170,7 +171,7 @@ public class Article extends DataEntity<Article> {
|
||||
this.keywords = keywords;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 500, message = "描述长度不能超过 500 个字符")
|
||||
@Size(min = 0, max = 500, message = "描述长度不能超过 500 个字符")
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
@@ -196,7 +197,7 @@ public class Article extends DataEntity<Article> {
|
||||
this.weightDate = weightDate;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1, message = "来源长度不能超过 1 个字符")
|
||||
@Size(min = 0, max = 1, message = "来源长度不能超过 1 个字符")
|
||||
public String getSource() {
|
||||
return source;
|
||||
}
|
||||
@@ -205,7 +206,7 @@ public class Article extends DataEntity<Article> {
|
||||
this.source = source;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 255, message = "文章来源出处长度不能超过 255 个字符")
|
||||
@Size(min = 0, max = 255, message = "文章来源出处长度不能超过 255 个字符")
|
||||
public String getCopyfrom() {
|
||||
return copyfrom;
|
||||
}
|
||||
@@ -248,7 +249,7 @@ public class Article extends DataEntity<Article> {
|
||||
this.wordCount = wordCount;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 255, message = "自定义内容视图长度不能超过 255 个字符")
|
||||
@Size(min = 0, max = 255, message = "自定义内容视图长度不能超过 255 个字符")
|
||||
public String getCustomContentView() {
|
||||
return customContentView;
|
||||
}
|
||||
@@ -257,7 +258,7 @@ public class Article extends DataEntity<Article> {
|
||||
this.customContentView = customContentView;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1000, message = "视图配置长度不能超过 1000 个字符")
|
||||
@Size(min = 0, max = 1000, message = "视图配置长度不能超过 1000 个字符")
|
||||
public String getViewConfig() {
|
||||
return viewConfig;
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.entity;
|
||||
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import com.jeesite.common.entity.DataEntity;
|
||||
import com.jeesite.common.entity.Extend;
|
||||
@@ -47,7 +48,7 @@ public class ArticleData extends DataEntity<ArticleData> {
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1000, message = "相关文章长度不能超过 1000 个字符")
|
||||
@Size(min = 0, max = 1000, message = "相关文章长度不能超过 1000 个字符")
|
||||
public String getRelation() {
|
||||
return relation;
|
||||
}
|
||||
@@ -56,7 +57,7 @@ public class ArticleData extends DataEntity<ArticleData> {
|
||||
this.relation = relation;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1, message = "是否允许评论长度不能超过 1 个字符")
|
||||
@Size(min = 0, max = 1, message = "是否允许评论长度不能超过 1 个字符")
|
||||
public String getIsCanComment() {
|
||||
return isCanComment;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.entity;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.entity;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.entity;
|
||||
|
||||
@@ -7,7 +8,7 @@ import java.util.List;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import com.jeesite.common.collect.ListUtils;
|
||||
import com.jeesite.common.entity.DataEntity;
|
||||
@@ -110,7 +111,7 @@ public class Category extends TreeEntity<Category> {
|
||||
}
|
||||
|
||||
@NotBlank(message = "栏目名称不能为空")
|
||||
@Length(min = 0, max = 100, message = "栏目名称长度不能超过 100 个字符")
|
||||
@Size(min = 0, max = 100, message = "栏目名称长度不能超过 100 个字符")
|
||||
public String getCategoryName() {
|
||||
return categoryName;
|
||||
}
|
||||
@@ -130,7 +131,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.site = site;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 50, message = "模块类型长度不能超过 50 个字符")
|
||||
@Size(min = 0, max = 50, message = "模块类型长度不能超过 50 个字符")
|
||||
public String getModuleType() {
|
||||
return moduleType;
|
||||
}
|
||||
@@ -139,7 +140,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.moduleType = moduleType;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 255, message = "栏目图片长度不能超过 255 个字符")
|
||||
@Size(min = 0, max = 255, message = "栏目图片长度不能超过 255 个字符")
|
||||
public String getImage() {
|
||||
return image;
|
||||
}
|
||||
@@ -148,7 +149,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.image = image;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 255, message = "链接长度不能超过 255 个字符")
|
||||
@Size(min = 0, max = 255, message = "链接长度不能超过 255 个字符")
|
||||
public String getHref() {
|
||||
return href;
|
||||
}
|
||||
@@ -157,7 +158,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.href = href;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 20, message = "目标长度不能超过 20 个字符")
|
||||
@Size(min = 0, max = 20, message = "目标长度不能超过 20 个字符")
|
||||
public String getTarget() {
|
||||
return target;
|
||||
}
|
||||
@@ -166,7 +167,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.target = target;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 500, message = "关键字长度不能超过 500 个字符")
|
||||
@Size(min = 0, max = 500, message = "关键字长度不能超过 500 个字符")
|
||||
public String getKeywords() {
|
||||
return keywords;
|
||||
}
|
||||
@@ -175,7 +176,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.keywords = keywords;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 500, message = "描述长度不能超过 500 个字符")
|
||||
@Size(min = 0, max = 500, message = "描述长度不能超过 500 个字符")
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
@@ -184,7 +185,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1, message = "是否在导航中显示长度不能超过 1 个字符")
|
||||
@Size(min = 0, max = 1, message = "是否在导航中显示长度不能超过 1 个字符")
|
||||
public String getInMenu() {
|
||||
return inMenu;
|
||||
}
|
||||
@@ -193,7 +194,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.inMenu = inMenu;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1, message = "是否在分类页中显示列表长度不能超过 1 个字符")
|
||||
@Size(min = 0, max = 1, message = "是否在分类页中显示列表长度不能超过 1 个字符")
|
||||
public String getInList() {
|
||||
return inList;
|
||||
}
|
||||
@@ -202,7 +203,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.inList = inList;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1, message = "展现模式长度不能超过 1 个字符")
|
||||
@Size(min = 0, max = 1, message = "展现模式长度不能超过 1 个字符")
|
||||
public String getShowModes() {
|
||||
return showModes;
|
||||
}
|
||||
@@ -211,7 +212,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.showModes = showModes;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1, message = "是否需要审核长度不能超过 1 个字符")
|
||||
@Size(min = 0, max = 1, message = "是否需要审核长度不能超过 1 个字符")
|
||||
public String getIsNeedAudit() {
|
||||
return isNeedAudit;
|
||||
}
|
||||
@@ -220,7 +221,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.isNeedAudit = isNeedAudit;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1, message = "是否允许评论长度不能超过 1 个字符")
|
||||
@Size(min = 0, max = 1, message = "是否允许评论长度不能超过 1 个字符")
|
||||
public String getIsCanComment() {
|
||||
return isCanComment;
|
||||
}
|
||||
@@ -229,7 +230,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.isCanComment = isCanComment;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 255, message = "自定义列表视图长度不能超过 255 个字符")
|
||||
@Size(min = 0, max = 255, message = "自定义列表视图长度不能超过 255 个字符")
|
||||
public String getCustomListView() {
|
||||
return customListView;
|
||||
}
|
||||
@@ -238,7 +239,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.customListView = customListView;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 255, message = "自定义内容视图长度不能超过 255 个字符")
|
||||
@Size(min = 0, max = 255, message = "自定义内容视图长度不能超过 255 个字符")
|
||||
public String getCustomContentView() {
|
||||
return customContentView;
|
||||
}
|
||||
@@ -247,7 +248,7 @@ public class Category extends TreeEntity<Category> {
|
||||
this.customContentView = customContentView;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1000, message = "视图配置长度不能超过 1000 个字符")
|
||||
@Size(min = 0, max = 1000, message = "视图配置长度不能超过 1000 个字符")
|
||||
public String getViewConfig() {
|
||||
return viewConfig;
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.entity;
|
||||
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import com.jeesite.common.entity.DataEntity;
|
||||
import com.jeesite.common.mybatis.annotation.Column;
|
||||
@@ -52,7 +53,7 @@ public class CategoryRole extends DataEntity<CategoryRole> {
|
||||
this.roleCode = roleCode;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 32, message = "控制类型长度不能超过 32 个字符")
|
||||
@Size(min = 0, max = 32, message = "控制类型长度不能超过 32 个字符")
|
||||
public String getCtrlType() {
|
||||
return ctrlType;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.entity;
|
||||
|
||||
@@ -8,7 +9,7 @@ import java.util.Date;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.jeesite.common.entity.BaseEntity;
|
||||
@@ -77,7 +78,7 @@ public class Comment extends DataEntity<Comment> {
|
||||
}
|
||||
|
||||
@NotBlank(message="栏目编码不能为空")
|
||||
@Length(min=0, max=64, message="栏目编码长度不能超过 64 个字符")
|
||||
@Size(min=0, max=64, message="栏目编码长度不能超过 64 个字符")
|
||||
public String getCategoryCode() {
|
||||
return categoryCode;
|
||||
}
|
||||
@@ -87,7 +88,7 @@ public class Comment extends DataEntity<Comment> {
|
||||
}
|
||||
|
||||
@NotBlank(message="内容编号不能为空")
|
||||
@Length(min=0, max=64, message="内容编号长度不能超过 64 个字符")
|
||||
@Size(min=0, max=64, message="内容编号长度不能超过 64 个字符")
|
||||
public String getArticleId() {
|
||||
return articleId;
|
||||
}
|
||||
@@ -96,7 +97,7 @@ public class Comment extends DataEntity<Comment> {
|
||||
this.articleId = articleId;
|
||||
}
|
||||
|
||||
@Length(min=0, max=64, message="父级评论长度不能超过 64 个字符")
|
||||
@Size(min=0, max=64, message="父级评论长度不能超过 64 个字符")
|
||||
public String getParentId() {
|
||||
return parentId;
|
||||
}
|
||||
@@ -106,7 +107,7 @@ public class Comment extends DataEntity<Comment> {
|
||||
}
|
||||
|
||||
@NotBlank(message="内容标题不能为空")
|
||||
@Length(min=0, max=255, message="内容标题长度不能超过 255 个字符")
|
||||
@Size(min=0, max=255, message="内容标题长度不能超过 255 个字符")
|
||||
public String getArticleTitle() {
|
||||
return articleTitle;
|
||||
}
|
||||
@@ -116,7 +117,7 @@ public class Comment extends DataEntity<Comment> {
|
||||
}
|
||||
|
||||
@NotBlank(message="评论内容不能为空")
|
||||
@Length(min=0, max=255, message="评论内容长度不能超过 255 个字符")
|
||||
@Size(min=0, max=255, message="评论内容长度不能超过 255 个字符")
|
||||
public String getContent() {
|
||||
return content;
|
||||
}
|
||||
@@ -125,7 +126,7 @@ public class Comment extends DataEntity<Comment> {
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
@Length(min=0, max=50, message="评论姓名长度不能超过 50 个字符")
|
||||
@Size(min=0, max=50, message="评论姓名长度不能超过 50 个字符")
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
@@ -134,7 +135,7 @@ public class Comment extends DataEntity<Comment> {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@Length(min=0, max=100, message="评论IP长度不能超过 100 个字符")
|
||||
@Size(min=0, max=100, message="评论IP长度不能超过 100 个字符")
|
||||
public String getIp() {
|
||||
return ip;
|
||||
}
|
||||
@@ -143,7 +144,7 @@ public class Comment extends DataEntity<Comment> {
|
||||
this.ip = ip;
|
||||
}
|
||||
|
||||
@Length(min=0, max=64, message="审核人长度不能超过 64 个字符")
|
||||
@Size(min=0, max=64, message="审核人长度不能超过 64 个字符")
|
||||
public String getAuditUserCode() {
|
||||
return auditUserCode;
|
||||
}
|
||||
@@ -161,7 +162,7 @@ public class Comment extends DataEntity<Comment> {
|
||||
this.auditDate = auditDate;
|
||||
}
|
||||
|
||||
@Length(min=0, max=200, message="审核意见长度不能超过 200 个字符")
|
||||
@Size(min=0, max=200, message="审核意见长度不能超过 200 个字符")
|
||||
public String getAuditComment() {
|
||||
return auditComment;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.entity;
|
||||
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.entity;
|
||||
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import com.jeesite.common.entity.DataEntity;
|
||||
import com.jeesite.common.mybatis.annotation.Column;
|
||||
@@ -40,7 +41,7 @@ public class Report extends DataEntity<Report> {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@Length(min=0, max=1, message="举报来源长度不能超过 1 个字符")
|
||||
@Size(min=0, max=1, message="举报来源长度不能超过 1 个字符")
|
||||
public String getReportSource() {
|
||||
return reportSource;
|
||||
}
|
||||
@@ -49,7 +50,7 @@ public class Report extends DataEntity<Report> {
|
||||
this.reportSource = reportSource;
|
||||
}
|
||||
|
||||
@Length(min=0, max=500, message="举报内容长度不能超过 500 个字符")
|
||||
@Size(min=0, max=500, message="举报内容长度不能超过 500 个字符")
|
||||
public String getReportContent() {
|
||||
return reportContent;
|
||||
}
|
||||
@@ -58,7 +59,7 @@ public class Report extends DataEntity<Report> {
|
||||
this.reportContent = reportContent;
|
||||
}
|
||||
|
||||
@Length(min=0, max=1000, message="举报的URL长度不能超过 1000 个字符")
|
||||
@Size(min=0, max=1000, message="举报的URL长度不能超过 1000 个字符")
|
||||
public String getReportUrl() {
|
||||
return reportUrl;
|
||||
}
|
||||
@@ -67,7 +68,7 @@ public class Report extends DataEntity<Report> {
|
||||
this.reportUrl = reportUrl;
|
||||
}
|
||||
|
||||
@Length(min=0, max=1, message="举报类型长度不能超过 1 个字符")
|
||||
@Size(min=0, max=1, message="举报类型长度不能超过 1 个字符")
|
||||
public String getReportType() {
|
||||
return reportType;
|
||||
}
|
||||
@@ -76,7 +77,7 @@ public class Report extends DataEntity<Report> {
|
||||
this.reportType = reportType;
|
||||
}
|
||||
|
||||
@Length(min=0, max=500, message="举报原因长度不能超过 500 个字符")
|
||||
@Size(min=0, max=500, message="举报原因长度不能超过 500 个字符")
|
||||
public String getReportCause() {
|
||||
return reportCause;
|
||||
}
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.entity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import com.jeesite.common.config.Global;
|
||||
import com.jeesite.common.entity.DataEntity;
|
||||
@@ -85,7 +86,7 @@ public class Site extends DataEntity<Site> {
|
||||
}
|
||||
|
||||
@NotBlank(message = "站点名称不能为空")
|
||||
@Length(min = 0, max = 100, message = "站点名称长度不能超过 100 个字符")
|
||||
@Size(min = 0, max = 100, message = "站点名称长度不能超过 100 个字符")
|
||||
public String getSiteName() {
|
||||
return siteName;
|
||||
}
|
||||
@@ -103,7 +104,7 @@ public class Site extends DataEntity<Site> {
|
||||
}
|
||||
|
||||
@NotBlank(message = "站点标题不能为空")
|
||||
@Length(min = 0, max = 100, message = "站点标题长度不能超过 100 个字符")
|
||||
@Size(min = 0, max = 100, message = "站点标题长度不能超过 100 个字符")
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
@@ -112,7 +113,7 @@ public class Site extends DataEntity<Site> {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1000, message = "站点Logo长度不能超过 1000 个字符")
|
||||
@Size(min = 0, max = 1000, message = "站点Logo长度不能超过 1000 个字符")
|
||||
public String getLogo() {
|
||||
return logo;
|
||||
}
|
||||
@@ -121,7 +122,7 @@ public class Site extends DataEntity<Site> {
|
||||
this.logo = logo;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 500, message = "站点域名长度不能超过 500 个字符")
|
||||
@Size(min = 0, max = 500, message = "站点域名长度不能超过 500 个字符")
|
||||
public String getDomain() {
|
||||
return domain;
|
||||
}
|
||||
@@ -130,7 +131,7 @@ public class Site extends DataEntity<Site> {
|
||||
this.domain = domain;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 500, message = "关键字长度不能超过 500 个字符")
|
||||
@Size(min = 0, max = 500, message = "关键字长度不能超过 500 个字符")
|
||||
public String getKeywords() {
|
||||
return keywords;
|
||||
}
|
||||
@@ -139,7 +140,7 @@ public class Site extends DataEntity<Site> {
|
||||
this.keywords = keywords;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 500, message = "描述长度不能超过 500 个字符")
|
||||
@Size(min = 0, max = 500, message = "描述长度不能超过 500 个字符")
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
@@ -148,7 +149,7 @@ public class Site extends DataEntity<Site> {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 500, message = "主题长度不能超过 500 个字符")
|
||||
@Size(min = 0, max = 500, message = "主题长度不能超过 500 个字符")
|
||||
public String getTheme() {
|
||||
return theme;
|
||||
}
|
||||
@@ -157,7 +158,7 @@ public class Site extends DataEntity<Site> {
|
||||
this.theme = theme;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 1000, message = "版权信息长度不能超过 1000 个字符")
|
||||
@Size(min = 0, max = 1000, message = "版权信息长度不能超过 1000 个字符")
|
||||
public String getCopyright() {
|
||||
return copyright;
|
||||
}
|
||||
@@ -166,7 +167,7 @@ public class Site extends DataEntity<Site> {
|
||||
this.copyright = copyright;
|
||||
}
|
||||
|
||||
@Length(min = 0, max = 500, message = "自定义站点首页视图长度不能超过 500 个字符")
|
||||
@Size(min = 0, max = 500, message = "自定义站点首页视图长度不能超过 500 个字符")
|
||||
public String getCustomIndexView() {
|
||||
return customIndexView;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.entity;
|
||||
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.entity;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.jeesite.common.entity.BaseEntity;
|
||||
@@ -96,7 +97,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@Length(min=0, max=1000, message="请求的URL地址长度不能超过 1000 个字符")
|
||||
@Size(min=0, max=1000, message="请求的URL地址长度不能超过 1000 个字符")
|
||||
public String getRequestUrl() {
|
||||
return requestUrl;
|
||||
}
|
||||
@@ -105,7 +106,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.requestUrl = requestUrl;
|
||||
}
|
||||
|
||||
@Length(min=0, max=128, message="受访域名长度不能超过 128 个字符")
|
||||
@Size(min=0, max=128, message="受访域名长度不能超过 128 个字符")
|
||||
public String getRequestUrlHost() {
|
||||
return requestUrlHost;
|
||||
}
|
||||
@@ -114,7 +115,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.requestUrlHost = requestUrlHost;
|
||||
}
|
||||
|
||||
@Length(min=0, max=1000, message="来源页面/上一个页面长度不能超过 1000 个字符")
|
||||
@Size(min=0, max=1000, message="来源页面/上一个页面长度不能超过 1000 个字符")
|
||||
public String getSourceReferer() {
|
||||
return sourceReferer;
|
||||
}
|
||||
@@ -123,7 +124,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.sourceReferer = sourceReferer;
|
||||
}
|
||||
|
||||
@Length(min=0, max=128, message="来源域名长度不能超过 128 个字符")
|
||||
@Size(min=0, max=128, message="来源域名长度不能超过 128 个字符")
|
||||
public String getSourceRefererHost() {
|
||||
return sourceRefererHost;
|
||||
}
|
||||
@@ -132,7 +133,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.sourceRefererHost = sourceRefererHost;
|
||||
}
|
||||
|
||||
@Length(min=0, max=1, message="访问来源类型长度不能超过 1 个字符")
|
||||
@Size(min=0, max=1, message="访问来源类型长度不能超过 1 个字符")
|
||||
public String getSourceType() {
|
||||
return sourceType;
|
||||
}
|
||||
@@ -141,7 +142,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.sourceType = sourceType;
|
||||
}
|
||||
|
||||
@Length(min=0, max=200, message="使用的搜索引擎长度不能超过 200 个字符")
|
||||
@Size(min=0, max=200, message="使用的搜索引擎长度不能超过 200 个字符")
|
||||
public String getSearchEngine() {
|
||||
return searchEngine;
|
||||
}
|
||||
@@ -150,7 +151,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.searchEngine = searchEngine;
|
||||
}
|
||||
|
||||
@Length(min=0, max=200, message="搜索的关键词长度不能超过 200 个字符")
|
||||
@Size(min=0, max=200, message="搜索的关键词长度不能超过 200 个字符")
|
||||
public String getSearchWord() {
|
||||
return searchWord;
|
||||
}
|
||||
@@ -159,7 +160,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.searchWord = searchWord;
|
||||
}
|
||||
|
||||
@Length(min=0, max=50, message="客户IP地址长度不能超过 50 个字符")
|
||||
@Size(min=0, max=50, message="客户IP地址长度不能超过 50 个字符")
|
||||
public String getRemoteAddr() {
|
||||
return remoteAddr;
|
||||
}
|
||||
@@ -168,7 +169,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.remoteAddr = remoteAddr;
|
||||
}
|
||||
|
||||
@Length(min=0, max=500, message="用户代理字符串长度不能超过 500 个字符")
|
||||
@Size(min=0, max=500, message="用户代理字符串长度不能超过 500 个字符")
|
||||
public String getUserAgent() {
|
||||
return userAgent;
|
||||
}
|
||||
@@ -177,7 +178,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.userAgent = userAgent;
|
||||
}
|
||||
|
||||
@Length(min=0, max=32, message="客户机语言长度不能超过 32 个字符")
|
||||
@Size(min=0, max=32, message="客户机语言长度不能超过 32 个字符")
|
||||
public String getUserLanguage() {
|
||||
return userLanguage;
|
||||
}
|
||||
@@ -186,7 +187,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.userLanguage = userLanguage;
|
||||
}
|
||||
|
||||
@Length(min=0, max=32, message="客户机屏幕大小0x0长度不能超过 32 个字符")
|
||||
@Size(min=0, max=32, message="客户机屏幕大小0x0长度不能超过 32 个字符")
|
||||
public String getUserScreenSize() {
|
||||
return userScreenSize;
|
||||
}
|
||||
@@ -195,7 +196,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.userScreenSize = userScreenSize;
|
||||
}
|
||||
|
||||
@Length(min=0, max=32, message="客户机设备类型长度不能超过 32 个字符")
|
||||
@Size(min=0, max=32, message="客户机设备类型长度不能超过 32 个字符")
|
||||
public String getUserDevice() {
|
||||
return userDevice;
|
||||
}
|
||||
@@ -204,7 +205,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.userDevice = userDevice;
|
||||
}
|
||||
|
||||
@Length(min=0, max=32, message="客户机操作系统长度不能超过 32 个字符")
|
||||
@Size(min=0, max=32, message="客户机操作系统长度不能超过 32 个字符")
|
||||
public String getUserOsName() {
|
||||
return userOsName;
|
||||
}
|
||||
@@ -213,7 +214,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.userOsName = userOsName;
|
||||
}
|
||||
|
||||
@Length(min=0, max=32, message="客户机浏览器长度不能超过 32 个字符")
|
||||
@Size(min=0, max=32, message="客户机浏览器长度不能超过 32 个字符")
|
||||
public String getUserBrowser() {
|
||||
return userBrowser;
|
||||
}
|
||||
@@ -222,7 +223,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.userBrowser = userBrowser;
|
||||
}
|
||||
|
||||
@Length(min=0, max=16, message="浏览器版本长度不能超过 16 个字符")
|
||||
@Size(min=0, max=16, message="浏览器版本长度不能超过 16 个字符")
|
||||
public String getUserBrowserVersion() {
|
||||
return userBrowserVersion;
|
||||
}
|
||||
@@ -231,7 +232,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.userBrowserVersion = userBrowserVersion;
|
||||
}
|
||||
|
||||
@Length(min=0, max=64, message="唯一访问标识长度不能超过 64 个字符")
|
||||
@Size(min=0, max=64, message="唯一访问标识长度不能超过 64 个字符")
|
||||
public String getUniqueVisitId() {
|
||||
return uniqueVisitId;
|
||||
}
|
||||
@@ -240,7 +241,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.uniqueVisitId = uniqueVisitId;
|
||||
}
|
||||
|
||||
@Length(min=0, max=8, message="本次访问日期长度不能超过 8 个字符")
|
||||
@Size(min=0, max=8, message="本次访问日期长度不能超过 8 个字符")
|
||||
public String getVisitDate() {
|
||||
return visitDate;
|
||||
}
|
||||
@@ -258,7 +259,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.visitTime = visitTime;
|
||||
}
|
||||
|
||||
@Length(min=0, max=1, message="是否新访问长度不能超过 1 个字符")
|
||||
@Size(min=0, max=1, message="是否新访问长度不能超过 1 个字符")
|
||||
public String getIsNewVisit() {
|
||||
return isNewVisit;
|
||||
}
|
||||
@@ -291,7 +292,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.totalRemainTime = totalRemainTime;
|
||||
}
|
||||
|
||||
@Length(min=0, max=64, message="站点编码长度不能超过 64 个字符")
|
||||
@Size(min=0, max=64, message="站点编码长度不能超过 64 个字符")
|
||||
public String getSiteCode() {
|
||||
return siteCode;
|
||||
}
|
||||
@@ -300,7 +301,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.siteCode = siteCode;
|
||||
}
|
||||
|
||||
@Length(min=0, max=100, message="站点名称长度不能超过 100 个字符")
|
||||
@Size(min=0, max=100, message="站点名称长度不能超过 100 个字符")
|
||||
public String getSiteName() {
|
||||
return siteName;
|
||||
}
|
||||
@@ -309,7 +310,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.siteName = siteName;
|
||||
}
|
||||
|
||||
@Length(min=0, max=64, message="栏目编码长度不能超过 64 个字符")
|
||||
@Size(min=0, max=64, message="栏目编码长度不能超过 64 个字符")
|
||||
public String getCategoryCode() {
|
||||
return categoryCode;
|
||||
}
|
||||
@@ -318,7 +319,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.categoryCode = categoryCode;
|
||||
}
|
||||
|
||||
@Length(min=0, max=100, message="栏目名称长度不能超过 100 个字符")
|
||||
@Size(min=0, max=100, message="栏目名称长度不能超过 100 个字符")
|
||||
public String getCategoryName() {
|
||||
return categoryName;
|
||||
}
|
||||
@@ -327,7 +328,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.categoryName = categoryName;
|
||||
}
|
||||
|
||||
@Length(min=0, max=64, message="栏目内容编号长度不能超过 64 个字符")
|
||||
@Size(min=0, max=64, message="栏目内容编号长度不能超过 64 个字符")
|
||||
public String getContentId() {
|
||||
return contentId;
|
||||
}
|
||||
@@ -336,7 +337,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.contentId = contentId;
|
||||
}
|
||||
|
||||
@Length(min=0, max=255, message="访问页面标题长度不能超过 255 个字符")
|
||||
@Size(min=0, max=255, message="访问页面标题长度不能超过 255 个字符")
|
||||
public String getContentTitle() {
|
||||
return contentTitle;
|
||||
}
|
||||
@@ -345,7 +346,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.contentTitle = contentTitle;
|
||||
}
|
||||
|
||||
@Length(min=0, max=100, message="访问用户编码长度不能超过 100 个字符")
|
||||
@Size(min=0, max=100, message="访问用户编码长度不能超过 100 个字符")
|
||||
public String getVisitUserCode() {
|
||||
return visitUserCode;
|
||||
}
|
||||
@@ -354,7 +355,7 @@ public class VisitLog extends DataEntity<VisitLog> {
|
||||
this.visitUserCode = visitUserCode;
|
||||
}
|
||||
|
||||
@Length(min=0, max=100, message="访问用户姓名长度不能超过 100 个字符")
|
||||
@Size(min=0, max=100, message="访问用户姓名长度不能超过 100 个字符")
|
||||
public String getVisitUserName() {
|
||||
return visitUserName;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.service;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.service;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.service;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.service;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.service;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.service;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.service;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.service;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.utils;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.utils;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.web;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.web;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.web;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.web;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.web;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.web;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
|
||||
* No deletion without permission, or be held responsible to law.
|
||||
*/
|
||||
package com.jeesite.modules.cms.web;
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user