Skip to content

I
ibzdst
提交 1e0983f6 编写于 作者: sq3536's avatar sq3536
浏览文件
操作

Merge remote-tracking branch 'origin/master'

上级 14618cb1 804e42ab
隐藏空白字符变更
内嵌 并排
正在显示 包含 116 行增加 和 631 行删除
app_web/src/locale/lanres/entities/meta-model/meta-model_BO_CN_base.ts
浏览文件 @ 1e0983f6
......@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts
浏览文件 @ 1e0983f6
......@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts
浏览文件 @ 1e0983f6
......@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/pages/lite/meta-model-grid-view/meta-model-grid-view-base.vue
浏览文件 @ 1e0983f6
......@@ -13,18 +13,18 @@
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
<i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
<i class=''></i>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
<i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
<i class=''></i>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
</tooltip>
<span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600">
......@@ -384,10 +384,10 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridView
*/
public toolBarModels: any = {
tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
tbitem1_import: { name: 'tbitem1_import', actiontarget: 'NONE', caption: '模型导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'import', target: 'NONE' } },
tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
......@@ -764,12 +764,12 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridViewBase
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem1_export')) {
this.toolbar_tbitem1_export_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem1_import')) {
this.toolbar_tbitem1_import_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem1_export')) {
this.toolbar_tbitem1_export_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2);
}
......@@ -920,7 +920,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -938,7 +938,7 @@ export default class MetaModelGridViewBase extends Vue {
}
// 界面行为
const curUIService:MetaModelUIService = new MetaModelUIService();
curUIService.MetaModel_export(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
curUIService.MetaModel_import(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
}
/**
......@@ -949,7 +949,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -967,7 +967,7 @@ export default class MetaModelGridViewBase extends Vue {
}
// 界面行为
const curUIService:MetaModelUIService = new MetaModelUIService();
curUIService.MetaModel_import(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
curUIService.MetaModel_export(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
}
/**
......
config.xml
浏览文件 @ 1e0983f6
......@@ -37,11 +37,11 @@
git clone -b master $para2 ibzdst/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzdst/
mvn clean package -Pweb
cd ibzdst-app/ibzdst-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzdst-app-web.yaml ibzlab-rt --with-registry-auth
mvn clean package -Papi
cd ibzdst-provider/ibzdst-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzdst-provider-api.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibzdst-app/ibzdst-app-web/src/main/docker/Dockerfile
浏览文件 @ 1e0983f6
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzdst-app-web.jar
EXPOSE 30011
EXPOSE 8080
ADD ibzdst-app-web.jar /ibzdst-app-web.jar
ibzdst-app/ibzdst-app-web/src/main/docker/ibzdst-app-web-k8s.yaml
浏览文件 @ 1e0983f6
......@@ -22,34 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-app-web:latest
imagePullPolicy: Always
ports:
- containerPort: 30011
env:
- name: SPRING_CLOUD_NACOS_DISCOVERY_IP
value: "172.16.180.237"
- name: SERVER_PORT
value: "30011"
- name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value: "172.16.100.243:8848"
- name: SPRING_REDIS_HOST
value: "172.16.100.243"
- name: SPRING_REDIS_PORT
value: "6379"
- name: SPRING_REDIS_DATABASE
value: "0"
- name: SPRING_DATASOURCE_USERNAME
value: "a_A_5d9d78509"
- name: SPRING_DATASOURCE_PASSWORD
value: "@6dEfb3@"
- name: SPRING_DATASOURCE_URL
value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
- name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
value: "com.mysql.jdbc.Driver"
- name: SPRING_DATASOURCE_DEFAULTSCHEMA
value: "a_A_5d9d78509"
- name: NACOS
value: "172.16.100.243:8848"
- name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
value: "ibizdev"
- containerPort: 8080
volumeMounts:
- name: data
mountPath: /app/file
......@@ -69,9 +42,9 @@ spec:
type: NodePort
ports:
- name: http
port: 30011
targetPort: 30011
nodePort: 30011
port: 8080
targetPort: 8080
nodePort: 8080
protocol: TCP
selector:
app: ibzdst-app-web
......
ibzdst-app/ibzdst-app-web/src/main/docker/ibzdst-app-web.yaml
浏览文件 @ 1e0983f6
......@@ -3,23 +3,9 @@ services:
ibzdst-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-app-web:latest
ports:
- "30011:30011"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=30011
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- NACOS=172.16.100.243:8848
- SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
deploy:
resources:
limits:
......
ibzdst-boot/src/main/java/dm/jdbc/driver/DmdbStatement.java 已删除 100644 → 0
浏览文件 @ 14618cb1
//
// Source code recreated from a .class file by IntelliJ IDEA
// (powered by Fernflower decompiler)
//
package dm.jdbc.driver;
import dm.jdbc.dbaccess.DBError;
import dm.jdbc.stat.ConnectionStat;
import dm.jdbc.stat.ExecuteType;
import dm.jdbc.stat.SqlStat;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLWarning;
import java.sql.Statement;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
public class DmdbStatement extends AbstractProxy<DmdbStatement_bs> implements Statement {
private DmdbStatement_bs rStmt = null;
private DmdbResultSet curResultSet = null;
private DmdbConnection curConnect = null;
private static AtomicLong index = new AtomicLong(0L);
private long constructNano;
private long lastExecuteStartNano;
private long lastExecuteTimeNano;
private ExecuteType lastExecuteType;
private boolean firstResultSet;
private String lastExecuteSql;
private SqlStat sqlStat;
public DmdbStatement(DmdbStatement_bs Stmt, DmdbConnection curConn) throws SQLException {
super(Stmt);
this.rStmt = Stmt;
this.curConnect = curConn;
this.ID = index.incrementAndGet();
}
void setCurResultSet(DmdbResultSet rs) {
if (this.curResultSet != null) {
this.curResultSet = null;
}
this.curResultSet = rs;
}
public ResultSet executeQuery(String sql) throws SQLException {
return this.createChain().Statement_executeQuery(this, sql);
}
public int executeUpdate(String sql) throws SQLException {
return this.createChain().Statement_executeUpdate(this, sql);
}
public void close() throws SQLException {
this.createChain().Statement_close(this);
}
public int getMaxFieldSize() throws SQLException {
return this.createChain().Statement_getMaxFieldSize(this);
}
public void setMaxFieldSize(int max) throws SQLException {
this.createChain().Statement_setMaxFieldSize(this, max);
}
public int getMaxRows() throws SQLException {
return this.createChain().Statement_getMaxRows(this);
}
public void setMaxRows(int max) throws SQLException {
this.createChain().Statement_setMaxRows(this, max);
}
public void setEscapeProcessing(boolean enable) throws SQLException {
this.createChain().Statement_setEscapeProcessing(this, enable);
}
public int getQueryTimeout() throws SQLException {
return this.createChain().Statement_getQueryTimeout(this);
}
public void setQueryTimeout(int seconds) throws SQLException {
this.createChain().Statement_setQueryTimeout(this, seconds);
}
public void cancel() throws SQLException {
this.createChain().Statement_cancel(this);
}
public SQLWarning getWarnings() throws SQLException {
return this.createChain().Statement_getWarnings(this);
}
public void clearWarnings() throws SQLException {
this.createChain().Statement_clearWarnings(this);
}
public void setCursorName(String name) throws SQLException {
this.createChain().Statement_setCursorName(this, name);
}
public boolean execute(String sql) throws SQLException {
return this.createChain().Statement_execute(this, sql);
}
public ResultSet getResultSet() throws SQLException {
return this.createChain().Statement_getResultSet(this);
}
public int getUpdateCount() throws SQLException {
return this.createChain().Statement_getUpdateCount(this);
}
public boolean getMoreResults() throws SQLException {
return this.createChain().Statement_getMoreResults(this);
}
public void setFetchDirection(int direction) throws SQLException {
this.createChain().Statement_setFetchDirection(this, direction);
}
public int getFetchDirection() throws SQLException {
return this.createChain().Statement_getFetchDirection(this);
}
public void setFetchSize(int rows) throws SQLException {
this.createChain().Statement_setFetchSize(this, rows);
}
public int getFetchSize() throws SQLException {
return this.createChain().Statement_getFetchSize(this);
}
public int getResultSetConcurrency() throws SQLException {
return this.createChain().Statement_getResultSetConcurrency(this);
}
public int getResultSetType() throws SQLException {
return this.createChain().Statement_getResultSetType(this);
}
public void addBatch(String sql) throws SQLException {
this.createChain().Statement_addBatch(this, sql);
}
public void clearBatch() throws SQLException {
this.createChain().Statement_clearBatch(this);
}
public int[] executeBatch() throws SQLException {
return this.createChain().Statement_executeBatch(this);
}
public Connection getConnection() throws SQLException {
return this.createChain().Statement_getConnection(this);
}
public boolean getMoreResults(int current) throws SQLException {
return this.createChain().Statement_getMoreResults(this, current);
}
public ResultSet getGeneratedKeys() throws SQLException {
return this.createChain().Statement_getGeneratedKeys(this);
}
public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
return this.createChain().Statement_executeUpdate(this, sql, autoGeneratedKeys);
}
public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
return this.createChain().Statement_executeUpdate(this, sql, columnIndexes);
}
public int executeUpdate(String sql, String[] columnNames) throws SQLException {
return this.createChain().Statement_executeUpdate(this, sql, columnNames);
}
public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
return this.createChain().Statement_execute(this, sql, autoGeneratedKeys);
}
public boolean execute(String sql, int[] columnIndexes) throws SQLException {
return this.createChain().Statement_execute(this, sql, columnIndexes);
}
public boolean execute(String sql, String[] columnNames) throws SQLException {
return this.createChain().Statement_execute(this, sql, columnNames);
}
public int getResultSetHoldability() throws SQLException {
return this.createChain().Statement_getResultSetHoldability(this);
}
public boolean isClosed() throws SQLException {
return this.createChain().Statement_isClosed(this);
}
public void setPoolable(boolean poolable) throws SQLException {
this.createChain().Statement_setPoolable(this, poolable);
}
public boolean isPoolable() throws SQLException {
return this.createChain().Statement_isPoolable(this);
}
public void closeOnCompletion() throws SQLException {
this.createChain().Statement_closeOnCompletion(this);
}
public boolean isCloseOnCompletion() throws SQLException {
return this.createChain().Statement_isCloseOnCompletion(this);
}
public <T> T unwrap(Class<T> iface) throws SQLException {
return iface.cast(this);
}
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return iface.isInstance(this);
}
public synchronized ResultSet do_executeQuery(String sql) throws SQLException {
DmdbResultSet_bs rsb = (DmdbResultSet_bs)this.rStmt.executeQuery(sql);
if (rsb == null) {
return null;
} else {
DmdbResultSet rs = new DmdbResultSet(rsb, this);
this.setCurResultSet(rs);
return rs;
}
}
public synchronized int do_executeUpdate(String sql) throws SQLException {
return this.rStmt.executeUpdate(sql);
}
public synchronized void do_close() throws SQLException {
this.rStmt.close();
}
public int do_getMaxFieldSize() throws SQLException {
return this.rStmt.getMaxFieldSize();
}
public synchronized void do_setMaxFieldSize(int max) throws SQLException {
this.rStmt.setMaxFieldSize(max);
}
public int do_getMaxRows() throws SQLException {
return this.rStmt.getMaxRows();
}
public synchronized void do_setMaxRows(int max) throws SQLException {
this.rStmt.setMaxRows(max);
}
public void do_setEscapeProcessing(boolean enable) throws SQLException {
this.rStmt.setEscapeProcessing(enable);
}
public int do_getQueryTimeout() throws SQLException {
return this.rStmt.getQueryTimeout();
}
public synchronized void do_setQueryTimeout(int seconds) throws SQLException {
this.rStmt.setQueryTimeout(seconds);
}
public synchronized void do_cancel() throws SQLException {
this.rStmt.cancel();
}
public SQLWarning do_getWarnings() throws SQLException {
return this.rStmt.getWarnings();
}
public void do_clearWarnings() throws SQLException {
this.rStmt.clearWarnings();
}
public void do_setCursorName(String name) throws SQLException {
this.rStmt.setCursorName(name);
}
public synchronized boolean do_execute(String sql) throws SQLException {
return this.rStmt.execute(sql);
}
public synchronized ResultSet do_getResultSet() throws SQLException {
DmdbResultSet_bs rs = (DmdbResultSet_bs)this.rStmt.getResultSet();
if (rs == null) {
return null;
} else {
this.curResultSet = new DmdbResultSet(rs, this);
return this.curResultSet;
}
}
public synchronized int do_getUpdateCount() throws SQLException {
return this.rStmt.getUpdateCount();
}
public boolean do_getMoreResults() throws SQLException {
if (this.curResultSet != null) {
this.curResultSet.close();
}
return this.rStmt.getMoreResults();
}
public synchronized void do_setFetchDirection(int direction) throws SQLException {
this.rStmt.setFetchDirection(direction);
}
public int do_getFetchDirection() throws SQLException {
return this.rStmt.getFetchDirection();
}
public synchronized void do_setFetchSize(int rows) throws SQLException {
this.rStmt.setFetchSize(rows);
}
public int do_getFetchSize() throws SQLException {
return this.rStmt.getFetchSize();
}
public int do_getResultSetConcurrency() throws SQLException {
return this.rStmt.getResultSetConcurrency();
}
public int do_getResultSetType() throws SQLException {
return this.rStmt.getResultSetType();
}
public void do_addBatch(String sql) throws SQLException {
this.rStmt.addBatch(sql);
}
public void do_clearBatch() throws SQLException {
this.rStmt.clearBatch();
}
public int[] do_executeBatch() throws SQLException {
return this.rStmt.executeBatch();
}
public DmdbConnection do_getConnection() {
return this.curConnect;
}
public synchronized boolean do_getMoreResults(int current) throws SQLException {
if ((current == 1 || current == 3) && this.curResultSet != null) {
this.curResultSet.close();
}
return this.rStmt.getMoreResults(current);
}
public ResultSet do_getGeneratedKeys() throws SQLException {
DmdbResultSet_bs rsb = (DmdbResultSet_bs)this.rStmt.getGeneratedKeys();
return rsb == null ? null : new DmdbResultSet(rsb, this);
}
public int do_executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
return this.rStmt.executeUpdate(sql, autoGeneratedKeys);
}
public int do_executeUpdate(String sql, int[] columnIndexes) throws SQLException {
return this.rStmt.executeUpdate(sql, columnIndexes);
}
public int do_executeUpdate(String sql, String[] columnNames) throws SQLException {
return this.rStmt.executeUpdate(sql, columnNames);
}
public boolean do_execute(String sql, int autoGeneratedKeys) throws SQLException {
return this.rStmt.execute(sql, autoGeneratedKeys);
}
public boolean do_execute(String sql, int[] columnIndexes) throws SQLException {
return this.rStmt.execute(sql, columnIndexes);
}
public boolean do_execute(String sql, String[] columnNames) throws SQLException {
return this.rStmt.execute(sql, columnNames);
}
public int do_getResultSetHoldability() throws SQLException {
return this.rStmt.getResultSetHoldability();
}
public boolean do_isClosed() throws SQLException {
return this.rStmt.isClosed();
}
public void do_setPoolable(boolean poolable) throws SQLException {
this.rStmt.setPoolable(poolable);
}
public boolean do_isPoolable() throws SQLException {
return this.rStmt.isPoolable();
}
public synchronized void preCompile(String sql) throws SQLException {
this.rStmt.preCompile(sql);
}
public synchronized void executeDirect() throws SQLException {
this.rStmt.executeDirect();
}
public void do_closeOnCompletion() throws SQLException {
//DBError.throwUnsupportedSQLException();
}
public boolean do_isCloseOnCompletion() throws SQLException {
return false;
}
public long getExecuteId() {
return this.rStmt.getExecuteId();
}
public long getRowId() {
return this.rStmt.getRowId();
}
public void setSqlStat(SqlStat sqlStat) {
this.sqlStat = sqlStat;
}
public SqlStat getSqlStat() {
return this.sqlStat;
}
public long getLastExecuteTimeNano() {
return this.lastExecuteTimeNano;
}
public void setLastExecuteStartNano(long lastExecuteStartNano) {
this.lastExecuteStartNano = lastExecuteStartNano;
}
public void setLastExecuteType(ExecuteType lastExecuteType) {
this.lastExecuteType = lastExecuteType;
}
public long getLastExecuteStartNano() {
return this.lastExecuteStartNano;
}
public void setLastExecuteTimeNano(long nanos) {
this.lastExecuteTimeNano = nanos;
}
public ExecuteType getLastExecuteType() {
return this.lastExecuteType;
}
public void setFirstResultSet(boolean firstResultSet) {
this.firstResultSet = firstResultSet;
}
public boolean isFirstResultSet() {
return this.firstResultSet;
}
public void setLastExecuteSql(String lastExecuteSql) {
this.lastExecuteSql = lastExecuteSql;
}
public String getLastExecuteSql() {
return this.lastExecuteSql;
}
public List<String> getBatchSqlList() {
return this.rStmt.getBatchSqlList();
}
public String getBatchSql() {
List<String> sqlList = this.getBatchSqlList();
StringBuffer buf = new StringBuffer();
String item;
for(Iterator var4 = sqlList.iterator(); var4.hasNext(); buf.append(item)) {
item = (String)var4.next();
if (buf.length() > 0) {
buf.append("\n;\n");
}
}
return buf.toString();
}
public void afterExecute(long nanoSpan) {
this.lastExecuteTimeNano = nanoSpan;
}
public void beforeExecute() {
this.lastExecuteStartNano = System.nanoTime();
}
public void setConstructNano() {
this.constructNano = System.nanoTime();
}
public long getConstructNano() {
return this.constructNano;
}
public ConnectionStat getConnStat() {
return this.curConnect.getConnStat();
}
public String getSql() {
return this.rStmt.getOriginalSql();
}
public ResultSet[] getResultSets() {
List<DmdbResultSet_bs> rsList = this.rStmt.getResultsList();
return rsList != null ? (ResultSet[])rsList.toArray(new ResultSet[0]) : new ResultSet[0];
}
}
ibzdst-core/pom.xml
浏览文件 @ 1e0983f6
......@@ -115,8 +115,8 @@
<!--达梦数据库-->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>Dm7JdbcDriver17</artifactId>
<version>7.6.0.165</version>
<artifactId>Dm8JdbcDriver18</artifactId>
<version>8.1.1.49</version>
</dependency>
......
ibzdst-core/src/main/java/cn/ibizlab/core/analysis/mapper/DABuildMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.analysis.domain.DABuild;
import cn.ibizlab.core.analysis.filter.DABuildSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/analysis/mapper/DAChartMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.analysis.domain.DAChart;
import cn.ibizlab.core.analysis.filter.DAChartSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/analysis/mapper/DAMetricMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.analysis.domain.DAMetric;
import cn.ibizlab.core.analysis.filter.DAMetricSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/analysis/mapper/DAReportMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.analysis.domain.DAReport;
import cn.ibizlab.core.analysis.filter.DAReportSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/DABuildExService.java
浏览文件 @ 1e0983f6
......@@ -133,9 +133,12 @@ public class DABuildExService extends DABuildServiceImpl {
liteDataService.processDataModel(et.getModelId(), et.getLastRuntime(), new LiteDataCallback<List<EntityObj>>() {
@Override
public void total(Integer total) {
String state = "FINISH";
if(total > 0)
state = "RUNNING";
et.setTotal(total);
et.setProcessed(0);
et.setState("RUNNING");
et.setState(state);
update(et);
}
......
ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/RuleEngineExService.java
浏览文件 @ 1e0983f6
......@@ -97,9 +97,12 @@ public class RuleEngineExService extends RuleEngineServiceImpl {
liteDataService.processDataModel(et.getModelId(), et.getLastRuntime(), new LiteDataCallback<List<EntityObj>>() {
@Override
public void total(Integer total) {
String state = "FINISH";
if(total > 0)
state = "RUNNING";
et.setTotal(total);
et.setProcessed(0);
et.setState("RUNNING");
et.setState(state);
update(et);
}
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/extensions/service/DbEntityService.java
浏览文件 @ 1e0983f6
......@@ -169,6 +169,11 @@ public class DbEntityService extends ServiceImpl<DbEntityMapper, EntityObj> impl
callback.total(total);
//没有业务数据时，不进行后续操作
if(total == 0){
return;
}
MyBatisCursorItemReader myMyBatisCursorItemReader =new MyBatisCursorItemReader();
try{
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/DstDataSourceMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.DstDataSource;
import cn.ibizlab.core.lite.filter.DstDataSourceSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/DstSystemMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.DstSystem;
import cn.ibizlab.core.lite.filter.DstSystemSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaDataSetMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaDataSet;
import cn.ibizlab.core.lite.filter.MetaDataSetSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaEntityMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaEntity;
import cn.ibizlab.core.lite.filter.MetaEntitySearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaFieldMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaField;
import cn.ibizlab.core.lite.filter.MetaFieldSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaModelMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaModel;
import cn.ibizlab.core.lite.filter.MetaModelSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaModuleMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaModule;
import cn.ibizlab.core.lite.filter.MetaModuleSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaRelationshipMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaRelationship;
import cn.ibizlab.core.lite.filter.MetaRelationshipSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/rule/mapper/ExecLogMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.rule.domain.ExecLog;
import cn.ibizlab.core.rule.filter.ExecLogSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/rule/mapper/ExecResultMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.rule.domain.ExecResult;
import cn.ibizlab.core.rule.filter.ExecResultSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/rule/mapper/RuleEngineMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.rule.domain.RuleEngine;
import cn.ibizlab.core.rule.filter.RuleEngineSearchContext;
......
ibzdst-core/src/main/java/cn/ibizlab/core/rule/mapper/RuleItemMapper.java
浏览文件 @ 1e0983f6
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.rule.domain.RuleItem;
import cn.ibizlab.core.rule.filter.RuleItemSearchContext;
......
ibzdst-provider/ibzdst-provider-api/src/main/docker/Dockerfile
浏览文件 @ 1e0983f6
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzdst-provider-api.jar
EXPOSE 8081
EXPOSE 40011
ADD ibzdst-provider-api.jar /ibzdst-provider-api.jar
ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api-k8s.yaml
浏览文件 @ 1e0983f6
......@@ -22,7 +22,34 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
imagePullPolicy: Always
ports:
- containerPort: 8081
- containerPort: 40011
env:
- name: SPRING_CLOUD_NACOS_DISCOVERY_IP
value: "172.16.180.237"
- name: SERVER_PORT
value: "40011"
- name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value: "172.16.100.243:8848"
- name: SPRING_REDIS_HOST
value: "172.16.100.243"
- name: SPRING_REDIS_PORT
value: "6379"
- name: SPRING_REDIS_DATABASE
value: "0"
- name: SPRING_DATASOURCE_USERNAME
value: "a_A_5d9d78509"
- name: SPRING_DATASOURCE_PASSWORD
value: "@6dEfb3@"
- name: SPRING_DATASOURCE_URL
value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
- name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
value: "com.mysql.jdbc.Driver"
- name: SPRING_DATASOURCE_DEFAULTSCHEMA
value: "a_A_5d9d78509"
- name: NACOS
value: "172.16.100.243:8848"
- name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
value: "ibizdev"
volumeMounts:
- name: data
mountPath: /app/file
......@@ -42,9 +69,9 @@ spec:
type: NodePort
ports:
- name: http
port: 8081
targetPort: 8081
nodePort: 8081
port: 40011
targetPort: 40011
nodePort: 40011
protocol: TCP
selector:
app: ibzdst-provider-api
......
ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api.yaml
浏览文件 @ 1e0983f6
......@@ -3,9 +3,23 @@ services:
ibzdst-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
ports:
- "8081:8081"
- "40011:40011"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=40011
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- NACOS=172.16.100.243:8848
- SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
deploy:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或