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

 Conflicts:
	src/main/java/com/baosight/hpjx/core/enums/DocRouteEnum.java

src/main/resources/application.properties

@@ -19,8 +19,8 @@ spring.servlet.multipart.file-size-threshold =0
 componentEname=hpjx
 projectName=hpjx
 moduleName=ep
-projectEnv=dev
-platSchema=iplat
+projectEnv=run
+platSchema=iplat_hpjx
 eplatSchema=EPLAT
 lowcodedbSchema=lowcodedb
 lowCodeSchema=LOWCODEDB
@@ -32,12 +32,12 @@ hpjxSchema=hpjx
 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.driverClassName=com.mysql.cj.jdbc.Driver
+#jdbc.url=jdbc:mysql://127.0.0.1:3306/iplat_hpjx?useSSL=false&useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://129.211.46.84:3306/iplat_hpjx?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true
+jdbc.username=root
 #jdbc.username=root
-jdbc.password=t9UrgcELp=
+jdbc.password=Whxz@2019
 #jdbc.password=123456
 jdbc.maxActive=20
 jdbc.validationQuery=SELECT 1 FROM ${platSchema}.TEDFA00

src/main/resources/quartz.properties

@@ -25,12 +25,12 @@ 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.user = dbprod32
+org.quartz.dataSource.appDS.driver = com.mysql.cj.jdbc.Driver
+org.quartz.dataSource.appDS.URL = jdbc:mysql://129.211.46.84:3306/iplat_hpjx?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true
+#org.quartz.dataSource.appDS.URL = jdbc:mysql://127.0.0.1:3306/iplat_hpjx?useSSL=false&useUnicode=true&characterEncoding=utf-8
+org.quartz.dataSource.appDS.user = root
 #org.quartz.dataSource.appDS.user = root
-org.quartz.dataSource.appDS.password =t9UrgcELp=
+org.quartz.dataSource.appDS.password =Whxz@2019
 #org.quartz.dataSource.appDS.password =123456
 org.quartz.dataSource.appDS.maxConnections = 30
 

src/main/webapp/HP/KC/HPKC103A.js

@@ -33,7 +33,7 @@ $(function () {
 			}, {
 				field: "completeNum",
 				template: function (model) {
-					return model.completeNum ? model.completeNum + "%" : "";
+					return model.completeNum ? model.completeNum + "%" : "0%";
 				}
 			}],
 			dataBound: function () {