rabbitmq配置

admin-web/src/views/admin/activity/dialog.vue

@@ -44,9 +44,10 @@
 
         <el-form-item label="活动描述" prop="remark" class="w100"></el-form-item>
         <div class="w100 flex mt20 mb20 flex-justify-between">
-          <ext-editor style="width:380px;flex:1;margin-right: 10px;" ref="ext_editor_ref" v-model="state.ruleForm.activityDesc"></ext-editor>
+          <ext-editor style="width:380px;flex:1;margin-right: 10px;" ref="ext_editor_ref"
+                      v-model="state.ruleForm.activityDesc"></ext-editor>
 
-<!--          <el-divider direction="vertical"></el-divider>-->
+          <!--          <el-divider direction="vertical"></el-divider>-->
           <div class="preview">
             <div class="preview_body" v-html="state.ruleForm.activityDesc"></div>
           </div>
@@ -233,14 +234,20 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="12">
-                <el-form-item label="折扣" prop="discount">
-                  <el-input-number
-                      :controls="false"
-                      v-model.trim="rights.discount"
-                      placeholder="例：75代表75折"
-                      clearable
-                      class="wd200">
-                  </el-input-number>
+                <el-form-item label="折扣率（%）" prop="discount">
+                  <ext-input-number class="wd200"
+                                    v-model="rights.discount"
+                                    placeholder="例：75代表75折"
+                                    precision="0"
+                  >
+                  </ext-input-number>
+                  <!--                  <el-input-number-->
+                  <!--                      :controls="false"-->
+                  <!--                      v-model.trim="rights.discount"-->
+                  <!--                      placeholder="例：75代表75折"-->
+                  <!--                      clearable-->
+                  <!--                      class="wd200">-->
+                  <!--                  </el-input-number>-->
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -313,15 +320,26 @@
               </el-col>
 
               <el-col :span="12">
-                <el-form-item label="折扣" prop="discount">
+                <el-form-item v-if="coupon.couponType==='Discount'" label="折扣率（%）" prop="discount">
                   <el-input-number
                       :controls="false"
                       v-model.trim="coupon.discount"
-                      placeholder="75代表75折或折扣金额（分）"
+                      placeholder="请输入折扣率"
                       clearable
                       class="wd200">
                   </el-input-number>
                 </el-form-item>
+
+              <el-form-item v-if="coupon.couponType==='FullDiscount'" label="折扣金额（元）" prop="discount">
+                  <ext-input-number
+                      :ratio="100"
+                      :controls="false"
+                      v-model.trim="coupon.discount"
+                      placeholder="请输入折扣金额"
+                      clearable
+                      class="wd200">
+                  </ext-input-number>
+                </el-form-item>
               </el-col>
             </el-row>
 

admin/src/main/resources/application-dev.yml

@@ -113,7 +113,7 @@ spring:
     port: 5674
     username: kym
     password: kym!@123
-    virtual-host: /
+    virtual-host: /dev
     publisher-returns: true
     publisher-confirms: true
     listener:

admin/src/main/resources/application-prod.yml

@@ -109,8 +109,8 @@ spring:
       # 缓存过期时间：7天
       time-to-live: 604800
   rabbitmq:
-    host: 121.40.98.15
-    port: 5674
+    host: 127.0.0.1
+    port: 5680
     username: kym
     password: kym!@123
     virtual-host: /

miniapp/src/main/resources/application-dev.yml

@@ -113,7 +113,7 @@ spring:
     port: 5674
     username: kym
     password: kym!@123
-    virtual-host: /
+    virtual-host: /dev
     publisher-returns: true
     publisher-confirms: true
     listener:

miniapp/src/main/resources/application-prod.yml

@@ -102,6 +102,23 @@ spring:
     redis:
       # 缓存过期时间：7天
       time-to-live: 604800
+  rabbitmq:
+    host: 127.0.0.1
+    port: 5680
+    username: kym
+    password: x3Z239f4H427bMd4EJNVvFFbkynyAsL6
+    virtual-host: /
+    publisher-returns: true
+    publisher-confirms: true
+    listener:
+      simple:
+        acknowledge-mode: manual
+        retry:
+          enabled: true
+          max-attempts: 3
+          initial-interval: 3000ms
+          max-interval: 6000ms
+          multiplier: 2
 
 kym:
   notify-email: zaizai@kuaiyuman.cn,skyline@kuaiyuman.cn