Merge remote-tracking branch 'origin/master'

serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/AipWordUtilBean.java

@@ -38,7 +38,6 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -52,8 +51,10 @@ import java.util.stream.Collectors;
 @Slf4j
 public final class AipWordUtilBean {
 
+    private static final String APP_ID = "10486245";
+    private static final String API_KEY = "ws8qdxT51xm2qbWufxzRedI3";
+    private static final String SECRET_KEY = "8b6g9ZyR69dFl6aqYdIOGa4IbOGgkdjh";
 
-    private static final ConcurrentHashMap<String, Double> SCORE_MAP = new ConcurrentHashMap<>();
     private static final String SCORE_KEY_PREFIX = "WORD_SCORE:";
     private static final double CRITICAL_VALUE = 0.4D;
     private static final double RELATE_CRITICAL_VALUE = 0.6D;
@@ -64,14 +65,15 @@ public final class AipWordUtilBean {
     private static final String INTERNAL_ERROR = "282000";
 
     private final AipNlp aipNlp;
-    private final StringRedisTemplate template;
 
     @Autowired
-    public AipWordUtilBean(AipNlp aipNlp, StringRedisTemplate template) {
-        this.aipNlp = aipNlp;
-        this.template = template;
+    private StringRedisTemplate template;
+
+    public AipWordUtilBean() {
+        this.aipNlp = new AipNlp(APP_ID, API_KEY, SECRET_KEY);
     }
 
+
     /**
      * 抽取查询关键词
      *

serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/config/AipConfig.java

-package com.dookay.cihai.core.aip.config;
-
-/*****************************************
- *                                       *
- *  @dookay.com Internet make it happen  *
- *  ----------- -----------------------  *
- *  dddd  ddddd Internet make it happen  *
- *  o   o     o Internet make it happen  *
- *  k    k    k Internet make it happen  *
- *  a   a     a Internet make it happen  *
- *  yyyy  yyyyy Internet make it happen  *
- *  ----------- -----------------------  *
- *  @dookay.com Internet make it happen  *
- *                                       *
- ****************************************/
-
-import com.baidu.aip.nlp.AipNlp;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 配置
- *
- * @author houkun
- * @date 2017/12/6
- */
-@Configuration
-public class AipConfig {
-
-    private final AipProperties aipProperties;
-
-    @Autowired
-    public AipConfig(AipProperties aipProperties) {
-        this.aipProperties = aipProperties;
-    }
-
-    @Bean
-    public AipNlp aipNlp() {
-        AipNlp aipNlp = new AipNlp(aipProperties.getAppId(), aipProperties.getApiKey(), aipProperties.getSecretKey());
-        aipNlp.setConnectionTimeoutInMillis(2000);
-        aipNlp.setSocketTimeoutInMillis(60000);
-        return aipNlp;
-    }
-}

serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/config/AipProperties.java

-package com.dookay.cihai.core.aip.config;
-
-/*****************************************
- *                                       *
- *  @dookay.com Internet make it happen  *
- *  ----------- -----------------------  *
- *  dddd  ddddd Internet make it happen  *
- *  o   o     o Internet make it happen  *
- *  k    k    k Internet make it happen  *
- *  a   a     a Internet make it happen  *
- *  yyyy  yyyyy Internet make it happen  *
- *  ----------- -----------------------  *
- *  @dookay.com Internet make it happen  *
- *                                       *
- ****************************************/
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * 配置文件
- *
- * @author houkun
- * @date 2017/12/6
- */
-@ConfigurationProperties("aip")
-@Data
-@Component
-public class AipProperties {
-
-    private String appId;
-
-    private String apiKey;
-
-    private String secretKey;
-}

serverside/cihai-core/src/test/resources/application.properties

@@ -18,10 +18,6 @@ mybatis.mapper-locations=classpath*:mapper/*.xml
 
 spring.redis.host=192.168.2.27
 spring.redis.password=100001
-
-aip.app-id=10486245
-aip.api-key=ws8qdxT51xm2qbWufxzRedI3
-aip.secret-key=8b6g9ZyR69dFl6aqYdIOGa4IbOGgkdjh
 logging.level.com.dookay.cihai.core=debug
 
 

serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/config/WechatSecurityConfig.java

@@ -15,6 +15,7 @@
 package com.dookay.cihai.wechat.config;
 
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -25,7 +26,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
  * @date 2017/12/7
  */
 @EnableWebSecurity
-@Order
+@Order(Ordered.HIGHEST_PRECEDENCE)
 public class WechatSecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     protected void configure(HttpSecurity http) throws Exception {

serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/HomeController.java

@@ -89,4 +89,5 @@ public class HomeController extends BaseController {
             return errorResult(String.format("暂无\"%s\"检索结果",keyword));
         }
     }
+
 }

serverside/cihai-wechat/src/main/resources/application-dev.properties

@@ -28,7 +28,3 @@ coral.wechat.WechatConfig.encodingAESKey=agkC7tsPUoOtbbUyxxcCLVJZVqVOCTeJgxUCXAx
 # 是否加密
 coral.wechat.WechatConfig.messageEncrypt=false
 # 微信授权回调地址
-
-aip.app-id=10486245
-aip.api-key=ws8qdxT51xm2qbWufxzRedI3
-aip.secret-key=8b6g9ZyR69dFl6aqYdIOGa4IbOGgkdjh
\ No newline at end of file

serverside/cihai-wechat/src/main/resources/application.properties

@@ -30,4 +30,3 @@ coral.web.view.error.internal-error=500
 coral.web.view.error.service=service
 coral.web.view.error.other=other
 
-