Kaynağa Gözat

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ipfcst-console/src/main/frontend/router/modules/dataquery.js
wangtao 3 yıl önce
ebeveyn
işleme
f63c10d3c7
31 değiştirilmiş dosya ile 135 ekleme ve 346 silme
  1. 105 0
      ipfcst-common/ipfcst-common-data/src/main/resources/logback-console.xml
  2. 1 1
      ipfcst-console/pom.xml
  3. 13 21
      ipfcst-console/src/main/frontend/layout/components/Navbar.vue
  4. 8 4
      ipfcst-console/src/main/frontend/router/modules/dataquery.js
  5. 4 1
      ipfcst-console/src/main/java/com/jiayue/ipfcst/config/RedisConfig.java
  6. 2 2
      ipfcst-console/src/main/resources/application.yml
  7. 0 14
      syjy/ipfcstV3/bin/install-ipfcst-centos.sh
  8. 0 35
      syjy/ipfcstV3/bin/install-ipfcst-linx.sh
  9. 0 9
      syjy/ipfcstV3/bin/restart-monitor.sh
  10. 0 9
      syjy/ipfcstV3/bin/restart-reportquery.sh
  11. 2 2
      syjy/ipfcstV3/bin/start-console.sh
  12. 0 32
      syjy/ipfcstV3/bin/start-monitor.sh
  13. 0 31
      syjy/ipfcstV3/bin/start-reportquery.sh
  14. 0 16
      syjy/ipfcstV3/bin/status-monitor.sh
  15. 0 16
      syjy/ipfcstV3/bin/status-reportquery.sh
  16. 0 17
      syjy/ipfcstV3/bin/stop-monitor.sh
  17. 0 17
      syjy/ipfcstV3/bin/stop-reportquery.sh
  18. 0 9
      syjy/ipfcstV3/bin/update-lib.sh
  19. 0 10
      syjy/ipfcstV3/bin/update-monitor.sh
  20. 0 10
      syjy/ipfcstV3/bin/update-reportquery.sh
  21. 0 0
      syjy/ipfcstV3/downloadFile/new/解析目录
  22. 0 0
      syjy/ipfcstV3/logs/日志目录
  23. 0 0
      syjy/ipfcstV3/original/bin/原有bin
  24. 0 0
      syjy/ipfcstV3/original/原有程序
  25. 0 90
      syjy/ipfcstV3/produce/console/3.1.0.f2/application.yml
  26. BIN
      syjy/ipfcstV3/produce/console/3.1.0.f2/ipfcst-console.jar
  27. BIN
      syjy/ipfcstV3/produce/monitor/1.0.32/ipfcst-monitor.jar
  28. 0 0
      syjy/ipfcstV3/receive/接收文件
  29. 0 0
      syjy/ipfcstV3/systemFile/系统文件
  30. 0 0
      syjy/ipfcstV3/tempFile/上报文件临时目录
  31. 0 0
      syjy/ipfcstV3/uploadFile/上报文件目录

