Mosher 发布系统代码 [后台服务，演示应用]

app_Web/public/assets/json/view-config.json

@@ -687,6 +687,14 @@
         "viewname": "IBIZOrderF10EditView",
         "viewtag": "ad37d44e57c18e4431a609968203c646"
     },
+    "ibizbooklistview": {
+        "title": "图书列表视图",
+        "caption": "图书",
+        "viewtype": "DELISTVIEW",
+        "viewmodule": "Sample",
+        "viewname": "IBIZBOOKListView",
+        "viewtag": "b038c48269316664e5b48380a879fd99"
+    },
     "ibizsample0001sf6editview": {
         "title": "示例实体01编辑视图(编辑器扩展)",
         "caption": "示例实体01编辑视图(编辑器扩展)",

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts

@@ -30,6 +30,10 @@ export default {
 			caption: "图书",
       		title: "图书表格视图（当前页本地聚合）",
 		},
+		listview: {
+			caption: "图书",
+      		title: "图书列表视图",
+		},
 		editview: {
 			caption: "图书",
       		title: "图书编辑视图",
@@ -197,6 +201,11 @@ export default {
 		uiactions: {
 		},
 	},
+	mob_list: {
+		nodata:"",
+		uiactions: {
+		},
+	},
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
@@ -557,4 +566,6 @@ export default {
 	},
 	usr3gridviewtoolbar_toolbar: {
 	},
+	listviewtoolbar_toolbar: {
+	},
 };
\ No newline at end of file

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts

@@ -29,6 +29,10 @@ export default {
 			caption: "图书",
       		title: "图书表格视图（当前页本地聚合）",
 		},
+		listview: {
+			caption: "图书",
+      		title: "图书列表视图",
+		},
 		editview: {
 			caption: "图书",
       		title: "图书编辑视图",
@@ -196,6 +200,11 @@ export default {
 		uiactions: {
 		},
 	},
+	mob_list: {
+		nodata:"",
+		uiactions: {
+		},
+	},
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
@@ -556,4 +565,6 @@ export default {
 	},
 	usr3gridviewtoolbar_toolbar: {
 	},
+	listviewtoolbar_toolbar: {
+	},
 };
\ No newline at end of file

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -695,6 +695,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBIZOrderF10EditView",
             "viewtag": "ad37d44e57c18e4431a609968203c646"
         },
+        "ibizbooklistview": {
+            "title": "图书列表视图",
+            "caption": "图书",
+            "viewtype": "DELISTVIEW",
+            "viewmodule": "Sample",
+            "viewname": "IBIZBOOKListView",
+            "viewtag": "b038c48269316664e5b48380a879fd99"
+        },
         "ibizsample0001sf6editview": {
             "title": "示例实体01编辑视图(编辑器扩展)",
             "caption": "示例实体01编辑视图(编辑器扩展)",

app_Web/src/uiservice/ibizbook/ibizbook-ui-service-base.ts

@@ -100,6 +100,7 @@ export default class IBIZBOOKUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'valuerulesgridview',srfappde:'ibizbooks',component:'ibizbookvalue-rules-grid-view'});
         this.allViewMap.set(':',{viewname:'usr5gridview',srfappde:'ibizbooks',component:'ibizbookusr5-grid-view'});
         this.allViewMap.set(':',{viewname:'usr4gridview',srfappde:'ibizbooks',component:'ibizbookusr4-grid-view'});
+        this.allViewMap.set(':',{viewname:'listview',srfappde:'ibizbooks',component:'ibizbooklist-view'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'ibizbooks',component:'ibizbookedit-view'});
         this.allViewMap.set(':',{viewname:'roweditgridview',srfappde:'ibizbooks',component:'ibizbookrow-edit-grid-view'});
         this.allViewMap.set(':',{viewname:'usr3gridview',srfappde:'ibizbooks',component:'ibizbookusr3-grid-view'});

app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-base.vue

