#51 使用elasticsearch服务

2025-08-01 16:38:02 +08:00 · 2018-09-05 17:23:21 +08:00 · 2018-09-05 17:23:21 +08:00 · 917491f5ce
commit 917491f5ce
parent b2d163063f
15 changed files with 36 additions and 15 deletions
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/Contacts.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/Contacts.java
@ -29,7 +29,7 @@ import org.springframework.data.elasticsearch.annotations.Document;

 import com.chatopera.cc.util.UKTools;

-@Document(indexName = "uckefu", type = "uk_contacts")
+@Document(indexName = "cskefu", type = "contacts")
@Entity
@Table(name = "uk_contacts")
@org.hibernate.annotations.Proxy(lazy = false)
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/EntCustomer.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/EntCustomer.java
@ -30,7 +30,7 @@ import org.springframework.data.elasticsearch.annotations.Document;

 import com.chatopera.cc.util.UKTools;

-@Document(indexName = "uckefu", type = "uk_entcustomer")
+@Document(indexName = "cskefu", type = "entcustomer")
@Entity
@Table(name = "uk_entcustomer")
@org.hibernate.annotations.Proxy(lazy = false)
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/Favorites.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/Favorites.java
@ -34,7 +34,7 @@ import org.springframework.data.elasticsearch.annotations.Parent;

 import com.chatopera.cc.util.UKTools;

-@Document(indexName = "uckefu", type = "uk_favorites" , createIndex = false )
+@Document(indexName = "cskefu", type = "favorites" , createIndex = false )
@Entity
@Table(name = "uk_favorites")
@org.hibernate.annotations.Proxy(lazy = false)
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/KbsTopic.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/KbsTopic.java
@ -35,7 +35,7 @@ import com.chatopera.cc.util.UKTools;
 /**
 * 
 */
-@Document(indexName = "uckefu", type = "uk_kbs_topic")
+@Document(indexName = "cskefu", type = "kbs_topic")
@Entity
@Table(name = "uk_kbs_topic")
@org.hibernate.annotations.Proxy(lazy = false)
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/KbsTopicComment.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/KbsTopicComment.java
@ -32,7 +32,7 @@ import org.springframework.data.elasticsearch.annotations.FieldIndex;
 import org.springframework.data.elasticsearch.annotations.FieldType;

 import com.chatopera.cc.util.UKTools;
