Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

pom.xml

@@ -289,6 +289,11 @@
                         </filesets>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>com.google.cloud.tools</groupId>
+                    <artifactId>jib-maven-plugin</artifactId>
+                    <version>3.4.5</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

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

+spring:
+  application:
+    # dubbo启动需要程序名称
+    name: web
+  cloud:
+    nacos:
+      config:
+        server-addr: 10.102.1.163:8848
+        file-extension: yaml
+        group: signal
+        namespace: signal
+        username: nacos
+        password: Wgzonal0sowQjm9
+  main:
+    allow-circular-references: true
\ No newline at end of file

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

-utc.service.url=http://192.168.208.43:32000/utc
-utc.dt.service.url=http://192.168.208.43:39002/utc-dt
-utc.hisense.service.url=http://192.168.208.43:39003/utc-hisense
-control.url=http://192.168.208.43:32001/web
+utc.service.url=http://fuzhujuece-signal-utc-service:32000/utc
+utc.dt.service.url=http://10.102.1.182:39002/utc-dt
+utc.hisense.service.url=http://10.102.1.182:39003/utc-hisense
+control.url=http://10.102.1.182:32001/web

wj-common/pom.xml

@@ -558,4 +558,32 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>jib-maven-plugin</artifactId>
+                <configuration>
+                    <!-- we don't want jib to execute on this module -->
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <!-- we want this library to be built reproducibly -->
+            <plugin>
+                <groupId>io.github.zlika</groupId>
+                <artifactId>reproducible-build-maven-plugin</artifactId>
+                <version>0.11</version>
+                <executions>
+                    <execution>
+                        <id>run-when-packaged</id>
+                        <goals>
+                            <goal>strip-jar</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

wj-databus/pom.xml

@@ -44,6 +44,29 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>jib-maven-plugin</artifactId>
+                <configuration>
+                    <!-- we don't want jib to execute on this module -->
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <!-- we want this library to be built reproducibly -->
+            <plugin>
+                <groupId>io.github.zlika</groupId>
+                <artifactId>reproducible-build-maven-plugin</artifactId>
+                <version>0.11</version>
+                <executions>
+                    <execution>
+                        <id>run-when-packaged</id>
+                        <goals>
+                            <goal>strip-jar</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>