Merge branch 'test' into releases

src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java

@@ -2,9 +2,11 @@ package com.fdkankan.ucenter.httpClient.service;
 
 import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.common.http.client.NacosAsyncRestTemplate;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.ucenter.common.CameraTypeEnum;
 import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.common.utils.ShellUtil;
 import com.fdkankan.ucenter.entity.Camera;
 import com.fdkankan.ucenter.entity.CameraDetail;
@@ -47,6 +49,9 @@ public class LaserService {
      */
     public SceneNumVo getLaserSceneNumByUser(String token) {
         SceneNumVo sceneNumVo = new SceneNumVo();
+        if("aws".equals(NacosProperty.uploadType)){
+            return sceneNumVo;
+        }
         try {
             Result sceneNum = laserClient.getSceneNum(token);
             if(sceneNum != null && sceneNum.getCode() == 200){

src/main/java/com/fdkankan/ucenter/interceptor/ControllerAopInterceptor.java

@@ -52,7 +52,7 @@ public class ControllerAopInterceptor {
 		String requestURL = request.getRequestURL().toString();
 		String ip = getIpAddr(request);
 
-		StringBuffer paramsBuf = new StringBuffer();
+		StringBuilder paramsBuf = new StringBuilder();
 		// 获取请求参数集合并进行遍历拼接
 		for (int i = 0; i < args.length; i++) {
 			if (paramsBuf.length() > 0) {
@@ -65,8 +65,8 @@ public class ControllerAopInterceptor {
 		// 记录开始时间
 		long start = System.currentTimeMillis();
 
-		log.info("请求| ip:{} , 请求接口:{} , 参数:{} , 请求token:{} ",
-				ip, requestURL, paramsBuf.toString(), request.getHeader("token"));
+		log.info("请求| ip:{} , 请求接口:{} ,请求时间:{}, 参数:{} , 请求token:{} ",
+				ip, requestURL, start,paramsBuf.toString(), request.getHeader("token"));
 		// 执行目标方法
 		result = pjp.proceed();
 		// 获取执行完的时间 打印返回报文

src/main/resources/bootstrap-prod-eur.yml

@@ -0,0 +1,41 @@
+spring:
+  application:
+    name: 4dkankan-center-ucenter
+  cloud:
+    nacos:
+      config:
+        server-addr: 172.31.42.151:8848
+        file-extension: yaml
+        namespace: 4dkankan-v4-prod-eur
+        extension-configs:
+          - data-id: 4dkankan-center-ucenter.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-rabbitmq-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-fyun-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: forest-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+      discovery:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}
+
+
+