Skip to content

Commit 75e1d89

Browse files
author
philip
committed
Update build.gralde - supporting springboot
1 parent 918f523 commit 75e1d89

File tree

1,173 files changed

+5767
-59204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,173 files changed

+5767
-59204
lines changed

‎backend-sync.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11

22
MODELNAME=retailscm
3+
DEST_HOST=philip@demo.doublechaintech.com
4+
cd ~/githome/${MODELNAME}-biz-suite/ && rm -rf bizcore/WEB-INF/${MODELNAME}_core_src
35
java -jar ~/githome/splitter.jar ${MODELNAME}
46
# cd ~/githome/${MODELNAME}-biz-suite/&& git pull --allow-unrelated-histories && cd ../
57
cd ~/githome/${MODELNAME}-biz-suite/bizcore&& ~/.sdkman/candidates/gradle/5.2.1/bin/gradle classes && cd ../../
6-
cd ~/githome/${MODELNAME}-biz-suite/ && rsync -avz bizcore/* philip@demo2.doublechaintech.com:~/resin-3.1.12/webapps/${MODELNAME}/
7-
ssh philip@demo2.doublechaintech.com "mysql -uroot -p0254891276 -h 127.0.0.1 < resin-3.1.12/webapps/${MODELNAME}/WEB-INF/${MODELNAME}_core_src/META-INF/${MODELNAME}_mysql.sql"
8+
cd ~/githome/${MODELNAME}-biz-suite/ && rsync -avz bizcore/* ${DEST_HOST}:~/resin-3.1.12/webapps/${MODELNAME}/
9+
ssh ${DEST_HOST} "mysql -uroot -p0254891276 -h 127.0.0.1 < resin-3.1.12/webapps/${MODELNAME}/WEB-INF/${MODELNAME}_core_src/META-INF/${MODELNAME}_mysql.sql"
810

‎bizcore/build.gradle‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
1+
2+
buildscript {
3+
repositories {
4+
mavenCentral()
5+
}
6+
dependencies {
7+
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.5.RELEASE")
8+
}
9+
}
10+
11+
12+
apply plugin: 'java'
13+
apply plugin: 'eclipse'
14+
apply plugin: 'idea'
15+
apply plugin: 'org.springframework.boot'
16+
apply plugin: 'io.spring.dependency-management'
17+
118
group 'com.doublechaintech'
219
version '1.0.0'
320

4-
apply plugin: 'war'
521

6-
apply plugin: 'java'
722

823
[compileJava,compileTestJava,javadoc]*.options*.encoding = "UTF-8"
924
[compileJava,compileTestJava]*.options*.compilerArgs = ["-parameters"]
@@ -41,45 +56,25 @@ repositories {
4156
}
4257

4358
dependencies {
44-
compile group: 'com.auth0', name: 'java-jwt', version: '3.4.0'
45-
compile group: 'org.apache.poi', name: 'poi', version: '3.17'
46-
compile group: 'cglib', name: 'cglib', version: '3.2.6'
47-
compile group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: '3.3.1'
59+
compile group: 'com.auth0', name: 'java-jwt', version: '3.4.0'
4860
compile group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: '3.5.1'
4961
compile group: 'com.aliyun', name: 'aliyun-java-sdk-dysmsapi', version: '1.0.0'
5062
compile group: 'com.aliyun', name: 'aliyun-java-sdk-sts', version: '3.0.0'
5163
compile group: 'com.aliyun.mns', name: 'aliyun-sdk-mns', version: '1.1.8'
5264
compile group: 'com.aliyun.oss', name: 'aliyun-sdk-oss', version: '2.8.3'
53-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.5'
54-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.5'
5565
compile group: 'com.github.binarywang', name: 'weixin-java-miniapp', version: '3.0.0'
5666
compile group: 'com.github.binarywang', name: 'weixin-java-pay', version: '3.0.0'
57-
compile group: 'commons-dbcp', name: 'commons-dbcp', version: '1.4'
5867
compile group: 'javax.mail', name: 'mail', version: '1.4.7'
59-
compile group: 'mysql', name: 'mysql-connector-java', version: '6.0.6'
60-
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
61-
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.5'
68+
compile group: 'mysql', name: 'mysql-connector-java'
6269
compile group: 'org.apache.kafka', name: 'kafka-clients', version: '1.1.0'
6370
compile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-high-level-client', version: '5.6.3'
64-
compile group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: '1.5.2'
65-
compile group: 'org.ow2.asm', name: 'asm-all', version: '5.2'
66-
compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.0'
67-
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
68-
compile group: 'org.springframework', name: 'spring-context', version: '4.3.16.RELEASE'
69-
compile group: 'org.springframework', name: 'spring-context-support', version: '4.3.16.RELEASE'
70-
compile group: 'org.springframework', name: 'spring-jdbc', version: '4.3.16.RELEASE'
71-
compile group: 'org.springframework', name: 'spring-tx', version: '4.3.16.RELEASE'
71+
compile("org.springframework.boot:spring-boot-starter-web")
72+
compile("org.springframework:spring-jdbc")
7273
compile group: 'redis.clients', name: 'jedis', version: '2.9.0'
73-
compile fileTree(dir: 'WEB-INF/lib', include: '*.jar')
74-
providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
74+
compile group: 'org.apache.poi', name: 'poi-ooxml', version: '4.0.1'
7575
testCompile group: 'junit', name: 'junit', version: '4.12'
7676
}
7777

78-
war {
79-
from 'viewlayers'
80-
archiveName = 'retailscm.war'
81-
webXml = file('WEB-INF/web.xml')
82-
}
8378

8479
task copyJars(type: Copy) {
8580
from configurations.runtime
@@ -90,3 +85,11 @@ task copyJars(type: Copy) {
9085

9186

9287

88+
89+
90+
91+
92+
93+
94+
95+

‎bizcore/conf/report.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#Error field definition: level_one_department.manager: word 'manager' in keywords set skynet.kw;
99

1010

11-
=================Execute Report (Model Time 190613T1817) @Wed Jul 03 11:54:39 CST 2019, 150 objects and 1010 fields===========================
11+
=================Execute Report (Model Time 190613T1817) @Wed Jul 03 14:06:53 CST 2019, 150 objects and 1010 fields===========================
1212

1313

1414

‎bizui/src/axios/config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
export const SYSTEM_SHORT_NAME = "retailscmgbase" //Use for requssting different apps
2+
export const SYSTEM_SHORT_NAME = "retailscm" //Use for requssting different apps
33
export const SYSTEM_LOCAL_NAME = "双链小超全流程供应链系统"
4-
export const BUILD_TIIME="Mon May 20 12:23:42 CST 2019"
4+
export const BUILD_TIIME="Wed Jul 03 14:06:54 CST 2019"
55
export const MEDIA_UPLOAD_URL="https://www.doublechaintech.com/mss/upload.html"
66
export const MEDIA_PREFIX="https://www.doublechaintech.com/mss/"
77

‎bizui/src/bizcomponents/accountingdocument/AccountingDocument.associateform.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ const testValues = {};
1919
/*
2020
const testValues = {
2121
name: '记账凭证',
22-
accountingDocumentDate: '2018-04-30',
23-
accountingPeriodId: 'AP000001',
24-
documentTypeId: 'ADT000001',
22+
accountingDocumentDate: '2018-06-19',
23+
accountingPeriodId: 'AP00000001',
24+
documentTypeId: 'ADT00000001',
2525
}
2626
*/
2727

