Redeem 20 ore fa
parent
commit
765cfc16e6

+ 13 - 2
pom.xml

@@ -9,10 +9,10 @@
     </parent>
 
     <groupId>com.steerinfo</groupId>
-    <artifactId>system-base-pass</artifactId>
+    <artifactId>jg_wzjl_api</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
-    <name>system-base-pass</name>
+    <name>jg_wzjl_api</name>
     <url>http://maven.apache.org</url>
 
     <properties>
@@ -113,6 +113,17 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <!-- 排除 classes 目录下的这两个配置文件 -->
+                        <exclude>**/application.properties</exclude>
+                        <exclude>**/application-prod.properties</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>

+ 1 - 1
src/main/java/com/steerinfo/SysManageApplication.java

@@ -56,7 +56,7 @@ public class SysManageApplication implements WebMvcConfigurer {
 
             long endTime = System.currentTimeMillis();
             float excTime = (float) (endTime - startTime) / 1000;
-            //system.out.println("====================================>执行时间:" + excTime + "s");
+            System.out.println("====================================>执行时间:" + excTime + "s");
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 1 - 3
src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/impl/MeterWorkMonitorServiceImpl.java

@@ -200,9 +200,7 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         return meterWorkMonitorRtdbRepository != null
                 && rtdbPoolProperties != null
                 && rtdbPoolProperties.getMonitor().isEnabled()
-                && !rtdbPoolProperties.getMonitor().isFallbackOracle()
-                && rtdbPoolProperties.getMonitor().isSyncEnabled();
-
+                && !rtdbPoolProperties.getMonitor().isFallbackOracle();
     }
 
     private boolean isFallbackOracle() {

+ 1 - 1
src/main/java/com/steerinfo/meterwork/rtdb/RtdbPoolProperties.java

@@ -84,7 +84,7 @@ public class RtdbPoolProperties {
     public static class Monitor {
         /** 是否启用 Monitor 写 Tarantool */
         @Value("${rtdb.monitor.enabled:true}")
-        private boolean enabled = true;
+        private boolean enabled;
         /** Tarantool 失败时是否回退 Oracle */
         @Value("${rtdb.monitor.fallback-oracle:false}")
         private boolean fallbackOracle;

+ 2 - 2
src/main/resources/application.properties

@@ -149,6 +149,6 @@ rtdb.pool.borrow-timeout-ms=3000
 rtdb.monitor.enabled=true
 rtdb.monitor.fallback-oracle = false
 rtdb.monitor.bootstrap-enabled = false
-meter.monitor.sync.enabled = false
-meter.monitor.sync.cron=0 */1 * * * ?
+#meter.monitor.sync.enabled = true
+#meter.monitor.sync.cron=0 */1 * * * ?
 security.verification.enabled = true

+ 10 - 16
src/main/resources/bootstrap.yml

@@ -1,20 +1,18 @@
 spring:
   application:
-    name: system-pass
+    name: jg_wzjl_api
   profiles:
     active: ${SPRING_PROFILES:prod}
-#  zipkin:
-#    base-url: http://${ZIPKIN_HOST:localhost}:9411 #2021年10月20日注释
   sleuth:
     sampler:
       #默认值为0.1f,现在为了测试设置100%采集
       percentage: 1.0      
-#  cloud:
-#    config:
+  cloud:
+    config:
 #      fail-fast: true
-#      discovery:
-#        enabled: true
-#        service-id: config-server
+      discovery:
+        enabled: true
+        service-id: config-server
     bus:
       trace:
         enabled: false # 2021年9月10日取消springcloud中bus总线服务
@@ -23,27 +21,23 @@ server:
   port: ${SERVER_PORT:9004}
 eureka:
   client:
-    fetch-registry: false # 取消从注册中心获取服务信息
-    register-with-eureka: false # 取消注册服务到注册中心
     serviceUrl:
       defaultZone: http://root:root@${EUREKA_HOST:localhost}:${EUREKA_PORT:8061}/eureka/
     metadata-map:
       cluster: ribbon
   instance:
-    hostname: system-base-pass
+    hostname: jg_wzjl_api
     status-page-url: http://${SWAGGER_INDEX:localhost:9002}/swagger-ui.html
     prefer-ip-address: true
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
 #禁止调用eureka client获取注册列表信息
 ribbon:
   eureka:
-    enabled: false # 2021年9月10日取消注册服务到注册中心
+    enabled: true # 2021年9月10日取消注册服务到注册中心
 #新版配置,否则后面dashboard无法找到hystrix.stream
 management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
+  server:
+    port: -1
 meter:
   sync:
     enabled: false

+ 1 - 1
src/main/resources/log4j.properties

@@ -1,6 +1,6 @@
 ## LOG4J配置
 #log4j.rootCategory=INFO,stdout,file, RUNNING,errorfile
-log4j.rootCategory=ERROR,file, RUNNING,errorfile 
+log4j.rootCategory=ERROR,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout