Merge branch 'dev'

mall-search/src/main/java/com/uas/search/controller/IndexController.java

@@ -2,13 +2,16 @@ package com.uas.search.controller;
 
 import com.uas.search.annotation.NotEmpty;
 import com.uas.search.constant.model.SPage;
+import com.uas.search.dao.KindDao;
 import com.uas.search.jms.JmsListener;
 import com.uas.search.jms.LuceneMessage;
 import com.uas.search.jms.LuceneMessageDao;
 import com.uas.search.jms.LuceneMessageService;
+import com.uas.search.model.Kind;
 import com.uas.search.service.IndexService;
 import com.uas.search.support.DownloadHelper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Controller;
 import com.uas.search.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,6 +45,12 @@ public class IndexController {
     @Autowired
     private JmsListener jmsListener;
 
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    private KindDao kindDao;
+
     @RequestMapping("/create")
     @ResponseBody
     public String initIndexes(String tableNames, HttpServletRequest request) {
@@ -49,6 +58,14 @@ public class IndexController {
                 indexService.createIndexes(toList(tableNames), true) / 1000.0);
     }
 
+    @RequestMapping("/test")
+    @ResponseBody
+    public String testController(){
+        Integer count = jdbcTemplate.queryForObject("select count(1) from lucene$message", Integer.class);
+        List<Kind> kinds = kindDao.findAll();
+        return String.format("Indexes test success , %s; kind size : %s", count, kinds.size());
+    }
+
     /**
      * 根据逗号进行分隔，将字符串转为 List
      *

mall-search/src/main/resources/application.yml

@@ -14,7 +14,9 @@ spring:
    max-request-size: 512MB
   encoding:
     charset: UTF-8
-     
+ profiles:
+  active: test
+
 security:
  basic:
   enabled: true
@@ -27,4 +29,5 @@ security:
   
 schedule:
  auto-start: false
-
+server:
+ port: 20000

mall-search/src/main/resources/config/application-ptest.properties

@@ -0,0 +1,22 @@
+datasource.url=jdbc:mysql://192.168.100.3:3306/mall_test_dev?characterEncoding=utf-8&useSSL=false
+datasource.username=sa
+datasource.password=select111***
+datasource.driverClassName=com.mysql.jdbc.Driver
+datasource.initialSize=1
+datasource.minIdle=1
+datasource.maxActive=100
+datasource.maxWait=60000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=300000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+
+lucene.indexes.dir=/app/mall-search/indexes
+lucene.data.dir=/app/mall-search/data

search-console-b2b/src/main/resources/config/application-pre.properties

@@ -24,10 +24,10 @@ platformmanager.datasource.url=jdbc:oracle:thin:@//10.10.100.215:1521/orcl
 platformmanager.datasource.username=platformmanager
 platformmanager.datasource.password=select!#%*(
 
-dubbo.owner=pre
-dubbo.group=pre
+dubbo.owner=prod
+dubbo.group=prod
 
-lucene.indexes.dir=/mnt/data/b2b-search/indexes
-lucene.data.dir=/mnt/data/b2b-search/data
+lucene.indexes.dir=/mnt/data/b2b-search/prod/indexes
+lucene.data.dir=/mnt/data/b2b-search/prod/data
 
 schedule.auto-start=true

search-console-b2b/src/main/resources/config/application-prod.properties → search-console-b2b/src/main/resources/config/application-ptest.properties

@@ -1,7 +1,7 @@
 datasource.driverClassName=com.mysql.jdbc.Driver
-datasource.url=jdbc:mysql://10.10.100.18:3306/b2b_prod?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true
-datasource.username=root
-datasource.password=select
+datasource.url=jdbc:mysql://192.168.100.3:3306/b2b_mysql_test?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true
+datasource.username=sa
+datasource.password=select111***
 datasource.initialSize=3
 datasource.minIdle=1
 datasource.maxActive=20
@@ -20,14 +20,14 @@ datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMill
 
 #platformmanager
 platformmanager.datasource.driverClassName=oracle.jdbc.driver.OracleDriver
-platformmanager.datasource.url=jdbc:oracle:thin:@//10.10.100.215:1521/orcl
-platformmanager.datasource.username=platformmanager
+platformmanager.datasource.url=jdbc:oracle:thin:@218.17.158.219:1521:orcl
+platformmanager.datasource.username=platformmanager$test
 platformmanager.datasource.password=select!#%*(
 
-dubbo.owner=prod
-dubbo.group=prod
+dubbo.owner=test
+dubbo.group=test
 
-lucene.indexes.dir=/mnt/data/b2b-search/prod/indexes
-lucene.data.dir=/mnt/data/b2b-search/prod/data
+lucene.indexes.dir=/app/b2b-search/indexes
+lucene.data.dir=/app/b2b-search/data
 
-schedule.auto-start=true
+schedule.auto-start=true