JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【添加】jeecg字样去除

Browse Source
This commit is contained in:
zer0Black
2021-03-12 17:58:56 +08:00
parent ed22cee030
commit 823866b7d1
28 changed files with 693 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/jeroboot-oracle11g.sql
+277 -277
View File
File diff suppressed because one or more lines are too long
jero-boot/db/jeroboot-sqlserver2017.sql
+278 -278
View File
File diff suppressed because one or more lines are too long
jero-boot/db/增量SQL/jimureport/jimureport.mysql5.7.create.sql
+94 -94
View File
File diff suppressed because one or more lines are too long
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DySmsEnum.java
+3 -3
View File
@@ -4,9 +4,9 @@ import org.apache.commons.lang3.StringUtils;
public enum DySmsEnum {
LOGIN_TEMPLATE_CODE("SMS_175435174","JEECG","code"),
FORGET_PASSWORD_TEMPLATE_CODE("SMS_175435174","JEECG","code"),
REGISTER_TEMPLATE_CODE("SMS_175430166","JEECG","code"),
LOGIN_TEMPLATE_CODE("SMS_175435174","JERO","code"),
FORGET_PASSWORD_TEMPLATE_CODE("SMS_175435174","JERO","code"),
REGISTER_TEMPLATE_CODE("SMS_175430166","JERO","code"),
/**会议通知*/
MEET_NOTICE_TEMPLATE_CODE("SMS_201480469","H5活动之家","username,title,minute,time"),
/**我的计划通知*/
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/YouBianCodeUtil.java
-8
View File
@@ -35,9 +35,6 @@ public class YouBianCodeUtil {
String after_code = code.substring(code.length() - 1 - numLength,code.length());
char after_code_zimu = after_code.substring(0, 1).charAt(0);
Integer after_code_num = Integer.parseInt(after_code.substring(1));
// org.jeecgframework.core.util.LogUtil.info(after_code);
// org.jeecgframework.core.util.LogUtil.info(after_code_zimu);
// org.jeecgframework.core.util.LogUtil.info(after_code_num);
String nextNum = "";
char nextZimu = 'A';
@@ -165,9 +162,4 @@ public class YouBianCodeUtil {
}
}
// public static void main(String[] args) {
// // org.jeecgframework.core.util.LogUtil.info(getNextZiMu('C'));
// // org.jeecgframework.core.util.LogUtil.info(getNextNum(8));
// // org.jeecgframework.core.util.LogUtil.info(cutYouBianCode("C99A01B01")[2]);
// }
}
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java
+2 -2
View File
@@ -21,12 +21,12 @@ import java.util.ArrayList;
import java.util.List;
/**
* 单数据源配置（jeecg.datasource.open = false时生效）
* 单数据源配置（jero.datasource.open = false时生效）
* @Author zhoujf
*
*/
@Configuration
@MapperScan(value={"com.jero.modules.**.mapper*"})
@MapperScan(value={"com.jero.**.mapper*"})
public class MybatisPlusConfig {
/**
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java
+2 -2
View File
@@ -103,9 +103,9 @@ public class OnlCgformApiController {
private ISysBaseAPI sysBaseAPI;
@Autowired
private IOnlineService onlineService;
@Value("${jeecg.path.upload}")
@Value("${jero.path.upload}")
private String upLoadPath;
@Value("${jeecg.uploadType}")
@Value("${jero.uploadType}")
private String uploadType;
public OnlCgformApiController() {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java
+1 -1
View File
@@ -564,7 +564,7 @@ public class OnlCgformHeadController {
private void b() {
if (b == null) {
Resource var1 = this.resourceLoader.getResource("classpath:jeecg" + File.separator + "jeecg_config.properties");
Resource var1 = this.resourceLoader.getResource("classpath:jero" + File.separator + "jero_config.properties");
InputStream var2 = null;
try {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/service/a/OnlCgreportHeadServiceImpl.java
+6 -6
View File
@@ -107,16 +107,16 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
var23.eq(OnlCgreportItem::getCgrheadId, onlCgreportHeadId);
var23.eq(OnlCgreportItem::getIsSearch, 1);
List var12 = this.onlCgreportItemService.list(var23);
String var13 = "jeecg_rp_temp.";
String var13 = "jero_rp_temp.";
String var14 = CgReportQueryParamUtil.a(var12, params, var13, (String)null);
if (ReUtil.contains(" order\\s+by ", sql.toLowerCase()) && "SQLSERVER".equalsIgnoreCase(var4)) {
throw new JeroBootException("SqlServer不支持SQL内排序!");
} else {
String var15 = "select * from (" + sql + ") jeecg_rp_temp where 1=1 " + var14;
String var15 = "select * from (" + sql + ") jero_rp_temp where 1=1 " + var14;
var15 = SqlUtil.b(var15);
Object var16 = params.get("column");
if (var16 != null) {
var15 = var15 + " order by jeecg_rp_temp." + var16.toString() + " " + params.get("order").toString();
var15 = var15 + " order by jero_rp_temp." + var16.toString() + " " + params.get("order").toString();
}
a.info("报表查询sql=>\r\n" + var15);
@@ -168,15 +168,15 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
if (ReUtil.contains(" order\\s+by ", sql.toLowerCase()) && "3".equalsIgnoreCase(var5.getDbType())) {
throw new JeroBootException("SqlServer不支持SQL内排序!");
} else {
String var26 = "jeecg_rp_temp.";
String var26 = "jero_rp_temp.";
var15 = DataBaseEnum.getDataBaseNameByValue(var5.getDbType());
String var16 = CgReportQueryParamUtil.a(var25, params, var26, var15);
String var17 = "select * from (" + sql + ") jeecg_rp_temp where 1=1 " + var16;
String var17 = "select * from (" + sql + ") jero_rp_temp where 1=1 " + var16;
var17 = SqlUtil.b(var17);
String var18 = SqlUtils.getCountSql(var17);
Object var19 = params.get("column");
if (var19 != null) {
var17 = var17 + " order by jeecg_rp_temp." + var19.toString() + " " + params.get("order").toString();
var17 = var17 + " order by jero_rp_temp." + var19.toString() + " " + params.get("order").toString();
}
String var20 = var17;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/util/SqlUtil.java
-24
View File
@@ -60,30 +60,6 @@ public class SqlUtil {
return var2;
}
public static String a(String var0, Map var1, int var2, int var3) {
String var4 = "jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false";
int var5 = (var2 - 1) * var3;
String[] var6 = new String[]{var0, var5 + "", var3 + ""};
if (var4.indexOf("MYSQL") != -1) {
var0 = MessageFormat.format("select * from ( {0}) sel_tab00 limit {1},{2}", var6);
} else if (var4.indexOf("POSTGRESQL") != -1) {
var0 = MessageFormat.format("select * from ( {0}) sel_tab00 limit {2} offset {1}", var6);
} else {
int var7 = (var2 - 1) * var3;
int var8 = var7 + var3;
var6[2] = Integer.toString(var7);
var6[1] = Integer.toString(var8);
if (var4.indexOf("ORACLE") != -1) {
var0 = MessageFormat.format("select * from (select row_.*,rownum rownum_ from ({0}) row_ where rownum <= {1}) where rownum_>{2}", var6);
} else if (var4.indexOf("SQLSERVER") != -1) {
var6[0] = var0.substring(c(var0));
var0 = MessageFormat.format("select * from ( select row_number() over(order by tempColumn) tempRowNumber, * from (select top {1} tempColumn = 0, {0}) t ) tt where tempRowNumber > {2}", var6);
}
}
return var0;
}
public static String a(String var0, String var1, String var2, Map var3, int var4, int var5) {
var2 = a(var2, var3);
int var6 = (var4 - 1) * var5;
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/json/asyn_tree_list_2.json
+3 -3
View File
@@ -6,21 +6,21 @@
{
"id": 21,
"name": "弹框选择Demo",
"component": "jeecg/SelectDemo",
"component": "jero/SelectDemo",
"orderNum": 1,
"hasChildren": false
},
{
"id": 22,
"name": "单表模型示例",
"component": "jeecg/JeroDemoList",
"component": "jero/JeroDemoList",
"orderNum": 2,
"hasChildren": false
},
{
"id": 23,
"name": "一对多Tab示例",
"component": "jeecg/tablist/JeecgOrderDMainList",
"component": "jero/tablist/JeroOrderDMainList",
"orderNum": 3,
"hasChildren": false
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java
+4 -4
View File
@@ -57,7 +57,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
*/
@ApiOperation(value = "获取Demo数据列表", notes = "获取所有Demo数据列表")
@GetMapping(value = "/list")
@PermissionData(pageComponent = "jeecg/JeroDemoList")
@PermissionData(pageComponent = "jero/JeroDemoList")
public Result<?> list(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<JeroDemo> queryWrapper = QueryGenerator.initQueryWrapper(jeroDemo, req.getParameterMap());
@@ -145,7 +145,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
* @param request
*/
@RequestMapping(value = "/exportXls")
@PermissionData(pageComponent = "jeecg/JeroDemoList")
@PermissionData(pageComponent = "jero/JeroDemoList")
public ModelAndView exportXls(HttpServletRequest request, JeroDemo jeroDemo) {
//获取导出表格字段
String exportFields = JeroDemoService.getExportFields();
@@ -253,7 +253,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
* @return
*/
@GetMapping(value = "/mpList")
@PermissionData(pageComponent = "jeecg/JeroDemoList")
@PermissionData(pageComponent = "jero/JeroDemoList")
public Result<?> loadMpPermissonList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<JeroDemo> queryWrapper = new QueryWrapper<JeroDemo>();
@@ -274,7 +274,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
* @return
*/
@GetMapping(value = "/sqlList")
@PermissionData(pageComponent = "jeecg/JeroDemoList")
@PermissionData(pageComponent = "jero/JeroDemoList")
public Result<?> loadSqlPermissonList(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
IPage<JeroDemo> pageList = JeroDemoService.queryListWithPermission(pageSize, pageNo);
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java
+1 -1
View File
@@ -199,7 +199,7 @@ public class JoaDemoController {
//导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME, "流程测试列表");
mv.addObject(NormalExcelConstants.CLASS, JoaDemo.class);
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("流程测试列表数据", "导出人:Jeecg", "导出信息"));
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("流程测试列表数据", "导出人:Jero", "导出信息"));
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/entity/JeroDemo.java
+1 -1
View File
@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: jeecg 测试demo
* @Description: Jero 测试demo
* @Author: jero-boot
* @Date: 2018-12-29
* @Version:V1.0
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/mapper/JeroDemoMapper.java
+1 -1
View File
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
* @Description: jeecg 测试demo
* @Description: jero 测试demo
* @Author: jero-boot
* @Date: 2018-12-29
* @Version: V1.0
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/service/IJeroDemoService.java
+1 -1
View File
@@ -6,7 +6,7 @@ import com.jero.modules.demo.test.entity.JeroDemo;
import com.baomidou.mybatisplus.core.metadata.IPage;
/**
* @Description: jeecg 测试demo
* @Description: jero 测试demo
* @Author: jero-boot
* @Date: 2018-12-29
* @Version: V1.0
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/service/impl/JeroDemoServiceImpl.java
+1 -1
View File
@@ -21,7 +21,7 @@ import java.util.Arrays;
import java.util.List;
/**
* @Description: jeecg 测试demo
* @Description: Jero 测试demo
* @Author: jero-boot
* @Date: 2018-12-29
* @Version: V1.0
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/ngalain/controller/NgAlainController.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class NgAlainController {
j.put("menu",ngAlainService.getMenu(user.getUsername()));
JSONObject app = new JSONObject();
app.put("name", "jero-boot-angular");
app.put("description", "jeecg+ng-alain整合版本");
app.put("description", "jero+ng-alain整合版本");
j.put("app", app);
return j;
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java
+1 -1
View File
@@ -218,7 +218,7 @@ public class QuartzJobController {
// 导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME, "定时任务列表");
mv.addObject(NormalExcelConstants.CLASS, QuartzJob.class);
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("定时任务列表数据", "导出人:Jeecg", "导出信息"));
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("定时任务列表数据", "导出人:Jero", "导出信息"));
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPositionController.java
+1 -1
View File
@@ -211,7 +211,7 @@ public class SysPositionController {
//导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME, "职务表列表");
mv.addObject(NormalExcelConstants.CLASS, SysPosition.class);
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("职务表列表数据", "导出人:Jeecg", "导出信息"));
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("职务表列表数据", "导出人:jero", "导出信息"));
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementServiceImpl.java
+1 -1
View File
@@ -104,7 +104,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl<SysAnnouncementMappe
SysAnnouncement announcement = new SysAnnouncement();
announcement.setTitile(title);
announcement.setMsgContent(msgContent);
announcement.setSender("JEECG BOOT");
announcement.setSender("JERO BOOT");
announcement.setPriority(CommonConstant.PRIORITY_L);
announcement.setMsgType(CommonConstant.MSG_TYPE_ALL);
announcement.setSendStatus(CommonConstant.HAS_SEND);
jero-boot/jero-boot-module-system/src/main/resources/application-dev.yml
+1 -1
View File
@@ -167,7 +167,7 @@ mybatis-plus:
table-underline: true
configuration:
# 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true
#jero专用配置
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+1 -1
View File
@@ -49,7 +49,7 @@ import java.util.stream.Collectors;
@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;
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+7 -7
View File
@@ -281,7 +281,7 @@
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import ${entityName}Modal from './modules/${entityName}Modal'
<#list subTables as sub>
import ${sub.entityName}SubTable from './subTables/${sub.entityName}SubTable'
@@ -290,7 +290,7 @@
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
</#if>
<#if query_field_date>
import JDate from '@/components/jeecg/JDate.vue'
import JDate from '@/components/jero/JDate.vue'
</#if>
<#if list_need_dict>
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
@@ -299,10 +299,10 @@
import { loadCategoryData } from '@/api/api'
</#if>
<#if query_sel_user>
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JSelectUserByDep from '@/components/jerobiz/JSelectUserByDep'
</#if>
<#if query_sel_dep>
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectDepart from '@/components/jerobiz/JSelectDepart'
</#if>
<#if query_sel_multi>
import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
@@ -311,16 +311,16 @@
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
</#if>
<#if query_field_pca>
import JAreaLinkage from '@comp/jeecg/JAreaLinkage'
import JAreaLinkage from '@comp/jero/JAreaLinkage'
</#if>
<#if query_sel_cat>
import JCategorySelect from '@comp/jeecg/JCategorySelect'
import JCategorySelect from '@comp/jero/JCategorySelect'
</#if>
import '@/assets/less/TableExpand.less'
export default {
name: '${entityName}List',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
${entityName}Modal,
<#list subTables as sub>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
+1 -1
View File
@@ -99,7 +99,7 @@
import pick from 'lodash.pick'
import { getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JFormContainer from '@/components/Jero/JFormContainer'
export default {
name: '${sub.entityName}Form',
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+2 -2
View File
@@ -110,11 +110,11 @@
<script>
import '@/assets/less/TableExpand.less'
import ${entityName}Modal from './modules/${entityName}Modal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
export default {
name: "${entityName}List",
mixins:[JeecgListMixin],
mixins:[JeroListMixin],
components: {
${entityName}Modal
},
jero-boot/jero-boot-starter/jero-boot-starter-job/src/main/java/com/jero/boot/starter/job/config/XxlJobConfiguration.java
+1 -1
View File
@@ -18,7 +18,7 @@ import org.springframework.context.annotation.Configuration;
@Slf4j
@Configuration
@EnableConfigurationProperties(value = XxlJobProperties.class)
@ConditionalOnProperty(value = "jeecg.xxljob.enabled", havingValue = "true", matchIfMissing = true)
@ConditionalOnProperty(value = "jero.xxljob.enabled", havingValue = "true", matchIfMissing = true)
public class XxlJobConfiguration {
jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/java/com/jero/JeroGatewayApplication.java
+1 -1
View File
@@ -12,7 +12,7 @@ import org.springframework.context.ConfigurableApplicationContext;
public class JeroGatewayApplication {
public static void main(String[] args) {
ConfigurableApplicationContext applicationContext = SpringApplication.run(JeroGatewayApplication.class, args);
String userName = applicationContext.getEnvironment().getProperty("jeecg.test");
String userName = applicationContext.getEnvironment().getProperty("jero.test");
System.err.println("user name :" +userName);
}
}