Explorar o código

【MQ执行方法】三坐标获取点位注释掉硬编码

lxb hai 1 ano
pai
achega
79ced34482

+ 8 - 8
imcs-admin-boot/imcs-authority-server/src/main/resources/application-prod.yml

@@ -1,24 +1,24 @@
 zuihou:
   nginx:
-    ip: 127.0.0.1    # 正式环境需要将该ip设置成nginx对应的 公网ip
-    port: 10000
+    ip: 192.168.11.240    # 正式环境需要将该ip设置成nginx对应的 公网ip
+    port: 80
   redis:
-    ip: 127.0.0.1
+    ip: 192.168.11.240
     port: 6379
     password: 123456
     database: 0
   rabbitmq:
     enabled: true
-    ip: 127.0.0.1
+    ip: 192.168.11.240
     port: 5672
-    username: guest
-    password: guest
+    username: admin
+    password: adminoyq
   mysql:
-    ip: 127.0.0.1
+    ip: 192.168.11.240
     port: 3306
     driverClassName: com.mysql.cj.jdbc.Driver
     database: zuihou_defaults_yj
-    username: root
+    username: admin
     password: adminoyq
     url: jdbc:mysql://${zuihou.mysql.ip}:${zuihou.mysql.port}/${zuihou.mysql.database}?serverTimezone=CTT&characterEncoding=utf8&useUnicode=true&useSSL=false&autoReconnect=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
   database:

+ 2 - 2
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/RobotNodeServiceImpl.java

@@ -1137,8 +1137,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                             //动态调用接口和新增指令执行时间
                             String requestUrl = instructionUrl + "/api/" + "QueryThreeCoordinatesFreePos";
                             // TODO 先写死测试
-//                            String canPutInfo = restTemplate.postForObject(requestUrl, formEntity, String.class);
-                            String canPutInfo ="{\"result\":\"L\"}";
+                            String canPutInfo = restTemplate.postForObject(requestUrl, formEntity, String.class);
+                            /*String canPutInfo ="{\"result\":\"L\"}";*/
                             JSONObject canPutInfoObject = JSONObject.parseObject(canPutInfo);
                             if("false".equals(canPutInfoObject.getString("result"))){
                                 targetList = null;