提交

jy-starter/pom.xml

@@ -48,7 +48,7 @@
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}</finalName>
+        <finalName>jy-erp</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

jy-starter/src/main/resources/application-dev.yml

@@ -12,6 +12,7 @@ spring:
           url: jdbc:mysql://sh-cdb-22oyn58i.sql.tencentcdb.com:63963/jy_erp_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: root
           password: PdKKy%vZ)2mGykg
+
   rabbitmq:
     port: 5672
     host: 111.229.165.209

jy-starter/src/main/resources/application-test.yml

@@ -9,10 +9,25 @@ spring:
       strict: true
       datasource:
         master:
-          url: jdbc:mysql://172.17.0.4:3306/jy_erp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://172.17.0.4:3306/jy_erp_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: root
           password: PdKKy%vZ)2mGykg
 
+  rabbitmq:
+    port: 5672
+    host: 111.229.165.209
+    username: JyByteSailingAdmin
+    password: ds7us8nqt@777s
+    #这个配置是保证提供者确保消息推送到交换机中，不管成不成功，都会回调
+    publisher-confirm-type: correlated
+    #保证交换机能把消息推送到队列中
+    publisher-returns: true
+    virtual-host: JyByteSailingTest
+    #这个配置是保证消费者会消费消息，手动确认
+    listener:
+      simple:
+        acknowledge-mode: manual
+
   data:
     redis:
       # 地址

jy-starter/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 jy:
   # 项目名
-  projectName: jyBase
+  projectName: jyErp
   # 是否启用验证码
   captchaOnOff: false
   # 验证码过期时间（分钟）

jy-ui/src/views/business/payment/remit/index.vue

@@ -399,6 +399,7 @@ const clickDownload = () => {
     <a-dialog
       v-model="dialogVisible"
       :title="dialogTitle"
+      :footer="!disabled"
       @submit="formSubmit"
       @closed="formClosed"
       width="1400px"

jy-ui/src/views/business/payment/requests/index.vue

@@ -529,6 +529,7 @@ const clickDownload = () => {
     <a-dialog
       v-model="dialogVisible"
       :title="dialogTitle"
+      :footer="!disabled"
       @submit="formSubmit"
       @closed="formClosed"
       width="1400px"