소스 검색

添加前缀

wuweihao 2 년 전
부모
커밋
fffb776b36

+ 11 - 2
720yun_fd_consumer/src/main/resources/application-pro.properties

@@ -2,8 +2,14 @@
 #DB
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.druid.username=root
+
+# 8.129.209.131\u4F7F\u7528local
+#spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#spring.datasource.druid.password=4dkk2020cuikuan%
+
+# \u7F16\u8F91\u7B97\u6CD5\u670D\u52A1\u5668-47.106.173.174
+spring.datasource.druid.url=jdbc:mysql://172.18.157.42:3306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.druid.password=4dkk2020cuikuan%
 
 
@@ -38,7 +44,10 @@ spring.datasource.druid.stat-view-servlet.enabled=true
 #spring.rabbitmq.password=root
 
 #rabbit MQ\uFFFD\uFFFD\u023A
-spring.rabbitmq.address=127.0.0.1:5672
+#spring.rabbitmq.address=127.0.0.1:5672
+
+# \u7F16\u8F91\u7B97\u6CD5\u670D\u52A1\u5668-47.106.173.174
+spring.rabbitmq.address=172.18.157.42:5672
 spring.rabbitmq.username=guest
 spring.rabbitmq.password=guest
 spring.rabbitmq.virtual-host=/

+ 4 - 4
720yun_fd_manage/gis_application/src/main/resources/application-pro.properties

@@ -3,10 +3,10 @@
 #DB
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.druid.username=root
-spring.datasource.druid.password=4dkk2020cuikuan%
 
+spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.password=4dkk2020cuikuan%
 
 # \u521D\u59CB\u8FDE\u63A5\u6570
 spring.datasource.druid.initial-size=5
@@ -32,10 +32,10 @@ spring.datasource.druid.stat-view-servlet.enabled=true
 
 
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database=0
 spring.redis.host=127.0.0.1
-spring.redis.port=6379
 spring.redis.password=
+spring.redis.database=0
+spring.redis.port=6379
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
 spring.redis.timeout=3000ms
 # \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002

+ 1 - 0
720yun_fd_manage/gis_application/src/main/resources/application.properties

@@ -1,4 +1,5 @@
 server.port=8001
+server.servlet.context-path=/qjkankan
 
 spring.profiles.active=locPro
 

+ 4 - 4
720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/TestServiceImpl.java

@@ -148,13 +148,13 @@ public class TestServiceImpl implements TestService {
         int i = 0;
         for (FodderEntity entity : list) {
             String tour = entity.getTour();
-            if (StrUtil.isBlank(tour)){
+            if (StrUtil.isNotBlank(tour)){
                 continue;
             }
             String sceneCode = entity.getSceneCode();
-            if (tour.contains("%CURRENTXML%")){
-                continue;
-            }
+//            if (tour.contains("%CURRENTXML%")){
+//                continue;
+//            }
             i ++ ;
             String basePath = "%CURRENTXML%../" + sceneCode + "/vtour/panos/";
             tour = tour.replaceAll("panos/", basePath);

+ 2 - 0
720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/TestController.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -37,6 +38,7 @@ import java.util.concurrent.TimeUnit;
  * Created by owen on 2021/1/14 0014 19:02
  * 这个类header 不能有token, 否则webLogAspect会报错
  */
+@ApiIgnore
 @Slf4j
 @Api(tags = "测试")
 @RestController

+ 1 - 1
720yun_fd_manage/remark-m.md

@@ -74,7 +74,7 @@
         2. 更新错误提示
         
         
-    2022-11-03 v1.2
+    2022-11-03 v1.2 - 已部署-2022-11-15
          1. consumer, tour.xml改用相对地址   
          2. 需要将dev-1.2弄一个pro-1.2版本
          3. 数据库tb_fodder加一个tour字段