【修改】将jeecg字样修改为jero

This commit is contained in:
zer0Black
2021-03-10 17:17:01 +08:00
parent 79e2bebd93
commit ba4ef45423
654 changed files with 5088 additions and 386022 deletions
@@ -7,7 +7,7 @@ server:
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
context-path: /jeecg-boot
context-path: /jero-boot
compression:
enabled: true
min-response-size: 1024
@@ -26,7 +26,7 @@ spring:
max-request-size: 10MB
mail:
host: smtp.163.com
username: jeecgos@163.com
username: test@163.com
password: ??
properties:
mail:
@@ -131,13 +131,13 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
url: jdbc:mysql://127.0.0.1:3306/jeecgboot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://127.0.0.1:3306/jeroboot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
#multi-datasource1:
#url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
#url: jdbc:mysql://localhost:3306/jero-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
#username: root
#password: root
#driver-class-name: com.mysql.cj.jdbc.Driver
@@ -156,7 +156,7 @@ spring:
port: 6379
#mybatis plus 设置
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
mapper-locations: classpath*:com/jero/modules/**/xml/*Mapper.xml
global-config:
# 关闭MP3.0自带的banner
banner: false
@@ -170,8 +170,8 @@ mybatis-plus:
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true
#jeecg专用配置
jeecg :
#jero专用配置
jero :
# 本地:local\Miniominio\阿里云:alioss
uploadType: local
path :
@@ -180,17 +180,17 @@ jeecg :
#webapp文件路径
webapp: D://opt//webapp
shiro:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
#阿里云oss存储配置
oss:
endpoint: oss-cn-beijing.aliyuncs.com
accessKey: ??
secretKey: ??
bucketName: jeecgos
bucketName: jeroos
staticDomain: ??
# ElasticSearch 6设置
elasticsearch:
cluster-name: jeecg-ES
cluster-name: jero-ES
cluster-nodes: 127.0.0.1:9200
check-enabled: false
# 表单设计器配置
@@ -203,7 +203,7 @@ jeecg :
file-view-domain: 127.0.0.1:8012
# minio文件上传
minio:
minio_url: http://minio.jeecg.com
minio_url: http://minio.jero.com
minio_name: ??
minio_pass: ??
bucketName: otatest
@@ -230,12 +230,12 @@ jeecg :
address: 127.0.0.1:30007
ip: 127.0.0.1
port: 30007
logPath: logs/jeecg/job/jobhandler/
logPath: logs/jero/job/jobhandler/
logRetentionDays: 30
#自定义路由配置 yml nacos database
route:
config:
data-id: jeecg-gateway-router
data-id: jero-gateway-router
group: DEFAULT_GROUP
data-type: yml
#分布式锁配置
@@ -250,14 +250,14 @@ cas:
#Mybatis输出sql日志
logging:
level:
org.jeecg.modules.system.mapper : info
com.jero.modules.system.mapper : info
#swagger
knife4j:
production: false
basic:
enable: false
username: jeecg
password: jeecg1314
username: jero
password: jero.com
#第三方登录
justauth:
enabled: true
@@ -265,20 +265,20 @@ justauth:
GITHUB:
client-id: true
client-secret: true
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/github/callback
WECHAT_ENTERPRISE:
client-id: true
client-secret: true
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/wechat_enterprise/callback
agent-id: 1000002
DINGTALK:
client-id: true
client-secret: true
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/dingtalk/callback
WECHAT_OPEN:
client-id: ??
client-secret: ??
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/wechat_open/callback
cache:
type: default
prefix: 'demo::'
@@ -7,7 +7,7 @@ server:
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
context-path: /jeecg-boot
context-path: /jero-boot
compression:
enabled: true
min-response-size: 1024
@@ -26,7 +26,7 @@ spring:
max-request-size: 10MB
mail:
host: smtp.163.com
username: jeecgos@163.com
username: test@163.com
password: ??
properties:
mail:
@@ -131,13 +131,13 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: root
driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
#multi-datasource1:
#url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
#url: jdbc:mysql://localhost:3306/jero-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
#username: root
#password: root
#driver-class-name: com.mysql.cj.jdbc.Driver
@@ -156,7 +156,7 @@ spring:
port: 6379
#mybatis plus 设置
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
mapper-locations: classpath*:com/jero/modules/**/xml/*Mapper.xml
global-config:
# 关闭MP3.0自带的banner
banner: false
@@ -170,27 +170,27 @@ mybatis-plus:
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true
#jeecg专用配置
jeecg :
#jero专用配置
jero :
# 本地:local\Miniominio\阿里云:alioss
uploadType: alioss
path :
#文件上传根目录 设置
upload: /opt/jeecg-boot/upload
upload: /opt/jero-boot/upload
#webapp文件路径
webapp: /opt/jeecg-boot/webapp
webapp: /opt/jero-boot/webapp
shiro:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
#阿里云oss存储配置
oss:
endpoint: oss-cn-beijing.aliyuncs.com
accessKey: ??
secretKey: ??
bucketName: jeecgos
staticDomain: https://static.jeecg.com
bucketName: jeroos
staticDomain: https://static.jero.com
# ElasticSearch 设置
elasticsearch:
cluster-name: jeecg-ES
cluster-name: jero-ES
cluster-nodes: 111.225.222.176:9200
check-enabled: true
# 表单设计器配置
@@ -200,10 +200,10 @@ jeecg :
# 文件、图片上传方式,可选项:qiniu(七牛云)、system(跟随系统配置)
upload-type: system
# 在线预览文件服务器地址配置
file-view-domain: http://fileview.jeecg.com
file-view-domain: http://fileview.jero.com
# minio文件上传
minio:
minio_url: http://minio.jeecg.com
minio_url: http://minio.jero.com
minio_name: ??
minio_pass: ??
bucketName: otatest
@@ -230,12 +230,12 @@ jeecg :
address: 127.0.0.1:30007
ip: 127.0.0.1
port: 30007
logPath: logs/jeecg/job/jobhandler/
logPath: logs/jero/job/jobhandler/
logRetentionDays: 30
#自定义路由配置 yml nacos database
route:
config:
data-id: jeecg-gateway-router
data-id: jero-gateway-router
group: DEFAULT_GROUP
data-type: yml
#分布式锁配置
@@ -250,14 +250,14 @@ cas:
#Mybatis输出sql日志
logging:
level:
org.jeecg.modules.system.mapper : info
com.jero.modules.system.mapper : info
#swagger
knife4j:
production: false
basic:
enable: true
username: jeecg
password: jeecg1314
username: jero
password: jero.com
#第三方登录
justauth:
enabled: true
@@ -265,20 +265,20 @@ justauth:
GITHUB:
client-id: true
client-secret: true
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/github/callback
WECHAT_ENTERPRISE:
client-id: true
client-secret: true
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/wechat_enterprise/callback
agent-id: 1000002
DINGTALK:
client-id: true
client-secret: true
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/dingtalk/callback
WECHAT_OPEN:
client-id: true
client-secret: true
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/wechat_open/callback
cache:
type: default
prefix: 'demo::'
@@ -7,7 +7,7 @@ server:
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
context-path: /jeecg-boot
context-path: /jero-boot
compression:
enabled: true
min-response-size: 1024
@@ -26,7 +26,7 @@ spring:
max-request-size: 10MB
mail:
host: smtp.163.com
username: jeecgos@163.com
username: test@163.com
password: ??
properties:
mail:
@@ -131,13 +131,13 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: root
driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
#multi-datasource1:
#url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
#url: jdbc:mysql://localhost:3306/jero-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
#username: root
#password: root
#driver-class-name: com.mysql.cj.jdbc.Driver
@@ -156,7 +156,7 @@ spring:
port: 6379
#mybatis plus 设置
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
mapper-locations: classpath*:com/jero/modules/**/xml/*Mapper.xml
global-config:
# 关闭MP3.0自带的banner
banner: false
@@ -170,8 +170,8 @@ mybatis-plus:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true
#jeecg专用配置
jeecg :
#jero专用配置
jero :
# 本地:local\Miniominio\阿里云:alioss
uploadType: local
path :
@@ -180,17 +180,17 @@ jeecg :
#webapp文件路径
webapp: D://opt//webapp
shiro:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
#阿里云oss存储配置
oss:
endpoint: oss-cn-beijing.aliyuncs.com
accessKey: ??
secretKey: ??
bucketName: jeecgos
staticDomain: https://static.jeecg.com
bucketName: jeroos
staticDomain: https://static.jero.com
# ElasticSearch 设置
elasticsearch:
cluster-name: jeecg-ES
cluster-name: jero-ES
cluster-nodes: ??
check-enabled: false
# 表单设计器配置
@@ -203,7 +203,7 @@ jeecg :
file-view-domain: http://127.0.0.1:8012
# minio文件上传
minio:
minio_url: http://minio.jeecg.com
minio_url: http://minio.jero.com
minio_name: ??
minio_pass: ??
bucketName: otatest
@@ -230,12 +230,12 @@ jeecg :
address: 127.0.0.1:30007
ip: 127.0.0.1
port: 30007
logPath: logs/jeecg/job/jobhandler/
logPath: logs/jero/job/jobhandler/
logRetentionDays: 30
#自定义路由配置 yml nacos database
route:
config:
data-id: jeecg-gateway-router
data-id: jero-gateway-router
group: DEFAULT_GROUP
data-type: yml
#分布式锁配置
@@ -247,7 +247,7 @@ jeecg :
#Mybatis输出sql日志
logging:
level:
org.jeecg.modules.system.mapper : info
com.jero.modules.system.mapper : info
#cas单点登录
cas:
prefixUrl: http://cas.example.org:8443/cas
@@ -256,8 +256,8 @@ knife4j:
production: false
basic:
enable: false
username: jeecg
password: jeecg1314
username: jero
password: jero.com
#第三方登录
justauth:
enabled: true
@@ -265,20 +265,20 @@ justauth:
GITHUB:
client-id: ??
client-secret: ??
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/github/callback
WECHAT_ENTERPRISE:
client-id: ??
client-secret: ??
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/wechat_enterprise/callback
agent-id: 1000002
DINGTALK:
client-id: ??
client-secret: ??
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/dingtalk/callback
WECHAT_OPEN:
client-id: ??
client-secret: ??
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/wechat_open/callback
cache:
type: default
prefix: 'demo::'
@@ -1,5 +1,5 @@
spring:
application:
name: jeecg-system
name: jero-system
profiles:
active: @profile.name@
@@ -9,6 +9,6 @@ ${AnsiColor.BRIGHT_BLUE}
${AnsiColor.BRIGHT_GREEN}
Jeecg Boot Version: 2.4.2
jero Boot Version: 2.4.2
Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
${AnsiColor.BLACK}
@@ -9,9 +9,9 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
import ${bussiPackage}.${entityPackage}.entity.${entityName};
import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
@@ -25,7 +25,7 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import com.jero.common.system.base.controller.JeroController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -34,7 +34,7 @@ import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.AutoLog;
<#assign bpm_flag=false>
<#list originalColumns as po>
<#if po.fieldDbName=='bpm_status'>
@@ -44,7 +44,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -52,7 +52,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
@RestController
@RequestMapping("/${entityPackage}/${entityName?uncap_first}")
@Slf4j
public class ${entityName}Controller extends JeecgController<${entityName}, I${entityName}Service> {
public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service> {
@Autowired
private I${entityName}Service ${entityName?uncap_first}Service;
@@ -11,7 +11,7 @@ import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -17,11 +17,11 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.vo.LoginUser;
import com.jero.common.system.vo.LoginUser;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
<#list subTables as sub>
import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
</#list>
@@ -44,7 +44,7 @@ import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.AutoLog;
<#assign bpm_flag=false>
<#list originalColumns as po>
<#if po.fieldDbName=='bpm_status'>
@@ -54,7 +54,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -10,13 +10,13 @@ import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -17,7 +17,7 @@ import java.io.UnsupportedEncodingException;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -11,7 +11,7 @@ import java.util.List;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import java.util.List;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -19,7 +19,7 @@ import java.util.Collection;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -12,13 +12,13 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -211,7 +211,7 @@
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import ${entityName}Modal from './modules/${entityName}Modal'
<#if list_need_category>
import { loadCategoryData } from '@/api/api'
@@ -229,7 +229,7 @@
export default {
name: "${entityName}List",
mixins:[JeecgListMixin],
mixins:[JeroListMixin],
components: {
${entityName}Modal
},
@@ -9,9 +9,9 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
import ${bussiPackage}.${entityPackage}.entity.${entityName};
import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
@@ -25,7 +25,7 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import com.jero.common.system.base.controller.JeroController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -34,11 +34,11 @@ import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.AutoLog;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -52,7 +52,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
@RestController
@RequestMapping("/${entityPackage}/${entityName?uncap_first}")
@Slf4j
public class ${entityName}Controller extends JeecgController<${entityName}, I${entityName}Service>{
public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service>{
@Autowired
private I${entityName}Service ${entityName?uncap_first}Service;
@@ -10,14 +10,14 @@ import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.UnsupportedEncodingException;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -2,13 +2,13 @@ package ${bussiPackage}.${entityPackage}.service;
import ${bussiPackage}.${entityPackage}.entity.${entityName};
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.exception.JeecgBootException;
import com.jero.common.exception.JeroBootException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.List;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -27,10 +27,10 @@ public interface I${entityName}Service extends IService<${entityName}> {
void add${entityName}(${entityName} ${entityName?uncap_first});
/**修改节点*/
void update${entityName}(${entityName} ${entityName?uncap_first}) throws JeecgBootException;
void update${entityName}(${entityName} ${entityName?uncap_first}) throws JeroBootException;
/**删除节点*/
void delete${entityName}(String id) throws JeecgBootException;
void delete${entityName}(String id) throws JeroBootException;
/**查询所有数据,无分页*/
List<${entityName}> queryTreeListNoPage(QueryWrapper<${entityName}> queryWrapper);
@@ -1,7 +1,7 @@
package ${bussiPackage}.${entityPackage}.service.impl;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.util.oConvertUtils;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.oConvertUtils;
import ${bussiPackage}.${entityPackage}.entity.${entityName};
import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper;
import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
@@ -26,7 +26,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -52,7 +52,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
public void update${entityName}(${entityName} ${entityName?uncap_first}) {
${entityName} entity = this.getById(${entityName?uncap_first}.getId());
if(entity==null) {
throw new JeecgBootException("未找到对应实体");
throw new JeroBootException("未找到对应实体");
}
String old_pid = entity.get${pidFieldName?cap_first}();
String new_pid = ${entityName?uncap_first}.get${pidFieldName?cap_first}();
@@ -70,7 +70,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
@Override
@Transactional(rollbackFor = Exception.class)
public void delete${entityName}(String id) throws JeecgBootException {
public void delete${entityName}(String id) throws JeroBootException {
//查询选中节点下所有子节点一并删除
id = this.queryTreeChildIds(id);
if(id.indexOf(",")>0) {
@@ -99,7 +99,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
}else{
${entityName} ${entityName?uncap_first} = this.getById(id);
if(${entityName?uncap_first}==null) {
throw new JeecgBootException("未找到对应实体");
throw new JeroBootException("未找到对应实体");
}
updateOldParentNode(${entityName?uncap_first}.get${pidFieldName?cap_first}());
baseMapper.deleteById(id);
@@ -212,7 +212,7 @@
<script>
import { getAction, deleteAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import ${entityName}Modal from './modules/${entityName}Modal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import { filterObj } from '@/utils/util';
@@ -225,7 +225,7 @@
export default {
name: "${entityName}List",
mixins:[JeecgListMixin],
mixins:[JeroListMixin],
components: {
${entityName}Modal
},
@@ -1,19 +1,19 @@
package ${bussiPackage}.${entityPackage}.controller;
import org.jeecg.common.system.query.QueryGenerator;
import com.jero.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.api.vo.Result;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.api.vo.Result;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.web.servlet.ModelAndView;
import java.util.Arrays;
import org.jeecg.common.util.oConvertUtils;
import com.jero.common.util.oConvertUtils;
<#list subTables as sub>
import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
</#list>
@@ -24,9 +24,9 @@ import ${bussiPackage}.${entityPackage}.service.I${sub.entityName}Service;
</#list>
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.AutoLog;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
import com.jero.common.system.vo.LoginUser;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -10,13 +10,13 @@ import org.jeecgframework.poi.excel.annotation.Excel;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -6,7 +6,7 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,7 +18,7 @@ import java.io.UnsupportedEncodingException;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -12,7 +12,7 @@ import java.util.List;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import java.util.List;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -19,7 +19,7 @@ import java.util.Collection;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -17,11 +17,11 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.vo.LoginUser;
import com.jero.common.system.vo.LoginUser;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
<#list subTables as sub>
import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
</#list>
@@ -44,11 +44,11 @@ import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.AutoLog;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -10,13 +10,13 @@ import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -11,14 +11,14 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.util.Date;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.UnsupportedEncodingException;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -11,7 +11,7 @@ import java.util.List;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import java.util.List;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -19,7 +19,7 @@ import java.util.Collection;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -12,13 +12,13 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -17,11 +17,11 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.vo.LoginUser;
import com.jero.common.system.vo.LoginUser;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
<#list subTables as sub>
import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
</#list>
@@ -44,7 +44,7 @@ import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.AutoLog;
<#assign bpm_flag=false>
<#list originalColumns as po>
<#if po.fieldDbName=='bpm_status'>
@@ -54,7 +54,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -10,13 +10,13 @@ import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -17,7 +17,7 @@ import java.io.UnsupportedEncodingException;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -11,7 +11,7 @@ import java.util.List;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import java.util.List;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -19,7 +19,7 @@ import java.util.Collection;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -12,13 +12,13 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -17,11 +17,11 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.vo.LoginUser;
import com.jero.common.system.vo.LoginUser;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
<#list subTables as sub>
import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
</#list>
@@ -44,11 +44,11 @@ import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.AutoLog;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -10,13 +10,13 @@ import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -17,7 +17,7 @@ import java.io.UnsupportedEncodingException;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -11,7 +11,7 @@ import java.util.List;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import java.util.List;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -19,7 +19,7 @@ import java.util.Collection;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -12,13 +12,13 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import org.jeecg.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,10 +8,10 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.util.oConvertUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.util.oConvertUtils;
import ${bussiPackage}.${entityPackage}.entity.${entityName};
import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
import java.util.Date;
@@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import com.jero.common.system.base.controller.JeroController;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -37,7 +37,7 @@ import io.swagger.annotations.ApiOperation;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -17,7 +17,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -10,12 +10,12 @@ import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
import ${bussiPackage}.entity.${entityPackage}.${entityName};
import ${bussiPackage}.service.${entityPackage}.I${entityName}Service;
import org.jeecg.common.system.base.controller.JeecgController;
import com.jero.common.system.base.controller.JeroController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -37,11 +37,11 @@ import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.AutoLog;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -14,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -10,7 +10,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.system.vo.LoginUser;
import com.jero.common.system.vo.LoginUser;
import org.apache.shiro.SecurityUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -18,9 +18,9 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
<#list subTables as sub>
import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
</#list>
@@ -43,11 +43,11 @@ import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.AutoLog;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -16,7 +16,7 @@ import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -11,7 +11,7 @@ import java.util.List;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import java.util.List;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -19,7 +19,7 @@ import java.util.Collection;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -16,7 +16,7 @@ import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -16,10 +16,10 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
<#list subTables as sub>
import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
</#list>
@@ -42,11 +42,11 @@ import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.AutoLog;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -15,7 +15,7 @@ import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -11,7 +11,7 @@ import java.util.List;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -8,7 +8,7 @@ import java.util.List;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -19,7 +19,7 @@ import java.util.Collection;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: ${subTab.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -15,7 +15,7 @@ import io.swagger.annotations.ApiModelProperty;
/**
* @Description: ${tableVo.ftlDescription}
* @Author: jeecg-boot
* @Author: jero-boot
* @Date: ${.now?string["yyyy-MM-dd"]}
* @Version: V1.0
*/
@@ -1,7 +1,7 @@
#code_generate_project_path
project_path=E:\\eclipse2018-workspace\\jeecg-boot
project_path=E:\\eclipse2018-workspace\\jero-boot
#bussi_package[User defined]
bussi_package=org.jeecg.modules.demo
bussi_package=com.jero.modules.demo
#default code path
@@ -1,9 +1,9 @@
#mysql
diver_name=com.mysql.cj.jdbc.Driver
url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
url=jdbc:mysql://localhost:3306/jero-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
username=root
password=root
database_name=jeecg-boot
database_name=jero-boot
#oracle
#diver_name=oracle.jdbc.driver.OracleDriver
@@ -12,7 +12,7 @@
<script type="text/javascript">
function openScanFile(title,token,bizNo,archivesNo){
//var pdfUrl ="http://127.0.0.1:8080/jeecg-boot/generic/web/viewer.html?file="+encodeURIComponent("http://127.0.0.1:8080/jeecg-boot/test/jeecgDemo/getPdfUrl?title="+encodeURI(title));
//var pdfUrl ="http://127.0.0.1:8080/jero-boot/generic/web/viewer.html?file="+encodeURIComponent("http://127.0.0.1:8080/jero-boot/test/jeecgDemo/getPdfUrl?title="+encodeURI(title));
var pdfUrl ="${base}/generic/web/viewer.html?file="+encodeURIComponent("http://storage.xuetangx.com/public_assets/xuetangx/PDF/PlayerAPI_v1.0.6.pdf");
var vm=window.open(pdfUrl);