Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

README.md

@@ -81,40 +81,40 @@
 
 | 数据库      | 类型   | 地址   |  账号  |  密码  |  说明  |
 | --------   | :-----: | :-----:  | :----:  | :----: | :------  |
-| saas_account | mysql | 192.168.0.172:3306 |  root  | select111*** |  账户中心  |
-| saas_auth | mysql | 192.168.0.172:3306 |  root  | select111*** |  鉴权系统  |
-| saas_file | mysql | 192.168.0.172:3306 |  root  | select111*** |  文件系统  |
-| saas_mail | mysql | 192.168.0.172:3306 |  root  | select111*** |  邮件系统  |
-| saas_biz | mysql | 192.168.0.172:3306 |  root  | select111*** |  业务系统  |
-| saas_ui | mongo | 192.168.0.183:27017 |    |  |  UI配置  |
+| saas_account | mysql | 10.1.81.54:3306 |  root  | select111*** |  账户中心  |
+| saas_auth | mysql | 10.1.81.54:3306 |  root  | select111*** |  鉴权系统  |
+| saas_file | mysql | 10.1.81.54:3306 |  root  | select111*** |  文件系统  |
+| saas_mail | mysql | 10.1.81.54:3306 |  root  | select111*** |  邮件系统  |
+| saas_biz | mysql | 10.1.81.54:3306 |  root  | select111*** |  业务系统  |
+| saas_ui | mongo | 10.1.81.63:27017 |    |  |  UI配置  |
 
 > 中间件
 
 | 类型 | 地址 | 账号 | 密码 | 说明 |
 | ---- | :----: | :----: | :----: | ---- |
