Update build.gralde - supporting springboot

doublechaintech · Jul 3, 2019 · de6a52a · de6a52a
1 parent 25ab7e8
commit de6a52a
Show file tree

Hide file tree

Showing 1,173 changed files with 5,767 additions and 59,204 deletions.
diff --git a/backend-sync.sh b/backend-sync.sh
@@ -1,8 +1,10 @@
 
 MODELNAME=retailscm
+[email protected]
+cd ~/githome/${MODELNAME}-biz-suite/ && rm -rf bizcore/WEB-INF/${MODELNAME}_core_src
 java -jar ~/githome/splitter.jar ${MODELNAME}
 # cd ~/githome/${MODELNAME}-biz-suite/&& git pull --allow-unrelated-histories && cd ../
 cd ~/githome/${MODELNAME}-biz-suite/bizcore&& ~/.sdkman/candidates/gradle/5.2.1/bin/gradle classes && cd ../../
-cd ~/githome/${MODELNAME}-biz-suite/ && rsync -avz   bizcore/* [email protected]:~/resin-3.1.12/webapps/${MODELNAME}/
-ssh [email protected] "mysql -uroot -p0254891276 -h 127.0.0.1 < resin-3.1.12/webapps/${MODELNAME}/WEB-INF/${MODELNAME}_core_src/META-INF/${MODELNAME}_mysql.sql"
+cd ~/githome/${MODELNAME}-biz-suite/ && rsync -avz   bizcore/* ${DEST_HOST}:~/resin-3.1.12/webapps/${MODELNAME}/
+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"
 
diff --git a/bizcore/build.gradle b/bizcore/build.gradle
@@ -1,9 +1,24 @@
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.5.RELEASE")
+    }
+}
+
+
+apply plugin: 'java'
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
+
 group 'com.doublechaintech'
 version '1.0.0'
 
-apply plugin: 'war'
 
-apply plugin: 'java'
 
 [compileJava,compileTestJava,javadoc]*.options*.encoding = "UTF-8"
 [compileJava,compileTestJava]*.options*.compilerArgs = ["-parameters"]
@@ -41,45 +56,25 @@ repositories {
 }
 
 dependencies {
-	compile group: 'com.auth0', name: 'java-jwt', version: '3.4.0'
-    compile group: 'org.apache.poi', name: 'poi', version: '3.17'
-    compile group: 'cglib', name: 'cglib', version: '3.2.6'
-    compile group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: '3.3.1'
+    compile group: 'com.auth0', name: 'java-jwt', version: '3.4.0'
     compile group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: '3.5.1'
     compile group: 'com.aliyun', name: 'aliyun-java-sdk-dysmsapi', version: '1.0.0'
     compile group: 'com.aliyun', name: 'aliyun-java-sdk-sts', version: '3.0.0'
     compile group: 'com.aliyun.mns', name: 'aliyun-sdk-mns', version: '1.1.8'
     compile group: 'com.aliyun.oss', name: 'aliyun-sdk-oss', version: '2.8.3'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.5'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.5'
     compile group: 'com.github.binarywang', name: 'weixin-java-miniapp', version: '3.0.0'
     compile group: 'com.github.binarywang', name: 'weixin-java-pay', version: '3.0.0'
-    compile group: 'commons-dbcp', name: 'commons-dbcp', version: '1.4'
     compile group: 'javax.mail', name: 'mail', version: '1.4.7'
-    compile group: 'mysql', name: 'mysql-connector-java', version: '6.0.6'
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
-    compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.5'
+    compile group: 'mysql', name: 'mysql-connector-java'
     compile group: 'org.apache.kafka', name: 'kafka-clients', version: '1.1.0'
     compile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-high-level-client', version: '5.6.3'
-    compile group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: '1.5.2'
-    compile group: 'org.ow2.asm', name: 'asm-all', version: '5.2'
-    compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.0'
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
-    compile group: 'org.springframework', name: 'spring-context', version: '4.3.16.RELEASE'
-    compile group: 'org.springframework', name: 'spring-context-support', version: '4.3.16.RELEASE'
-    compile group: 'org.springframework', name: 'spring-jdbc', version: '4.3.16.RELEASE'
-    compile group: 'org.springframework', name: 'spring-tx', version: '4.3.16.RELEASE'
+    compile("org.springframework.boot:spring-boot-starter-web")
+    compile("org.springframework:spring-jdbc")
     compile group: 'redis.clients', name: 'jedis', version: '2.9.0'
-    compile fileTree(dir: 'WEB-INF/lib', include: '*.jar')
-    providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
+	compile group: 'org.apache.poi', name: 'poi-ooxml', version: '4.0.1'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
-war {
-    from 'viewlayers'
-    archiveName = 'retailscm.war'
-    webXml = file('WEB-INF/web.xml')
-}
 
 task copyJars(type: Copy) {
   from configurations.runtime
@@ -90,3 +85,11 @@ task copyJars(type: Copy) {
 
 
 
+
+
+
+
+
+
+
+
diff --git a/bizcore/conf/report.txt b/bizcore/conf/report.txt
@@ -8,7 +8,7 @@
 #Error field definition: level_one_department.manager: word 'manager' in keywords set skynet.kw; 
 
 
-=================Execute Report (Model Time 190613T1817) @Wed Jul 03 11:54:39 CST 2019, 150 objects and 1010 fields===========================
+=================Execute Report (Model Time 190613T1817) @Wed Jul 03 14:06:53 CST 2019, 150 objects and 1010 fields===========================
 
 
 

diff --git a/bizui/src/axios/config.js b/bizui/src/axios/config.js
@@ -1,7 +1,7 @@
 
-export const SYSTEM_SHORT_NAME = "retailscmgbase" //Use for requssting different apps
+export const SYSTEM_SHORT_NAME = "retailscm" //Use for requssting different apps
 export const SYSTEM_LOCAL_NAME = "双链小超全流程供应链系统" 
-export const BUILD_TIIME="Mon May 20 12:23:42 CST 2019"
+export const BUILD_TIIME="Wed Jul 03 14:06:54 CST 2019"
 export const MEDIA_UPLOAD_URL="https://www.doublechaintech.com/mss/upload.html"
 export const MEDIA_PREFIX="https://www.doublechaintech.com/mss/"
 

diff --git a/bizui/src/bizcomponents/accountingdocument/AccountingDocument.associateform.js b/bizui/src/bizcomponents/accountingdocument/AccountingDocument.associateform.js
@@ -19,9 +19,9 @@ const testValues = {};
 /*
 const testValues = {
   name: '记账凭证',
-  accountingDocumentDate: '2018-04-30',
-  accountingPeriodId: 'AP000001',
-  documentTypeId: 'ADT000001',
+  accountingDocumentDate: '2018-06-19',
+  accountingPeriodId: 'AP00000001',
+  documentTypeId: 'ADT00000001',
 }
 */
 