+ 105 - 0
ipfcst-common/ipfcst-common-data/src/main/resources/logback-console.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration scan="false" scanPeriod="60 seconds" debug="false"><!-- 这个是根配置文件,一定要有的
+                            scan:
+                                是当配置文件被修改后会被重新加载
+                            scanPeriod:
+                                设置监测配置文件是否有修改的时间间隔,如果没有给出时间单位,
+                                默认单位是毫秒。当scan为true时,此属性生效。默认的时间间隔为1分钟。
+                            debug:
+                                当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。
+                                默认值为false。
+                             -->
+  <!-- 日志存放路径
+      下面的标签可以自己定义
+      name:相当于Map的key
+      value:就是map的value
+      ${catalina.base}是tomcat的当前路径
+      /logs:就是tomcat下的日志路径,
+      /ehrlog:如果没有目录会默认创建
+  -->
+  <property name="logbase" value="../../../logs/"/>
+  <!-- 时间戳:这个时间戳可以作为每日日志的名称 -->
+  <timestamp key="bySecond" datePattern="yyyy-MM-dd"/>
+  <!-- appender:
+      name相当于一个名称
+      class:确定要加载哪个类
+      encoder:一定要加 encoder ,
+      默认配置为PatternLayoutEncoder
+      patter:必填
+      ConsoleAppender:也明白是什么意思,就是输出在控制台上-->
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+      <charset>UTF-8</charset>
+    </encoder>
+  </appender>
+  <!-- 把日志存储
+      encoding:日志的编码
+      file:指定当前生成的日志文件名称
+      rollingPolicy:滚动策略
+      FileNamePattern:移动文件最后的名称,跟file标签结合使用,
+      比如file里面的内容是  1.txt
+      那么,FileNamePattern里面写的是2.txt,那么最后文件名就为2.txt
+      如果最后结尾是gz或者zip,那么,就会自动打成压缩包
+      -->
+  <appender name="logFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!-- 编码 -->
+    <!--<Encoding>UTF-8</Encoding>-->
+    <!-- 按照时间来 -->
+    <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+      <!--日志文件输出的文件名-->
+      <FileNamePattern>${logbase}/%d{yyyy-MM-dd}/ipfcst-console.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+      <!--日志文件保留天数-->
+      <MaxHistory>180</MaxHistory>
+      <maxFileSize>10MB</maxFileSize>
+      <totalSizeCap>1024MB</totalSizeCap>
+      <cleanHistoryOnStart>true</cleanHistoryOnStart>
+    </rollingPolicy>
+    <!-- 布局 -->
+    <encoder>
+      <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符-->
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+      <charset>UTF-8</charset>
+    </encoder>
+    <append>false</append>
+  </appender>
+
+
+  <!-- <appender name="TunnelLogFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+     &lt;!&ndash; 编码 &ndash;&gt;
+     &lt;!&ndash;<Encoding>UTF-8</Encoding>&ndash;&gt;
+     &lt;!&ndash; 按照时间来 &ndash;&gt;
+     <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+       &lt;!&ndash;日志文件输出的文件名&ndash;&gt;
+       <FileNamePattern>D://testlog//#TunnelName#.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+       &lt;!&ndash;日志文件保留天数&ndash;&gt;
+       <MaxHistory>180</MaxHistory>
+       <maxFileSize>10MB</maxFileSize>
+       <totalSizeCap>1024MB</totalSizeCap>
+       <cleanHistoryOnStart>true</cleanHistoryOnStart>
+     </rollingPolicy>
+     &lt;!&ndash; 布局 &ndash;&gt;
+     <encoder>
+       &lt;!&ndash;格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符&ndash;&gt;
+       <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+       <charset>UTF-8</charset>
+     </encoder>
+     <append>false</append>
+   </appender>
+
+   <logger name="TunnelLogger" level="debug" additivity="true">
+     <appender-ref ref="TunnelLogFile"/>
+   </logger>-->
+
+  <logger name="com.jiayue" level="info" additivity="true">
+    <appender-ref ref="logFile"/>
+  </logger>
+  <logger name="org" level="info" additivity="true">
+    <appender-ref ref="logFile"/>
+  </logger>
+
+  <root level="info">
+    <appender-ref ref="STDOUT"/>
+  </root>
+</configuration>

+ 1 - 1
ipfcst-console/pom.xml

@@ -21,7 +21,7 @@
   <artifactId>ipfcst-console</artifactId>
 
   <!--改版本号时注意第2位的大小包:0大包 1小包-->
-  <version>3.1.0.f2</version>
+  <version>3.1.0.f1</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+ 13 - 21
ipfcst-console/src/main/frontend/layout/components/Navbar.vue

@@ -11,16 +11,19 @@
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
-          <!--<router-link to="/">-->
-            <el-dropdown-item @click.native='jumpReport'>
-              统计查询
-            </el-dropdown-item>
-            <el-dropdown-item @click.native='jumpMonitor'>
-              系统监控
-            </el-dropdown-item>
-          <el-dropdown-item divided @click.native="logout">
-            <span style="display:block;">退出系统</span>
+          <el-dropdown-item @click.native='logout'>
+            退出系统
           </el-dropdown-item>
