ibiz4j 发布系统代码 [ibiz-notify，通知消息]

ibznotify-app/ibznotify-app-web/src/main/docker/ibznotify-app-web.yaml

@@ -14,6 +14,10 @@ services:
                memory: 400M    
       mode: replicated
       replicas: 1
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
+        window: 120s
     volumes:
       - "nfs:/app/file"
 

ibznotify-boot/src/main/resources/logback-spring.xml

@@ -20,18 +20,17 @@
     <appender name="file"  class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_PATH}/ibznotify.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>${LOG_PATH}/ibznotify.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件最大的大小-->
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>${LOG_PATTERN}</pattern>
         </encoder>
-
-        <!--日志文件最大的大小-->
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
     </appender>
     <!-- 日志输出级别 -->
     <root level="INFO">

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/IMsgBodyService.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * 实体[MsgBody] 服务对象接口
  */
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface IMsgBodyService extends IService<MsgBody> {
 
     boolean create(MsgBody et);

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/IMsgOpenAccessService.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * 实体[MsgOpenAccess] 服务对象接口
  */
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface IMsgOpenAccessService extends IService<MsgOpenAccess> {
 
     boolean create(MsgOpenAccess et);

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/IMsgTemplateService.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * 实体[MsgTemplate] 服务对象接口
  */
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface IMsgTemplateService extends IService<MsgTemplate> {
 
     boolean create(MsgTemplate et);

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/IMsgUserAccountService.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * 实体[MsgUserAccount] 服务对象接口
  */
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface IMsgUserAccountService extends IService<MsgUserAccount> {
 
     boolean create(MsgUserAccount et);

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgBodyServiceImpl.java

@@ -48,9 +48,6 @@ import org.springframework.util.StringUtils;
 @Service("MsgBodyServiceImpl")
 public class MsgBodyServiceImpl extends ServiceImpl<MsgBodyMapper, MsgBody> implements IMsgBodyService {
 
-    @Autowired
-    @Lazy
-    IMsgBodyService proxyService;
 
     protected int batchSize = 500;
 
@@ -136,7 +133,7 @@ public class MsgBodyServiceImpl extends ServiceImpl<MsgBodyMapper, MsgBody> impl
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
+            return checkKey(et) ? getProxyService().update(et) : getProxyService().create(et);
         }
     }
 
@@ -153,10 +150,10 @@ public class MsgBodyServiceImpl extends ServiceImpl<MsgBodyMapper, MsgBody> impl
             }
         }
         if (create.size() > 0) {
-            proxyService.createBatch(create);
+            getProxyService().createBatch(create);
         }
         if (update.size() > 0) {
-            proxyService.updateBatch(update);
+            getProxyService().updateBatch(update);
         }
         return true;
     }
@@ -174,10 +171,10 @@ public class MsgBodyServiceImpl extends ServiceImpl<MsgBodyMapper, MsgBody> impl
             }
         }
         if (create.size() > 0) {
-            proxyService.createBatch(create);
+            getProxyService().createBatch(create);
         }
         if (update.size() > 0) {
-            proxyService.updateBatch(update);
+            getProxyService().updateBatch(update);
         }
     }
 
@@ -226,6 +223,10 @@ public class MsgBodyServiceImpl extends ServiceImpl<MsgBodyMapper, MsgBody> impl
 
 
 
+
+    public IMsgBodyService getProxyService() {
+        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
+    }
 }
 
 

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgOpenAccessServiceImpl.java

@@ -51,9 +51,6 @@ public class MsgOpenAccessServiceImpl extends ServiceImpl<MsgOpenAccessMapper, M
     @Autowired
     @Lazy
     protected cn.ibizlab.core.notify.service.IMsgTemplateService msgtemplateService;
-    @Autowired
-    @Lazy
-    IMsgOpenAccessService proxyService;
 
     protected int batchSize = 500;
 
@@ -139,7 +136,7 @@ public class MsgOpenAccessServiceImpl extends ServiceImpl<MsgOpenAccessMapper, M
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
+            return checkKey(et) ? getProxyService().update(et) : getProxyService().create(et);
         }
     }
 
@@ -156,10 +153,10 @@ public class MsgOpenAccessServiceImpl extends ServiceImpl<MsgOpenAccessMapper, M
             }
         }
         if (create.size() > 0) {
-            proxyService.createBatch(create);
+            getProxyService().createBatch(create);
         }
         if (update.size() > 0) {
-            proxyService.updateBatch(update);
+            getProxyService().updateBatch(update);
         }
         return true;
     }
