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

pom.xml

@@ -15,7 +15,7 @@
     <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
 
-    <name>hggp_dev</name>
+    <name>hggp_master</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/resources/application.properties

@@ -18,7 +18,7 @@ spring.servlet.multipart.file-size-threshold=0
 componentEname=hggp
 projectName=hggp
 moduleName=ep
-projectEnv=dev
+projectEnv=run
 platSchema=iplat_hggp
 eplatSchema=EPLAT_HGGP
 lowcodedbSchema=lowcodedb_hggp
@@ -33,12 +33,12 @@ 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.cj.jdbc.Driver
-#jdbc.url=jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-#jdbc.username=hggp
-jdbc.username=root
-#jdbc.password=hggp_Twhxz2024Aly
-jdbc.password=Whxz@2019
+jdbc.url=jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+jdbc.username=hggp
+#jdbc.username=root
+jdbc.password=hggp_Twhxz2024Aly
+#jdbc.password=Whxz@2019
 jdbc.maxActive=20
 jdbc.validationQuery=SELECT 1 FROM ${platSchema}.TEDFA00
 

src/main/resources/quartz.properties

@@ -22,12 +22,12 @@ org.quartz.jobStore.isClustered = true
 #\u6570\u636E\u5E93\u8FDE\u63A5\u914D\u7F6E\u4FE1\u606F
 org.quartz.jobStore.clusterCheckinInterval = 20000
 org.quartz.dataSource.appDS.driver = com.mysql.cj.jdbc.Driver
-#org.quartz.dataSource.appDS.URL = jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-org.quartz.dataSource.appDS.URL = jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-#org.quartz.dataSource.appDS.user = hggp
-org.quartz.dataSource.appDS.user = root
-#org.quartz.dataSource.appDS.password = hggp_Twhxz2024Aly
-org.quartz.dataSource.appDS.password = Whxz@2019
+org.quartz.dataSource.appDS.URL = jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+#org.quartz.dataSource.appDS.URL = jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+org.quartz.dataSource.appDS.user = hggp
+#org.quartz.dataSource.appDS.user = root
+org.quartz.dataSource.appDS.password = hggp_Twhxz2024Aly
+#org.quartz.dataSource.appDS.password = Whxz@2019
 org.quartz.dataSource.appDS.maxConnections = 30
 
 org.quartz.plugin.logging.class = com.baosight.xservices.ej.job.quartz.JobLoggingPluginWithPartition