-@Document(indexName = "uckefu", type = "uc_kbs_topiccomment")
+@Document(indexName = "cskefu", type = "kbs_topiccomment")
 public class KbsTopicComment implements UKAgg{

 	/**
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/OrdersComment.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/OrdersComment.java
@ -33,7 +33,7 @@ import org.springframework.data.elasticsearch.annotations.FieldIndex;
 import org.springframework.data.elasticsearch.annotations.FieldType;

 import com.chatopera.cc.util.UKTools;
-@Document(indexName = "uckefu", type = "uk_orderscomment")
+@Document(indexName = "cskefu", type = "orderscomment")
@Entity
@Table(name = "uk_orderscomment")
@org.hibernate.annotations.Proxy(lazy = false)
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/PublishedReport.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/PublishedReport.java
@ -31,7 +31,7 @@ import org.hibernate.annotations.GenericGenerator;
 import org.springframework.data.elasticsearch.annotations.Document;

 import com.chatopera.cc.util.UKTools;
-@Document(indexName = "uckefu", type = "uk_publishedreport")
+@Document(indexName = "cskefu", type = "publishedreport")
@Entity
@Table(name = "uk_publishedreport")
@org.hibernate.annotations.Proxy(lazy = false)
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/QuickReply.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/QuickReply.java
@ -29,7 +29,7 @@ import org.springframework.data.elasticsearch.annotations.Document;

 import com.chatopera.cc.util.UKTools;

-@Document(indexName = "uckefu", type = "uk_quickreply")
+@Document(indexName = "cskefu", type = "quickreply")
@Entity
@Table(name = "uk_quickreply")
@org.hibernate.annotations.Proxy(lazy = false)
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/Report.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/Report.java
@ -31,7 +31,7 @@ import com.chatopera.cc.util.UKTools;
 import org.hibernate.annotations.GenericGenerator;
 import org.springframework.data.elasticsearch.annotations.Document;

-@Document(indexName = "uckefu", type = "uk_report")
+@Document(indexName = "cskefu", type = "report")
@Entity
@Table(name = "uk_report")
@org.hibernate.annotations.Proxy(lazy = false)
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/Topic.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/Topic.java
@ -36,7 +36,7 @@ import com.chatopera.cc.util.UKTools;
 /**
 * 表 uk_xiaoe_topic
 */
-@Document(indexName = "uckefu", type = "uk_xiaoe_topic")
+@Document(indexName = "cskefu", type = "xiaoe_topic")
@Entity
@Table(name = "uk_xiaoe_topic")
@org.hibernate.annotations.Proxy(lazy = false)
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/WorkOrders.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/WorkOrders.java
@ -34,7 +34,7 @@ import com.chatopera.cc.util.UKTools;
 /**
 * 
 */
-@Document(indexName = "uckefu", type = "uk_workorders" , createIndex = false )
+@Document(indexName = "cskefu", type = "workorders" , createIndex = false )
@Entity
@Table(name = "uk_workorders")
@org.hibernate.annotations.Proxy(lazy = false)
--- a/contact-center/app/src/main/resources/application.properties
+++ b/contact-center/app/src/main/resources/application.properties
@ -72,7 +72,7 @@ spring.data.jpa.repositories.enabled=true

 # Elasticsearch
 spring.data.elasticsearch.properties.path.data=../data
-#spring.data.elasticsearch.cluster-name=ukefu
+#spring.data.elasticsearch.cluster-name=elasticsearch
 #spring.data.elasticsearch.cluster-nodes=127.0.0.1:9300
 #spring.data.elasticsearch.local=false  
 #spring.data.elasticsearch.repositories.enabled=true 
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -64,6 +64,10 @@ services:
     - SPRING_REDIS_HOST=redis
     - SPRING_REDIS_PORT=6379
     - CSKEFU_CALLOUT_WATCH_INTERVAL=60000
+     - SPRING_DATA_ELASTICSEARCH_CLUSTER_NAME=elasticsearch
+     - SPRING_DATA_ELASTICSEARCH_CLUSTER_NODES=elasticsearch:9300
+     - SPRING_DATA_ELASTICSEARCH_LOCAL=false
+     - SPRING_DATA_ELASTICSEARCH_REPOSITORIES_ENABLED=true
    depends_on:
     - mysql
     - redis
--- a/elasticsearch/config/elasticsearch.yml
+++ b/elasticsearch/config/elasticsearch.yml
@ -5,8 +5,11 @@ http.cors.enabled: true
 http.cors.allow-origin: "*"

 # Uncomment the following lines for a production cluster deployment
-# #transport.host: 0.0.0.0
-# #discovery.zen.minimum_master_nodes: 1
+transport.host: 0.0.0.0
+discovery.zen.minimum_master_nodes: 1
 cluster.routing.allocation.disk.threshold_enabled: true
 cluster.routing.allocation.disk.watermark.low: 1gb
 cluster.routing.allocation.disk.watermark.high: 1gb
+
+node.master: true
+node.data: true
--- a/scripts/start.sh
+++ b/scripts/start.sh
@ -0,0 +1,14 @@
+#! /bin/bash 
+###########################################
+#
+###########################################
+
+# constants
+baseDir=$(cd `dirname "$0"`;pwd)
+# functions
+
+# main 
+[ -z "${BASH_SOURCE[0]}" -o "${BASH_SOURCE[0]}" = "$0" ] || return
+cd $baseDir/..
+docker-compose pull elasticsearch mysql redis contact-center
+docker-compose up -d