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

README.md

@@ -169,7 +169,7 @@
 
 > 构建
 
-* [jenkins](http://10.10.100.200:5001/job/saas/prod) **账号** admin **密码** select123***
+* [jenkins](http://10.10.100.200:5001/job/saas/job/prod) **账号** admin **密码** select123***
 
 > 日志
 
@@ -180,7 +180,7 @@
 > 服务
 
 * [eureka http://10.10.100.23:8500](http://10.10.100.23:8500) **账号** admin **密码** select111***
-* [gateway http://10.10.100.23:8560](http://10.10.100.23:8560)
+* [gateway http://10.10.100.23:8560](https://saas-api.usoftchina.com)
 * [admin](http://10.10.100.23:8520) **账号** admin **密码** select111***
 * [zipkin](http://10.10.100.23:8540) **账号** admin **密码** select111***
 

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

@@ -35,6 +35,7 @@
     <result column="sa_date" property="sa_date" jdbcType="TIMESTAMP"/>
     <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
     <result column="updaterName" property="updaterName" jdbcType="VARCHAR" />
+    <result column="createTime" property="createTime" jdbcType="TIMESTAMP"/>
   </resultMap>
   <sql id="Base_Column_List" >
     sa_id, sa_code, sa_custid, sa_custcode, sa_custname, sa_toplace, sa_total, sa_totalupper, 
@@ -419,7 +420,7 @@
     and ifnull(sd_yqty, 0) > 0;
   </select>
   <update id="updateCreator">
-    update sale set creatorId = #{userId} , creatorName=#{userName} where sa_id=#{id}
+    update sale set creatorId = #{userId} ,createTime=now(), creatorName=#{userName} where sa_id=#{id}
   </update>
 
   <select id="checkIsTurnPurchase"  resultType="java.lang.String">

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

@@ -5,9 +5,6 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
-spring:
-  rabbitmq:
-    virtual-host: docker
 spring:
   rabbitmq:
     host: 10.10.100.103