@@ -1068,12 +1068,12 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main2-grid/main2-grid-base.vue

@@ -1079,12 +1079,12 @@ export default class Main2Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main3-grid/main3-grid-base.vue

@@ -1079,12 +1079,12 @@ export default class Main3Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main4-grid/main4-grid-base.vue

@@ -1091,12 +1091,12 @@ export default class Main4Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main5-grid/main5-grid-base.vue

@@ -1107,12 +1107,12 @@ export default class Main5Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue

@@ -1206,12 +1206,12 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue

@@ -1214,12 +1214,12 @@ export default class RowEditBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue

@@ -1172,12 +1172,12 @@ export default class RowRulesBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/update-default-grid/update-default-grid-base.vue

@@ -1206,12 +1206,12 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 demosys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd demosys/
-      mvn clean package -Pweb
-      cd demo-app/demo-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-app-web.yaml iBizDemo --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

demo-app/demo-app-web/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-app-web.jar
 
-EXPOSE 51001
+EXPOSE 8080
 
 ADD demo-app-web.jar /demo-app-web.jar

demo-app/demo-app-web/src/main/docker/demo-app-web.yaml

@@ -3,24 +3,9 @@ services:
   demo-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
     ports:
-      - "51001:51001"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51001
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-      - SPRING_DATASOURCE_PASSWORD=3d6@460A
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZBOOKDataImport.java

@@ -8,11 +8,11 @@ import java.util.List;
 public interface IBIZBOOKDataImport {
     @Mappings({
         @Mapping(target = "ibizbookid", source = "ibizbookid"),
-        @Mapping(target = "type", source = "type"),
         @Mapping(target = "press", source = "press"),
         @Mapping(target = "author", source = "author"),
         @Mapping(target = "price", source = "price"),
         @Mapping(target = "ibizbookname", source = "ibizbookname"),
+        @Mapping(target = "type", source = "type"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZBOOK toDomain(IBIZBOOK entity);

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZOrderImport.java

@@ -8,10 +8,10 @@ import java.util.List;
 public interface IBIZOrderImport {
     @Mappings({
         @Mapping(target = "ibizorderid", source = "ibizorderid"),
-        @Mapping(target = "ordertime", source = "ordertime"),
-        @Mapping(target = "orderuid", source = "orderuid"),
         @Mapping(target = "ibizordername", source = "ibizordername"),
         @Mapping(target = "ordertype", source = "ordertype"),
+        @Mapping(target = "ordertime", source = "ordertime"),
+        @Mapping(target = "orderuid", source = "orderuid"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZOrder toDomain(IBIZOrder entity);

demo-core/src/main/resources/liquibase/h2_table.xml

@@ -28,7 +28,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-157-2">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-160-2">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>

demo-provider/demo-provider-demoapi/src/main/java/cn/ibizlab/demoapi/rest/IBIZCustomer_INTFResource.java

@@ -50,7 +50,7 @@ public class IBIZCustomer_INTFResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','DemoSys-IBIZCustomer_INTF-searchCurCustomer-all') and hasPermission(#context,'DemoSys-IBIZCustomer_INTF-Get')")
 	@ApiOperation(value = "获取CurCustomer", tags = {"客户" } ,notes = "获取CurCustomer")
     @RequestMapping(method= RequestMethod.POST , value="/ibizcustomer_intfs/fetchcurcustomer")
-	public ResponseEntity<List<IBIZCustomer_INTFDTO>> fetchCurCustomer(IBIZCustomer_INTFSearchContext context) {
+	public ResponseEntity<List<IBIZCustomer_INTFDTO>> fetchCurCustomer(@RequestBody IBIZCustomer_INTFSearchContext context) {
         Page<IBIZCustomer_INTF> domains = ibizcustomer_intfService.searchCurCustomer(context) ;
         List<IBIZCustomer_INTFDTO> list = ibizcustomer_intfMapping.toDto(domains.getContent());
         return ResponseEntity.status(HttpStatus.OK)