把jeecg字样修改为jero

jero-boot/README.md

@@ -99,7 +99,7 @@ QueryWrapper<?> queryWrapper = QueryGenerator.initQueryWrapper(?, req.getParamet
 
 > 功能说明：   一键生成的代码（包括：controller、service、dao、mapper、entity、vue）
  
- - 模板位置： src/main/resources/jeecg/code-template
+ - 模板位置： src/main/resources/jero/code-template
  - 技术文档： http://doc.jeecg.com/2043916
 
 

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java

@@ -34,7 +34,6 @@ import java.util.Date;
  * 系统日志，切面处理类
  *
  * @Author scott
- * @email jeecgos@163.com
  * @Date 2018年1月14日
  */
 @Aspect

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/Swagger2Config.java

@@ -110,7 +110,7 @@ public class Swagger2Config implements WebMvcConfigurer {
                 // 描述
                 .description("后台API接口")
                 // 作者
-                .contact("JEECG团队")
+                .contact("JERO团队")
                 .license("The Apache License, Version 2.0")
                 .licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html")
                 .build();

jero-boot/jero-boot-module-demo/src/main/java/com/jero/JeroDemoCloudApplication.java

@@ -1,14 +0,0 @@
-//package com.jero;
-//
-//import org.springframework.boot.SpringApplication;
-//import org.springframework.boot.autoconfigure.SpringBootApplication;
-//import org.springframework.cloud.openfeign.EnableFeignClients;
-//
-//@SpringBootApplication
-//@EnableFeignClients
-//public class JeroDemoCloudApplication {
-//
-//    public static void main(String[] args) {
-//        SpringApplication.run(JeroDemoCloudApplication.class, args);
-//    }
-//}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/ngalain/service/impl/NgAlainServiceImpl.java

@@ -31,13 +31,13 @@ public class NgAlainServiceImpl implements NgAlainService {
         JSONArray jsonArray = new JSONArray();
         getPermissionJsonArray(jsonArray, metaList, null);
         JSONArray menulist= parseNgAlain(jsonArray);
-        JSONObject jeecgMenu = new JSONObject();
+        JSONObject menu = new JSONObject();
-        jeecgMenu.put("text", "jeecg菜单");
+        menu.put("text", "jero菜单");
-        jeecgMenu.put("group",true);
+        menu.put("group",true);
-        jeecgMenu.put("children", menulist);
+        menu.put("children", menulist);
-        JSONArray jeecgMenuList=new JSONArray();
+        JSONArray jeroMenuList=new JSONArray();
-        jeecgMenuList.add(jeecgMenu);
+        jeroMenuList.add(menu);
-        return jeecgMenuList;
+        return jeroMenuList;
     }
 
     @Override

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -221,7 +221,7 @@
 
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { JeroListMixin } from '@/mixins/JeroListMixin'
   import ${entityName}Modal from './modules/${entityName}Modal'
   <#if bpm_flag>
   import { postAction } from '@/api/manage'
@@ -238,7 +238,7 @@
 
   export default {
     name: '${entityName}List',
-    mixins:[JeecgListMixin, mixinDevice],
+    mixins:[JeroListMixin, mixinDevice],
     components: {
       ${entityName}Modal
     },

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -200,7 +200,7 @@
 
 <script>
 
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { JeroListMixin } from '@/mixins/JeroListMixin'
   import ${entityName}Modal from './modules/${entityName}Modal'
   import { getAction } from '@/api/manage'
   <#list subTables as sub>
@@ -219,7 +219,7 @@
 
   export default {
     name: "${entityName}List",
-    mixins:[JeecgListMixin],
+    mixins:[JeroListMixin],
     components: {
       <#list subTables as sub>
       ${sub.entityName}List,

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei

@@ -82,12 +82,12 @@
 
 <script>
 
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { JeroListMixin } from '@/mixins/JeroListMixin'
   import ${sub.entityName}Modal from './modules/${sub.entityName}Modal'
 
   export default {
     name: "${sub.entityName}List",
-    mixins:[JeecgListMixin],
+    mixins:[JeroListMixin],
     components: { ${sub.entityName}Modal },
     props:{
       mainId:{

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/subTables/[1-n]SubTable.vuei

@@ -42,11 +42,11 @@
 
 <script>
   import { getAction } from '@api/manage'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { JeroListMixin } from '@/mixins/JeroListMixin'
 
   export default {
     name: '${sub.entityName}SubTable',
-    mixins: [JeecgListMixin],
+    mixins: [JeroListMixin],
     props: {
       record: {
         type: Object,

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -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
     },

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei

@@ -146,10 +146,10 @@
   import pick from 'lodash.pick'
   import { getAction } from '@/api/manage'
   import { JVxeTableMixin } from '@/mixins/JVxeTableMixin.js'
-  import { JVXETypes } from '@/components/jeecg/JVxeTable'
+  import { JVXETypes } from '@/components/jero/JVxeTable'
-  import { getRefPromise} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
+  import { getRefPromise} from '@/components/jero/JVxeTable/utils/vxeUtils.js'
   import { validateDuplicateValue } from '@/utils/util'
-  import JFormContainer from '@/components/jeecg/JFormContainer'
+  import JFormContainer from '@/components/jero/JFormContainer'
   <#list subTables as sub>
   <#if sub.foreignRelationType =='1'>
   import ${sub.entityName}Form from './${sub.entityName}Form.vue'

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei

@@ -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-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -198,7 +198,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'
@@ -213,7 +213,7 @@
 
   export default {
     name: "${entityName}List",
-    mixins:[JeecgListMixin],
+    mixins:[JeroListMixin],
     components: {
       ${entityName}Modal
     },

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai

@@ -49,7 +49,7 @@ import com.jero.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;
 	

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei

@@ -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-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -92,12 +92,12 @@
 
 <script>
 
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { JeroListMixin } from '@/mixins/JeroListMixin'
   import ${entityName}Modal from './modules/${entityName}Modal'
 
   export default {
     name: "${entityName}List",
-    mixins: [JeecgListMixin],
+    mixins: [JeroListMixin],
     components: {
       ${entityName}Modal
     },

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -97,7 +97,7 @@
 </template>
 
 <script>
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { JeroListMixin } from '@/mixins/JeroListMixin'
   import ${entityName}Modal from './modules/${entityName}Modal'
   import {deleteAction} from '@/api/manage'
   <#list subTables as sub><#rt/>
@@ -107,7 +107,7 @@
 
   export default {
     name: "${entityName}List",
-    mixins: [JeecgListMixin],
+    mixins: [JeroListMixin],
     components: {
       ${entityName}Modal,
     <#list subTables as sub><#rt/>

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei

@@ -69,12 +69,12 @@
 
 <script>
   import ${subTab.entityName}Modal from './modules/${subTab.entityName}Modal'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import {JeroListMixin} from '@/mixins/JeroListMixin'
   import {getAction} from '@/api/manage'
 
   export default {
     name: "${subTab.entityName}List",
-    mixins: [JeecgListMixin],
+    mixins: [JeroListMixin],
     components: {
       ${subTab.entityName}Modal,
     },

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -35,7 +35,7 @@
 
 <script>
   import {httpAction} from '@/api/manage'
-  import JDate from '@/components/jeecg/JDate'
+  import JDate from '@/components/jero/JDate'
   import pick from 'lodash.pick'
   import moment from "moment"
 

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei

@@ -49,7 +49,7 @@
   import {httpAction} from '@/api/manage'
   import pick from 'lodash.pick'
   import moment from 'moment'
-  import JDate from '@/components/jeecg/JDate'
+  import JDate from '@/components/jero/JDate'
 
   export default {
     components: {

jero-boot/jero-boot-module-system/src/main/resources/jero/jero_config.properties

@@ -13,7 +13,7 @@ source_root_package=src.main.java
 webroot_package=src.main.webapp
 
 #ftl resource url
-templatepath=/jeecg/code-template
+templatepath=/jero/code-template
 system_encoding=utf-8
 
 #db Table id [User defined] 

jero-boot/jero-boot-module-system/src/main/resources/jero/jero_database.properties

@@ -14,14 +14,14 @@ database_name=jero-boot
 
 #postgre
 #diver_name=org.postgresql.Driver
-#url=jdbc:postgresql://localhost:5432/jeecg
+#url=jdbc:postgresql://localhost:5432/jero
 #username=postgres
 #password=postgres
 #database_name=jeecg
 
 #SQLServer2005\u4ee5\u4e0a
 #diver_name=org.hibernate.dialect.SQLServerDialect
-#url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=jeecg
+#url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=jero
 #username=sa
 #password=SA
-#database_name=jeecg
+#database_name=jero

jero-boot/jero-boot-module-system/src/main/resources/logback-spring.xml

@@ -17,7 +17,7 @@
 	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
 			<!--日志文件输出的文件名 -->
-			<FileNamePattern>${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+			<FileNamePattern>${LOG_HOME}/jeroboot-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
 			<!--日志文件保留天数 -->
 			<MaxHistory>30</MaxHistory>
 			<maxFileSize>10MB</maxFileSize>
@@ -47,7 +47,7 @@
 	<appender name="FILE_HTML" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
 			<!--日志文件输出的文件名 -->
-			<FileNamePattern>${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.html</FileNamePattern>
+			<FileNamePattern>${LOG_HOME}/jeroboot-%d{yyyy-MM-dd}.%i.html</FileNamePattern>
 			<!--日志文件保留天数 -->
 			<MaxHistory>30</MaxHistory>
 			<MaxFileSize>10MB</MaxFileSize>

jero-boot/jero-boot-module-system/src/test/java/com/jero/SampleTest.java

@@ -1,65 +0,0 @@
-//package com.jero;
-//
-//import com.jero.modules.demo.mock.MockController;
-//import com.jero.modules.demo.test.entity.JeroDemo;
-//import com.jero.modules.demo.test.mapper.JeroDemoMapper;
-//import com.jero.modules.demo.test.service.IJeroDemoService;
-//import org.junit.Assert;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
-//
-//import javax.annotation.Resource;
-//import java.util.List;
-//
-//@RunWith(SpringRunner.class)
-//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
-//public class SampleTest {
-//
-//	@Resource
-//	private JeroDemoMapper JeroDemoMapper;
-//	@Resource
-//	private IJeroDemoService JeroDemoService;
-////	@Resource
-////	private ISysDataLogService sysDataLogService;
-//	@Resource
-//	private MockController mock;
-//
-//	@Test
-//	public void testSelect() {
-//		System.out.println(("----- selectAll method test ------"));
-//		List<JeroDemo> userList = JeroDemoMapper.selectList(null);
-//		Assert.assertEquals(5, userList.size());
-//		userList.forEach(System.out::println);
-//	}
-//
-//	@Test
-//	public void testXmlSql() {
-//		System.out.println(("----- selectAll method test ------"));
-//		List<JeroDemo> userList = JeroDemoMapper.getDemoByName("Sandy12");
-//		userList.forEach(System.out::println);
-//	}
-//
-//	/**
-//	 * 测试事务
-//	 */
-//	@Test
-//	public void testTran() {
-//		JeroDemoService.testTran();
-//	}
-//
-//	//author:lvdandan-----date：20190315---for:添加数据日志测试----
-//	/**
-//	 * 测试数据日志添加
-//	 */
-////	@Test
-////	public void testDataLogSave() {
-////		System.out.println(("----- datalog test ------"));
-////		String tableName = "jero_demo";
-////		String dataId = "4028ef81550c1a7901550c1cd6e70001";
-////		String dataContent = mock.sysDataLogJson();
-////		sysDataLogService.addDataLog(tableName, dataId, dataContent);
-////	}
-//	//author:lvdandan-----date：20190315---for:添加数据日志测试----
-//}

jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-dev.yaml

@@ -77,8 +77,8 @@ spring:
         #是否支持重试
         retry:
           enabled: true
-#jeecg专用配置
+#jero专用配置
-jeecg :
+jero :
   # 本地：local\Minio：minio\阿里云：alioss
   uploadType: local
   path :
@@ -93,7 +93,7 @@ jeecg :
     endpoint: oss-cn-beijing.aliyuncs.com
     accessKey: ??
     secretKey: ??
-    bucketName: jeecgos
+    bucketName: jeroos
     staticDomain: ??
   # ElasticSearch 6设置
   elasticsearch:
@@ -135,7 +135,7 @@ 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:
@@ -161,8 +161,8 @@ knife4j:
   production: false
   basic:
     enable: false
-    username: jeecg
+    username: jero
-    password: jeecg1314
+    password: jero1314
 
 #第三方登录
 justauth:

jero-boot/jero-boot-starter/jero-boot-starter-job/src/main/java/com/jero/boot/starter/job/config/XxlJobConfiguration.java

@@ -12,8 +12,7 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * 定时任务配置
- *
+
- * @author jeecg
  */
 @Slf4j
 @Configuration

jero-boot/jero-boot-starter/jero-boot-starter-job/src/main/java/com/jero/boot/starter/job/prop/XxlJobProperties.java

@@ -4,7 +4,7 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @Data
-@ConfigurationProperties(prefix = "jeecg.xxljob")
+@ConfigurationProperties(prefix = "jero.xxljob")
 public class XxlJobProperties {
 
 

jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/enums/LockModel.java

@@ -2,7 +2,6 @@ package com.jero.boot.starter.lock.enums;
 
 /**
  * 锁的模式
- * @author jeecg
  */
 public enum LockModel {
     //可重入锁

jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/prop/RedissonProperties.java

@@ -11,7 +11,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @date 2020-11-11
  */
 @Data
-@ConfigurationProperties(prefix = "jeecg.redisson")
+@ConfigurationProperties(prefix = "jero.redisson")
 public class RedissonProperties {
 
     /**

jero-boot/jero-boot-starter/jero-boot-starter-rabbitmq/src/main/java/com/jero/boot/starter/rabbitmq/exchange/DelayExchangeBuilder.java

@@ -15,11 +15,11 @@ public class DelayExchangeBuilder {
     /**
      * 默认延迟消息交换器
      */
-    public final static  String DEFAULT_DELAY_EXCHANGE = "jeecg.delayed.exchange";
+    public final static  String DEFAULT_DELAY_EXCHANGE = "jero.delayed.exchange";
     /**
      * 普通交换器
      */
-    public final static  String DELAY_EXCHANGE = "jeecg.direct.exchange";
+    public final static  String DELAY_EXCHANGE = "jero.direct.exchange";
 
     /**
      * 构建延迟消息交换器

jero-boot/jero-boot-starter/jero-boot-starter-redis/src/main/java/com/jero/boot/starter/redis/config/RedisConfiguration.java

@@ -24,7 +24,6 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 /**
  * redis配置
  *
- * @author jeecg
  */
 @Slf4j
 @Configuration

jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/java/com/jero/JeroSystemCloudApplication.java

@@ -16,7 +16,7 @@ import java.net.UnknownHostException;
 
 /**
  * 微服务启动类（采用此类启动项目为微服务模式）
- *  注意： 需要先在naocs里面创建配置文件，参考文档 http://doc.jeecg.com/2043906
+ *  注意： 需要先在naocs里面创建配置文件，参考文档 xxx
  */
 @Slf4j
 @SpringBootApplication