1增加task配置

C00-common/pps-common/src/main/java/pps/core/common/entity/BaseSysConfigEnt.java

@@ -20,7 +20,7 @@ public class BaseSysConfigEnt implements Serializable {
 
     @XText("配置key")
     @TableField
-    private String key;
+    private String mainKeys;
 
     @XText("配置值")
     @TableField
@@ -62,12 +62,12 @@ public class BaseSysConfigEnt implements Serializable {
         this.name = value;
     }
 
-    public String getKey() {
-        return this.key;
+    public String getMainKeys() {
+        return mainKeys;
     }
 
-    public void setKey(String value) {
-        this.key = value;
+    public void setMainKeys(String mainKeys) {
+        this.mainKeys = mainKeys;
     }
 
     public String getValue() {

C00-common/pps-common/src/main/java/pps/core/common/entity/BaseSysConfigView.java

@@ -16,7 +16,7 @@ public class BaseSysConfigView implements Serializable {
 
     @XText("配置key")
     @TableField
-    private String key;
+    private String mainKeys;
 
     @XText("配置值")
     @TableField
@@ -58,12 +58,12 @@ public class BaseSysConfigView implements Serializable {
         this.name = value;
     }
 
-    public String getKey() {
-        return this.key;
+    public String getMainKeys() {
+        return mainKeys;
     }
 
-    public void setKey(String value) {
-        this.key = value;
+    public void setMainKeys(String mainKeys) {
+        this.mainKeys = mainKeys;
     }
 
     public String getValue() {

C00-common/pps-common/src/main/java/pps/core/common/provider/impl/PpsConfigProviderCommonImpl.java

@@ -18,7 +18,7 @@ import xstartup.kernel.system.provider.spec.XConfigProvider;
  * @author lixueyan
  * @date 2022/8/5 0005 17:11
  */
-//@XImplement
+@XImplement
 public class PpsConfigProviderCommonImpl implements XConfigProvider {
     //private static Map<String,String> configMap = new ConcurrentHashMap();
 

C00-common/pps-common/src/main/java/pps/core/common/provider/impl/PpsConfigProviderImpl.java

@@ -36,7 +36,7 @@ public class PpsConfigProviderImpl implements XConfigProvider {
             try {
                 BaseSysConfigMapper configMapper = context.getBean(BaseSysConfigMapper.class);
                 QueryWrapper<BaseSysConfigEnt> queryWrapper = new QueryWrapper<>();
-                queryWrapper.lambda().eq(BaseSysConfigEnt::getKey, configKey);
+                queryWrapper.lambda().eq(BaseSysConfigEnt::getMainKeys, configKey);
                 List<BaseSysConfigEnt> baseSysConfigEnts = configMapper.selectList(queryWrapper);
                 if (!baseSysConfigEnts.isEmpty()) {
                     return baseSysConfigEnts.get(0).getValue();

C00-common/pps-common/src/main/java/pps/core/common/service/BaseSysConfigService.java

@@ -86,7 +86,7 @@ public class BaseSysConfigService {
         QueryWrapper<BaseSysConfigEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().like(BaseSysConfigEnt::getId, input.getId())
             .like(BaseSysConfigEnt::getName, input.getName())
-            .like(BaseSysConfigEnt::getKey, input.getKey())
+            .like(BaseSysConfigEnt::getMainKeys, input.getKey())
             .like(BaseSysConfigEnt::getValue, input.getValue())
             .like(BaseSysConfigEnt::getCreateById, input.getCreateById())
             .like(BaseSysConfigEnt::getCreateByName, input.getCreateByName())

C02-system/pps-core-system/src/main/java/pps/core/system/service/ConfigServiceImpl.java

@@ -32,7 +32,7 @@ public class ConfigServiceImpl implements ConfigService {
             //系统配置
             BaseSysConfigMapper configMapper = context.getBean(BaseSysConfigMapper.class);
             QueryWrapper<BaseSysConfigEnt> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(BaseSysConfigEnt::getKey, input.getConfigKey());
+            queryWrapper.lambda().eq(BaseSysConfigEnt::getMainKeys, input.getConfigKey());
             List<BaseSysConfigEnt> baseSysConfigEnts = configMapper.selectList(queryWrapper);
             if(!CollectionUtils.isEmpty(baseSysConfigEnts)){
                 try {

C10-task/pps-core-task/src/main/java/pps/core/task/job/TestJob.java

@@ -4,6 +4,8 @@ import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
 import xstartup.data.XServiceResult;
+import xstartup.data.XSingleResult;
+import xstartup.error.XError;
 import xstartup.service.job.XJob;
 import xstartup.service.job.annotation.XCronTrigger;
 
@@ -16,6 +18,6 @@ public class TestJob implements XJob {
     public XServiceResult execute(XContext context) {
         context.getLogger().info("push_shipper_gas_split_fail_data_start");
         context.getLogger().info("push_shipper_gas_split_fail_data_end");
-        return XServiceResult.OK;
+        return XServiceResult.error(context, XError.NotFound);
     }
 }

C10-task/pps-core-task/src/main/java/pps/core/task/module/PpsCoreTaskModule.java

 package pps.core.task.module;
 
+import pps.core.common.provider.impl.PpsConfigProviderCommonImpl;
 import pps.core.common.utils.CommonTraceLogger;
 import pps.core.common.utils.ManifestComponentInfoHelper;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
 import xstartup.base.XModule;
+import xstartup.base.pattern.XProviderManager;
+import xstartup.kernel.system.provider.spec.XConfigProvider;
 
 @XText("任务模块")
 public class PpsCoreTaskModule extends XModule {
@@ -17,7 +20,7 @@ public class PpsCoreTaskModule extends XModule {
         CommonTraceLogger.INSTANCE.start();
 
         //配置信息 自定义实现类
-//        XProviderManager.setDefaultImplement(context, XConfigProvider.class, PpsConfigProviderCommonImpl.class);
+        XProviderManager.setDefaultImplement(context, XConfigProvider.class, PpsConfigProviderCommonImpl.class);
         ManifestComponentInfoHelper.init(this.getClass().getClassLoader());
 
     }

D03-deploy/deploy-pps-all/src/main/java/app/DeployPpsAllApplication.java

 package app;
 
+import pps.core.task.job.TestJob;
 import xstartup.base.XStartup;
 import xstartup.base.conf.XServerConf;
 import xstartup.base.conf.XServiceConf;
 import xstartup.base.util.XEncryptUtils;
 import xstartup.boot.XStartupApplication;
+import xstartup.feature.XJobFeature;
 import xstartup.feature.api.XApiFeature;
 import xstartup.feature.api.conf.XApiCookieConf;
 import xstartup.feature.cors.XCorsFeature;
 import xstartup.feature.mybatis.XMybatisFeature;
 import xstartup.feature.rpc.XRpcFeature;
 import xstartup.feature.swagger.XSwaggerFeature;
+import xstartup.service.job.conf.XJobServiceConf;
 
 //import xstartup.feature.cloud.XCloudHuaweiCseFeature;
 
@@ -26,6 +29,7 @@ public class DeployPpsAllApplication {
         startup.enable(XMybatisFeature.class);
         startup.enable(XRpcFeature.class);
         startup.enable(XCorsFeature.class);
+        startup.enable(XJobFeature.class).config(new XJobServiceConf(TestJob.class));
         //startup.enable(XCloudHuaweiCseFeature.class);
         startup.run(args);
     }

D03-deploy/deploy-pps-task/src/main/resources/deploy-pps-task.app.properties

@@ -7,8 +7,7 @@ pps.core.common.mq-config.consumeInterval=@pps.core.common.mq-config.consumeInte
 pps.core.common.obs-config.urlExpires=@pps.core.common.obs-config.urlExpires@
 pps.core.common.mq-config.ackImsMq=@pps.core.common.mq-config.ackImsMq@
 
-x.job.service=\
-  pps.core.task.job.TestJob
+x.job.service=pps.core.task.job.TestJob
 
 
 #\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD

D03-deploy/filters/filter-dev.properties

@@ -121,7 +121,7 @@ x.mq.ssl-truststore-location=classpath:kafka/truststore-uat.jks
 # datasource
 x.db.sharding=1
 x.db.driver=com.mysql.jdbc.Driver
-x.db.url=jdbc:mysql://81.70.29.235:3306/gf_demo?characterEncoding=utf8&allowEncodingChanges=true&serverTimezone=Asia/Shanghai&useSSL=false
+x.db.url=jdbc:mysql://121.36.43.217:3306/gf_demo?characterEncoding=utf8&allowEncodingChanges=true&serverTimezone=Asia/Shanghai&useSSL=false
 x.db.user=root
 x.db.password=_X2csclhj1QIh7OU1ta6iw==
 x.db.naming=snake-case

pom.xml

@@ -10,6 +10,7 @@
     <modules>
         <module>C00-common</module>
         <module>C02-system</module>
+        <module>C10-task</module>
         <module>D01-dependency</module>
         <module>C09-base</module>
     </modules>