+                      <!--<router-link to="/">-->
+<!--            <el-dropdown-item @click.native='jumpReport'>-->
+<!--              统计查询-->
+<!--            </el-dropdown-item>-->
+<!--            <el-dropdown-item @click.native='jumpMonitor'>-->
+<!--              系统监控-->
+<!--            </el-dropdown-item>-->
+<!--          <el-dropdown-item divided @click.native="logout">-->
+<!--            <span style="display:block;">退出系统</span>-->
+<!--          </el-dropdown-item>-->
         </el-dropdown-menu>
       </el-dropdown>
     </div>
@@ -54,18 +57,7 @@
       // this.$router.push(`/login?redirect=${this.$route.fullPath}`)
       sessionStorage.clear()
       var href = window.location.href
-      window.location.href='https://'+href.split("//")[1].split(":")[0]+':9000'
-    },
-    // 查询
-    jumpReport(){
-      //页面url通常为http://localhost:8090/XXXX/images/1_15.png
-      var href = window.location.href
-      window.location.href='https://'+href.split("//")[1].split(":")[0]+':9000'
-    },
-    jumpMonitor(){
-      //页面url通常为http://localhost:8090/XXXX/images/1_15.png
-      var href = window.location.href
-      window.location.href='https://'+href.split("//")[1].split(":")[0]+':8088'
+      window.location.href='https://'+href.split("//")[1].split(":")[0]+':9001'
     }
   }
 }

+ 8 - 4
ipfcst-console/src/main/frontend/router/modules/dataquery.js

@@ -16,25 +16,29 @@ const dataqueryRouter = {
       path: 'inverterStatusData',
       component: () => import('@/views/dataquery/inverterStatusData'),
       name: 'inverterStatusData',
-      meta: {title: '逆变器数据', noCache: true}
+      meta: { title: '逆变器数据', noCache: true },
+      sign: 'currency'
     },
     {
       path: 'windTurbineStatusData',
       component: () => import('@/views/dataquery/windTurbineStatusData'),
       name: 'windTurbineStatusData',
-      meta: {title: '风机数据', noCache: true}
+      meta: { title: '风机数据', noCache: true },
+      sign: 'currency'
     },
     {
       path: 'weatherStationStatusData',
       component: () => import('@/views/dataquery/weatherStationStatusData'),
       name: 'weatherStationStatusData',
-      meta: {title: '气象站数据', noCache: true}
+      meta: { title: '气象站数据', noCache: true },
+      sign: 'currency'
     },
     {
       path: 'windTowerStatusData',
       component: () => import('@/views/dataquery/windTowerStatusData'),
       name: 'windTowerStatusData',
-      meta: {title: '测风塔数据', noCache: true}
+      meta: { title: '测风塔数据', noCache: true },
+      sign: 'currency'
     },
     {
       path: 'realTimeDQ',

+ 4 - 1
ipfcst-console/src/main/java/com/jiayue/ipfcst/config/RedisConfig.java

@@ -15,6 +15,9 @@ public class RedisConfig {
     @Value("${spring.redis.port}")
     private int port;
 
+    @Value("${spring.redis.password}")
+    private String password;
+
     @Value("${spring.redis.timeout}")
     private int timeout;
 
@@ -39,7 +42,7 @@ public class RedisConfig {
         jedisPoolConfig.setBlockWhenExhausted(blockWhenExhausted);
         // 是否启用pool的jmx管理功能, 默认true
         jedisPoolConfig.setJmxEnabled(JmxEnabled);
-        JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout);
+        JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout,password);
         return jedisPool;
     }
 }

+ 2 - 2
ipfcst-console/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
   redis:
     host: 192.168.1.205
     port: 6379
-    password: 'null'
+    password: jiayue
     maxIdle: 10
     maxTotal: 30
     maxWaitMillis: 1500
@@ -38,7 +38,7 @@ spring:
       # 数据源配置
       username: root
       password: '!QAZ2root'
-      url: jdbc:mysql://192.168.1.205:3306/focus?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://localhost:3306/focus?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
       driver-class-name: com.mysql.cj.jdbc.Driver
       # 初始化 最小 最大
       initial-size: 10

+ 0 - 14
syjy/ipfcstV3/bin/install-ipfcst-centos.sh

@@ -14,37 +14,23 @@ if test -e /home/syjy/patch.zip
 	unzip -o patch.zip
 fi
 
-cp -f $basedir/settings/monitor /etc/init.d/
 cp -f $basedir/settings/console /etc/init.d/
