浏览代码

docker改造

lym 1 周之前
父节点
当前提交
d4cc49fd0d

+ 2 - 2
common-parent/pom.xml

@@ -62,13 +62,13 @@
 
     <profiles>
         <profile>
-            <id>dev</id>
+            <id>test</id>
             <!--默认激活当前配置-->
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <profiles.active>dev</profiles.active>
+                <profiles.active>test</profiles.active>
                 <!-- Docker 配置 -->
                 <docker.dockerHost>http://172.16.90.199:2376</docker.dockerHost>
                 <docker.serviceId>DockerHub</docker.serviceId>

+ 1 - 1
goods-manage-service/src/main/resources/application-dev.properties

@@ -58,7 +58,7 @@ eureka.client.service-url.defaultZone=http://localhost:8761/eureka/
 
 ###redis配置#########
 spring.redis.database=0
-spring.redis.host=127.0.0.1
+spring.redis.host=172.16.90.201
 spring.redis.port=6379
 spring.redis.pool.max-idle=8
 spring.redis.pool.min-idle=0

+ 4 - 4
goods-manage-service/src/main/resources/application-test.properties

@@ -13,11 +13,11 @@ spring.http.multipart.maxRequestSize=10Mb
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/traced_source?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=true&&allowMultiQueries=true
-spring.datasource.url=jdbc:mysql://172.16.90.64:3306/forest_traced_source?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&&allowMultiQueries=true
+spring.datasource.url=jdbc:mysql://172.16.90.156:13306/forest_traced_source?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&&allowMultiQueries=true
 #spring.datasource.url=jdbc:mysql://localhost:3306/food_security_db?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
-spring.datasource.username=root
+spring.datasource.username=admin
 #spring.datasource.password=root123456
-spring.datasource.password=123456
+spring.datasource.password=Dzkj$123
 spring.datasource.initialSize=5
 spring.datasource.minIdle=5
 spring.datasource.maxActive=20
@@ -58,7 +58,7 @@ eureka.client.service-url.defaultZone=http://127.0.0.1:8766/eureka/
 
 ###redis配置#########
 spring.redis.database=0
-spring.redis.host=127.0.0.1
+spring.redis.host=172.16.90.201
 spring.redis.port=6379
 spring.redis.pool.max-idle=8
 spring.redis.pool.min-idle=0

+ 2 - 2
org-manage-service/src/main/resources/application-dev.properties

@@ -66,7 +66,7 @@ eureka.client.service-url.defaultZone=http://localhost:8761/eureka/
 
 ###redis配置#########
 spring.redis.database=0
-spring.redis.host=127.0.0.1
+spring.redis.host=172.16.90.201
 spring.redis.port=6379
 spring.redis.pool.max-idle=8
 spring.redis.pool.min-idle=0
@@ -90,5 +90,5 @@ xxl.sso.redis.host=172.16.90.201
 xxl.sso.redis.port=6379
 xxl.sso.redis.password=
 
-xxl.sso.server: https://sso.hw.hongweisoft.com/
+xxl.sso.server= https://basketsso.dev.dazesoft.cn/
 

+ 5 - 5
org-manage-service/src/main/resources/application-test.properties

@@ -13,10 +13,10 @@ spring.http.multipart.maxRequestSize=10Mb
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/traced_source?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=true&&allowMultiQueries=true
-spring.datasource.url=jdbc:mysql://172.16.90.64:3306/forest_traced_source?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&&allowMultiQueries=true
+spring.datasource.url=jdbc:mysql://172.16.90.156:13306/forest_traced_source?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&&allowMultiQueries=true
 #spring.datasource.url=jdbc:mysql://localhost:3306/food_security_db?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
-spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.username=admin
+spring.datasource.password=Dzkj$123
 spring.datasource.initialSize=5
 spring.datasource.minIdle=5
 spring.datasource.maxActive=20
@@ -65,7 +65,7 @@ eureka.client.service-url.defaultZone=http://127.0.0.1:8766/eureka/
 
 ###redis配置#########
 spring.redis.database=0
-spring.redis.host=127.0.0.1
+spring.redis.host=172.16.90.201
 spring.redis.port=6379
 spring.redis.pool.max-idle=8
 spring.redis.pool.min-idle=0
@@ -89,4 +89,4 @@ xxl.sso.redis.host=172.16.90.201
 xxl.sso.redis.port=6379
 xxl.sso.redis.password=
 
-xxl.sso.server: https://sso.hw.hongweisoft.com/
+xxl.sso.server= https://basketsso.dev.dazesoft.cn/

+ 1 - 1
traced-source-web/src/main/resources/application-dev.properties

@@ -34,7 +34,7 @@ eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/
 
 ###redis配置#########
 spring.redis.database=0
-spring.redis.host=127.0.0.1
+spring.redis.host=172.16.90.201
 spring.redis.port=6379
 spring.redis.pool.max-idle=8
 spring.redis.pool.min-idle=0

+ 2 - 2
traced-source-web/src/main/resources/application-test.properties

@@ -1,4 +1,4 @@
-server.port=8103
+server.port=21881
 spring.application.name=traced-web
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
@@ -34,7 +34,7 @@ eureka.client.service-url.defaultZone=http://127.0.0.1:8766/eureka/
 
 ###redis配置#########
 spring.redis.database=0
-spring.redis.host=127.0.0.1
+spring.redis.host=172.16.90.201
 spring.redis.port=6379
 spring.redis.pool.max-idle=8
 spring.redis.pool.min-idle=0