修改环境及配置

docker-compose-server.yml

@@ -12,12 +12,12 @@
 # 第二步：将此yml文件上传服务器，执行启动命令 docker-compose -f ./docker-compose-server.yml up
 version: '2'
 services:
-  eipsystem-mysql:
-    image: 1ar8696937.iok.la:22594/eipsystem-mysql:latest
+  oasystem-mysql:
+    image: 1ar8696937.iok.la:22594/oasystem-mysql:latest
     environment:
       MYSQL_ROOT_PASSWORD: gf^*i6%&9J83&(*kJ653F&L
     restart: always
-    container_name: eipsystem-mysql
+    container_name: oasystem-mysql
     command:
       --character-set-server=utf8mb4
       --collation-server=utf8mb4_general_ci
@@ -27,19 +27,19 @@ services:
     ports:
       - 24680:3306
 
-  eipsystem-redis:
+  oasystem-redis:
     image: redis:5.0
     ports:
       - 6666:6379
     restart: always
-    container_name: eipsystem-redis
+    container_name: oasystem-redis
 
-  eipsystem-system:
-    image: 1ar8696937.iok.la:22594/eipsystem-system:latest
+  oasystem-system:
+    image: 1ar8696937.iok.la:22594/oasystem-system:latest
     restart: always
-    container_name: eipsystem-system
+    container_name: oasystem-system
     volumes:
-      - /data/config:/eipsystem/config
+      - /data/config:/oasystem/config
     ports:
       - 8081:8081
 

docker-compose.yml

 version: '2'
 services:
-  eipsystem-mysql:
+  oasystem-mysql:
     build:
       context: ./db
     environment:
       MYSQL_ROOT_PASSWORD: gf^*i6%&9J83&(*kJ653F&L
     restart: always
-    container_name: eipsystem-mysql
-    image: eipsystem-mysql
+    container_name: oasystem-mysql
+    image: oasystem-mysql
     command:
       --character-set-server=utf8mb4
       --collation-server=utf8mb4_general_ci
@@ -17,19 +17,19 @@ services:
     ports:
       - 24680:3306
 
-  eipsystem-redis:
+  oasystem-redis:
     image: redis:5.0
     ports:
       - 6666:6379
     restart: always
-    container_name: eipsystem-redis
+    container_name: oasystem-redis
 
 
-  eipsystem-system:
+  oasystem-system:
     build:
       context: ./jeecg-boot-module-system
     restart: always
-    container_name: eipsystem-system
-    image: eipsystem-system
+    container_name: oasystem-system
+    image: oasystem-system
     ports:
       - 8081:8081
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/entity/kingdeejournal/KingdeeSaveJournal.java

@@ -11,12 +11,15 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+
 @Data
-@TableName("KingdeeSaveJournal")
+@TableName("kingdee_save_journal")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "KingdeeSaveJournal对象", description = "保存到金蝶-日志")
-public class KingdeeSaveJournal {
+@ApiModel(value = "kingdee_save_journal对象", description = "保存到金蝶-日志")
+public class KingdeeSaveJournal implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
      * 主键
      */

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/entity/kingdeejournal/KingdeeJournalSelect.java → jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/entity/kingdeejournal/KingdeeSelectJournal.java

@@ -11,12 +11,15 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+
 @Data
-@TableName("")
+@TableName("kingdee_select_journal")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "KingdeeSelectJournal对象", description = "查询金蝶-日志")
-public class KingdeeJournalSelect {
+@ApiModel(value = "kingdee_select_journal对象", description = "查询金蝶-日志")
+public class KingdeeSelectJournal implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
      * 主键
      */

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/entity/oajournal/OaSaveJournal.java

+package org.jeecg.modules.iost.API.entity.oajournal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 国网日志
+ * @Author: jeecg-boot
+ * @Date:   2021-07-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="对象", description="传入到OA-日志")
+public class OaSaveJournal implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**报错代码*/
+    private String code;
+    /**返回信息*/
+    private String message;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createtime;
+    //传入OA数据
+    private String requestjson;
+    //OA响应数据
+    private String responsejson;
+    /**数据同步:失败:0,成功:1*/
+    private Integer synchronization;
+    /**
+     * 是否已成功:失败:0,成功:1
+     */
+    private Integer successagain;
+    /**业务编号**/
+    private Integer businessNo;
+    // 传入的业务
+    private String businessName;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/entity/oajournal/OaSelectJournal.java

+package org.jeecg.modules.iost.API.entity.oajournal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 国网日志
+ * @Author: jeecg-boot
+ * @Date:   2021-07-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("oa_select_journal")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="对象", description="查询OA-日志")
+public class OaSelectJournal implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**报错代码*/
+    private String code;
+    /**返回信息*/
+    private String message;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createtime;
+    //传入OA数据
+    private String requestjson;
+    //OA响应数据
+    private String responsejson;
+    /**数据同步:失败:0,成功:1*/
+    private Integer synchronization;
+    /**
+     * 是否已成功:失败:0,成功:1
+     */
+    private Integer successagain;
+    /**业务编号**/
+    private Integer businessNo;
+    // 传入的业务
+    private String businessName;
+}

jeecg-boot-module-system/src/main/resources/application-docker.yml

 server:
-  localip:  119.29.114.197
   port: 8081
   tomcat:
     max-swallow-size: -1
@@ -128,7 +127,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://eipsystem-mysql:3306/wmssystem?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://oasystem-mysql:3306/oasystem?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: gf^*i6%&9J83&(*kJ653F&L
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -141,7 +140,7 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: eipsystem-redis
+    host: oasystem-redis
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制

jeecg-boot-module-system/src/main/resources/application-test.yml

 server:
-  localip: 192.168.2.209
   port: 8090
   tomcat:
     max-swallow-size: -1
@@ -132,7 +131,7 @@ spring:
 #            username: root
 #            password: root
 #            driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://localhost:3307/test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+            url: jdbc:mysql://localhost:3307/oasystem?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
             username: root
             password: root
             driver-class-name: com.mysql.cj.jdbc.Driver

jeecg-boot-module-system/src/main/resources/application.yml

 spring:
   profiles:
-    active: test
+    active: docker
 swagger:
   production: false
   basic: