Skip to content

I
ibzdict
提交 e5d36bd0 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码 [ibz-dict，字典]

上级 6cec7d04
隐藏空白字符变更
内嵌 并排
正在显示 包含 65 行增加 和 57 行删除
ibzdict-app/ibzdict-app-web/src/main/docker/ibzdict-app-web.yaml
浏览文件 @ e5d36bd0
......@@ -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"
......
ibzdict-boot/src/main/resources/logback-spring.xml
浏览文件 @ e5d36bd0
......@@ -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}/ibzdict.%d{yyyy-MM-dd}.log</FileNamePattern>
<FileNamePattern>${LOG_PATH}/ibzdict.%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">
......
ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictCatalogServiceImpl.java
浏览文件 @ e5d36bd0
......@@ -51,9 +51,6 @@ public class DictCatalogServiceImpl extends ServiceImpl<DictCatalogMapper, DictC
@Autowired
@Lazy
protected cn.ibizlab.core.dict.service.IDictOptionService dictoptionService;
@Autowired
@Lazy
IDictCatalogService proxyService;
protected int batchSize = 500;
......@@ -139,7 +136,7 @@ public class DictCatalogServiceImpl extends ServiceImpl<DictCatalogMapper, DictC
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 DictCatalogServiceImpl extends ServiceImpl<DictCatalogMapper, DictC
}
}
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 DictCatalogServiceImpl extends ServiceImpl<DictCatalogMapper, DictC
}
}
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 DictCatalogServiceImpl extends ServiceImpl<DictCatalogMapper, DictC
public IDictCatalogService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
}
}
......
ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictOptionServiceImpl.java
浏览文件 @ e5d36bd0
......@@ -51,9 +51,6 @@ public class DictOptionServiceImpl extends ServiceImpl<DictOptionMapper, DictOpt
@Autowired
@Lazy
protected cn.ibizlab.core.dict.service.IDictCatalogService dictcatalogService;
@Autowired
@Lazy
IDictOptionService proxyService;
protected int batchSize = 500;
......@@ -144,7 +141,7 @@ public class DictOptionServiceImpl extends ServiceImpl<DictOptionMapper, DictOpt
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 DictOptionServiceImpl extends ServiceImpl<DictOptionMapper, DictOpt
}
}
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 DictOptionServiceImpl extends ServiceImpl<DictOptionMapper, DictOpt
}
}
if (create.size() > 0) {
proxyService.createBatch(create);
getProxyService().createBatch(create);
}
if (update.size() > 0) {
proxyService.updateBatch(update);
getProxyService().updateBatch(update);
}
}
......@@ -261,6 +258,10 @@ public class DictOptionServiceImpl extends ServiceImpl<DictOptionMapper, DictOpt
public IDictOptionService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
}
}
......
ibzdict-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ e5d36bd0
......@@ -28,7 +28,7 @@
<!--输出实体[DICT_OPTION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dict_option-15-2">
<changeSet author="a_A_5d9d78509" id="tab-dict_option-16-2">
<createTable tableName="IBZDICTOPTION">
<column name="VKEY" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/>
......@@ -66,7 +66,7 @@
<!--输出实体[DICT_CATALOG]外键关系 -->
<!--输出实体[DICT_OPTION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-dict_option-15-3">
<changeSet author="a_A_5d9d78509" id="fk-dict_option-16-3">
<addForeignKeyConstraint baseColumnNames="CID" baseTableName="IBZDICTOPTION" constraintName="DER1N_DICT_OPTION_DICT_CATALOG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CID" referencedTableName="IBZDICTCATALOG" validate="true"/>
</changeSet>
......
ibzdict-provider/ibzdict-provider-api/src/main/docker/ibzdict-provider-api.yaml
浏览文件 @ e5d36bd0
......@@ -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"
......
ibzdict-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @ e5d36bd0
......@@ -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:ibzdict}")
private String systemId;
@Value("${ibiz.systemname:ibzdict}")
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/ibzdict.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/ibzdict.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("向[lite]同步系统模型失败，请检查[lite]服务是否正常运行! {}", ex.getMessage());
}
catch (Exception ex) {
log.error(String.format("向[lite]同步系统模型失败，请检查[lite]服务是否正常! [%s]",ex));
}
}
}
\ No newline at end of file
ibzdict-util/src/main/resources/application-sys.yml
浏览文件 @ e5d36bd0
......@@ -107,3 +107,4 @@ server:
min-response-size: 10240
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或