默认数据库切换为mysql

zhoutaoo · zhoutaoo · commit c4cab6d76426 · 2019-08-28T23:34:01.000+08:00
diff --git a/auth/authentication-server/src/main/java/com/springboot/auth/authentication/config/WebServerSecurityConfig.java b/auth/authentication-server/src/main/java/com/springboot/auth/authentication/config/WebServerSecurityConfig.java
@@ -1,17 +1,14 @@
 package com.springboot.auth.authentication.config;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
-import lombok.extern.slf4j.Slf4j;
-
 @Slf4j
 @Configuration
 @EnableWebSecurity
-@Order(1)
 public class WebServerSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Override
diff --git a/auth/authentication-server/src/main/resources/application.yml b/auth/authentication-server/src/main/resources/application.yml
@@ -20,9 +20,9 @@ spring:
     ##password: ${REDIS_PASSWORD:}
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_auth?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:${DATASOURCE_DBTYPE:mysql}://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_auth?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: ${DATASOURCE_USERNAME:root}
-    password: ${DATASOURCE_PASSWORD:123456}
+    password: ${DATASOURCE_PASSWORD:root123}
 
   zipkin:
     enabled: true
diff --git a/auth/authorization-server/src/main/resources/application.yml b/auth/authorization-server/src/main/resources/application.yml
@@ -20,9 +20,9 @@ spring:
     ##password: ${REDIS_PASSWORD:}
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_auth?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:${DATASOURCE_DBTYPE:mysql}://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_auth?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: ${DATASOURCE_USERNAME:root}
-    password: ${DATASOURCE_PASSWORD:123456}
+    password: ${DATASOURCE_PASSWORD:root123}
 
   zipkin:
     enabled: true
diff --git a/auth/db/dml/oauth2_dml.sql b/auth/db/dml/oauth2_dml.sql
@@ -1,2 +1,2 @@
-INSERT INTO public.oauth_client_details (client_id, resource_ids, client_secret, scope, authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, refresh_token_validity, additional_information, autoapprove)
+INSERT INTO oauth_client_details (client_id, resource_ids, client_secret, scope, authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, refresh_token_validity, additional_information, autoapprove)
 VALUES ('test_client', NULL, '$2a$10$2szDKjvKHJCWE6YQNznogOeQF3USZHmCYj1fG7YbfK.vnTgNKLzri', 'read', 'client_credentials,authorization_code,password,refresh_token', 'http://baidu.com', NULL, 7200, 108000, NULL, NULL);
diff --git a/auth/pom.xml b/auth/pom.xml
@@ -53,17 +53,12 @@
             <artifactId>druid-spring-boot-starter</artifactId>
             <version>1.1.9</version>
         </dependency>
+        <!--数据库-->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>5.1.39</version>
         </dependency>
-        <!--数据库-->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>9.4-1203-jdbc4</version>
-        </dependency>
         <!--Redis缓存-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/demos/producer-jpa/pom.xml b/demos/producer-jpa/pom.xml
@@ -59,9 +59,9 @@
         </dependency>
         <!--数据库-->
         <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>9.4-1203-jdbc4</version>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.39</version>
         </dependency>
         <!--Swagger2 - RESTful API文档-->
         <dependency>
diff --git a/demos/producer-jpa/src/main/resources/application.yml b/demos/producer-jpa/src/main/resources/application.yml
@@ -26,7 +26,7 @@ spring:
     port: ${REDIS_PORT:6379}
     ##password: ${REDIS_PASSWORD:}
   datasource:
-    url: jdbc:${DATASOURCE_DB:postgresql}://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:5432}/sc_product
+    url: jdbc:${DATASOURCE_DBTYPE:mysql}://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_product?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: ${DATASOURCE_USERNAME:postgres}
     password: ${DATASOURCE_PASSWORD:postgres}
     driver-class-name: ${DATASOURCE_DRIVER:org.postgresql.Driver}
diff --git a/demos/producer/pom.xml b/demos/producer/pom.xml
@@ -46,17 +46,12 @@
             <artifactId>druid-spring-boot-starter</artifactId>
             <version>1.1.9</version>
         </dependency>
+        <!--数据库-->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>5.1.39</version>
         </dependency>
