7 次代碼提交 e6c58ebaa2 ... c4f3f6371d

作者 SHA1 備註 提交日期
  zcb c4f3f6371d 增加测试环境跟生产环境的访问地址 4 年之前
  张创标 286bebf8c9 Merge branch 'master' of yb/eccs into master 4 年之前
  yangbo 21974d1a6b 修改配置 4 年之前
  张创标 4817355628 Merge branch 'master' of zcb/eccs into master 4 年之前
  Scott Chen 72430e5cc9 Merge branch 'master' of csk/eccs into master 4 年之前
  csk 7de9639e0d 修改说明文档内默认登录密码 4 年之前
  csk 885e8f5361 Merge branch 'master' of http://git.ds-bay.com/project/eccs 4 年之前

+ 1 - 1
README.MD

@@ -33,7 +33,7 @@ ECCS 基于开源项目 RuoYi-Vue
 
 ## 在线体验
 
-- admin/admin123
+- admin/***
 
 演示地址:http://vue.ruoyi.vip  
 文档地址:http://doc.ruoyi.vip

+ 1 - 1
build.gradle

@@ -158,7 +158,7 @@ subprojects {
 
 
 configure(subprojects.findAll{
-    it.name == 'cadmin-admin'
+    it.name == 'eccs-admin'
 }){
     apply plugin: "org.springframework.boot"
     apply plugin: 'io.spring.dependency-management'

+ 4 - 4
eccs-admin/src/main/resources/application-dev.yml

@@ -33,16 +33,16 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://localhost:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: root
+        password: 123456
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: false
-        url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://localhost:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: root
+        password: 123456
       # 初始连接数
       initialSize: 5
       # 最小连接池数量

+ 7 - 7
eccs-admin/src/main/resources/application-prod.yml

@@ -8,7 +8,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 127.0.0.1
+    host: 120.78.152.8
     # 端口,默认为6379
     port: 6379
     # 数据库索引
@@ -33,16 +33,16 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
-        password: 123456
+        url: jdbc:mysql://120.76.84.45:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: tuser
+        password: Qq!123
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: false
-        url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
-        password: 123456
+        url: jdbc:mysql://120.76.84.45:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: tuser
+        password: Qq!123
       # 初始连接数
       initialSize: 5
       # 最小连接池数量

+ 8 - 8
eccs-admin/src/main/resources/application-test.yml

@@ -8,7 +8,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 127.0.0.1
+    host: 120.78.152.8
     # 端口,默认为6379
     port: 6379
     # 数据库索引
@@ -33,16 +33,16 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
-        password: 123456
+        url: jdbc:mysql://120.76.84.45:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: tuser
+        password: Qq!123
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: false
-        url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
-        password: 123456
+        url: jdbc:mysql://120.76.84.45:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: tuser
+        password: Qq!123
       # 初始连接数
       initialSize: 5
       # 最小连接池数量
@@ -97,7 +97,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping: /test-api
 
 # 日志配置
 logging:

+ 17 - 3
eccs-biz/src/main/resources/kmall-config.yml

@@ -1,8 +1,22 @@
 kmall:
+    # 开发环境地址
+#  # 查询所有库存接口
+#  queryAllInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllGoodsInfo
+#  # 查询门店库存接口
+#  queryAllShopInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllStoreProductInfo
+#  # 发送请求
+#  requestToKmall: http://127.0.0.1:8080/ktoeccs/sendToEccs
+  # 测试环境地址
   # 查询所有库存接口
-  queryAllInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllGoodsInfo
+  queryAllInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllGoodsInfo
   # 查询门店库存接口
-  queryAllShopInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllStoreProductInfo
+  queryAllShopInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllStoreProductInfo
   # 发送请求
-  requestToKmall: http://127.0.0.1:8080/ktoeccs/sendToEccs
+  requestToKmall: http://183.62.225.124:8080/ktoeccs/sendToEccs
+#   生产环境地址
+#  queryAllInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllGoodsInfo
+#  # 查询门店库存接口
+#  queryAllShopInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllStoreProductInfo
+#  # 发送请求
+#  requestToKmall: http://8.135.102.238:8080/ktoeccs/sendToEccs
 

+ 64 - 11
eccs-biz/src/main/resources/oms-config.yml

@@ -11,30 +11,83 @@ oms:
   thirdSn: CW001
   # 生产环境密钥
   md5Salt: IxyIvP0sJqlUZinx
+#  # 查询商户信息接口
+#  queryMerchantInfoUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryMerchantInfoUrl
+#  # 查询第三方商户信息接口
+#  queryThirdMerchantInfoUrl:
+#  # 查询库存接口
+#  queryMngInveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryInveMng
+#  # 查询门店库存接口
+#  queryShopMngInveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopInveMng
+#  # 查询入库单接口
+#  queryInveReceiptUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryInveReceiptGoods
+#  # 查询入库单明细接口
+#  queryInveReceiptDetailUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryInveReceiptGoods
+#  # 查询结转接口
+#  queryAdjustmentUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryAdjustmentRecord
+#  # 查询结转明细接口
+#  queryAdjustmentDetailUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryAdjustmentDetail
+#  # 查询出区接口
+#  queryInveShipmentUrl:
+#  # 查询出区明细接口
+#  queryInveShipmentDetailUrl:
+#  # 查询门店进货接口
+#  queryShopInUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopIn
+#  # 查询门店出场接口
+#  queryShopOutUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopOut
+#  # 查询门店转移接口
+#  queryShopMoveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopMove
+  # 测试环境
   # 查询商户信息接口
-  queryMerchantInfoUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryMerchantInfoUrl
+  queryMerchantInfoUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryMerchantInfoUrl
   # 查询第三方商户信息接口
   queryThirdMerchantInfoUrl:
   # 查询库存接口
-  queryMngInveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryInveMng
+  queryMngInveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveMng
   # 查询门店库存接口
-  queryShopMngInveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopInveMng
+  queryShopMngInveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopInveMng
   # 查询入库单接口
-  queryInveReceiptUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryInveReceiptGoods
+  queryInveReceiptUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveReceiptGoods
   # 查询入库单明细接口
-  queryInveReceiptDetailUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryInveReceiptGoods
+  queryInveReceiptDetailUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveReceiptGoods
   # 查询结转接口
-  queryAdjustmentUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryAdjustmentRecord
+  queryAdjustmentUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryAdjustmentRecord
   # 查询结转明细接口
-  queryAdjustmentDetailUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryAdjustmentDetail
+  queryAdjustmentDetailUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryAdjustmentDetail
   # 查询出区接口
   queryInveShipmentUrl:
   # 查询出区明细接口
   queryInveShipmentDetailUrl:
   # 查询门店进货接口
-  queryShopInUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopIn
+  queryShopInUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopIn
   # 查询门店出场接口
-  queryShopOutUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopOut
+  queryShopOutUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopOut
   # 查询门店转移接口
-  queryShopMoveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopMove
-
+  queryShopMoveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopMove
+  # 生产环境 ws.ds-bay.com
+#  # 查询商户信息接口
+#  queryMerchantInfoUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryMerchantInfoUrl
+#  # 查询第三方商户信息接口
+#  queryThirdMerchantInfoUrl:
+#  # 查询库存接口
+#  queryMngInveUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryInveMng
+#  # 查询门店库存接口
+#  queryShopMngInveUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryShopInveMng
+#  # 查询入库单接口
+#  queryInveReceiptUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryInveReceiptGoods
+#  # 查询入库单明细接口
+#  queryInveReceiptDetailUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryInveReceiptGoods
+#  # 查询结转接口
+#  queryAdjustmentUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryAdjustmentRecord
+#  # 查询结转明细接口
+#  queryAdjustmentDetailUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryAdjustmentDetail
+#  # 查询出区接口
+#  queryInveShipmentUrl:
+#  # 查询出区明细接口
+#  queryInveShipmentDetailUrl:
+#  # 查询门店进货接口
+#  queryShopInUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryShopIn
+#  # 查询门店出场接口
+#  queryShopOutUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryShopOut
+#  # 查询门店转移接口
+#  queryShopMoveUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryShopMove