微调

integrate-system/db/Api.sql

@@ -12,7 +12,7 @@ MySQL - 5.7.25 : Database - db_integrate_shop
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-CREATE DATABASE /*!32312 IF NOT EXISTS*/`db_integrate_shop_shop` /*!40100 DEFAULT CHARACTER SET utf8 */;
+CREATE DATABASE /*!32312 IF NOT EXISTS*/`db_integrate_shop` /*!40100 DEFAULT CHARACTER SET utf8 */;
 
 USE `db_integrate_shop`;
 
@@ -276,7 +276,7 @@ CREATE TABLE `oauth_client_details` (
   `additional_information` varchar(4096) DEFAULT NULL,
   `autoapprove` varchar(256) DEFAULT NULL,
   PRIMARY KEY (`client_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 /*Data for the table `oauth_client_details` */
 
@@ -329,7 +329,7 @@ CREATE TABLE `sys_fill_rule` (
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE KEY `uni_sys_fill_rule_code` (`rule_code`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 /*Data for the table `sys_fill_rule` */
 
@@ -355,7 +355,7 @@ CREATE TABLE `sys_permission` (
   `fremarks` varchar(128) DEFAULT '' COMMENT '备注',
   `fstatus` varchar(1) DEFAULT '1' COMMENT '状态',
   `Fmodify_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-  `Fmodify` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新人',
+  `Fmodify` varchar(64) CHARACTER SET utf8mb4 DEFAULT '' COMMENT '更新人',
   `fdate` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `fcreator` varchar(64) DEFAULT '' COMMENT '创建人',
   PRIMARY KEY (`id`),
@@ -400,7 +400,7 @@ CREATE TABLE `sys_role_permission` (
   `role_id` bigint NOT NULL,
   `perm_id` bigint NOT NULL,
   `Fmodify_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-  `Fmodify` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新人',
+  `Fmodify` varchar(64) CHARACTER SET utf8mb4 DEFAULT '' COMMENT '更新人',
   `fdate` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `fcreator` varchar(64) DEFAULT '' COMMENT '创建人',
   PRIMARY KEY (`id`),
@@ -585,15 +585,15 @@ DROP TABLE IF EXISTS `undo_log`;
 CREATE TABLE `undo_log` (
   `id` bigint NOT NULL AUTO_INCREMENT,
   `branch_id` bigint NOT NULL,
-  `xid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
-  `context` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `xid` varchar(100) CHARACTER SET utf8mb4 NOT NULL,
+  `context` varchar(128) CHARACTER SET utf8mb4 NOT NULL,
   `rollback_info` longblob NOT NULL,
   `log_status` int NOT NULL,
   `log_created` datetime NOT NULL,
   `log_modified` datetime NOT NULL,
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=385 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=385 DEFAULT CHARSET=utf8mb4;
 
 /*Data for the table `undo_log` */
 
@@ -618,6 +618,42 @@ CREATE TABLE `tb_third_party_log` (
 
 /*Data for the table `tb_third_party_log` */
 
+/*Table structure for table `tb_custom_form_config` */
+
+DROP TABLE IF EXISTS `tb_custom_form_config`;
+
+CREATE TABLE `tb_custom_form_config` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+  `doc_type` varchar(64) NOT NULL COMMENT '第三方标识',
+  `name` varchar(64) NOT NULL COMMENT '日志名称',
+  `configure_direction` varchar(64) NOT NULL COMMENT '配置方向',
+  `operation` tinyint(1) NOT NULL COMMENT '操作(1-查询 2-创建)',
+  `request_address` text COMMENT '请求地址',
+  `response_address` text COMMENT '发送地址',
+  `custom_sql` text COMMENT '自定义Sql',
+  `form_field_mapping_detail` longtext NOT NULL COMMENT '表单字段映射明细',
+  `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='自定义表单配置表';
+
+/*Data for the table `tb_custom_form_config` */
+
+/*Table structure for table `tb_synchronization_operation` */
+
+DROP TABLE IF EXISTS `tb_synchronization_operation`;
+
+CREATE TABLE `tb_synchronization_operation` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+  `job_class_name` varchar(255) NOT NULL COMMENT '任务类名',
+  `doc_type` varchar(64) NOT NULL COMMENT '第三方标识',
+  `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='定时任务操作表';
+
+/*Data for the table `tb_synchronization_operation` */
+
 /*Table structure for table `tb_quartz_job` */
 
 DROP TABLE IF EXISTS `tb_quartz_job`;

integrate-system/src/main/java/com/system/controller/CommonHttpController.java

@@ -2,9 +2,15 @@ package com.system.controller;
 
 import com.system.transfer.platform.PlatformDockingShoppingMallCommodityInVo;
 import com.system.transfer.response.RestResponse;
+import com.system.utils.HttpUtil;
+import com.system.utils.JsonUtil;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /**
  * @author Inori
  */
@@ -22,6 +28,8 @@ public class CommonHttpController {
     @PostMapping("/docking/shopping/mall/commodity")
     public RestResponse dockingShoppingMallCommodity(@RequestBody PlatformDockingShoppingMallCommodityInVo inVo) {
         System.out.println(inVo);
+        ResponseEntity<String> responseEntity = HttpUtil.httpPost("http://192.168.0.9:8089/api/dataSyn/getSyn", JsonUtil.toString(Stream.of(12).collect(Collectors.toList())));
+        System.out.println(responseEntity.getBody());
         return RestResponse.success();
     }
 

integrate-system/src/main/java/com/system/oauth/config/ResourceServerConfig.java

@@ -47,6 +47,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .antMatchers("/webSocketApi/**").permitAll()
                 .antMatchers("/websocket/**").permitAll()
                 .antMatchers("/api/docking/distribution/**").permitAll()
+                .antMatchers("/api/docking/shopping/mall/**").permitAll()
                 .anyRequest().authenticated()
 //                .antMatchers("/**").access("#oauth2.hasScope('ROLE_ADMIN')")
                 .and().csrf().disable()