Merge branch 'master' of http://116.63.33.55/git/read_opc

chuanyi_server/src/main/resources/application-dev.yml

@@ -10,16 +10,16 @@ spring:
       max-request-size: 500MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://116.63.49.144:3307/cqcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
-    username: jvdong
-    password: '@jvdong123465'
+    url: jdbc:mysql://192.168.0.40:3306/chuanyi?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+    username: root
+    password: root
   resources:
     static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${file.path},file:${file.location}
   redis:
     database: 0
-    host: 116.63.49.144
-    port: 6380
-    password: '@jvdong_2022'
+    host: 192.168.0.40
+    port: 6379
+#    password: 123456
     jedis:
       pool:
         max-active: 50