Jelajahi Sumber

字符串判断需要用isNotBlank

wuweihao 4 tahun lalu
induk
melakukan
d81045340c

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

@@ -1,5 +1,4 @@
-spring.application.name=pano-service
-spring.cloud.nacos.discovery.server-addr=8.135.98.231:8848
+
 
 #DB
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource

+ 7 - 2
720yun_fd_manage/gis_application/src/main/resources/application-loc.properties

@@ -2,9 +2,13 @@
 #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://localhost:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#spring.datasource.druid.url=jdbc:mysql://localhost:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#spring.datasource.druid.username=root
+#spring.datasource.druid.password=root
+
+spring.datasource.druid.url=jdbc:mysql://120.25.146.52:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.druid.username=root
-spring.datasource.druid.password=root
+spring.datasource.druid.password=4dkk2020test%
 
 
 # \u521D\u59CB\u8FDE\u63A5\u6570
@@ -33,6 +37,7 @@ 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.host=120.25.146.52
 spring.redis.port=6379
 spring.redis.password=
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09

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

@@ -1,5 +1,4 @@
-spring.application.name=pano-service
-spring.cloud.nacos.discovery.server-addr=8.135.98.231:8848
+
 
 #DB
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource

+ 2 - 1
720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/SceneServiceImpl.java

@@ -211,7 +211,8 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, Long> implem
         }
         String sceneIndex = entity.getSceneIndex();
         SceneEntity sceneEntity = null;
-        if (sceneIndex != null) {
+        // 字符串判断需要用isNotBlank
+        if (StringUtils.isNotBlank(sceneIndex)) {
              sceneEntity = this.findById(Long.valueOf(sceneIndex));
         }
         return Result.success(sceneEntity);

+ 1 - 0
720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/SceneController.java

@@ -36,6 +36,7 @@ import java.util.Map;
 @Api(tags = "场景管理")
 @RestController
 @RequestMapping("manage/scene")
+//@RequestMapping("aa/scene")
 public class SceneController extends BaseController {
 
     @Autowired

+ 1 - 0
720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkController.java

@@ -31,6 +31,7 @@ import java.util.Date;
 @Api(tags = "我的作品")
 @RestController
 @RequestMapping("manage/work")
+//@RequestMapping("c/work")
 public class WorkController extends BaseController {
 
     @Autowired