@@ -177,10 +174,10 @@ public class MsgOpenAccessServiceImpl extends ServiceImpl<MsgOpenAccessMapper, M
             }
         }
         if (create.size() > 0) {
-            proxyService.createBatch(create);
+            getProxyService().createBatch(create);
         }
         if (update.size() > 0) {
-            proxyService.updateBatch(update);
+            getProxyService().updateBatch(update);
         }
     }
 
@@ -229,6 +226,10 @@ public class MsgOpenAccessServiceImpl extends ServiceImpl<MsgOpenAccessMapper, M
 
 
 
+
+    public IMsgOpenAccessService getProxyService() {
+        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
+    }
 }
 
 

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgTemplateServiceImpl.java

@@ -51,9 +51,6 @@ public class MsgTemplateServiceImpl extends ServiceImpl<MsgTemplateMapper, MsgTe
     @Autowired
     @Lazy
     protected cn.ibizlab.core.notify.service.IMsgOpenAccessService msgopenaccessService;
-    @Autowired
-    @Lazy
-    IMsgTemplateService proxyService;
 
     protected int batchSize = 500;
 
@@ -144,7 +141,7 @@ public class MsgTemplateServiceImpl extends ServiceImpl<MsgTemplateMapper, MsgTe
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
+            return checkKey(et) ? getProxyService().update(et) : getProxyService().create(et);
         }
     }
 
@@ -162,10 +159,10 @@ public class MsgTemplateServiceImpl extends ServiceImpl<MsgTemplateMapper, MsgTe
             }
         }
         if (create.size() > 0) {
-            proxyService.createBatch(create);
+            getProxyService().createBatch(create);
         }
         if (update.size() > 0) {
-            proxyService.updateBatch(update);
+            getProxyService().updateBatch(update);
         }
         return true;
     }
@@ -184,10 +181,10 @@ public class MsgTemplateServiceImpl extends ServiceImpl<MsgTemplateMapper, MsgTe
             }
         }
         if (create.size() > 0) {
-            proxyService.createBatch(create);
+            getProxyService().createBatch(create);
         }
         if (update.size() > 0) {
-            proxyService.updateBatch(update);
+            getProxyService().updateBatch(update);
         }
     }
 
@@ -262,6 +259,10 @@ public class MsgTemplateServiceImpl extends ServiceImpl<MsgTemplateMapper, MsgTe
 
 
 
+
+    public IMsgTemplateService getProxyService() {
+        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
+    }
 }
 
 

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgUserAccountServiceImpl.java

@@ -48,9 +48,6 @@ import org.springframework.util.StringUtils;
 @Service("MsgUserAccountServiceImpl")
 public class MsgUserAccountServiceImpl extends ServiceImpl<MsgUserAccountMapper, MsgUserAccount> implements IMsgUserAccountService {
 
-    @Autowired
-    @Lazy
-    IMsgUserAccountService proxyService;
 
     protected int batchSize = 500;
 
@@ -136,7 +133,7 @@ public class MsgUserAccountServiceImpl extends ServiceImpl<MsgUserAccountMapper,
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
+            return checkKey(et) ? getProxyService().update(et) : getProxyService().create(et);
         }
     }
 
@@ -153,10 +150,10 @@ public class MsgUserAccountServiceImpl extends ServiceImpl<MsgUserAccountMapper,
             }
         }
         if (create.size() > 0) {
-            proxyService.createBatch(create);
+            getProxyService().createBatch(create);
         }
         if (update.size() > 0) {
-            proxyService.updateBatch(update);
+            getProxyService().updateBatch(update);
         }
         return true;
     }
@@ -174,10 +171,10 @@ public class MsgUserAccountServiceImpl extends ServiceImpl<MsgUserAccountMapper,
             }
         }
         if (create.size() > 0) {
-            proxyService.createBatch(create);
+            getProxyService().createBatch(create);
         }
         if (update.size() > 0) {
-            proxyService.updateBatch(update);
+            getProxyService().updateBatch(update);
         }
     }
 
@@ -226,6 +223,10 @@ public class MsgUserAccountServiceImpl extends ServiceImpl<MsgUserAccountMapper,
 
 
 
+
+    public IMsgUserAccountService getProxyService() {
+        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
+    }
 }
 
 

ibznotify-dependencies/pom.xml

@@ -261,6 +261,7 @@
                 <version>${baomidou-jobs.version}</version>
             </dependency>
 
+
         </dependencies>
     </dependencyManagement>
 
@@ -344,7 +345,6 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-
         <!--  mp动态数据源 -->
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -352,7 +352,6 @@
         </dependency>
 
 