-cp -f $basedir/settings/reportquery /etc/init.d/
 
-chmod 777 /etc/init.d/monitor
 chmod 777 /etc/init.d/console
-chmod 777 /etc/init.d/reportquery
 
 if test -x /usr/lib/systemd/system
 	then
-	cp -f $basedir/settings/monitor.service /usr/lib/systemd/system
 	cp -f $basedir/settings/console.service /usr/lib/systemd/system
-	cp -f $basedir/settings/reportquery.service /usr/lib/systemd/system
 	
-	chmod 777 /usr/lib/systemd/system/monitor.service
 	chmod 777 /usr/lib/systemd/system/console.service
-	chmod 777 /usr/lib/systemd/system/reportquery.service
 	
 	systemctl daemon-reload
-	systemctl enable monitor
 	systemctl enable console
-	systemctl enable reportquery
 	
 	else
-	chkconfig monitor on
 	chkconfig console on
-	chkconfig reportquery on
 fi
 
-service monitor start
 service console start
-service reportquery start
 
 echo "Installation is complete!"

+ 0 - 35
syjy/ipfcstV3/bin/install-ipfcst-linx.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-export basedir=/home/syjy/ipfcstV3
-
-chmod -R 777 $basedir
-
-cd $basedir/jdk
-
-echo "Install jdk8!"
-tar -zxvf jdk-8u261-linux-x64.tar.gz
-
-if test -e /home/syjy/patch.zip
-	then
-	cd /home/syjy
-	unzip -o patch.zip
-fi
-
-cp -f $basedir/settings/monitor /etc/init.d/
-cp -f $basedir/settings/console /etc/init.d/
-cp -f $basedir/settings/reportquery /etc/init.d/
-
-chmod 777 /etc/init.d/monitor
-chmod 777 /etc/init.d/console
-chmod 777 /etc/init.d/reportquery
-
-update-rc.d monitor defaults
-update-rc.d console defaults
-update-rc.d reportquery defaults
-systemctl daemon-reload
-
-service monitor start
-service console start
-service reportquery start
-
-echo "Installation is complete!"

+ 0 - 9
syjy/ipfcstV3/bin/restart-monitor.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-export basedir=/home/syjy/ipfcstV3
-export bindir=$basedir/bin
-
-sh $bindir/stop-monitor.sh
-sh $bindir/start-monitor.sh
-
-exit 0

+ 0 - 9
syjy/ipfcstV3/bin/restart-reportquery.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-export basedir=/home/syjy/ipfcstV3
-export bindir=$basedir/bin
-
-sh $bindir/stop-reportquery.sh
-sh $bindir/start-reportquery.sh
-
-exit 0

+ 2 - 2
syjy/ipfcstV3/bin/start-console.sh

@@ -5,9 +5,9 @@ export producedir=$basedir/produce
 
 export start_app_log=$basedir/logs/ipfcst_console.log
 
-export version="3.1.0.f2"
+export version="3.1.0.f1"
 
-export app_path=$producedir/console/3.1.0.f2
+export app_path=$producedir/console/3.1.0.f1
 
 export JAVA_HOME=/home/syjy/ipfcstV3/jdk/jdk1.8.0_261
 export JRE_HOME=$JAVA_HOME/jre

+ 0 - 32
syjy/ipfcstV3/bin/start-monitor.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-export basedir=/home/syjy/ipfcstV3
-export producedir=$basedir/produce
-
-export start_app_log=$basedir/logs/ipfcst_monitor.log
-
-export version="1.0.32"
-
-export app_path=$producedir/monitor/$version
-
-export JAVA_HOME=/home/syjy/ipfcstV3/jdk/jdk1.8.0_261
-export JRE_HOME=$JAVA_HOME/jre
-export CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH
-export PATH=$JAVA_HOME/bin:$JRE_HOME/bin:$PATH
-
-cd $app_path
-echo "Starting monitor"
-if test -r $basedir/settings/application.yml
-  then
-	cp -f $basedir/settings/application.yml $app_path/
-	echo "cp $basedir/settings/application.yml $app_path/"
-fi
-if test -x $app_path/ipfcst-monitor.jar
-  then
-	java -jar $app_path/ipfcst-monitor.jar >$start_app_log &
-	echo "monitor started, PID is $!" | sed -e "s/\b\(.\)/\u\1/g"
-  else
-	echo "Couldn't find monitor server($app_path/ipfcst-monitor.jar)"
-fi
-
-exit 0

