xumutong

xmt_service/pom.xml

@@ -23,21 +23,21 @@
         <spring.boot.version>2.3.12.RELEASE</spring.boot.version>
         <spring.platform.version>Cairo-SR8</spring.platform.version>
 
-<!--        <docker.registry.url>192.168.1.67</docker.registry.url>-->
-<!--        <docker.registry.host>http://${docker.registry.url}:8858</docker.registry.host>-->
-<!--        <docker.username>sentinel</docker.username>-->
-<!--        <docker.password>sentinel</docker.password>-->
-<!--        <docker.namespace>blade</docker.namespace>-->
-<!--        <docker.plugin.version>1.4.13</docker.plugin.version>-->
-<!--        <docker.plugin.version>0.4.14</docker.plugin.version>-->
+        <!--        <docker.registry.url>192.168.1.67</docker.registry.url>-->
+        <!--        <docker.registry.host>http://${docker.registry.url}:8858</docker.registry.host>-->
+        <!--        <docker.username>sentinel</docker.username>-->
+        <!--        <docker.password>sentinel</docker.password>-->
+        <!--        <docker.namespace>blade</docker.namespace>-->
+        <!--        <docker.plugin.version>1.4.13</docker.plugin.version>-->
+        <!--        <docker.plugin.version>0.4.14</docker.plugin.version>-->
         <!-- 推荐使用Harbor -->
-            <docker.registry.url>192.168.0.157</docker.registry.url>
-            <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
-            <docker.username>admin</docker.username>
-            <docker.password>Harbor12345</docker.password>
-            <docker.namespace>blade</docker.namespace>
-            <docker.plugin.version>1.4.13</docker.plugin.version>
-<!--            <docker.plugin.version>0.4.14</docker.plugin.version>-->
+        <docker.registry.url>192.168.0.157</docker.registry.url>
+        <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
+        <docker.username>admin</docker.username>
+        <docker.password>Harbor12345</docker.password>
+        <docker.namespace>blade</docker.namespace>
+        <docker.plugin.version>1.4.13</docker.plugin.version>
+        <!--            <docker.plugin.version>0.4.14</docker.plugin.version>-->
     </properties>
 
 
@@ -313,7 +313,6 @@
         </dependency>
 
 
-
         <dependency>
             <groupId>com.wn.common</groupId>
             <artifactId>app</artifactId>
@@ -326,6 +325,12 @@
             <version>3.0.0</version>
         </dependency>
 
+        <!--        <dependency>-->
+        <!--            <groupId>com.wn.common</groupId>-->
+        <!--            <artifactId>common-auth</artifactId>-->
+        <!--            <version>3.0.0</version>-->
+        <!--        </dependency>-->
+
 
         <dependency>
             <groupId>com.getui.push</groupId>

xmt_service/src/main/resources/application-dev.yml

@@ -147,8 +147,8 @@ redis:
 xxl:
   job:
     accessToken: ''
-    admin:
-      addresses: http://192.168.0.234:7889/xxl-job-admin
+      #      addresses: http://192.168.0.234:7889/xxl-job-admin
+      addresses: http://127.0.0.1:8080/xxl-job-admin
     executor:
       appname: ffjob
       ip: 192.168.3.62

xmt_service/target/classes/META-INF/spring.factories

@@ -5,8 +5,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springblade.common.auth.permission.PermissionHandler,\
   org.springblade.common.auth.config.PermissionWebConfig,\
   org.springblade.modules.app.service.impl.TransportServiceImpl,\
-  org.springblade.common.auth.SessionStoreConfig,\
   org.springblade.modules.app.web.AppVersionController,\
+  org.springblade.common.auth.SessionStoreConfig,\
   org.springblade.modules.app.manager.TransportManager,\
   org.springblade.modules.app.manager.AppUserIdManager,\
   org.springblade.modules.system.service.impl.TopMenuSettingServiceImpl,\
@@ -16,15 +16,15 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springblade.common.notify.dingding.DingDingRobotMsgNotify,\
   org.springblade.common.config.BladePreviewConfiguration,\
   org.springblade.modules.app.service.impl.PayServiceImpl,\
-  org.springblade.modules.app.web.TransportStageInfoController,\
   org.springblade.modules.app.web.AppTransportController,\
+  org.springblade.modules.app.web.TransportStageInfoController,\
   org.springblade.modules.system.controller.TransportController,\
-  org.springblade.modules.develop.service.impl.DatasourceServiceImpl,\
   org.springblade.modules.app.job.DriverConfirmJobHandler,\
+  org.springblade.modules.develop.service.impl.DatasourceServiceImpl,\
   org.springblade.common.notify.dingding.handler.DingDingAccessTokenHandler,\
   org.springblade.modules.app.service.impl.ApiLogServiceImpl,\
-  org.springblade.common.notify.rocketmq.consumer.RocketConsumerInitProcessor,\
   org.springblade.modules.auth.granter.RefreshTokenGranter,\
