Ver código fonte

Merge remote-tracking branch 'origin/master'

zhaoxian 1 ano atrás
pai
commit
f3df73923e

+ 6 - 0
ruixuan-admin/pom.xml

@@ -158,5 +158,11 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>mgs</id>
+            <properties>
+                <activatedProperties>mgs</activatedProperties>
+            </properties>
+        </profile>
     </profiles>
 </project>

+ 6 - 6
ruixuan-admin/src/main/resources/application-dev.yml

@@ -47,12 +47,12 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://139.186.165.84:3306/ruixuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: hcst
-        password: hcst@2020
-#         url: jdbc:mysql://139.186.27.96:3390/ruixuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#         username: data
-#         password: hcst@2021
+#        url: jdbc:mysql://139.186.165.84:3306/ruixuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        username: hcst
+#        password: hcst@2020
+        url: jdbc:mysql://139.186.27.96:3390/ruixuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: data
+        password: hcst@2021
       #        从库数据源
       slave:
         # 从数据源开关/默认关闭

Diferenças do arquivo suprimidas por serem muito extensas
+ 198 - 0
ruixuan-admin/src/main/resources/application-mgs.yml


+ 7 - 7
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -1325,7 +1325,7 @@
     </select>
     <select id="getCookie" resultType="java.lang.String">
         select cookie
-        from ruixuan.kuaishou_supply_chain_cookie
+        from kuaishou_supply_chain_cookie
         where id = #{regId} limit 1
     </select>
 
@@ -1770,7 +1770,7 @@
         sum(total_regimental_settle_amount) as 'totalRegimentalSettleAmount',
         IFNULL(SUM(CASE WHEN sample_voucher_status = 2 THEN total_regimental_settle_amount ELSE 0 END), 0) AS
         'voucherTotalRegimentalSettleAmount'
-        from ruixuan.promoter_item_order_count
+        from promoter_item_order_count
         where 1 = 1
         <if test="start != null and start != ''">
             and stat_date &gt;= #{start}
@@ -1845,7 +1845,7 @@
         sum(order_amount) as 'orderAmount',
         sum(regimental_promotion_amount) as 'regimentalPromotionAmount',
         sum(total_regimental_settle_amount) as 'totalRegimentalSettleAmount'
-        from ruixuan.promoter_item_order_count
+        from promoter_item_order_count
         where 1 = 1
         <if test="start != null and start != ''">
             and stat_date &gt;= #{start}
@@ -1886,7 +1886,7 @@
         sum(order_amount) as 'orderAmount',
         sum(regimental_promotion_amount) as 'regimentalPromotionAmount',
         sum(total_regimental_settle_amount) as 'totalRegimentalSettleAmount'
-        from ruixuan.promoter_item_order_count
+        from promoter_item_order_count
         where 1 = 1
         <if test="start != null and start != ''">
             and stat_date &gt;= #{start}
@@ -1931,7 +1931,7 @@
         sum(order_amount) as 'orderAmount',
         sum(regimental_promotion_amount) as 'regimentalPromotionAmount',
         sum(total_regimental_settle_amount) as 'totalRegimentalSettleAmount'
-        from ruixuan.promoter_item_order_count
+        from promoter_item_order_count
         where 1 = 1
         <if test="start != null and start != ''">
             and stat_date &gt;= #{start}
@@ -2007,7 +2007,7 @@
         sum(total_regimental_settle_amount) as 'totalRegimentalSettleAmount',
         IFNULL(SUM(CASE WHEN sample_voucher_status = 2 THEN total_regimental_settle_amount ELSE 0 END), 0) AS
         'voucherTotalRegimentalSettleAmount'
-        from ruixuan.promoter_item_order_count
+        from  promoter_item_order_count
         where 1 = 1
         <if test="start != null and start != ''">
             and stat_date &gt;= #{start}
@@ -2525,7 +2525,7 @@
     </insert>
 
     <insert id="replaceKuaishouActivityInfo">
-        replace into ruixuan.kuaishou_activity_info(
+        replace into kuaishou_activity_info(
         activity_id,
         regimental_id,
         activity_title,