update docker

MINIMAZ · Nov 12, 2020 · 0c9ec80 · 0c9ec80
1 parent 9ff86dd
commit 0c9ec80
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/docker/conf/nginx/conf.d/wkcrm.conf b/docker/conf/nginx/conf.d/wkcrm.conf
@@ -18,7 +18,7 @@
                 proxy_connect_timeout 60;
                 proxy_send_timeout 120;
                 proxy_read_timeout 120;
-                proxy_pass   http://wkcrm:8848/nacos/;
+                proxy_pass   http://nacos:8848/nacos/;
 	    }
         location /xxl-job-admin/ {
             add_header Access-Control-Allow-Origin *;
@@ -33,7 +33,7 @@
             proxy_connect_timeout 60;
             proxy_send_timeout 120;
             proxy_read_timeout 120;
-            proxy_pass   http://wkcrm:8080/xxl-job-admin/;
+            proxy_pass   http://xxl-job-admin:8080/xxl-job-admin/;
         }
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {

diff --git a/docker/data/mysql/init/wk_crm_single.sql b/docker/data/mysql/init/wk_crm_single.sql
@@ -7423,4 +7423,12 @@ CREATE TABLE `wk_work_user`  (
 -- Records of wk_work_user
 -- ----------------------------
 
+CREATE TABLE `wk_crm_customer_stats_info` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `last_customer_id` int(11) NOT NULL COMMENT '最后同步客户ID',
+  `create_time` datetime NOT NULL COMMENT '同步时间',
+  `sync_num` int(11) DEFAULT NULL COMMENT '同步数量',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=130 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='客户数量统计汇总表';
+
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/docker/data/mysql/init/xxl_job.sql b/docker/data/mysql/init/xxl_job.sql
@@ -73,6 +73,7 @@ CREATE TABLE `xxl_job_info`  (
 INSERT INTO `xxl_job_info` VALUES (11, 3, '0 0 2 * * ?', '定时放入公海', '2020-08-21 14:56:42', '2020-09-26 16:06:42', 'admin', '', 'LAST', 'CrmCustomerJob', '', 'SERIAL_EXECUTION', 7200, 0, 'BEAN', '', 'GLUE代码初始化', '2020-08-21 14:56:42', '', 1, 1601488800000, 1602554400000);
 INSERT INTO `xxl_job_info` VALUES (12, 3, '0 0 0 * * ?', '日程通知', '2020-08-24 14:43:08', '2020-09-26 16:06:35', 'admin', '', 'FIRST', 'EventNoticeJob', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2020-08-24 14:43:08', '', 1, 1602547200000, 1602633600000);
 INSERT INTO `xxl_job_info` VALUES (13, 3, '0 0 1 * * ?', '任务设置延期', '2020-08-24 14:43:43', '2020-09-26 16:06:27', 'admin', '', 'FIRST', 'TaskJob', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2020-08-24 14:43:43', '', 1, 1602550800000, 1602637200000);
+INSERT INTO `xxl_job_info` VALUES (14, 3, '0 0 2 * * ?', '同步客户信息', '2020-10-27 10:15:45', '2020-10-27 10:15:45', 'admin', '', 'FIRST', 'BiCustomerStatsJob', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2020-10-27 10:15:45', '', 1, 0, 0);
 
 -- ----------------------------
 -- Table structure for xxl_job_lock

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -12,6 +12,8 @@ services:
       - ./mysql.sh:/mysql.sh
     environment:
       - MYSQL_ROOT_PASSWORD=password
+      - TZ=Asia/Shanghai
+      - LANG=en_US.UTF-8
     networks:
       wkcrm_network:
         ipv4_address: 172.20.0.2
@@ -38,6 +40,8 @@ services:
       - ./data/elasticsearch/plugins:/usr/share/elasticsearch/plugins
     environment:
       - discovery.type=single-node
+      - TZ=Asia/Shanghai
+      - LANG=en_US.UTF-8
     ports:
       - "9200:9200"
     networks:
@@ -48,6 +52,8 @@ services:
     container_name: nacos
     environment:
       - MODE=standalone
+      - TZ=Asia/Shanghai
+      - LANG=en_US.UTF-8
     depends_on:
       - db
     volumes:
@@ -66,7 +72,7 @@ services:
     volumes:
       - ./log/xxl-job:/data/applogs/xxl-job/
     environment:
-      PARAMS: '--spring.datasource.url=jdbc:mysql://mysql:3306/xxl_job?Unicode=true&characterEncoding=UTF-8 --spring.datasource.username=root --spring.datasource.password=password'
+      PARAMS: '--spring.datasource.url=jdbc:mysql://mysql:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai --spring.datasource.username=root --spring.datasource.password=password'
     ports:
       - "8080:8080"
     networks:
@@ -88,9 +94,13 @@ services:
   wkcrm:
     image: registry.cn-hangzhou.aliyuncs.com/72crm/crm:11.0.2
     container_name: "wkcrm"
+    environment:
+      - TZ=Asia/Shanghai
+      - LANG=en_US.UTF-8
     volumes:
       - ./wkcrm.sh:/wkcrm.sh
       - ./log/wkcrm:/opt/package/log/
+      - ./data/wkcrm/file:/opt/upload/
     ports:
       - "8443:8443"
     networks: