Merge branch 'feature' into 'release'

修改路径存放地址3

See merge request !176

src/main/java/com/zhiwei/brandkbs2/config/WebAppConfig.java

+package com.zhiwei.brandkbs2.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @author lhb
+ * @version 1.0
+ * @description
+ * @date 2021/5/17 17:19
+ */
+@Configuration
+public class WebAppConfig implements WebMvcConfigurer {
+
+    @Value("${cbs.imagesPath}")
+    private String mImagesPath;
+
+    //访问图片方法
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/images/**").addResourceLocations(mImagesPath.split(","));
+    }
+}

src/main/java/com/zhiwei/brandkbs2/es/EsClientDao.java

@@ -51,7 +51,7 @@ public class EsClientDao {
     private static final Logger log = LogManager.getLogger(EsClientDao.class);
     protected static final FastDateFormat DF = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
     private static final String[] CHANNEL_RECORD_FETCH_SOURCE = new String[]{"id", "c5", "foreign", "real_source", "source", "mtime", "time",
-            "brandkbs_cache_maps", "brandkbs_mark_cache_maps","channel_influence"};
+            "brandkbs_cache_maps", "brandkbs_mark_cache_maps", "channel_influence", "ind_full_text", "url", "question_url", "answer_url"};
 
     private static final Long ONE_HOUR = 60 * 60 * 1000L;
     // 滚动查询超时时间

src/main/resources/application-dev.properties

@@ -6,10 +6,12 @@ server.servlet.context-path=/brandkbs
 jwt.key=Token
 jwt.hour=120
 #\u8DEF\u5F84\u5B58\u653E
-brandkbs.file.url=/usr/local/sources/brandkbs/files/
-brandkbs.img.url=/usr/local/sources/brandkbs/images/
-brandkbs.head.url=/usr/local/sources/brandkbs/head/
-brandkbs.image.url=https://brandkbs.zhiweidata.com/brandkbs/images/
+brandkbs.file.url=/usr/local/sources/brandkbs2/files/
+brandkbs.img.url=/usr/local/sources/brandkbs2/images/
+brandkbs.head.url=/usr/local/sources/brandkbs2/head/
+brandkbs.image.url=https://brandkbs.test.zhiweidata.com/brandkbs/images/
+#\u56FE\u7247\u8D44\u6E90\u8DEF\u5F84
+cbs.imagesPath=file:${brandkbs.img.url},file:${brandkbs.head.url}
 
 #redis
 spring.redis.host=192.168.0.39

src/main/resources/application-local.properties

@@ -9,7 +9,9 @@ jwt.hour=120
 brandkbs.file.url=E:\\work3\\brandkbs3\\
 brandkbs.img.url=E:\\work\\brandkbs2\\img\\
 brandkbs.head.url=E:\\work\\brandkbs2\\head\\
-brandkbs.image.url=\\\\DESKTOP-8CEJAD9\\brandkbs2\\img\\
+brandkbs.image.url=https://brandkbs.zhiweidata.com/brandkbs/images/
+#\u56FE\u7247\u8D44\u6E90\u8DEF\u5F84
+cbs.imagesPath=file:${brandkbs.img.url},file:${brandkbs.head.url}
 
 #redis
 spring.redis.host=192.168.0.24
@@ -64,7 +66,8 @@ qbjc.project.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/project
 qbjc.event.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/aplan/event
 qbjc.event.tag.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/tag/event?project={1}
 qbjc.platform.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/platform/resource
-qbjc.userCenter.url=http://192.168.0.225:10000
+#qbjc.userCenter.url=http://192.168.0.225:10000
+qbjc.userCenter.url=http://login.zhiweidata.top/plogin/center
 qbjc.userCenter.token=AoJ0ooy3HV1EElWnvQw9YTS9b5Y+fmtkbM6DdpPgDO6D/OhNqH4qrJKarzMr
 #\u5371\u673A\u5E93\u5916\u90E8\u63A5\u53E3
 crisis.search.url=https://crisis.zhiweidata.com/app/brandkbs/crisisSearch?page={1}&size={2}&keyword={3}

src/main/resources/application-prod.properties

@@ -10,6 +10,8 @@ brandkbs.file.url=/usr/local/sources/brandkbs2/files/
 brandkbs.img.url=/usr/local/sources/brandkbs2/images/
 brandkbs.head.url=/usr/local/sources/brandkbs2/head/
 brandkbs.image.url=https://brandkbs.zhiweidata.com/brandkbs/images/
+#\u56FE\u7247\u8D44\u6E90\u8DEF\u5F84
+cbs.imagesPath=file:${brandkbs.img.url},file:${brandkbs.head.url}
 
 #redis
 spring.redis.host=192.168.0.39