Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection/js/config.js

@@ -1,6 +1,6 @@
-// var base_ui_url = "http://localhost:8080/";
-// var base_server_url = "http://localhost:8089/";
+var base_ui_url = "http://localhost:8080/";
+var base_server_url = "http://localhost:8089/";
 
 
-var base_ui_url = "http://192.168.31.233:8080/";
-var base_server_url = "http://192.168.31.233:8089/";
+// var base_ui_url = "http://192.168.31.233:8080/";
+// var base_server_url = "http://192.168.31.233:8089/";

VisualInspection_server/src/main/resources/application.properties

@@ -2,14 +2,14 @@ server.port=8089
 spring.thymeleaf.cache=false
 
 
-master.datasource.url = jdbc:mysql://192.168.57.38:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://git.topm.win:9001/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-cluster.datasource.url=jdbc:mysql://192.168.57.38:3306/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://git.topm.win:9001/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -50,7 +50,7 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
 # Redis\u670d\u52a1\u5668\u5730\u5740
-spring.redis.host=192.168.57.38
+spring.redis.host=git.topm.win
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
 spring.redis.port=6379  
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09