+ 0 - 31
syjy/ipfcstV3/bin/start-reportquery.sh

@@ -1,31 +0,0 @@
-#!/bin/sh
-
-export basedir=/home/syjy/ipfcstV3
-export producedir=$basedir/produce
-
-export start_app_log=$basedir/logs/ipfcst_reportquery.log
-
-export version="3.1.175.m"
-
-export app_path=$producedir/reportquery/3.1.175.m
-
-export JAVA_HOME=/home/syjy/ipfcstV3/jdk/jdk1.8.0_261
-export JRE_HOME=$JAVA_HOME/jre
-export CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH
-export PATH=$JAVA_HOME/bin:$JRE_HOME/bin:$PATH
-
-export LANG="zh_CN.UTF-8"
-export LC_ALL="zh_CN.UTF-8"
-
-
-cd $app_path
-echo "Starting reportquery"
-if test -x $app_path/ipfcst-reportquery.jar
-  then
-	java -jar $app_path/ipfcst-reportquery.jar >$start_app_log &
-	echo "reportquery started, PID is $!" | sed -e "s/\b\(.\)/\u\1/g"
-  else
-	echo "Couldn't find reportquery server($app_path/ipfcst-reportquery.jar)"
-fi
-
-exit 0

+ 0 - 16
syjy/ipfcstV3/bin/status-monitor.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-pid_list="$(ps aux | grep ipfcst-monitor | grep -v grep | awk '{print $2}')"
-pid_count=`echo $pid_list | wc -w`
-if test $pid_count -eq 1 ; then
-  echo "Monitor running, pid is $pid_list"
-  exit 0
-elif test $pid_count -gt 1 ; then
-  echo "Multiple Monitor running $pid_list"
-  exit 1
-elif test -z $pid_list ; then
-  echo "Monitor is not running"
-  exit 1
-fi
-
-exit 0

+ 0 - 16
syjy/ipfcstV3/bin/status-reportquery.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-pid_list="$(ps aux | grep ipfcst-reportquery | grep -v grep | awk '{print $2}')"
-pid_count=`echo $pid_list | wc -w`
-if test $pid_count -eq 1 ; then
-  echo "reportquery running, pid is $pid_list"
-  exit 0
-elif test $pid_count -gt 1 ; then
-  echo "Multiple reportquery running $pid_list"
-  exit 1
-elif test -z $pid_list ; then
-  echo "reportquery is not running"
-  exit 1
-fi
-
-exit 0

+ 0 - 17
syjy/ipfcstV3/bin/stop-monitor.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-echo "Shutting down Monitor"
-pid_list="$(ps aux | grep ipfcst-monitor | grep -v grep | awk '{print $2}')"
-if test -z $pid_list ; then
-	echo "Monitor is not running"
-else
-	for pid in $pid_list;  
-	do  
-	if kill -0 "$pid" 2>/dev/null; then
-		echo "kill pid $pid"
-		kill -9 $pid
-	fi
-	done  
-fi
-
-exit 0

+ 0 - 17
syjy/ipfcstV3/bin/stop-reportquery.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-echo "Shutting down reportquery"
-pid_list="$(ps aux | grep ipfcst-reportquery | grep -v grep | awk '{print $2}')"
-if test -z $pid_list ; then
-	echo "reportquery is not running"
-else
-	for pid in $pid_list;  
-	do  
-	if kill -0 "$pid" 2>/dev/null; then
-		echo "kill pid $pid"
-		kill -9 $pid
-	fi
-	done  
-fi
-
-exit 0

+ 0 - 9
syjy/ipfcstV3/bin/update-lib.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-export basedir=/home/syjy/ipfcstV3
-
-rm -rf $basedir/ipfcst-lib
-unzip -o -d $basedir $basedir/receive/ipfcst-lib.zip
-chmod -R 777 $basedir
-
-exit 0