+  org.springblade.common.notify.rocketmq.consumer.RocketConsumerInitProcessor,\
   org.springblade.modules.resource.config.BladeOssConfiguration,\
   org.springblade.modules.app.manager.WaybillManager,\
   org.springblade.modules.app.web.AppProblemBackController,\
@@ -33,21 +33,21 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springblade.modules.app.utils.SpringUtil,\
   org.springblade.modules.system.controller.TenantController,\
   org.springblade.modules.app.web.AppUserController,\
-  org.springblade.modules.app.service.impl.ContractServiceImpl,\
   org.springblade.common.auth.producer.OperationLogProducer,\
+  org.springblade.modules.app.service.impl.ContractServiceImpl,\
   org.springblade.common.cache.CachesService,\
   org.springblade.modules.app.web.ResourceController,\
   org.springblade.modules.system.service.impl.LogServiceImpl,\
   org.springblade.modules.app.web.SlaughterBuyerRelationLogController,\
   org.springblade.modules.app.service.impl.AppVersionServiceImpl,\
-  org.springblade.common.auth.permission.CasSecurityInterceptor,\
   org.springblade.modules.app.service.impl.AppUserIdServiceImpl,\
+  org.springblade.common.auth.permission.CasSecurityInterceptor,\
   org.springblade.modules.app.web.admin.AdminContractController,\
-  org.springblade.modules.app.web.admin.AdminTransportController,\
   org.springblade.modules.app.web.WaybillController,\
-  org.springblade.modules.app.service.impl.PictureInfoServiceImpl,\
-  org.springblade.modules.app.service.impl.VerifyStationServiceImpl,\
+  org.springblade.modules.app.web.admin.AdminTransportController,\
   org.springblade.modules.app.config.SmartPayConfig,\
+  org.springblade.modules.app.service.impl.VerifyStationServiceImpl,\
+  org.springblade.modules.app.service.impl.PictureInfoServiceImpl,\
   org.springblade.modules.app.web.admin.AdminUserController,\
   org.springblade.modules.app.manager.TransportStageManager,\
   org.springblade.modules.system.service.impl.ApiScopeServiceImpl,\
@@ -55,8 +55,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springblade.modules.system.service.impl.DictServiceImpl,\
   org.springblade.modules.system.service.impl.TenantServiceImpl,\
   org.springblade.modules.app.service.impl.OcrService,\
-  org.springblade.modules.app.web.StatReportController,\
   org.springblade.modules.system.controller.ApiScopeController,\
+  org.springblade.modules.app.web.StatReportController,\
   org.springblade.modules.app.web.SlaughterBuyerRelationController,\
   org.springblade.modules.system.controller.WayBillController,\
   org.springblade.modules.system.service.impl.ParamServiceImpl,\
@@ -78,13 +78,13 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springblade.modules.develop.controller.DatasourceController,\
   org.springblade.common.config.SwaggerConfiguration,\
   org.springblade.modules.auth.endpoint.BladeSocialEndpoint,\
-  org.springblade.modules.system.service.impl.UserSearchServiceImpl,\
   org.springblade.modules.desk.service.impl.NoticeServiceImpl,\
-  org.springblade.modules.system.service.impl.LogUsualServiceImpl,\
+  org.springblade.modules.system.service.impl.UserSearchServiceImpl,\
   org.springblade.modules.system.service.impl.RoleServiceImpl,\
+  org.springblade.modules.system.service.impl.LogUsualServiceImpl,\
   org.springblade.modules.app.client.ZmtClientService,\
-  org.springblade.modules.app.manager.ContractManager,\
   org.springblade.modules.app.manager.UserManager,\
+  org.springblade.modules.app.manager.ContractManager,\
   org.springblade.modules.app.job.SlaughterAcceptConfirmJobHandler,\
   org.springblade.common.auth.config.SpringCasAutoconfig,\
   org.springblade.modules.app.web.admin.AdminEnteringZhejiangFilingController,\
@@ -92,28 +92,28 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springblade.modules.app.utils.UserUtils,\
   org.springblade.modules.system.controller.DataScopeController,\
   org.springblade.modules.app.service.impl.EnteringZhejiangFilingServiceImpl,\
-  org.springblade.common.config.BladeConfiguration,\
   org.springblade.modules.system.service.impl.DictBizServiceImpl,\
+  org.springblade.common.config.BladeConfiguration,\
   org.springblade.modules.app.init.InitWork,\
   org.springblade.modules.resource.endpoint.OssEndpoint,\
   org.springblade.modules.system.service.impl.RoleScopeServiceImpl,\
   org.springblade.modules.desk.controller.DashBoardController,\
   org.springblade.modules.system.controller.TopMenuController,\
-  org.springblade.modules.app.web.admin.AdminRegisterController,\
   org.springblade.modules.resource.config.BladeSmsConfiguration,\
+  org.springblade.modules.app.web.admin.AdminRegisterController,\
   org.springblade.modules.system.service.impl.RegionServiceImpl,\
   org.springblade.modules.app.web.AppOssController,\
