将一期项目中相关代码合并到二期项目中去

smartFishingPort-admin/src/main/java/com/ltgk/smartFishingPort/SmartFishingPortApplication.java

@@ -3,6 +3,8 @@ package com.ltgk.smartFishingPort;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 启动程序
@@ -10,6 +12,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author ltgk
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@EnableAspectJAutoProxy
+@EnableScheduling
 public class SmartFishingPortApplication
 {
     public static void main(String[] args)

smartFishingPort-admin/src/main/resources/application-druid.yml

@@ -1,18 +1,21 @@
 # 数据源配置
 spring:
+  data:
+    solr:
+      host: http://198.16.74.212:8983/solr
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
     druid:
       # 主库数据源
-#      master:
-#        url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#        username: root
-#        password: password
+      #      master:
+      #        url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+      #        username: root
+      #        password: password
       master:
-          url: jdbc:mysql://119.167.138.11:3306/smart_fishing_port?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-          username: ltgk
-          password: litugaoke01!
+        url: jdbc:mysql://119.167.138.11:3306/smart_fishing_port?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: ltgk
+        password: litugaoke01!
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
@@ -62,4 +65,47 @@ spring:
           merge-sql: true
         wall:
           config:
-            multi-statement-allow: true
+            multi-statement-allow: true
+url:
+  picFile: http://198.16.74.209:6060
+sdk:
+  loginDHUrl: http://192.168.1.18:6450/dhsdk/rest/sdk/init
+  attachTrafficDHUrl: http://192.168.1.18:6450/dhsdk/rest/sdk/attachTraffic
+  attachAlarmChanDHByAccountUrl: http://localhost:6450/dhsdk/rest/sdk/attachAlarmChanByAccount
+  attachAlarmChanHKByAccountUrl: http://localhost:6350/hksdk/rest/sdk/attachAlarmChanByAccount
+  hk:
+    getPtzCfgUrl: http://198.16.74.211:6350/hksdk/rest/sdk/getPtzCfg
+    setPtzCfgUrl: http://198.16.74.211:6350/hksdk/rest/sdk/setPtzCfg
+    setupAlarmChanUrl: http://198.16.74.211:6350/hksdk/rest/sdk/setupAlarmChan
+file:
+  base: /file
+  image: /file/image
+  kml: /files/kml/
+
+sysLog:
+  logFilePath: file/log/ # 系统操作日志备份文件夹
+path:
+  rootPath: file/ # 文件存储的跟路径,绝对路径-直接使用,相对路径-项目运行目录下
+  filePattern: YYYY-MM/  # 存储目录的格式,日期格式YYYYMMddHHmmss,按照日期格式化来进行,为根目录下的一级
+  mysqlhome: J://MYSQL5.7//bin//
+  sql: ${server.servlet.context-path}/file/sql
+
+#数据库备份时间间隔
+database:
+  backup:
+    interval: 3 # 单位天
+jwt:
+  tokenKey: Auth
+  duration: 18000
+drone:
+  url: http://198.16.74.210:30812/openapi/v0.1/
+  key: eyJhbGciOiJIUzUxMiIsImNyaXQiOlsidHlwIiwiYWxnIiwia2lkIl0sImtpZCI6IjU3YmQyNmEwLTYyMDktNGE5My1hNjg4LWY4NzUyYmU1ZDE5MSIsInR5cCI6IkpXVCJ9.eyJhY2NvdW50IjoiIiwiZXhwIjoyMDc1OTQ3NzIyLCJuYmYiOjE3NjA0MTQ5MjIsIm9yZ2FuaXphdGlvbl91dWlkIjoiOWRmMjlmYTgtNGI5OS00MThlLWJhMmQtMGY5ZWY5ZWVlMzkyIiwicHJvamVjdF91dWlkIjoiIiwic3ViIjoiZmgyIiwidXNlcl9pZCI6IjE3NjA0MTQxMDkzNTcwMDI0MjkifQ.DC_aS37W2fkqOjCtfvysDfhTn-4XVn3_IrXBnPD9rICGyrIBKBG3oPldeW_pqele5H_gCn1EgM0KXcbDgvq-dw
+  url2: http://198.16.74.210:30812/openapi/v0.9/
+  url3: http://198.16.74.210:63302/
+rocketmq:
+  name-server: 198.16.74.211:9876
+  producer:
+    group: collect
+    topic: point-topic
+# 温州大致范围
+geoJson: 119.6203422546387,27.68292003880313;119.800415040,27.962869020;119.948730470,27.999251730;120.132751460,27.999251730;120.305786130,28.011376570;120.375137330,28.144659670;120.337371830,28.336417060;120.321578980,28.378110320;120.312652590,28.425825960;120.336685180,28.440921370;120.4183960,28.574271040;120.443801880,28.592962710;120.490493770,28.58874230;120.568771360,28.547132060;120.628509520,28.584521720;120.701293950,28.619487110;120.747299190,28.62069260;120.797424320,28.596580060;120.957412720,28.520589410;121.098175050,28.544719370;121.168212890,28.518779440;121.259536740,28.41072840;121.242657720,28.38772010;121.222457890,28.374787540;121.214561460,28.349410190;121.210098270,28.325840080;121.202459340,28.273166160;121.153106690,28.266287160;121.149673460,28.214869550;121.139373780,28.153741130;121.058349610,28.038652480;121.127700810,28.013195180;121.260223390,27.99682660;121.198425290,27.827842780;121.18194580,27.72486720;121.254730220,27.610538530;121.140747070,27.414442970;120.886688230,27.004078760;120.40191650,27.137368360;120.252227780,27.372986830;120.0503540,27.315654240;119.766082760,27.286366590;119.6733856201172,27.43455578758766;119.6150207519531,27.59350062636446;119.6126174926758,27.63396131658914;119.6151924133301,27.65935568886939;119.6203422546387,27.68292003880313

smartFishingPort-admin/src/main/resources/application.yml

@@ -16,7 +16,7 @@ smartFishingPort:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 6061
   servlet:
     # 应用的访问路径
     context-path: /
@@ -133,4 +133,4 @@ xss:
   # 排除链接（多个用逗号分隔）
   excludes: /system/notice
   # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*
+  urlPatterns: /system/*,/monitor/*,/tool/*