瀚高数据库国产化适配

signal-control-service/src/main/resources/bootstrap-docker.yaml

@@ -5,12 +5,12 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 37.8.219.162:8848
+        server-addr: 37.8.219.227:28848
         file-extension: yaml
         group: signal
         namespace: signal
         username: nacos
-        password: nacos
+        password: Nacos@2025
   main:
     allow-circular-references: true
 feign:

signal-feign-service/src/main/resources/application-docker.properties

@@ -2,7 +2,7 @@ utc.service.url=http://37.8.219.195:32000/utc
 utc.dt.service.url=http://37.8.219.195:39002/utc-dt
 utc.hisense.service.url=http://37.8.219.195:39003/utc-hisense
 control.url=http://37.8.219.195:32001/web
-ehualu.url=http://37.8.219.195:30015
-inforsuite.license-path=D:\\license
-#inforsuite.license-path=/license
+ehualu.url=http://37.12.182.29:30015
+#inforsuite.license-path=D:\\license
+inforsuite.license-path=/license
 #inforsuite.license-path=/data/license
\ No newline at end of file

signal-utc-hisense-service/src/main/resources/bootstrap-docker.yaml

@@ -2,12 +2,12 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 37.8.219.162:8848
+        server-addr: 37.8.219.227:28848
         file-extension: yaml
         group: signal
         namespace: signal
         username: nacos
-        password: nacos
+        password: Nacos@2025
   application:
     # dubbo启动需要程序名称
     name: utc-hisense

signal-utc-service/src/main/java/net/wanji/utc/config/RedisConfig.java

@@ -119,7 +119,7 @@ public class RedisConfig extends CachingConfigurerSupport {
     @Bean
     public Jedis jedis() {
         Jedis jedis = new Jedis(redisHost, redisPort);
-        jedis.auth("Wanji300552");
+        jedis.auth(password);
         return jedis;
     }
 

signal-utc-service/src/main/resources/bootstrap-docker.yaml

@@ -7,12 +7,12 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 37.8.219.162:8848
+        server-addr: 37.8.219.227:28848
         file-extension: yaml
         group: signal
         namespace: signal
         username: nacos
-        password: nacos
+        password: Nacos@2025
 
 inforsuite:
-  license-path: D:\\济南\\国产化迁移\\中创中间件inforsuite
\ No newline at end of file
+  license-path: D:\\license
\ No newline at end of file

wj-databus/src/main/resources/mapper/BaseCrossLaneLightsMapper.xml

@@ -55,9 +55,9 @@
     <select id="selectLightsCodeByLaneId" resultType="java.lang.String">
         select t2.lights_no
         from t_base_cross_lane_lights t1
-            join t_base_cross_lights t2
-            join t_base_lane_info t3
-            on t1.lane_id = t3.id and t1.lights_id = t2.id
+                 join t_base_cross_lights t2  on t1.lights_id = t2.id
+                 join t_base_lane_info t3
+                      ON t1.lane_id = t3.id
         where t3.id = #{laneId} and t3.type = 2
     </select>
 

wj-databus/src/main/resources/mapper/BaseCrossSectionMapper.xml

@@ -133,12 +133,9 @@
         SELECT t1.cross_id, t1.start_time, t1.end_time, t1.scheme_id, t2.name as planName, t3.schedules_id,
                t3.week, t3.special_date, t4.name as scheduleName
         FROM t_base_cross_section t1
-                 JOIN t_base_cross_plan t2
-                 JOIN t_base_cross_schedules_plan t3
-                 JOIN t_base_cross_schedules t4
-                      ON t1.plan_id = t2.id
-                          AND t2.id = t3.plan_id
-                          AND t3.schedules_id = t4.id
+                 JOIN t_base_cross_plan t2 ON t1.plan_id = t2.id
+                 JOIN t_base_cross_schedules_plan t3 ON t2.id = t3.plan_id
+                 JOIN t_base_cross_schedules t4 ON t3.schedules_id = t4.id
         WHERE t1.cross_id = #{crossId}
           AND t4.status = 1
     </select>