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

把jeecg字样修改为jero

Browse Source
This commit is contained in:
zeroBlack
2021-03-13 10:44:32 +08:00
parent 823866b7d1
commit 43272ce875
33 changed files with 58 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/ngalain/service/impl/NgAlainServiceImpl.java
+7 -7
View File
@@ -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();
jeecgMenu.put("text", "jeecg菜单");
jeecgMenu.put("group",true);
jeecgMenu.put("children", menulist);
JSONArray jeecgMenuList=new JSONArray();
jeecgMenuList.add(jeecgMenu);
return jeecgMenuList;
JSONObject menu = new JSONObject();
menu.put("text", "jero菜单");
menu.put("group",true);
menu.put("children", menulist);
JSONArray jeroMenuList=new JSONArray();
jeroMenuList.add(menu);
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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+3 -3
View File
@@ -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 { getRefPromise} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
import { JVXETypes } from '@/components/jero/JVxeTable'
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
+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-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+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-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+2 -2
View File
@@ -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>