‎bizui/src/bizcomponents/accountingdocument/AccountingDocument.base.js‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import React from 'react'
2-
import { Icon } from 'antd'
2+
import { Icon,Divider } from 'antd'
3+
34
import { Link } from 'dva/router'
45
import moment from 'moment'
56
import ImagePreview from '../../components/ImagePreview'
67
import appLocaleName from '../../common/Locale.tool'
78
import BaseTool from '../../common/Base.tool'
89
import GlobalComponents from '../../custcomponents'
910
import DescriptionList from '../../components/DescriptionList'
10-
11+
const { Description } = DescriptionList
1112
const {
1213
defaultRenderReferenceCell,
1314
defaultRenderBooleanCell,
@@ -46,7 +47,7 @@ const fieldLabels = {
4647
creation: '创建',
4748
confirmation: '确认',
4849
auditing: '审计',
49-
posting: '过账',
50+
posting: '帖子',
5051
currentStatus: '当前状态',
5152

5253
}
@@ -65,33 +66,29 @@ const displayColumns = [
6566

6667
]
6768
// refernce to https://ant.design/components/list-cn/
68-
const renderItemOfList=({accountingDocument,targetComponent})=>{
69+
const renderItemOfList=(accountingDocument,targetComponent)=>{
6970

7071

7172

72-
const {AccountingDocumentService} = GlobalComponents
73-
// const userContext = null
73+
74+
const userContext = null
7475
return (
75-
<DescriptionList className={styles.headerList} size="small" col="4">
76+
<div key={accountingDocument.id}>
77+
78+
<DescriptionList key={accountingDocument.id} size="small" col="4">
7679
<Description term="序号">{accountingDocument.id}</Description>
7780
<Description term="名称">{accountingDocument.name}</Description>
7881
<Description term="会计凭证日期">{ moment(accountingDocument.accountingDocumentDate).format('YYYY-MM-DD')}</Description>
7982
<Description term="会计期间">{accountingDocument.accountingPeriod==null?appLocaleName(userContext,"NotAssigned"):`${accountingDocument.accountingPeriod.displayName}(${accountingDocument.accountingPeriod.id})`}
80-
<Icon type="swap" onClick={()=>
81-
showTransferModel(targetComponent,"会计期间","accountingPeriod",AccountingDocumentService.requestCandidateAccountingPeriod,
82-
AccountingDocumentService.transferToAnotherAccountingPeriod,"anotherAccountingPeriodId",accountingDocument.accountingPeriod?accountingDocument.accountingPeriod.id:"")}
83-
style={{fontSize: 20,color:"red"}} />
8483
</Description>
8584
<Description term="文档类型">{accountingDocument.documentType==null?appLocaleName(userContext,"NotAssigned"):`${accountingDocument.documentType.displayName}(${accountingDocument.documentType.id})`}
86-
<Icon type="swap" onClick={()=>
87-
showTransferModel(targetComponent,"文档类型","accountingDocumentType",AccountingDocumentService.requestCandidateDocumentType,
88-
AccountingDocumentService.transferToAnotherDocumentType,"anotherDocumentTypeId",accountingDocument.documentType?accountingDocument.documentType.id:"")}
89-
style={{fontSize: 20,color:"red"}} />
9085
</Description>
9186
<Description term="当前状态">{accountingDocument.currentStatus}</Description>
9287

93-
{buildTransferModal(accountingDocument,targetComponent)}
88+
9489
</DescriptionList>
90+
<Divider style={{ height: '2px' }} />
91+
</div>
9592
)
9693

9794
}

‎bizui/src/bizcomponents/accountingdocument/AccountingDocument.createform.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ const testValues = {};
1818
/*
1919
const testValues = {
2020
name: '记账凭证',
21-
accountingDocumentDate: '2018-08-10',
22-
accountingPeriodId: 'AP000001',
23-
documentTypeId: 'ADT000001',
21+
accountingDocumentDate: '2019-06-03',
22+
accountingPeriodId: 'AP00000001',
23+
documentTypeId: 'ADT00000001',
2424
}
2525
*/
2626

‎bizui/src/bizcomponents/accountingdocument/AccountingDocument.dashboard.js‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,12 @@ const {aggregateDataset,calcKey, defaultHideCloseTrans,
2727
defaultExecuteTrans,defaultHandleTransferSearch,defaultShowTransferModel,
2828
defaultRenderExtraHeader,
2929
defaultSubListsOf,defaultRenderAnalytics,
30-
defaultRenderExtraFooter,renderForTimeLine,renderForNumbers,defaultQuickFunctions
30+
defaultRenderExtraFooter,renderForTimeLine,renderForNumbers,
31+
defaultQuickFunctions, defaultRenderSubjectList,
3132
}= DashboardTool
3233

3334

3435

35-
36-
3736
const { Description } = DescriptionList;
3837
const { TabPane } = Tabs
3938
const { RangePicker } = DatePicker
@@ -50,6 +49,7 @@ const optionList =(accountingDocument)=>{return [
5049

5150
const buildTransferModal = defaultBuildTransferModal
5251
const showTransferModel = defaultShowTransferModel
52+
const internalRenderSubjectList = defaultRenderSubjectList
5353
const internalSettingListOf = (accountingDocument) =>defaultSettingListOf(accountingDocument, optionList)
5454
const internalLargeTextOf = (accountingDocument) =>{
5555

@@ -137,8 +137,8 @@ class AccountingDocumentDashboard extends Component {
137137
const cardsData = {cardsName:"会计凭证",cardsFor: "accountingDocument",
138138
cardsSource: this.props.accountingDocument,returnURL,displayName,
139139
subItems: [
140-
{name: 'originalVoucherList', displayName:'原始凭证',type:'originalVoucher',count:originalVoucherCount,addFunction: true, role: 'originalVoucher', metaInfo: originalVoucherListMetaInfo},
141-
{name: 'accountingDocumentLineList', displayName:'会计凭证行',type:'accountingDocumentLine',count:accountingDocumentLineCount,addFunction: true, role: 'accountingDocumentLine', metaInfo: accountingDocumentLineListMetaInfo},
140+
{name: 'originalVoucherList', displayName:'原始凭证',type:'originalVoucher',count:originalVoucherCount,addFunction: true, role: 'originalVoucher', metaInfo: originalVoucherListMetaInfo, renderItem: GlobalComponents.OriginalVoucherBase.renderItemOfList},
141+
{name: 'accountingDocumentLineList', displayName:'会计凭证行',type:'accountingDocumentLine',count:accountingDocumentLineCount,addFunction: true, role: 'accountingDocumentLine', metaInfo: accountingDocumentLineListMetaInfo, renderItem: GlobalComponents.AccountingDocumentLineBase.renderItemOfList},
142142

143143
],
144144
};
@@ -153,6 +153,8 @@ class AccountingDocumentDashboard extends Component {
153153
const renderExtraFooter = this.props.renderExtraFooter || internalRenderExtraFooter
154154
const renderAnalytics = this.props.renderAnalytics || defaultRenderAnalytics
155155
const quickFunctions = this.props.quickFunctions || internalQuickFunctions
156+
const renderSubjectList = this.props.renderSubjectList || internalRenderSubjectList
157+
156158
return (
157159

158160
<PageHeaderLayout
@@ -165,10 +167,11 @@ class AccountingDocumentDashboard extends Component {
165167
{quickFunctions(cardsData)}
166168
{renderAnalytics(cardsData.cardsSource)}
167169
{settingListOf(cardsData.cardsSource)}
168-
{imageListOf(cardsData.cardsSource)}
170+
{imageListOf(cardsData.cardsSource)}
171+
{renderSubjectList(cardsData)}
169172
{largeTextOf(cardsData.cardsSource)}
170173
{renderExtraFooter(cardsData.cardsSource)}
171-
174+
172175
</PageHeaderLayout>
173176

174177
)

‎bizui/src/bizcomponents/accountingdocument/AccountingDocument.permission.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import numeral from 'numeral'
1111

1212
import DashboardTool from '../../common/Dashboard.tool'
1313
import PageHeaderLayout from '../../layouts/PageHeaderLayout'
14-
import styles from './AccountingDocument.preference.less'
14+
import styles from './AccountingDocument.profile.less'
1515
import DescriptionList from '../../components/DescriptionList';
1616

1717
import GlobalComponents from '../../custcomponents';

0 commit comments

Comments
 (0)