diff --git a/bizui/src/bizcomponents/accountingdocument/AccountingDocument.base.js b/bizui/src/bizcomponents/accountingdocument/AccountingDocument.base.js
@@ -1,13 +1,14 @@
 import React from 'react'
-import { Icon } from 'antd'
+import { Icon,Divider } from 'antd'
+
 import { Link } from 'dva/router'
 import moment from 'moment'
 import ImagePreview from '../../components/ImagePreview'
 import appLocaleName from '../../common/Locale.tool'
 import BaseTool from '../../common/Base.tool'
 import GlobalComponents from '../../custcomponents'
 import DescriptionList from '../../components/DescriptionList'
-
+const { Description } = DescriptionList
 const {
 	defaultRenderReferenceCell,
 	defaultRenderBooleanCell,
@@ -46,7 +47,7 @@ const fieldLabels = {
   creation: '创建',
   confirmation: '确认',
   auditing: '审计',
-  posting: '过账',
+  posting: '帖子',
   currentStatus: '当前状态',
 
 }
@@ -65,33 +66,29 @@ const displayColumns = [
 
 ]
 // refernce to https://ant.design/components/list-cn/
-const renderItemOfList=({accountingDocument,targetComponent})=>{
+const renderItemOfList=(accountingDocument,targetComponent)=>{
 
 
 
-	const {AccountingDocumentService} = GlobalComponents
-	// const userContext = null
+
+	const userContext = null
 	return (
-	<DescriptionList className={styles.headerList} size="small" col="4">
+	<div key={accountingDocument.id}>
+
+	<DescriptionList  key={accountingDocument.id} size="small" col="4">
 <Description term="序号">{accountingDocument.id}</Description> 
 <Description term="名称">{accountingDocument.name}</Description> 
 <Description term="会计凭证日期">{ moment(accountingDocument.accountingDocumentDate).format('YYYY-MM-DD')}</Description> 
 <Description term="会计期间">{accountingDocument.accountingPeriod==null?appLocaleName(userContext,"NotAssigned"):`${accountingDocument.accountingPeriod.displayName}(${accountingDocument.accountingPeriod.id})`}
- <Icon type="swap" onClick={()=>
-  showTransferModel(targetComponent,"会计期间","accountingPeriod",AccountingDocumentService.requestCandidateAccountingPeriod,
-	      AccountingDocumentService.transferToAnotherAccountingPeriod,"anotherAccountingPeriodId",accountingDocument.accountingPeriod?accountingDocument.accountingPeriod.id:"")} 
-  style={{fontSize: 20,color:"red"}} />
 </Description>
 <Description term="文档类型">{accountingDocument.documentType==null?appLocaleName(userContext,"NotAssigned"):`${accountingDocument.documentType.displayName}(${accountingDocument.documentType.id})`}
- <Icon type="swap" onClick={()=>
-  showTransferModel(targetComponent,"文档类型","accountingDocumentType",AccountingDocumentService.requestCandidateDocumentType,
-	      AccountingDocumentService.transferToAnotherDocumentType,"anotherDocumentTypeId",accountingDocument.documentType?accountingDocument.documentType.id:"")} 
-  style={{fontSize: 20,color:"red"}} />
 </Description>
 <Description term="当前状态">{accountingDocument.currentStatus}</Description> 
 
-        {buildTransferModal(accountingDocument,targetComponent)}
+
       </DescriptionList>
+       <Divider style={{ height: '2px' }} />
+      </div>
 	)
 
 }

diff --git a/bizui/src/bizcomponents/accountingdocument/AccountingDocument.createform.js b/bizui/src/bizcomponents/accountingdocument/AccountingDocument.createform.js
@@ -18,9 +18,9 @@ const testValues = {};
 /*
 const testValues = {
   name: '记账凭证',
-  accountingDocumentDate: '2018-08-10',
-  accountingPeriodId: 'AP000001',
-  documentTypeId: 'ADT000001',
+  accountingDocumentDate: '2019-06-03',
+  accountingPeriodId: 'AP00000001',
+  documentTypeId: 'ADT00000001',
 }
 */
 

diff --git a/bizui/src/bizcomponents/accountingdocument/AccountingDocument.dashboard.js b/bizui/src/bizcomponents/accountingdocument/AccountingDocument.dashboard.js
@@ -27,13 +27,12 @@ const {aggregateDataset,calcKey, defaultHideCloseTrans,
   defaultExecuteTrans,defaultHandleTransferSearch,defaultShowTransferModel,
   defaultRenderExtraHeader,
   defaultSubListsOf,defaultRenderAnalytics,
-  defaultRenderExtraFooter,renderForTimeLine,renderForNumbers,defaultQuickFunctions
+  defaultRenderExtraFooter,renderForTimeLine,renderForNumbers,
+  defaultQuickFunctions, defaultRenderSubjectList,
 }= DashboardTool
 
 
 
-
-
 const { Description } = DescriptionList;
 const { TabPane } = Tabs
 const { RangePicker } = DatePicker
@@ -50,6 +49,7 @@ const optionList =(accountingDocument)=>{return [
 
 const buildTransferModal = defaultBuildTransferModal
 const showTransferModel = defaultShowTransferModel
+const internalRenderSubjectList = defaultRenderSubjectList
 const internalSettingListOf = (accountingDocument) =>defaultSettingListOf(accountingDocument, optionList)
 const internalLargeTextOf = (accountingDocument) =>{
 
@@ -137,8 +137,8 @@ class AccountingDocumentDashboard extends Component {
     const cardsData = {cardsName:"会计凭证",cardsFor: "accountingDocument",
     	cardsSource: this.props.accountingDocument,returnURL,displayName,
   		subItems: [
-{name: 'originalVoucherList', displayName:'原始凭证',type:'originalVoucher',count:originalVoucherCount,addFunction: true, role: 'originalVoucher', metaInfo: originalVoucherListMetaInfo},
-{name: 'accountingDocumentLineList', displayName:'会计凭证行',type:'accountingDocumentLine',count:accountingDocumentLineCount,addFunction: true, role: 'accountingDocumentLine', metaInfo: accountingDocumentLineListMetaInfo},
+{name: 'originalVoucherList', displayName:'原始凭证',type:'originalVoucher',count:originalVoucherCount,addFunction: true, role: 'originalVoucher', metaInfo: originalVoucherListMetaInfo, renderItem: GlobalComponents.OriginalVoucherBase.renderItemOfList},
+{name: 'accountingDocumentLineList', displayName:'会计凭证行',type:'accountingDocumentLine',count:accountingDocumentLineCount,addFunction: true, role: 'accountingDocumentLine', metaInfo: accountingDocumentLineListMetaInfo, renderItem: GlobalComponents.AccountingDocumentLineBase.renderItemOfList},
 
       	],
   	};
@@ -153,6 +153,8 @@ class AccountingDocumentDashboard extends Component {
     const renderExtraFooter = this.props.renderExtraFooter || internalRenderExtraFooter
     const renderAnalytics = this.props.renderAnalytics || defaultRenderAnalytics
     const quickFunctions = this.props.quickFunctions || internalQuickFunctions
+    const renderSubjectList = this.props.renderSubjectList || internalRenderSubjectList
+
     return (
 
       <PageHeaderLayout
@@ -165,10 +167,11 @@ class AccountingDocumentDashboard extends Component {
         {quickFunctions(cardsData)} 
         {renderAnalytics(cardsData.cardsSource)}
         {settingListOf(cardsData.cardsSource)}
-        {imageListOf(cardsData.cardsSource)}        
+        {imageListOf(cardsData.cardsSource)}  
+        {renderSubjectList(cardsData)}       
         {largeTextOf(cardsData.cardsSource)}
         {renderExtraFooter(cardsData.cardsSource)}
-
+  		
       </PageHeaderLayout>
 
     )

diff --git a/bizui/src/bizcomponents/accountingdocument/AccountingDocument.permission.js b/bizui/src/bizcomponents/accountingdocument/AccountingDocument.permission.js
@@ -11,7 +11,7 @@ import numeral from 'numeral'
 
 import DashboardTool from '../../common/Dashboard.tool'
 import PageHeaderLayout from '../../layouts/PageHeaderLayout'
-import styles from './AccountingDocument.preference.less'
+import styles from './AccountingDocument.profile.less'
 import DescriptionList from '../../components/DescriptionList';
 
 import GlobalComponents from '../../custcomponents';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,7 +8,7 @@
		#Error field definition: level_one_department.manager: word 'manager' in keywords set skynet.kw;


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



Expand Down