-  org.springblade.modules.system.controller.MenuController,\
-  org.springblade.modules.app.manager.MessageLoggingManager,\
   org.springblade.modules.app.config.RemoteConfigProperties,\
+  org.springblade.modules.app.manager.MessageLoggingManager,\
+  org.springblade.modules.system.controller.MenuController,\
   org.springblade.modules.app.config.MybatisConfig,\
   org.springblade.common.auth.config.CasCustomConfig,\
   org.springblade.modules.app.web.outapi.SyncContraller,\
-  org.springblade.modules.app.web.admin.AdminProblemBackController,\
   org.springblade.modules.system.service.impl.TenantPackageServiceImpl,\
+  org.springblade.modules.app.web.admin.AdminProblemBackController,\
   org.springblade.modules.app.manager.SlaughterBuyerRelationLogManager,\
-  org.springblade.modules.system.service.impl.UserServiceImpl,\
   org.springblade.modules.app.web.CaptchaCheckController,\
+  org.springblade.modules.system.service.impl.UserServiceImpl,\
   org.springblade.modules.app.web.AppContractController,\
   org.springblade.modules.app.manager.EnteringZhejiangFilingManager,\
   org.springblade.modules.app.web.AppUserIdController,\
@@ -129,18 +129,18 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springblade.common.notify.rocketmq.producer.RocketMqProducer,\
   org.springblade.modules.app.web.InnerCaptchaController,\
   org.springblade.modules.resource.controller.AttachController,\
-  org.springblade.common.notify.dingding.DingDingMsgNotify,\
   org.springblade.modules.app.controller.PaymentAccountApplymentController,\
+  org.springblade.common.notify.dingding.DingDingMsgNotify,\
   org.springblade.modules.system.controller.DictBizController,\
-  org.springblade.modules.app.config.FeignConfiguration,\
   org.springblade.common.notify.dingding.handler.DingDingMsgSendHandler,\
+  org.springblade.modules.app.config.FeignConfiguration,\
   org.springblade.common.auth.InvokeConfiguration,\
   org.springblade.modules.desk.service.impl.PlatformUserServiceImpl,\
   org.springblade.modules.app.service.impl.SlaughterBuyerRelationLogServiceImpl,\
   org.springblade.common.notify.sms.AliSmsMsgNotify,\
   org.springblade.modules.system.service.impl.UserDeptServiceImpl,\
-  org.springblade.modules.app.web.admin.AdminWaybillController,\
   org.springblade.modules.app.config.OcrConfig,\
+  org.springblade.modules.app.web.admin.AdminWaybillController,\
   org.springblade.modules.resource.controller.SmsController,\
   org.springblade.modules.develop.service.impl.CodeServiceImpl,\
   org.springblade.common.config.ThirdpartyConfiguration,\
@@ -163,15 +163,15 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springblade.modules.app.manager.AppVersionManager,\
   org.springblade.modules.app.service.impl.PaymentOrderRecordServiceImpl,\
   org.springblade.common.auth.permission.BackendInnerLoginUtil,\
-  org.springblade.modules.system.controller.VersionController,\
   org.springblade.modules.app.web.SmartPayController,\
+  org.springblade.modules.system.controller.VersionController,\
   org.springblade.modules.app.manager.SlaughterBuyerRelationManager,\
   org.springblade.modules.app.service.impl.SmartPayServiceImpl,\
   org.springblade.modules.desk.controller.PlatformUserController,\
   org.springblade.modules.app.web.admin.AdminAppVersionController,\
   org.springblade.modules.system.controller.LogApiController,\
-  org.springblade.common.auth.aspect.OperationLogAspect,\
   org.springblade.modules.system.controller.EnteringController,\
+  org.springblade.common.auth.aspect.OperationLogAspect,\
   org.springblade.modules.app.web.AppRegionController,\
   org.springblade.modules.app.manager.SyncManager,\
   org.springblade.modules.system.service.impl.LogErrorServiceImpl,\
@@ -182,15 +182,15 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springblade.modules.resource.service.impl.SmsServiceImpl,\
   org.springblade.modules.app.manager.OssManager,\
   org.springblade.modules.desk.controller.NoticeController,\
+  org.springblade.modules.app.controller.PaymentOrderRecordController,\
   org.springblade.common.config.BladeReportConfiguration,\
   org.springblade.modules.app.service.impl.TransportStageInfoServiceImpl,\
-  org.springblade.modules.app.controller.PaymentOrderRecordController,\
   org.springblade.modules.app.web.VerifyController,\
   org.springblade.modules.auth.granter.SocialTokenGranter,\
   org.springblade.modules.app.config.XxlJobConfig,\
   org.springblade.modules.app.job.ZmtJobHandler,\
-  org.springblade.modules.system.controller.ContractController,\
   org.springblade.modules.app.service.impl.WaybillServiceImpl,\
+  org.springblade.modules.system.controller.ContractController,\
   org.springblade.modules.app.web.EnteringZhejiangFilingController,\
   org.springblade.modules.system.service.impl.PostServiceImpl,\
   org.springblade.modules.app.web.ImageRecognitionController,\