Browse Source

岸电报表分支创建,删除多余内容

sbj 3 weeks ago
parent
commit
4464d8314c

+ 1 - 1
src/main/java/com/shcd/conf/XxlJobConfig.java

@@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration;
  * @Date: 2021/6/29 14:10
  */
 @Slf4j
-@Configuration
+//@Configuration
 @ComponentScan(basePackages = "com.shcd.scheduling")
 public class XxlJobConfig {
 

File diff suppressed because it is too large
+ 0 - 1092
src/main/java/com/shcd/controller/ShorePowerController.java


+ 3 - 13
src/main/resources/profile/pro/application.properties

@@ -35,9 +35,9 @@ spring.jmx.enabled=false
 
 
 xxl.job.admin.addresses=http://127.0.0.1:8091/xxl-job-admin
-xxl.job.executor.appname=
+xxl.job.executor.appname=shorePowerReport
 xxl.job.executor.ip=127.0.0.1
-xxl.job.executor.port=
+xxl.job.executor.port=19996
 xxl.job.accessToken=
 xxl.job.executor.logpath=E:/xxl-job/applogs/xxl-job
 xxl.job.executor.logretentiondays=30
@@ -59,14 +59,4 @@ spring.redis.jedis.pool.max-idle=10
 # \u6700\u5C0F\u7A7A\u95F2
 spring.redis.jedis.pool.min-idle=-1
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4
-spring.redis.timeout=10000
-
-dredgingTokenUrl=http://172.31.233.22:8093/dredging/token/getToken
-#dredgingClientId=34cd20d8489f453d9a9671f1099d53f4
-#dredgingClientSecret=43f111ec3451405c97b914450a91a18c
-dredgingProjectUrl=http://172.31.233.22:8093/dredging/projectOverview/GetProjectOverview
-dredgingElectricFenUrl=http://172.31.233.22:8093/dredging/elecfence/GetElectronicFence
-dredgingWorkOrderUrl=http://172.31.233.22:8093/dredging/workOrder/GetWorkOrderList
-dredgingWorkTraceUrl=http://172.31.233.22:8093/dredging/workOrderHistory/getWorkHistory
-dredgingWorkCameraUrl=http://172.31.233.22:8093/dredging/getProjectCameraList
-#geographyChangeUrl=http://172.17.231.65:8080/NHJTWebservice/common/CommonWebservice.asmx/ChangeDataCoordinateNoLog
+spring.redis.timeout=10000