提交 2fae95ff 编写于 作者: ibizdev's avatar ibizdev

tony001 发布系统代码 [后台服务,演示应用]

上级 da0ef7d8
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
**.iml **.iml
*.jar *.jar
*.log *.log
.DS_Store .DS_Store
\ No newline at end of file
...@@ -670,7 +670,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface ...@@ -670,7 +670,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
*/ */
public load(opt: any = {}): void { public load(opt: any = {}): void {
if(!this.loadAction){ if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -706,7 +706,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface ...@@ -706,7 +706,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
*/ */
public async loadDraft(opt: any = {},mode?:string): Promise<any> { public async loadDraft(opt: any = {},mode?:string): Promise<any> {
if(!this.loaddraftAction){ if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
...@@ -70,11 +70,6 @@ export default class Usr4Model { ...@@ -70,11 +70,6 @@ export default class Usr4Model {
prop: 'n_ibizbookname_like', prop: 'n_ibizbookname_like',
dataType: 'QUERYPARAM' dataType: 'QUERYPARAM'
}, },
{
name: 'n_price_gtandeq',
prop: 'n_price_gtandeq',
dataType: 'QUERYPARAM'
},
{ {
......
...@@ -55,23 +55,6 @@ ...@@ -55,23 +55,6 @@
git clone -b master $para2 demosys/ git clone -b master $para2 demosys/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd demosys/ cd demosys/
cd demo-boot
mvn ibizlabcli:code
cd ..
set +e
git config user.name "ibizdev"
git add .
git commit -m "generator before deploy $para5"
git push origin master
git config user.name "root"
set -e
mvn package -Pboot
cd demo-boot
sed -i "s#dstimage#$para5#g" pom.xml
sed -i "s#dstimage#$para5#g" src/main/docker/demo-boot-demoapi.yaml
mvn -Pboot docker:build
mvn -Pboot docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/demo-boot-demoapi.yaml iBizDemo --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /demo-boot.jar java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /demo-boot.jar
EXPOSE 52000 EXPOSE 8081
ADD demo-boot.jar /demo-boot.jar ADD demo-boot.jar /demo-boot.jar
...@@ -51,4 +51,4 @@ public class BootApplication extends WebMvcConfigurerAdapter { ...@@ -51,4 +51,4 @@ public class BootApplication extends WebMvcConfigurerAdapter {
super.addArgumentResolvers(argumentResolvers); super.addArgumentResolvers(argumentResolvers);
argumentResolvers.add(resolver); argumentResolvers.add(resolver);
} }
} }
\ No newline at end of file
...@@ -868,6 +868,10 @@ ...@@ -868,6 +868,10 @@
"getPSEditor" : { "getPSEditor" : {
"editorType" : "LISTBOX", "editorType" : "LISTBOX",
"name" : "f14", "name" : "f14",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/BookSailState.json"
},
"placeHolder" : "占位提示-列表框" "placeHolder" : "占位提示-列表框"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
......
...@@ -983,6 +983,10 @@ ...@@ -983,6 +983,10 @@
"getPSEditor" : { "getPSEditor" : {
"editorType" : "LISTBOX", "editorType" : "LISTBOX",
"name" : "f14", "name" : "f14",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/BookSailState.json"
},
"placeHolder" : "占位提示-列表框" "placeHolder" : "占位提示-列表框"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
</parent> </parent>
<artifactId>demo-core</artifactId> <artifactId>demo-core</artifactId>
<name>Demo Core</name> <name>后台服务 Core</name>
<description>后台服务 Core,模板生成代码,再次发布会覆盖,建议不要直接修改,修改请在demo-boot项目中继承或覆盖重写</description> <description>后台服务 Core</description>
<dependencies> <dependencies>
...@@ -20,14 +20,6 @@ ...@@ -20,14 +20,6 @@
<artifactId>ibizlab-boot-starter-data</artifactId> <artifactId>ibizlab-boot-starter-data</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- MySQL驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
...@@ -101,4 +93,4 @@ ...@@ -101,4 +93,4 @@
</profile> </profile>
</profiles> </profiles>
</project> </project>
\ No newline at end of file
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
<!--输出实体[IBIZCPU]数据结构 --> <!--输出实体[IBIZCPU]数据结构 -->
<changeSet author="a_LAB01_df847bdfd" id="tab-ibizcpu-1-8"> <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcpu-5-8">
<createTable tableName="T_IBIZCPU"> <createTable tableName="T_IBIZCPU">
<column name="CREATEDATE" remarks="" type="DATETIME"> <column name="CREATEDATE" remarks="" type="DATETIME">
</column> </column>
...@@ -528,7 +528,7 @@ ...@@ -528,7 +528,7 @@
<!--输出实体[IBIZSAMPLE0001]数据结构 --> <!--输出实体[IBIZSAMPLE0001]数据结构 -->
<changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0001-14-19"> <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0001-16-19">
<createTable tableName="T_IBIZSAMPLE0001"> <createTable tableName="T_IBIZSAMPLE0001">
<column name="FIELD01" remarks="" type="VARCHAR(100)"> <column name="FIELD01" remarks="" type="VARCHAR(100)">
</column> </column>
...@@ -1473,7 +1473,7 @@ ...@@ -1473,7 +1473,7 @@
<!--输出实体[IBIZQJ]外键关系 --> <!--输出实体[IBIZQJ]外键关系 -->
<!--输出实体[IBIZSAMPLE]外键关系 --> <!--输出实体[IBIZSAMPLE]外键关系 -->
<!--输出实体[IBIZSAMPLE0001]外键关系 --> <!--输出实体[IBIZSAMPLE0001]外键关系 -->
<changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0001-14-48"> <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0001-16-48">
<addForeignKeyConstraint baseColumnNames="IBIZSAMPLE0002ID" baseTableName="T_IBIZSAMPLE0001" constraintName="DER1N_IBIZSAMPLE0001_IBIZSAMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZSAMPLE0002ID" referencedTableName="T_IBIZSAMPLE0002" validate="true"/> <addForeignKeyConstraint baseColumnNames="IBIZSAMPLE0002ID" baseTableName="T_IBIZSAMPLE0001" constraintName="DER1N_IBIZSAMPLE0001_IBIZSAMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZSAMPLE0002ID" referencedTableName="T_IBIZSAMPLE0002" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[IBIZSAMPLE0002]外键关系 --> <!--输出实体[IBIZSAMPLE0002]外键关系 -->
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</createView> </createView>
</changeSet> </changeSet>
<!--输出实体[IBIZCPU]视图结构信息 runOnChange="true" 当视图发生变更时,通过liquibase强刷prod的视图,实现视图的同步--> <!--输出实体[IBIZCPU]视图结构信息 runOnChange="true" 当视图发生变更时,通过liquibase强刷prod的视图,实现视图的同步-->
<changeSet author="a_LAB01_df847bdfd" id="view-ibizcpu-1-2" runOnChange="true"> <changeSet author="a_LAB01_df847bdfd" id="view-ibizcpu-5-2" runOnChange="true">
<createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZCPU"> <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZCPU">
<![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[IBIZCPUID], t1.[IBIZCPUNAME], t11.[IBIZHARDWARETYPE], t11.[PRODUCER], t11.[PRODUCTUID], t11.[UNIT], t11.[UNITPRICE], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZCPU] t1 LEFT JOIN T_IBIZHARDWARE t11 ON t1.IBIZCPUID = t11.IBIZHARDWAREID ]]> <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[IBIZCPUID], t1.[IBIZCPUNAME], t11.[IBIZHARDWARETYPE], t11.[PRODUCER], t11.[PRODUCTUID], t11.[UNIT], t11.[UNITPRICE], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZCPU] t1 LEFT JOIN T_IBIZHARDWARE t11 ON t1.IBIZCPUID = t11.IBIZHARDWAREID ]]>
</createView> </createView>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</createView> </createView>
</changeSet> </changeSet>
<!--输出实体[IBIZSAMPLE0001]视图结构信息 runOnChange="true" 当视图发生变更时,通过liquibase强刷prod的视图,实现视图的同步--> <!--输出实体[IBIZSAMPLE0001]视图结构信息 runOnChange="true" 当视图发生变更时,通过liquibase强刷prod的视图,实现视图的同步-->
<changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0001-14-13" runOnChange="true"> <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0001-16-13" runOnChange="true">
<createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZSAMPLE0001"> <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZSAMPLE0001">
<![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[FIELD01], t1.[FIELD02], t1.[FIELD05], t1.[FIELD06], t1.[FIELD07], t1.[FIELD08], t1.[FIELD09], t1.[FIELD10], t1.[FIELD11], t1.[FIELD12], t1.[FIELD13], t1.[FIELD14], t1.[FIELD15], t1.[FIELD16], t1.[FIELD17], t1.[FIELD18], t1.[FIELD19], t1.[FIELD20], t1.[FIELD21], t1.[FIELD22], t1.[FIELD23], t1.[FIELD24], t1.[FIELD25], t1.[FIELD26], t1.[FIELD27], t1.[IBIZSAMPLE0001ID], t1.[IBIZSAMPLE0001NAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZSAMPLE0001] t1 ]]> <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[FIELD01], t1.[FIELD02], t1.[FIELD05], t1.[FIELD06], t1.[FIELD07], t1.[FIELD08], t1.[FIELD09], t1.[FIELD10], t1.[FIELD11], t1.[FIELD12], t1.[FIELD13], t1.[FIELD14], t1.[FIELD15], t1.[FIELD16], t1.[FIELD17], t1.[FIELD18], t1.[FIELD19], t1.[FIELD20], t1.[FIELD21], t1.[FIELD22], t1.[FIELD23], t1.[FIELD24], t1.[FIELD25], t1.[FIELD26], t1.[FIELD27], t1.[IBIZSAMPLE0001ID], t1.[IBIZSAMPLE0001NAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZSAMPLE0001] t1 ]]>
</createView> </createView>
......
[ [
{
"name": "年度",
"code": "Years",
"group": "",
"memo": "",
}
]
\ No newline at end of file
{
"name":"年度",
"code":"Years",
"group":"",
"memo":"",
"enable":"",
}
]
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<artifactId>demo</artifactId> <artifactId>demo</artifactId>
<groupId>cn.ibizlab</groupId> <groupId>cn.ibizlab</groupId>
<version>1.0.0.0</version> <version>1.0.0.0</version>
<name>Demo</name> <name>后台服务</name>
<description>后台服务</description> <description></description>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<generateBackupPoms>false</generateBackupPoms> <generateBackupPoms>false</generateBackupPoms>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>cn.ibizlab</groupId> <groupId>cn.ibizlab</groupId>
<artifactId>ibizlab-generator-plugin</artifactId> <artifactId>ibizlab-generator-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
...@@ -137,4 +137,4 @@ ...@@ -137,4 +137,4 @@
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册