dengsixing 8 months ago
parent
commit
a5adc095bc

+ 10 - 0
src/main/java/com/fdkankan/modeldemo/controller/SceneController.java

@@ -2,6 +2,8 @@ package com.fdkankan.modeldemo.controller;
 
 
 
 
 import com.fdkankan.modeldemo.bean.ResultData;
 import com.fdkankan.modeldemo.bean.ResultData;
+import com.fdkankan.modeldemo.service.SceneConvertLogService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,11 +20,19 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/convert")
 @RequestMapping("/convert")
 public class SceneController {
 public class SceneController {
 
 
+    @Autowired
+    private SceneConvertLogService sceneConvertLogService;
+
     @GetMapping(value = "/ping")
     @GetMapping(value = "/ping")
     public ResultData ping(){
     public ResultData ping(){
         return ResultData.ok();
         return ResultData.ok();
     }
     }
 
 
+    @GetMapping(value = "/test")
+    public ResultData test(){
+        return ResultData.ok(sceneConvertLogService.list());
+    }
+
 
 
 
 
 
 

+ 2 - 2
src/main/resources/application-prod.yml

@@ -17,8 +17,8 @@ spring:
     publisher-confirm-type: correlated
     publisher-confirm-type: correlated
   datasource:
   datasource:
     url: jdbc:postgresql://10.159.32.174:5432/chinatower_vr
     url: jdbc:postgresql://10.159.32.174:5432/chinatower_vr
-    username: RES_VR
-    password: Changeme#123
+    username: res_vr
+    password: Qwer!@#123
     driver-class-name: org.postgresql.Driver
     driver-class-name: org.postgresql.Driver
     hikari:
     hikari:
       maximum-pool-size: 20 #连接池最大连接数
       maximum-pool-size: 20 #连接池最大连接数

+ 4 - 4
src/main/resources/application-test.yml

@@ -16,9 +16,9 @@ spring:
     #开启消息投递确认机制
     #开启消息投递确认机制
     publisher-confirm-type: correlated
     publisher-confirm-type: correlated
   datasource:
   datasource:
-    url: jdbc:postgresql://10.180.145.98:5432/chinatower_vr
-    username: res_vr
-    password: qawsed@123.
+    url: jdbc:postgresql://10.190.134.143:5432/chinatower_vr?currentSchema=res_vr
+    username: RES_VR
+    password: Qwer!@#123
     driver-class-name: org.postgresql.Driver
     driver-class-name: org.postgresql.Driver
     hikari:
     hikari:
       maximum-pool-size: 20 #连接池最大连接数
       maximum-pool-size: 20 #连接池最大连接数
@@ -28,7 +28,7 @@ spring:
       max-lifetime: 1800000
       max-lifetime: 1800000
       login-timeout: 60000
       login-timeout: 60000
       pool-name: MyHikariCP
       pool-name: MyHikariCP
-      connection-test-query: SELECT 1 FROM DUAL
+      connection-test-query: SELECT 1
 
 
 mybatis-plus:
 mybatis-plus:
   mapper-locations: classpath:mapper/*Mapper.xml
   mapper-locations: classpath:mapper/*Mapper.xml