Merge branch 'dev-sx' of http://git.pseer.com/platform/hp-smart into dev

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006A.java

@@ -41,8 +41,7 @@ public class ServiceHPSC006A extends ServiceBase {
             Map queryMap = EiInfoUtils.getFirstRow(inInfo);
             String prodOrderNo = MapUtils.getString(queryMap, CommonConstant.Field.PROD_ORDER_NO);
             HPSC006.setProductionOrderNo(prodOrderNo);
-            EiInfo outInfo = super.initLoad(inInfo, HPSC006);
-            outInfo.addBlock(EiConstant.resultBlock).addBlockMeta(HPSC006.eiMetadata);
+	        inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(HPSC006.eiMetadata);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null, false);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID), null, false);

src/main/resources/application.properties

@@ -33,11 +33,10 @@ customerName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
 enterpriseName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
 datasource.type=dbcp
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#jdbc.url=jdbc:mysql://127.0.0.1:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://10.135.13.5:30005/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
-jdbc.username=dbprod32
-jdbc.password=t9UrgcELp=
-#jdbc.password=123456
+jdbc.url=jdbc:mysql://127.0.0.1:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://10.135.13.5:30005/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
+jdbc.username=root
+jdbc.password=123456
 jdbc.maxActive=20
 jdbc.validationQuery=SELECT 1 FROM ${platSchema}.TEDFA00
 

src/main/resources/quartz.properties

@@ -26,12 +26,11 @@ org.quartz.jobStore.isClustered = true
 #\uFFFD\u02F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u077F\uFFFD\u05BE\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\u0635\uFFFD\uFFFD\uFFFD\u03E2
 org.quartz.jobStore.clusterCheckinInterval = 20000
 org.quartz.dataSource.appDS.driver = com.mysql.jdbc.Driver
-org.quartz.dataSource.appDS.URL = jdbc:mysql://10.135.13.5:30005/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
-#org.quartz.dataSource.appDS.URL = jdbc:mysql://127.0.0.1:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
+#org.quartz.dataSource.appDS.URL = jdbc:mysql://10.24.1.94:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
+org.quartz.dataSource.appDS.URL = jdbc:mysql://127.0.0.1:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
 
-org.quartz.dataSource.appDS.user = dbprod32
-#org.quartz.dataSource.appDS.password =root
-org.quartz.dataSource.appDS.password =t9UrgcELp=
+org.quartz.dataSource.appDS.user = root
+org.quartz.dataSource.appDS.password =123456
 org.quartz.dataSource.appDS.maxConnections = 30
 
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B1\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\u00BC\uFFFD\uFFFD\uFFFD