-| rabbitmq | 192.168.0.176:5672 | saas | select123*** | 消息中间件 [控制台](http://192.168.0.176:15672)|
-| redis | 192.168.0.182:6379 | | | 内存数据库 |
+| rabbitmq | 10.1.81.75:5672 | saas | select123*** | 消息中间件 [控制台](http://10.1.81.75:15672)|
+| redis | 10.1.81.62:6379 | | | 内存数据库 |
 
 
 > 服务器
 
 | IP      |  账号  |  密码  |  环境  |  资源  |
 | --------   | :----:  | :----: | :------:  | :------:  |
-| 192.168.0.172 |  root  | select123*** |  CentOS7, MySQL  | Cpu: 8, Mem: 16G, Disk: 80G |
-| 192.168.0.176 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
-| 192.168.0.177 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
-| 192.168.0.178 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
-| 192.168.0.179 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
-| 192.168.0.180 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
-| 192.168.0.181 |  root  | select123*** |  CentOS7, Docker  | Cpu: 8, Mem: 16G, Disk: 80G |
-| 192.168.0.182 |  root  | select123*** |  CentOS7, Redis  | Cpu: 2, Mem: 8G, Disk: 20G |
-| 192.168.0.183 |  root  | select123*** |  CentOS7, Mongo  | Cpu: 4, Mem: 8G, Disk: 50G |
-| 192.168.0.184 |  root  | select123*** |  CentOS7, Docker  | Cpu: 8, Mem: 16G, Disk: 50G |
-| 192.168.0.185 |  root  | select123*** |  CentOS7, Docker  | Cpu: 8, Mem: 16G, Disk: 50G |
+| 10.1.81.54 |  root  | select123*** |  CentOS7, MySQL  | Cpu: 8, Mem: 16G, Disk: 80G |
+| 10.1.81.75 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
+| 10.1.81.78 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
+| 10.1.81.76 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
+| 10.1.81.59 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
+| 10.1.81.60 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
+| 10.1.81.61 |  root  | select123*** |  CentOS7, Docker  | Cpu: 8, Mem: 16G, Disk: 80G |
+| 10.1.81.62 |  root  | select123*** |  CentOS7, Redis  | Cpu: 2, Mem: 8G, Disk: 20G |
+| 10.1.81.63 |  root  | select123*** |  CentOS7, Mongo  | Cpu: 4, Mem: 8G, Disk: 50G |
+| 10.1.81.64 |  root  | select123*** |  CentOS7, Docker  | Cpu: 8, Mem: 16G, Disk: 50G |
+| 10.1.81.65 |  root  | select123*** |  CentOS7, Docker  | Cpu: 8, Mem: 16G, Disk: 50G |
 
 > 构建
 
-* [jenkins](http://192.168.0.181:8080/job/saas/view/dev) **账号** admin **密码** select123***
+* [jenkins](http://10.1.81.61:8080/job/saas/view/dev) **账号** admin **密码** select123***
 
 > 日志
 
@@ -124,10 +124,10 @@
 
 > 服务
 
-* [eureka http://192.168.0.181:8500](http://192.168.0.181:8500) **账号** admin **密码** select111***
-* [gateway http://192.168.0.181:8560](http://192.168.0.181:8560)
-* [admin http://192.168.0.181:8520](http://192.168.0.181:8520) **账号** admin **密码** select111***
-* [zipkin http://192.168.0.181:8540](http://192.168.0.181:8540) **账号** admin **密码** select111***
+* [eureka http://10.1.81.61:8500](http://10.1.81.61:8500) **账号** admin **密码** select111***
+* [gateway http://10.1.81.61:8560](http://10.1.81.61:8560)
+* [admin http://10.1.81.61:8520](http://10.1.81.61:8520) **账号** admin **密码** select111***
+* [zipkin http://10.1.81.61:8540](http://10.1.81.61:8540) **账号** admin **密码** select111***
 
 > 访问
 
@@ -140,22 +140,22 @@
 
 > 服务
 
-* [eureka http://192.168.0.181:8510](http://192.168.0.181:8510) **账号** admin **密码** select111***
-* [gateway http://192.168.0.181:8570](http://192.168.0.181:8570)
+* [eureka http://10.1.81.61:8510](http://10.1.81.61:8510) **账号** admin **密码** select111***
+* [gateway http://10.1.81.61:8570](http://10.1.81.61:8570)
 
 
 # 测试环境
 
 > 构建
 
-* [jenkins](http://192.168.0.181:8080/job/saas/view/test) **账号** admin **密码** select123***
+* [jenkins](http://10.1.81.61:8080/job/saas/view/test) **账号** admin **密码** select123***
 
 > 服务
 
-* [eureka http://192.168.0.181:8515](http://192.168.0.181:8515) **账号** admin **密码** select111***
-* [gateway http://192.168.0.181:8575](http://192.168.0.181:8575)
-* [admin http://192.168.0.181:8535](http://192.168.0.181:8535) **账号** admin **密码** select111***
-* [zipkin http://192.168.0.181:8555](http://192.168.0.181:8555) **账号** admin **密码** select111***
+* [eureka http://10.1.81.61:8515](http://10.1.81.61:8515) **账号** admin **密码** select111***
+* [gateway http://10.1.81.61:8575](http://10.1.81.61:8575)
+* [admin http://10.1.81.61:8535](http://10.1.81.61:8535) **账号** admin **密码** select111***
+* [zipkin http://10.1.81.61:8555](http://10.1.81.61:8555) **账号** admin **密码** select111***
 
 > 访问
 

applications/commons/commons-server/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:
@@ -20,7 +20,7 @@ spring:
     basename: i18n/messages
     encoding: UTF-8
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -35,7 +35,7 @@ spring:
     sampler:
       probability: 1.0
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
 management:
   endpoints:
@@ -56,7 +56,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@10.1.81.61:8510/eureka/
 server:
   port: 8920
   tomcat:

applications/document/document-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:
@@ -21,10 +21,10 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -50,7 +50,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@10.1.81.61:8510/eureka/
 management:
   endpoints:
     web:

applications/money/money-server/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:
@@ -19,10 +19,10 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@10.1.81.61:8510/eureka/
 management:
   endpoints:
     web:

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:
@@ -21,7 +21,7 @@ spring:
   messages:
     basename: i18n/messages
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -36,7 +36,7 @@ spring:
     sampler:
       probability: 1.0
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
 eureka:
   instance:
@@ -50,7 +50,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@10.1.81.61:8510/eureka/
 management:
   endpoints:
     web:

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseMapper.xml

@@ -372,6 +372,9 @@
       <if test="pu_currency != null" >
         pu_currency = #{pu_currency,jdbcType=VARCHAR},
       </if>
+      <if test="sa_delivery!=null">
+        sa_delivery = #{sa_delivery,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where pu_id = #{id,jdbcType=INTEGER}
   </update>

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/SaleDTO.java

@@ -65,4 +65,6 @@ public class SaleDTO extends CommonBaseDTO{
     private String sa_currency;
 
     private Double sa_nettotal;
+
+    private Date sa_delivery;
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/SaleMapper.java

@@ -68,4 +68,6 @@ public interface SaleMapper extends CommonBaseMapper<Sale> {
 
     void updateAudit(@Param("id") Long id, @Param("status") String status, @Param("statuscode") String statuscode, @Param("format") String format,
                      @Param("name") String name);
+
+    void updateDelivery(@Param("id")Long id);
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/Sale.java

@@ -64,4 +64,6 @@ public class Sale extends CommonBaseEntity{
     private String sa_currency;
 
     private Double sa_nettotal;
+
+    private Date sa_delivery;
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -188,6 +188,8 @@ public class SaleServiceImpl implements SaleService{
             saledetailMapper.batchUpdate(updateDetails);
         }
         baseDTO = getBaseDTOById(sa_id);
+        //明细需求日期为空时==主表交货日期
+        saleMapper.updateDelivery(sa_id);
         //更新销售金额
         updateTotal(sa_id);
         //更新从表总额

applications/sale/sale-server/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:
@@ -20,7 +20,7 @@ spring:
     basename: i18n/messages
     encoding: UTF-8
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -35,7 +35,7 @@ spring:
     sampler:
       probability: 1.0
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
 eureka:
   instance:
@@ -48,7 +48,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@10.1.81.61:8510/eureka/
 management:
   endpoints:
     web:

applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -159,6 +159,9 @@
       <if test="sa_nettotal != null">
         sa_nettotal,
       </if>
+      <if test="sa_delivery != null">
+        sa_delivery,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="sa_code != null" >
@@ -245,6 +248,9 @@
       <if test="sa_nettotal != null" >
         #{sa_nettotal,jdbcType=DOUBLE},
       </if>
+      <if test="sa_delivery != null" >
+        #{sa_delivery,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.sale.po.Sale" >
@@ -706,4 +712,8 @@
     </if>
 
   </select>
+
+  <update id="updateDelivery" parameterType="long">
+    update saledetail set sd_delivery = (select sa_delivery from sale where sa_id=#{id}) where sdsaid=#{id} and sa_delivery is null
+  </update>
 </mapper>

applications/storage/storage-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:
@@ -21,7 +21,7 @@ spring:
   messages:
     basename: i18n/messages
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -36,7 +36,7 @@ spring:
     sampler:
       probability: 1.0
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
 eureka:
   instance:
@@ -50,7 +50,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@10.1.81.61:8510/eureka/
 management:
   endpoints:
     web:

base-servers/account/account-server/src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
       name: admin
       password: select111***
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.172:3306/saas_account?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.54:3306/saas_account?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:
@@ -36,7 +36,7 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss

base-servers/admin-server/src/main/resources/application.yml

@@ -22,7 +22,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@10.1.81.61:8500/eureka/
 info:
   name: '@project.artifactId@'
   description: '@project.description@'

base-servers/auth/auth-server/src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
       name: admin
       password: select111***
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.172:3306/saas_auth?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.54:3306/saas_auth?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:
@@ -36,7 +36,7 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss

base-servers/datacenter/datacenter-server/src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
       name: admin
       password: select111***
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.172:3306/saas_manage?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.54:3306/saas_manage?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:
@@ -36,7 +36,7 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
@@ -53,7 +53,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@10.1.81.61:8510/eureka/
 server:
   port: 8720
   tomcat:

base-servers/file/file-server/src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
       name: admin
       password: select111***
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -22,7 +22,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.172:3306/saas_file?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.54:3306/saas_file?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:
@@ -34,7 +34,7 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
@@ -51,7 +51,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@10.1.81.61:8510/eureka/
 server:
   port: 8640
   tomcat:

base-servers/gateway-server/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
       name: admin
       password: select111***
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -109,7 +109,7 @@ spring:
         predicates:
         - Path=/ws/**
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss

base-servers/mail/mail-server/src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
       name: admin
       password: select111***
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -22,7 +22,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.172:3306/saas_mail?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.54:3306/saas_mail?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:
@@ -34,7 +34,7 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
@@ -55,7 +55,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@10.1.81.61:8510/eureka/
 server:
   port: 8660
   tomcat:

base-servers/sms/sms-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:
@@ -21,10 +21,10 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas

base-servers/socket/socket-server/src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
       name: admin
       password: select111***
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -23,7 +23,7 @@ spring:
     sampler:
       probability: 1.0
   redis:
-    host: 192.168.0.182
+    host: 10.1.81.62
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss

base-servers/ui-server/src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
       name: admin
       password: select111***
   rabbitmq:
-    host: 192.168.0.176
+    host: 10.1.81.75
     port: 5672
     virtual-host: dev
     username: saas
@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   data:
     mongodb:
-      uri: mongodb://192.168.0.183:27017/saas_ui
+      uri: mongodb://10.1.81.63:27017/saas_ui
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -44,7 +44,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@10.1.81.61:8510/eureka/
 management:
   endpoints:
     web:

base-servers/ui-server/src/test/java/com/usoftchina/saas/ui/controller/co/CoViewControllerTest.java

@@ -46,7 +46,7 @@ public class CoViewControllerTest {
         MultiValueMap headers = new LinkedMultiValueMap();
         headers.add("Authorization", "eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiIxMzkwNzk5Nzk5OSIsImFwcElkIjoidHJhZGUtYXBwIiwidXNlcklkIjo1NSwiY29tcGFueUlkIjoxLCJ1c2VyTmFtZSI6IjEzOTA3OTk3OTk5IiwicmVhbE5hbWUiOiJoZXkiLCJleHAiOjE1NDM4NDUyMDB9.eKN7UZTdFfAQLj_FB80ifxYu8nF_j-UQtKXSxPGA706iaJyIjR_LM_vbp-ZXx2GLBvZaH89o1qTUxleCCCepl27lvJPgyMqoZWW1YXDfO3hT25DEQoe8zzLH2Dd4GIj8jZ8zEMOhaFsvwMKWNqfCS6ML7pqfhoeoDihyZcv165s");
         HttpEntity entity = new HttpEntity(headers);
-        ResponseEntity<String> result = restTemplate.exchange("http://192.168.0.174:8560/api/purchase/purchase/list",
+        ResponseEntity<String> result = restTemplate.exchange("http://10.1.81.66:8560/api/purchase/purchase/list",
                 HttpMethod.GET, entity, String.class);
         if (result.getStatusCodeValue() == 200) {
             System.out.println(result.getBody());

base-servers/zipkin-server/src/main/resources/application.yml

@@ -36,7 +36,7 @@ zipkin:
     http:
       enabled: false
     rabbitmq:
-      uri: amqp://saas:select123***@192.168.0.176:5672/dev
+      uri: amqp://saas:select123***@10.1.81.75:5672/dev
       queue: zipkin
   storage:
     type: elasticsearch

base-servers/zipkin-server/src/main/resources/config/application-docker-test.yml

@@ -8,6 +8,6 @@ eureka:
 zipkin:
   collector:
     rabbitmq:
-      uri: amqp://saas:select123***@192.168.0.176:5672/test
+      uri: amqp://saas:select123***@10.1.81.75:5672/test
 server:
   port: 8555

base-servers/zipkin-server/src/main/resources/config/application-docker.yml

@@ -8,4 +8,4 @@ eureka:
 zipkin:
   collector:
     rabbitmq:
-      uri: amqp://saas:select123***@192.168.0.176:5672/docker
+      uri: amqp://saas:select123***@10.1.81.75:5672/docker

frontend/saas-web/app.json

@@ -284,7 +284,7 @@
                 "accountEnterprise":"https://saas-dev.usoftchina.com:5443/#/enterprise",
                 "basePath": {
                     "https": "https://saas-api-dev.usoftchina.com:5443",
-                    "http": "http://192.168.0.181:8560"
+                    "http": "http://10.1.81.61:8560"
                 },
                 "urlPattern": "^\/api\/"
             }

pom.xml

@@ -39,7 +39,7 @@
         <feign.form.version>3.0.3</feign.form.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <commons.compress.version>1.18</commons.compress.version>
-        <docker.repository>192.168.0.63:4000</docker.repository>
+        <docker.repository>10.1.81.1:4000</docker.repository>
         <docker.registry.name>saas</docker.registry.name>
         <guava.version>18.0</guava.version>
         <fastdfs.client.version>1.26.3</fastdfs.client.version>