Merge branch 'dev' of http://gitlab.aukeyit.com/xiaoziguang/trobs-config into dev

@@ -2,8 +2,8 @@
 security:
 security:
   oauth2:
   oauth2:
     client:
     client:
-      client-id: ENC(x7WyTO8i3c5Lk3ANZ7sze7CRxNBv65MINU09Qvn/pHw=)
-      client-secret: ENC(x7WyTO8i3c5Lk3ANZ7sze7CRxNBv65MINU09Qvn/pHw=)
+      client-id: ENC(AD9hQaPSRKmmXTPLBW1HOCGGWU19CckQwuHfXFztfYs=)
+      client-secret: ENC(AD9hQaPSRKmmXTPLBW1HOCGGWU19CckQwuHfXFztfYs=)
       scope: server
       scope: server
 # 数据源配置
 # 数据源配置
 spring:
 spring:

+## spring security 配置
+security:
+  oauth2:
+    client:
+      client-id: ENC(O4oY1VNRbO4q6Gnr+SvMYqWQGQyxzpsZlNS/jYekbQtJBPmyHasv4g==)
+      client-secret: ENC(O4oY1VNRbO4q6Gnr+SvMYqWQGQyxzpsZlNS/jYekbQtJBPmyHasv4g==)
+      scope: server
+# 数据源配置
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: trobs
+    password: dfU76$N(kp
+    url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
+  resources:
+    static-locations: classpath:/static/,classpath:/views/