-        <!--数据库-->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>9.4-1203-jdbc4</version>
-        </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
diff --git a/demos/producer/src/main/db/ddl/mysql/V1__product.sql b/demos/producer/src/main/db/ddl/mysql/V1__product.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS product;
+CREATE TABLE product
+(
+  id           VARCHAR(20) PRIMARY KEY COMMENT '编号',
+  name         VARCHAR(200)             NOT NULL COMMENT '产品名称',
+  description  VARCHAR(500) COMMENT '产品描述',
+  deleted      VARCHAR(1) DEFAULT 'N'   NOT NULL COMMENT '是否已删除Y：已删除，N：未删除',
+  created_time datetime   DEFAULT now() NOT NULL COMMENT '创建时间',
+  updated_time datetime   DEFAULT now() NOT NULL COMMENT '更新时间',
+  created_by   VARCHAR(100)             NOT NULL COMMENT '创建人',
+  updated_by   VARCHAR(100)             NOT NULL COMMENT '更新人'
+) COMMENT '产品表';
+
+
+
diff --git a/demos/producer/src/main/db/ddl/postgres/V1__product.sql b/demos/producer/src/main/db/ddl/postgres/V1__product.sql
@@ -0,0 +1,22 @@
+DROP TABLE IF EXISTS product;
+CREATE TABLE product
+(
+  id           VARCHAR(20) PRIMARY KEY,
+  name         VARCHAR(200)             NOT NULL,
+  description  VARCHAR(500),
+  deleted      VARCHAR(1) DEFAULT 'N'   NOT NULL,
+  created_time TIMESTAMP  DEFAULT now() NOT NULL,
+  updated_time TIMESTAMP  DEFAULT now() NOT NULL,
+  created_by   VARCHAR(100)             NOT NULL,
+  updated_by   VARCHAR(100)             NOT NULL
+);
+
+COMMENT ON COLUMN product.id IS '编号';
+COMMENT ON COLUMN product.name IS '产品名称';
+COMMENT ON COLUMN product.description IS '产品描述';
+COMMENT ON COLUMN product.deleted IS '是否已删除Y：已删除，N：未删除';
+COMMENT ON COLUMN product.created_time IS '创建时间';
+COMMENT ON COLUMN product.updated_time IS '更新时间';
+COMMENT ON COLUMN product.created_by IS '创建人';
+COMMENT ON COLUMN product.updated_by IS '更新人';
+
diff --git a/demos/producer/src/main/resources/application.yml b/demos/producer/src/main/resources/application.yml
@@ -21,9 +21,9 @@ spring:
     #password: ${REDIS_PASSWORD:123456}
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_product?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:${DATASOURCE_DBTYPE:mysql}://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_product?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: ${DATASOURCE_USERNAME:root}
-    password: ${DATASOURCE_PASSWORD:123456}
+    password: ${DATASOURCE_PASSWORD:root123}
 
   zipkin:
     enabled: true
diff --git a/docker-compose/.env b/docker-compose/.env
@@ -11,20 +11,20 @@ POSTGRES_USERNAME=postgres
 POSTGRES_PASSWORD=postgres
 
 ### 数据源postgres实例
-DATASOURCE_DB=postgresql
-DATASOURCE_HOST=postgres
-DATASOURCE_PORT=5432
-DATASOURCE_USERNAME=postgres
-DATASOURCE_PASSWORD=postgres
-DATASOURCE_DRIVER=org.postgresql.Driver
+#DATASOURCE_DBTYPE=postgresql
+#DATASOURCE_HOST=postgres
+#DATASOURCE_PORT=5432
+#DATASOURCE_USERNAME=postgres
+#DATASOURCE_PASSWORD=postgres
+#DATASOURCE_DRIVER=org.postgresql.Driver
 
 ### 数据源mysql实例
-#DATASOURCE_DB=mysql
-#DATASOURCE_HOST=mysql
-#DATASOURCE_PORT=3306
-#DATASOURCE_USERNAME=root
-#DATASOURCE_PASSWORD=root123
-#DATASOURCE_DRIVER=com.mysql.jdbc.Driver
+DATASOURCE_DBTYPE=mysql
+DATASOURCE_HOST=mysql
+DATASOURCE_PORT=3306
+DATASOURCE_USERNAME=root
+DATASOURCE_PASSWORD=root123
+DATASOURCE_DRIVER=com.mysql.jdbc.Driver
 
 ### 分布式缓存
 REDIS_HOST=redis
diff --git a/gateway/gateway-admin/src/main/resources/application.yml b/gateway/gateway-admin/src/main/resources/application.yml
@@ -20,9 +20,9 @@ spring:
     #password: ${REDIS_PASSWORD:}
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_gateway?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:${DATASOURCE_DBTYPE:mysql}://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_gateway?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: ${DATASOURCE_USERNAME:root}
-    password: ${DATASOURCE_PASSWORD:123456}
+    password: ${DATASOURCE_PASSWORD:root123}
 
   zipkin:
     enabled: true
diff --git a/sysadmin/organization/src/main/resources/application.yml b/sysadmin/organization/src/main/resources/application.yml
@@ -23,9 +23,9 @@ spring:
     #password: ${REDIS_PASSWORD:123456}
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_admin?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:${DATASOURCE_DBTYPE:mysql}://${DATASOURCE_HOST:localhost}:${DATASOURCE_PORT:3306}/sc_admin?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: ${DATASOURCE_USERNAME:root}
-    password: ${DATASOURCE_PASSWORD:123456}
+    password: ${DATASOURCE_PASSWORD:root123}
 
   zipkin:
     enabled: true
diff --git a/webapps/pom.xml b/webapps/pom.xml
@@ -40,9 +40,9 @@
         </dependency>
         <!--数据库-->
         <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>9.4-1203-jdbc4</version>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.39</version>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
diff --git a/webapps/webapp-parent/pom.xml b/webapps/webapp-parent/pom.xml
@@ -26,16 +26,6 @@
             <artifactId>mybatis-spring</artifactId>
             <version>2.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.39</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.1.9</version>
-        </dependency>
     </dependencies>
 
 </project>

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-INSERT INTO public.oauth_client_details (client_id, resource_ids, client_secret, scope, authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, refresh_token_validity, additional_information, autoapprove)`
	`1`	`+INSERT INTO oauth_client_details (client_id, resource_ids, client_secret, scope, authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, refresh_token_validity, additional_information, autoapprove)`
`2`	`2`	`VALUES ('test_client', NULL, '$2a$10$2szDKjvKHJCWE6YQNznogOeQF3USZHmCYj1fG7YbfK.vnTgNKLzri', 'read', 'client_credentials,authorization_code,password,refresh_token', 'http://baidu.com', NULL, 7200, 108000, NULL, NULL);`