初始化修改

cn.com.taiji.myapp/pom.xml

@@ -217,11 +217,16 @@
 			<artifactId>hibernate-validator</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>8.0.23</version><!--$NO-MVN-MAN-VER$-->
+			<groupId>org.opengauss</groupId>
+			<artifactId>opengauss-jdbc</artifactId>
+			<version>5.0.0</version>
 		</dependency>
 <!--		<dependency>-->
+<!--			<groupId>mysql</groupId>-->
+<!--			<artifactId>mysql-connector-java</artifactId>-->
+<!--			<version>8.0.23</version>&lt;!&ndash;$NO-MVN-MAN-VER$&ndash;&gt;-->
+<!--		</dependency>-->
+<!--		<dependency>-->
 <!--			<groupId>com.oracle</groupId>-->
 <!--			<artifactId>ojdbc6</artifactId>-->
 <!--		</dependency>-->

cn.com.taiji.myapp/src/main/java/cn/com/taiji/Application.java

@@ -216,6 +216,7 @@ public class Application extends WebMvcConfigurerAdapter implements CommandLineR
 		DruidDataSource druidDataSource = new DruidDataSource();
 		druidDataSource.setDriverClassName(driver);
 		druidDataSource.setUrl(url);
+		druidDataSource.setDbType("postgresql");
 		druidDataSource.setUsername(username);
 		druidDataSource.setPassword(password);
 		druidDataSource.setInitialSize(10);

cn.com.taiji.myapp/src/main/resources/application-local.properties

@@ -1,18 +1,26 @@
-server.port=8081
+server.port=8890
 #spring.datasource.url=jdbc:mysql://200.1.54.238:8801/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
 #spring.datasource.username=cgw
 #spring.datasource.password=Cgw!1@2#3$4
-spring.datasource.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
-spring.datasource.username=root
-spring.datasource.password=umisoft.cn
-spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
+#spring.datasource.username=root
+#spring.datasource.password=umisoft.cn
+#spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:opengauss://172.2.1.36:5432/mlxt?currentSchema=mlxt&stringtype=unspecified
+spring.datasource.username=tj
+spring.datasource.password=Taiji@123
+spring.datasource.driverClassName=org.opengauss.Driver
 #spring.datasource2.url=jdbc:mysql://200.1.54.238:8801/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
 #spring.datasource2.username=cgw
 #spring.datasource2.password=Cgw!1@2#3$4
-spring.datasource2.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
-spring.datasource2.username=root
-spring.datasource2.password=umisoft.cn
-spring.datasource2.driverClassName=com.mysql.cj.jdbc.Driver
+spring.datasource2.url=jdbc:opengauss://172.2.1.36:5432/mlxt?currentSchema=mlxt&stringtype=unspecified
+spring.datasource2.username=tj
+spring.datasource2.password=Taiji@123
+spring.datasource2.driverClassName=org.opengauss.Driver
+#spring.datasource2.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
+#spring.datasource2.username=root
+#spring.datasource2.password=umisoft.cn
+#spring.datasource2.driverClassName=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.minIdle=5
 spring.datasource.maxActive=50

cn.com.taiji.system/pom.xml

@@ -162,9 +162,14 @@
 			<artifactId>hibernate-validator</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-		</dependency>
+			<groupId>org.opengauss</groupId>
+			<artifactId>opengauss-jdbc</artifactId>
+			<version>5.0.0</version>
+		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>mysql</groupId>-->
+<!--			<artifactId>mysql-connector-java</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>

cn.com.taiji.system/src/main/java/cn/com/taiji/pdf/ExportPdfController.java

@@ -28,6 +28,7 @@ import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
+import com.lowagie.text.Phrase;
 
 import cn.com.taiji.sys.domain.Dept;
 import cn.com.taiji.sys.domain.User;

cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/domain/WorkCalendarRepository.java

@@ -32,6 +32,6 @@ public interface WorkCalendarRepository
 	 * @param year
 	 * @return list
 	 */
-	@Query("select date_format(workdate,'%Y-%m-%d') from WorkCalendar t where iswork='1' and year=:year")
+	@Query("select to_char(workdate,'YYYY-MM-DD') from WorkCalendar t where iswork='1' and year=:year")
     public List<String> getWorkdayByYear(@Param("year")String year);//
 }