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

README.md

@@ -81,11 +81,11 @@
 
 | 数据库      | 类型   | 地址   |  账号  |  密码  |  说明  |
 | --------   | :-----: | :-----:  | :----:  | :----: | :------  |
-| saas_account | mysql | 10.1.81.54:3306 |  root  | select111*** |  账户中心  |
-| saas_auth | mysql | 10.1.81.54:3306 |  root  | select111*** |  鉴权系统  |
-| saas_file | mysql | 10.1.81.54:3306 |  root  | select111*** |  文件系统  |
-| saas_mail | mysql | 10.1.81.54:3306 |  root  | select111*** |  邮件系统  |
-| saas_biz | mysql | 10.1.81.54:3306 |  root  | select111*** |  业务系统  |
+| saas_account | mysql | 10.1.81.79:3306 |  root  | select111*** |  账户中心  |
+| saas_auth | mysql | 10.1.81.79:3306 |  root  | select111*** |  鉴权系统  |
+| saas_file | mysql | 10.1.81.79:3306 |  root  | select111*** |  文件系统  |
+| saas_mail | mysql | 10.1.81.79:3306 |  root  | select111*** |  邮件系统  |
+| saas_biz | mysql | 10.1.81.79:3306 |  root  | select111*** |  业务系统  |
 | saas_ui | mongo | 10.1.81.63:27017 |    |  |  UI配置  |
 
 > 中间件
@@ -100,7 +100,7 @@
 
 | IP      |  账号  |  密码  |  环境  |  资源  |
 | --------   | :----:  | :----: | :------:  | :------:  |
-| 10.1.81.54 |  root  | select123*** |  CentOS7, MySQL  | Cpu: 8, Mem: 16G, Disk: 80G |
+| 10.1.81.79 |  root  | select123*** |  CentOS7, MySQL  | Cpu: 8, Mem: 16G, Disk: 80G |
 | 10.1.81.75 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
 | 10.1.81.78 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
 | 10.1.81.76 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |

applications/commons/commons-server/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

applications/document/document-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

applications/money/money-server/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

applications/sale/sale-server/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

applications/storage/storage-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

base-servers/account/account-server/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_account?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.79:3306/saas_account?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:

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

@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_auth?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.79:3306/saas_auth?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:

base-servers/datacenter/datacenter-server/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_manage?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.79:3306/saas_manage?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:

base-servers/file/file-server/src/main/resources/application.yml

@@ -22,7 +22,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_file?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.79:3306/saas_file?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:

base-servers/mail/mail-server/src/main/resources/application.yml

@@ -22,7 +22,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_mail?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.79:3306/saas_mail?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:

base-servers/sms/sms-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

frontend/saas-portal-web/src/components/conenter/invitation.vue

@@ -221,11 +221,8 @@ import { setTimeout } from 'timers';
                 let url1 = window.location.href;
                 let param = url1.substring(url1.lastIndexOf('=')+1, url1.length);
                 this.$ajax({
-                    url: this.$url.api+"/api/commons/share/valid/param",
+                    url: this.$url.api+"/api/commons/share/valid/param?param="+param,
                     method:'POST',
-                    data:{
-                        param:param
-                    },
                     headers:{
                         "Authorization":Session.getToken(),
                         "Content-Type":"application/x-www-form-urlencoded",

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -149,7 +149,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pi_prstatus',
             width: 80
         }, {
-            text: '关联出货号',
+            text: '关联出货单号',
             dataIndex: 'pi_iocode',
             width: 150
         }, {