MSI\liwei пре 7 година
родитељ
комит
05f842a0f2
1 измењених фајлова са 23 додато и 5 уклоњено
  1. 23 5
      VisualInspection_server/src/main/resources/application.properties

+ 23 - 5
VisualInspection_server/src/main/resources/application.properties

@@ -6,9 +6,11 @@ context.listener.classes=com.xintong.SystemInit
 #master.datasource.url = jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://127.0.0.1:8502/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://172.28.2.6:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.username = root
-master.datasource.password = root
+master.datasource.password = xgssoft
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 
@@ -17,13 +19,26 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 #cluster.datasource.url=jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url=jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url=jdbc:mysql://xt.wenhq.top:8082/visualinspection_njy?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://xt.wenhq.top:8082/visualinspection_njy?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://127.0.0.1:8502/visualinspection_njy?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://172.28.2.6:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.username=root
-cluster.datasource.password=root
+cluster.datasource.password=xgssoft
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
 cluster.mapper-locations=classpath:com/xintong/visualinspection/mapper/cluster/*.xml
 cluster.mapper-locations=classpath:com/xintong/visualinspection/mapper/cluster/*.xml
 
 
 
 
+## \u7528\u6237\u6570\u636E\u6E90\u914D\u7F6E
+#cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
+xiansuo.datasource.url=jdbc:mysql://172.28.2.6:3306/DBTSIIS?useUnicode=true&characterEncoding=utf8
+xiansuo.datasource.username=root
+xiansuo.datasource.password=xgssoft
+xiansuo.datasource.driver-class-name = com.mysql.jdbc.Driver
+xiansuo.mapper-locations=classpath:com/xintong/visualinspection/mapper/xiansuo/*.xml
+
 # \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
 # \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
 spring.datasource.initialSize=5
 spring.datasource.initialSize=5
 spring.datasource.minIdle=5
 spring.datasource.minIdle=5
@@ -59,7 +74,9 @@ spring.datasource.useGlobalDataSourceStat=true
 spring.redis.database=0  
 spring.redis.database=0  
 # Redis\u670D\u52A1\u5668\u5730\u5740
 # Redis\u670D\u52A1\u5668\u5730\u5740
 #spring.redis.host=10.112.0.199
 #spring.redis.host=10.112.0.199
-spring.redis.host=192.168.45.158
+#spring.redis.host=192.168.45.158
+#spring.redis.host=127.0.0.1
+spring.redis.host=172.28.2.6
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
 spring.redis.port=6379
 spring.redis.port=6379
 
 
@@ -68,6 +85,7 @@ spring.redis.port=6379
 #spring.redis.port=6380
 #spring.redis.port=6380
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
 spring.redis.password=xintong
 spring.redis.password=xintong
+#spring.redis.password=123
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.pool.max-active=8  
 spring.redis.pool.max-active=8  
 # \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 # \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09