update 平台配置页面

jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java

@@ -16,7 +16,7 @@ public class MerchantUtils {
     }
 
     /**
-     *
+     * 从统一社会信用代码中获取组织机构代码
      * @param organizationCode
      * @return
      */

jsowell-ui/src/utils/common.js

@@ -107,6 +107,25 @@ export function selectDictLabels(datas, value, separator) {
   return actions.join('').substring(0, actions.join('').length - 1);
 }
 
+/*
+ * 验证字符串是否为空（也不能为纯空格）
+ * true--说明为空， false--说明不为空
+ */
+export function isEmptyString(string) {
+    if (
+        string == undefined ||
+        typeof string == 'undefined' ||
+        !string ||
+        string == null ||
+        string == '' ||
+        /^\s+$/gi.test(string)
+    ) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
 // 字符串格式化(%s )
 export function sprintf(str) {
   var args = arguments, flag = true, i = 1;

jsowell-ui/src/views/thirdparty/secret/detail.vue

@@ -6,14 +6,14 @@
                     <!-- 上 -->
                     <el-col :span="24">
                         <el-form-item label="对接平台名称" prop="platformName">
-                            <el-input v-model="form.platformName" placeholder="请输入对接平台名称" style="width: 90%" />
+                            <el-input v-model="form.platformName" placeholder="请输入对接平台名称" style="width: 90%"/>
                         </el-form-item>
                         <el-form-item label="接口地址前缀" prop="urlPrefix">
-                            <el-input v-model="form.urlPrefix" placeholder="请输入接口地址前缀" style="width: 90%" />
+                            <el-input v-model="form.urlPrefix" placeholder="请输入接口地址前缀" style="width: 90%"/>
                         </el-form-item>
                         <el-form-item label="对接平台标识(OperatorId)" prop="theirOperatorId">
                             <el-input v-model="form.theirOperatorId" placeholder="请输入对接平台标识(OperatorId)"
-                                style="width: 90%" />
+                                      style="width: 90%"/>
                         </el-form-item>
                     </el-col>
                     <!-- 左侧 -->
@@ -21,21 +21,25 @@
                         <el-card class="box-card" style="margin-right: 50px;">
                             <div slot="header" class="clearfix">对接平台密钥信息</div>
                             <el-form-item label="唯一识别密钥(OperatorSecret)" prop="theirOperatorSecret"
-                                style="margin-top: 20px;">
+                                          style="margin-top: 20px;">
                                 <el-input v-model="form.theirOperatorSecret"
-                                    placeholder="请输入对接平台生成的唯一识别密钥(OperatorSecret)" style="width: 90%" />
+                                          placeholder="请输入对接平台生成的唯一识别密钥(OperatorSecret)"
+                                          style="width: 90%"/>
                             </el-form-item>
                             <el-form-item label="消息密钥(DataSecret)" prop="theirDataSecret">
-                                <el-input v-model="form.theirDataSecret" placeholder="请输入对接平台生成的消息密钥(DataSecret)"
+                                <el-input v-model="form.theirDataSecret"
-                                    style="width: 90%" />
+                                          placeholder="请输入对接平台生成的消息密钥(DataSecret)"
+                                          style="width: 90%"/>
                             </el-form-item>
                             <el-form-item label="初始化向量(DataSecretIv)" prop="theirDataSecretIv">
-                                <el-input v-model="form.theirDataSecretIv" placeholder="请输入对接平台生成的初始化向量(DataSecretIv)"
+                                <el-input v-model="form.theirDataSecretIv"
-                                    style="width: 90%" />
+                                          placeholder="请输入对接平台生成的初始化向量(DataSecretIv)"
+                                          style="width: 90%"/>
                             </el-form-item>
                             <el-form-item label="签名密钥(SigSecret)" prop="theirSigSecret">
-                                <el-input v-model="form.theirSigSecret" placeholder="请输入对接平台生成的签名密钥(SigSecret)"
+                                <el-input v-model="form.theirSigSecret"
-                                    style="width: 90%" />
+                                          placeholder="请输入对接平台生成的签名密钥(SigSecret)"
+                                          style="width: 90%"/>
                             </el-form-item>
                         </el-card>
                     </el-col>
@@ -44,24 +48,29 @@
                         <el-card class="box-card">
                             <div slot="header" class="clearfix">
                                 <span>我方生成密钥信息</span>
-                                <el-button style="float: right; padding: 3px 0" type="text" @click="generateSecret">生成密钥</el-button>
+                                <el-button style="float: right; padding: 3px 0" type="text"
+                                           @click="clickGenerateSecret">生成密钥
+                                </el-button>
                             </div>
                             <el-form-item label="唯一识别密钥(OperatorSecret)" prop="ourOperatorSecret"
-                                style="margin-top: 20px;">
+                                          style="margin-top: 20px;">
-                                <el-input v-model="form.ourOperatorSecret" placeholder="请输入我方生成的唯一识别密钥(OperatorSecret)"
+                                <el-input v-model="form.ourOperatorSecret"
-                                    style="width: 90%" />
+                                          placeholder="请输入我方生成的唯一识别密钥(OperatorSecret)"
+                                          style="width: 90%"/>
                             </el-form-item>
                             <el-form-item label="消息密钥(DataSecret)" prop="ourDataSecret">
-                                <el-input v-model="form.ourDataSecret" placeholder="请输入我方生成的消息密钥(DataSecret)"
+                                <el-input v-model="form.ourDataSecret"
-                                    style="width: 90%" />
+                                          placeholder="请输入我方生成的消息密钥(DataSecret)"
+                                          style="width: 90%"/>
                             </el-form-item>
                             <el-form-item label="初始化向量(DataSecretIv)" prop="ourDataSecretIv">
-                                <el-input v-model="form.ourDataSecretIv" placeholder="请输入我方生成的初始化向量(DataSecretIv)"
+                                <el-input v-model="form.ourDataSecretIv"
-                                    style="width: 90%" />
+                                          placeholder="请输入我方生成的初始化向量(DataSecretIv)"
+                                          style="width: 90%"/>
                             </el-form-item>
                             <el-form-item label="签名密钥(SigSecret)" prop="ourSigSecret">
                                 <el-input v-model="form.ourSigSecret" placeholder="请输入我方生成的签名密钥(SigSecret)"
-                                    style="width: 90%" />
+                                          style="width: 90%"/>
                             </el-form-item>
                         </el-card>
                     </el-col>
@@ -83,7 +92,7 @@
 
 
 import {addSecret, getSecret, updateSecret} from "@/api/thirdParty/secret";
-import {generateRandomID} from "@/utils/common";
+import {generateRandomID, isEmptyString} from "@/utils/common";
 
 export default {
     dicts: ["third_party_type"],
@@ -96,8 +105,7 @@ export default {
             // 表单参数
             form: {},
             // 表单校验
-            rules: {
+            rules: {}
-            }
         };
     },
     created() {
@@ -106,8 +114,31 @@ export default {
     },
     methods: {
         // 生成密钥
+        clickGenerateSecret() {
+            // 是否有值，默认false
+            let hasValue = false;
+            if (!isEmptyString(this.form.ourOperatorSecret) || !isEmptyString(this.form.ourDataSecret)
+                || !isEmptyString(this.form.ourDataSecretIv) || !isEmptyString(this.form.ourSigSecret)) {
+                // 任一字段不为空，hasValue为true
+                hasValue = true;
+            }
+            if (hasValue) {
+                // 有值时弹出提示框
+                this.$confirm('当前已经有值, 此操作将覆盖原值, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    // 点击确定生成密钥
+                    this.generateSecret();
+                });
+            } else {
+                // 没有值，直接生成密钥
+                this.generateSecret();
+            }
+        },
+        // 生成密钥方法
         generateSecret() {
-            console.log("生成密钥");
             this.form.ourOperatorSecret = generateRandomID(16);
             this.form.ourDataSecret = generateRandomID(16);
             this.form.ourDataSecretIv = generateRandomID(16);
@@ -128,7 +159,7 @@ export default {
         updateTitle() {
             const platformName = this.platformName;
             const title = "【" + platformName + "】平台配置";
-            const route = Object.assign({}, this.$route, { title: `${title}` });
+            const route = Object.assign({}, this.$route, {title: `${title}`});
             this.$store.dispatch("tagsView/updateVisitedView", route);
         },
         submitForm() {

jsowell-ui/src/views/thirdparty/secret/index.vue

@@ -356,6 +356,13 @@ export default {
         // 生成密钥
         generateSecret() {
             console.log("生成密钥");
+            if ((this.form.ourOperatorSecret != null && this.form.ourOperatorSecret.length !== 0)
+                || (this.form.ourDataSecret != null && this.form.ourDataSecret.length !== 0)
+                || (this.form.ourDataSecretIv != null && this.form.ourDataSecretIv.length !== 0)
+                || (this.form.ourSigSecret != null && this.form.ourSigSecret.length !== 0)) {
+                console.log("当前已经有值，是否重新生成覆盖原值？");
+                return;
+            }
             this.form.ourOperatorSecret = generateRandomID(16);
             this.form.ourDataSecret = generateRandomID(16);
             this.form.ourDataSecretIv = generateRandomID(16);