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/IBIZBOOK.java

@@ -134,6 +134,22 @@ public class IBIZBOOK extends EntityMP implements Serializable {
     @JSONField(name = "subtext")
     @JsonProperty("subtext")
     private String subtext;
+    /**
+     * 借出日期
+     */
+    @TableField(value = "lendouttime")
+    @JsonFormat(pattern = "yyyy-MM-dd", locale = "zh", timezone = "GMT+8")
+    @JSONField(name = "lendouttime", format = "yyyy-MM-dd")
+    @JsonProperty("lendouttime")
+    private Timestamp lendouttime;
+    /**
+     * 归还日期
+     */
+    @TableField(value = "returntime")
+    @JsonFormat(pattern = "yyyy-MM-dd", locale = "zh", timezone = "GMT+8")
+    @JSONField(name = "returntime", format = "yyyy-MM-dd")
+    @JsonProperty("returntime")
+    private Timestamp returntime;
 
 
 
@@ -193,6 +209,42 @@ public class IBIZBOOK extends EntityMP implements Serializable {
         this.modify("subtext", subtext);
     }
 
+    /**
+     * 设置 [借出日期]
+     */
+    public void setLendouttime(Timestamp lendouttime) {
+        this.lendouttime = lendouttime;
+        this.modify("lendouttime", lendouttime);
+    }
+
+    /**
+     * 格式化日期 [借出日期]
+     */
+    public String formatLendouttime() {
+        if (this.lendouttime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(lendouttime);
+    }
+    /**
+     * 设置 [归还日期]
+     */
+    public void setReturntime(Timestamp returntime) {
+        this.returntime = returntime;
+        this.modify("returntime", returntime);
+    }
+
+    /**
+     * 格式化日期 [归还日期]
+     */
+    public String formatReturntime() {
+        if (this.returntime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(returntime);
+    }
 
     /**
      * 复制当前对象数据到目标对象(粘贴重置)

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 = "author", source = "author"),
-        @Mapping(target = "price", source = "price"),
         @Mapping(target = "booknumber", source = "booknumber"),
         @Mapping(target = "createman", source = "createman"),
+        @Mapping(target = "type", source = "type"),
         @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 = "updatedate", source = "updatedate"),
     })
     @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 = "ordertype", source = "ordertype"),
-        @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"),
     })
     @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-311-2">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-315-2">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -55,6 +55,10 @@
                 </column>
                 <column name="SUBTEXT" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="LENDOUTTIME" remarks="" type="DATETIME">
+                </column>
+                <column name="RETURNTIME" remarks="" type="DATETIME">
+                </column>
         </createTable>
     </changeSet>
 

demo-core/src/main/resources/mapper/sample/ibizbook/IBIZBOOKMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="IBIZBOOKResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`PRESS`, t1.`PRICE`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  ) t1 where ibizbookid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNTIME`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  ) t1 where ibizbookid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`PRESS`, t1.`PRICE`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  
+		<![CDATA[ SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNTIME`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`PRESS`, t1.`PRICE`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  
+		<![CDATA[ SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNTIME`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  
 			]]>
     </sql>
 </mapper>

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

@@ -331,6 +331,32 @@
     "key_field":0,
     "show_order":1000,
     "major_field":0
+    },
+    {
+    "fieldname":"LENDOUTTIME" ,
+    "codename":"Lendouttime",
+    "field_logic_name":"借出日期",
+    "entity_name":"IBIZBOOK",
+    "field_type":"DATE",
+    "nullable":0,
+    "physical_field":1,
+    "data_type":"DATETIME",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"RETURNTIME" ,
+    "codename":"Returntime",
+    "field_logic_name":"归还日期",
+    "entity_name":"IBIZBOOK",
+    "field_type":"DATE",
+    "nullable":0,
+    "physical_field":1,
+    "data_type":"DATETIME",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
     }
     ],
     "subEntitys":[

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/IBIZBOOKDTO.java

@@ -136,6 +136,26 @@ public class IBIZBOOKDTO extends DTOBase implements Serializable {
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
     private String subtext;
 
+    /**
+     * 属性 [LENDOUTTIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "lendouttime" , format="yyyy-MM-dd")
+    @JsonProperty("lendouttime")
+    @NotNull(message = "[借出日期]不允许为空!")
+    private Timestamp lendouttime;
+
+    /**
+     * 属性 [RETURNTIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "returntime" , format="yyyy-MM-dd")
+    @JsonProperty("returntime")
+    @NotNull(message = "[归还日期]不允许为空!")
+    private Timestamp returntime;
+
 
     /**
      * 设置 [IBIZBOOKNAME]
@@ -193,6 +213,22 @@ public class IBIZBOOKDTO extends DTOBase implements Serializable {
         this.modify("subtext",subtext);
     }
 
+    /**
+     * 设置 [LENDOUTTIME]
+     */
+    public void setLendouttime(Timestamp  lendouttime){
+        this.lendouttime = lendouttime ;
+        this.modify("lendouttime",lendouttime);
+    }
+
+    /**
+     * 设置 [RETURNTIME]
+     */
+    public void setReturntime(Timestamp  returntime){
+        this.returntime = returntime ;
+        this.modify("returntime",returntime);
+    }
+
 
 }