-
     </dependencies>
 
 </project>

ibznotify-provider/ibznotify-provider-api/src/main/docker/ibznotify-provider-api.yaml

@@ -14,6 +14,10 @@ services:
                memory: 400M    
       mode: replicated
       replicas: 1
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
+        window: 120s
     volumes:
       - "nfs:/app/file"
 

ibznotify-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

@@ -13,6 +13,7 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.DigestUtils;
 import java.io.InputStream;
 import java.util.*;
@@ -25,58 +26,55 @@ import java.util.*;
 @ConditionalOnProperty( name = "ibiz.enablePermissionValid", havingValue = "true")
 public class PermissionSyncJob implements ApplicationRunner {
 
-    @Autowired
-    @Lazy
-    private IBZUAAFeignClient client;
-
     @Value("${ibiz.systemid:ibznotify}")
     private String systemId;
     
     @Value("${ibiz.systemname:ibznotify}")
     private String systemName;
 
-
-
     @Autowired
     @Lazy
-    IBZLiteFeignClient liteFeignClient;
+    private IBZUAAFeignClient uaaClient;
 
+    @Autowired
+    @Lazy
+    IBZLiteFeignClient liteClient;
 
     @Override
     public void run(ApplicationArguments args) {
         try {
             Thread.sleep(10000);
-            InputStream permission = this.getClass().getResourceAsStream("/permission/systemResource.json"); //获取当前系统所有实体资源能力
-            String permissionResult = IOUtils.toString(permission,"UTF-8");
-            JSONObject system= new JSONObject();
-            system.put("pssystemid",systemId);
-            system.put("pssystemname",systemName);
-            system.put("sysstructure",JSONObject.parseObject(permissionResult));
-            system.put("md5check",DigestUtils.md5DigestAsHex(permissionResult.getBytes()));
-            if(client.syncSysAuthority(system)) {
-                log.info("向[UAA]同步系统资源成功");
-            }else{
-                log.error("向[UAA]同步系统资源失败");
+            InputStream permission = this.getClass().getResourceAsStream("/permission/systemResource.json"); //权限资源
+            if (!ObjectUtils.isEmpty(permission)) {
+                String strPermission = IOUtils.toString(permission, "UTF-8");
+                JSONObject system = new JSONObject() {{
+                    put("pssystemid", systemId);
+                    put("pssystemname", systemName);
+                    put("sysstructure", JSONObject.parseObject(strPermission));
+                    put("md5check", DigestUtils.md5DigestAsHex(strPermission.getBytes()));
+                }};
+                if (uaaClient.syncSysAuthority(system)) {
+                    log.info("向[uaa]同步系统资源成功");
+                } else {
+                    log.error("向[uaa]同步系统资源失败");
                 }
             }
-        catch (Exception ex) {
-            log.error(String.format("向[UAA]同步系统资源失败，请检查[UAA]服务是否正常! [%s]",ex));
+        } catch (Exception ex) {
+            log.error("向[uaa]同步系统资源失败，请检查[uaa]服务是否正常运行! {}", ex.getMessage());
         }
 
         try {
-            InputStream sysModel = this.getClass().getResourceAsStream("/sysmodel/ibznotify.json"); //获取当前系统所有实体资源能力
-            String strSysModel = IOUtils.toString(sysModel,"UTF-8");
-            if(liteFeignClient.syncSysModel(JSONObject.parseObject(strSysModel))) {
-                log.info("向[lite]同步系统模型成功");
-            }else{
-                log.error("向[lite]同步系统模型失败");
+            InputStream model = this.getClass().getResourceAsStream("/sysmodel/ibznotify.json"); //系统模型
+            if (!ObjectUtils.isEmpty(model)) {
+                String strModel = IOUtils.toString(model, "UTF-8");
+                if (liteClient.syncSysModel(JSONObject.parseObject(strModel))) {
+                    log.info("向[lite]同步模型成功");
+                } else {
+                    log.error("向[lite]同步模型失败");
                 }
             }
-        catch (Exception ex) {
-            log.error(String.format("向[lite]同步系统模型失败，请检查[lite]服务是否正常! [%s]",ex));
+        } catch (Exception ex) {
+            log.error("向[lite]同步系统模型失败，请检查[lite]服务是否正常运行! {}", ex.getMessage());
         }
-
-
-
     }
 }
\ No newline at end of file

ibznotify-util/src/main/resources/application-sys.yml

@@ -125,3 +125,4 @@ server:
     min-response-size: 10240
 
 
+