+ 0 - 10
syjy/ipfcstV3/bin/update-monitor.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-export basedir=/home/syjy/ipfcstV3
-
-cp -f $basedir/bin/start-monitor.sh $basedir/original/bin
-unzip -o -d $basedir $basedir/receive/ipfcst-monitor.zip
-chmod -R 777 $basedir
-sh $basedir/bin/restart-monitor.sh
-
-exit 0

+ 0 - 10
syjy/ipfcstV3/bin/update-reportquery.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-export basedir=/home/syjy/ipfcstV3
-
-cp -f $basedir/bin/start-reportquery.sh $basedir/original/bin
-unzip -o -d $basedir $basedir/receive/ipfcst-reportquery.zip
-chmod -R 777 $basedir
-sh $basedir/bin/restart-reportquery.sh
-
-exit 0

+ 0 - 0
syjy/ipfcstV3/downloadFile/new/解析目录


+ 0 - 0
syjy/ipfcstV3/logs/日志目录


+ 0 - 0
syjy/ipfcstV3/original/bin/原有bin


+ 0 - 0
syjy/ipfcstV3/original/原有程序


+ 0 - 90
syjy/ipfcstV3/produce/console/3.1.0.f2/application.yml

@@ -1,90 +0,0 @@
-server:
-  port: 9001
-  #https监听端口
-  ssl:
-    key-store: classpath:ipfcst.keystore
-    key-store-password: jiayue6677*
-    key-store-type: JKS
-spring:
-  servlet:
-    multipart:
-      max-file-size: 4096MB  # 单个文件的大小
-      max-request-size: 4096MB  # 上传文件的总大小
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    # 系统启动时执行sql 初始化表内容
-    data: classpath:sql/t_sys_user.sql
-    sql-script-encoding: utf-8
-    #schema:
-    # 每次启动时均初始化表
-    initialization-mode: always
-    druid:
-      # 数据源配置
-      username: root
-      password: '!QAZ2root'
-      url: jdbc:mysql://localhost:3306/focus?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      # 初始化 最小 最大
-      initial-size: 10
-      min-idle: 10
-      max-active: 90
-      # 配置获取连接等待超时的时间
-      max-wait: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      time-between-eviction-runs-millis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      min-evictable-idle-time-millis: 300000
-      validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      # 打开PSCache,并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置多个英文逗号分隔
-      filters: stat,wall
-      # WebStatFilter配置,说明请参考Druid Wiki,配置_配置WebStatFilter
-      # 是否启用StatFilter默认值true
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-        session-stat-enable: false
-        session-stat-max-count: 1000
-        principal-cookie-name: admin
-        principal-session-name: admin
-        profile-enable: true
-      # 根据配置中的url-pattern来访问内置监控页面,如果是上面的配置,内置监控页面的首页是/druid/index.html
-      # http://loacalhsot:8081/druid
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*  # 监控页面访问路径
-        # 允许清空统计数据
-        reset-enable: true
-        login-username: admin
-        login-password: 123456
-        # StatViewSerlvet展示出来的监控信息比较敏感,是系统运行的内部情况,如果你需要做访问控制,可以配置allow和deny这两个参数
-        # deny优先于allow,如果在deny列表中,就算在allow列表中,也会被拒绝。如果allow没有配置或者为空,则允许所有访问
-        # 配置的格式
-        # <IP>
-        # 或者<IP>/<SUB_NET_MASK_size>其中128.242.127.1/24
-        # 24表示,前面24位是子网掩码,比对的时候,前面24位相同就匹配,不支持IPV6。
-        allow:
-        deny:
-  jpa:
-    hibernate:
-      naming:
-        physical-strategy: com.jiayue.ipfcst.common.data.strategy.IpfcstNamingStrategy
-      ddl-auto: update
-    show-sql: false
-logging:
-  config: classpath:logback-console.xml
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: ALWAYS

BIN
syjy/ipfcstV3/produce/console/3.1.0.f2/ipfcst-console.jar


BIN
syjy/ipfcstV3/produce/monitor/1.0.32/ipfcst-monitor.jar


+ 0 - 0
syjy/ipfcstV3/receive/接收文件


+ 0 - 0
syjy/ipfcstV3/systemFile/系统文件


+ 0 - 0
syjy/ipfcstV3/tempFile/上报文件临时目录


+ 0 - 0
syjy/ipfcstV3/uploadFile/上报文件目录