ShineKOT 部署微服务接口 [后台服务，接口示例]

config.xml

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

demo-core/src/main/java/cn/ibizlab/core/sample/domain/IBIZAPPEDITOR.java

@@ -114,26 +114,12 @@ public class IBIZAPPEDITOR extends EntityMP implements Serializable {
     @JsonProperty("documentaddress")
     private String documentaddress;
     /**
-     * 内置编辑器数量
+     * 数量
      */
-    @TableField(value = "inbuilteditoramount")
-    @JSONField(name = "inbuilteditoramount")
-    @JsonProperty("inbuilteditoramount")
-    private Integer inbuilteditoramount;
-    /**
-     * 扩展编辑器数量
-     */
-    @TableField(value = "expandeditoramount")
-    @JSONField(name = "expandeditoramount")
-    @JsonProperty("expandeditoramount")
-    private Integer expandeditoramount;
-    /**
-     * 合计数量
-     */
-    @TableField(value = "totalamount")
-    @JSONField(name = "totalamount")
-    @JsonProperty("totalamount")
-    private Integer totalamount;
+    @TableField(value = "amount")
+    @JSONField(name = "amount")
+    @JsonProperty("amount")
+    private Integer amount;
 
 
 
@@ -170,27 +156,11 @@ public class IBIZAPPEDITOR extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [内置编辑器数量]
-     */
-    public void setInbuilteditoramount(Integer inbuilteditoramount) {
-        this.inbuilteditoramount = inbuilteditoramount;
-        this.modify("inbuilteditoramount", inbuilteditoramount);
-    }
-
-    /**
-     * 设置 [扩展编辑器数量]
-     */
-    public void setExpandeditoramount(Integer expandeditoramount) {
-        this.expandeditoramount = expandeditoramount;
-        this.modify("expandeditoramount", expandeditoramount);
-    }
-
-    /**
-     * 设置 [合计数量]
+     * 设置 [数量]
      */
-    public void setTotalamount(Integer totalamount) {
-        this.totalamount = totalamount;
-        this.modify("totalamount", totalamount);
+    public void setAmount(Integer amount) {
+        this.amount = amount;
+        this.modify("amount", amount);
     }
 
 

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

@@ -8,16 +8,16 @@ import java.util.List;
 public interface IBIZBOOKDataImport {
     @Mappings({
         @Mapping(target = "ibizbookid", source = "ibizbookid"),
-        @Mapping(target = "press", source = "press"),
-        @Mapping(target = "author", source = "author"),
-        @Mapping(target = "price", source = "price"),
-        @Mapping(target = "booknumber", source = "booknumber"),
-        @Mapping(target = "createman", source = "createman"),
         @Mapping(target = "createdate", source = "createdate"),
         @Mapping(target = "ibizbookname", source = "ibizbookname"),
         @Mapping(target = "updateman", source = "updateman"),
         @Mapping(target = "updatedate", source = "updatedate"),
         @Mapping(target = "type", source = "type"),
+        @Mapping(target = "press", source = "press"),
+        @Mapping(target = "author", source = "author"),
+        @Mapping(target = "price", source = "price"),
+        @Mapping(target = "booknumber", source = "booknumber"),
+        @Mapping(target = "createman", source = "createman"),
     })
     @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 = "ibizordername", source = "ibizordername"),
         @Mapping(target = "ordertype", source = "ordertype"),
         @Mapping(target = "ordertime", source = "ordertime"),
         @Mapping(target = "orderuid", source = "orderuid"),
+        @Mapping(target = "ibizordername", source = "ibizordername"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZOrder toDomain(IBIZOrder entity);

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[IBIZAPPCTRL]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizappctrl-44-1">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizappctrl-47-1">
         <createTable tableName="T_IBIZAPPCTRL">
                 <column name="IBIZAPPCTRLNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -32,7 +32,7 @@
 
 
     <!--输出实体[IBIZAPPEDITOR]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizappeditor-48-2">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizappeditor-62-2">
         <createTable tableName="T_IBIZAPPEDITOR">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -53,18 +53,14 @@
                 </column>
                 <column name="DOCUMENTADDRESS" remarks="" type="VARCHAR(100)">
                 </column>
-                <column name="INBUILTEDITORAMOUNT" remarks="" type="INT">
-                </column>
-                <column name="EXPANDEDITORAMOUNT" remarks="" type="INT">
-                </column>
-                <column name="TOTALAMOUNT" remarks="" type="INT">
+                <column name="AMOUNT" remarks="" type="INT">
                 </column>
         </createTable>
     </changeSet>
 
 
     <!--输出实体[IBIZAPPVIEW]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizappview-38-3">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizappview-40-3">
         <createTable tableName="T_IBIZAPPVIEW">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -118,7 +114,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-859-5">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-872-5">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>

demo-core/src/main/resources/mapper/sample/ibizappeditor/IBIZAPPEDITORMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="IBIZAPPEDITORResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DOCUMENTADDRESS`, t1.`EXPANDEDITORAMOUNT`, t1.`IBIZAPPEDITORID`, t1.`IBIZAPPEDITORNAME`, t1.`IBIZAPPEDITORTYPE`, t1.`INBUILTEDITORAMOUNT`, t1.`RDITORDESCRIPTION`, t1.`TOTALAMOUNT`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZAPPEDITOR` t1  ) t1 where ibizappeditorid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`AMOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DOCUMENTADDRESS`, t1.`IBIZAPPEDITORID`, t1.`IBIZAPPEDITORNAME`, t1.`IBIZAPPEDITORTYPE`, t1.`RDITORDESCRIPTION`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZAPPEDITOR` t1  ) t1 where ibizappeditorid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DOCUMENTADDRESS`, t1.`EXPANDEDITORAMOUNT`, t1.`IBIZAPPEDITORID`, t1.`IBIZAPPEDITORNAME`, t1.`IBIZAPPEDITORTYPE`, t1.`INBUILTEDITORAMOUNT`, t1.`RDITORDESCRIPTION`, t1.`TOTALAMOUNT`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZAPPEDITOR` t1  
+		<![CDATA[ SELECT t1.`AMOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DOCUMENTADDRESS`, t1.`IBIZAPPEDITORID`, t1.`IBIZAPPEDITORNAME`, t1.`IBIZAPPEDITORTYPE`, t1.`RDITORDESCRIPTION`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZAPPEDITOR` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DOCUMENTADDRESS`, t1.`EXPANDEDITORAMOUNT`, t1.`IBIZAPPEDITORID`, t1.`IBIZAPPEDITORNAME`, t1.`IBIZAPPEDITORTYPE`, t1.`INBUILTEDITORAMOUNT`, t1.`RDITORDESCRIPTION`, t1.`TOTALAMOUNT`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZAPPEDITOR` t1  
+		<![CDATA[ SELECT t1.`AMOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DOCUMENTADDRESS`, t1.`IBIZAPPEDITORID`, t1.`IBIZAPPEDITORNAME`, t1.`IBIZAPPEDITORTYPE`, t1.`RDITORDESCRIPTION`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZAPPEDITOR` t1  
 			]]>
     </sql>
 </mapper>

demo-core/src/main/resources/sysmodel/DemoSys.json

@@ -310,36 +310,9 @@
     "major_field":0
     },
     {
-    "fieldname":"INBUILTEDITORAMOUNT" ,
-    "codename":"Inbuilteditoramount",
-    "field_logic_name":"内置编辑器数量",
-    "entity_name":"IBIZAPPEDITOR",
-    "field_type":"INT",
-    "nullable":1,
-    "physical_field":1,
-    "data_type":"INT",
-    "data_length":100,
-    "key_field":0,
-    "show_order":1000,
-    "major_field":0
-    },
-    {
-    "fieldname":"EXPANDEDITORAMOUNT" ,
-    "codename":"Expandeditoramount",
-    "field_logic_name":"扩展编辑器数量",
-    "entity_name":"IBIZAPPEDITOR",
-    "field_type":"INT",
-    "nullable":1,
-    "physical_field":1,
-    "data_type":"INT",
-    "key_field":0,
-    "show_order":1000,
-    "major_field":0
-    },
-    {
-    "fieldname":"TOTALAMOUNT" ,
-    "codename":"Totalamount",
-    "field_logic_name":"合计数量",
+    "fieldname":"AMOUNT" ,
+    "codename":"Amount",
+    "field_logic_name":"数量",
     "entity_name":"IBIZAPPEDITOR",
     "field_type":"INT",
     "nullable":1,

demo-provider/demo-provider-demoapi/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-provider-demoapi.jar
 
-EXPOSE 8081
+EXPOSE 51000
 
 ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar

demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml

@@ -3,9 +3,24 @@ services:
   demo-provider-demoapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
     ports:
-      - "8081:8081"
+      - "51000:51000"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=51000
+      - 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-provider/demo-provider-demoapi/src/main/java/cn/ibizlab/demoapi/dto/IBIZAPPEDITORDTO.java

@@ -111,28 +111,12 @@ public class IBIZAPPEDITORDTO extends DTOBase implements Serializable {
     private String documentaddress;
 
     /**
-     * 属性 [INBUILTEDITORAMOUNT]
+     * 属性 [AMOUNT]
      *
      */
-    @JSONField(name = "inbuilteditoramount")
-    @JsonProperty("inbuilteditoramount")
-    private Integer inbuilteditoramount;
-
-    /**
-     * 属性 [EXPANDEDITORAMOUNT]
-     *
-     */
-    @JSONField(name = "expandeditoramount")
-    @JsonProperty("expandeditoramount")
-    private Integer expandeditoramount;
-
-    /**
-     * 属性 [TOTALAMOUNT]
-     *
-     */
-    @JSONField(name = "totalamount")
-    @JsonProperty("totalamount")
-    private Integer totalamount;
+    @JSONField(name = "amount")
+    @JsonProperty("amount")
+    private Integer amount;
 
 
     /**
@@ -168,27 +152,11 @@ public class IBIZAPPEDITORDTO extends DTOBase implements Serializable {
     }
 
     /**
-     * 设置 [INBUILTEDITORAMOUNT]
-     */
-    public void setInbuilteditoramount(Integer  inbuilteditoramount){
-        this.inbuilteditoramount = inbuilteditoramount ;
-        this.modify("inbuilteditoramount",inbuilteditoramount);
-    }
-
-    /**
-     * 设置 [EXPANDEDITORAMOUNT]
-     */
-    public void setExpandeditoramount(Integer  expandeditoramount){
-        this.expandeditoramount = expandeditoramount ;
-        this.modify("expandeditoramount",expandeditoramount);
-    }
-
-    /**
-     * 设置 [TOTALAMOUNT]
+     * 设置 [AMOUNT]
      */
-    public void setTotalamount(Integer  totalamount){
-        this.totalamount = totalamount ;
-        this.modify("totalamount",totalamount);
+    public void setAmount(Integer  amount){
+        this.amount = amount ;
+        this.modify("amount",amount);
     }