fix: ams 地址模块优化

front/admin-front/src/layout/components/Navbar.vue

@@ -184,7 +184,7 @@ export default {
     height: 43px;
     position: absolute;
     top: -4px;
-    left: 235px;
+    left: 200px;
     cursor: pointer;
   }
 }

front/admin-front/src/router/index.js

@@ -60,6 +60,11 @@ export const constantRoutes = [{
     path: '/user',
     component: Layout,
     props: true,
+    meta: {
+      roles: ['admin'],
+      title: "用户管理",
+      icon: 'user',
+    },
     children: [{
       path: 'index',
       name: 'user',
@@ -85,6 +90,11 @@ export const constantRoutes = [{
   {
     path: '/sys-param',
     component: Layout,
+    meta: {
+      roles: ['admin'],
+      title: "系统参数",
+      icon: 'sys-param',
+    },
     children: [{
       path: 'index',
       name: 'sys-param',

front/admin-front/src/views/address/SaveOrUpdate.vue

@@ -9,9 +9,7 @@
     >
       <el-row style="padding-top: 20px; border-bottom: 1px solid #f0f0f0">
         <el-col :span="13" class="mb-18">
-          <span
-            class="block-title"
-            style="line-height: 2.5;margin:20px"
+          <span class="block-title" style="line-height: 2.5; margin: 20px"
             >生成地址</span
           >
         </el-col>
@@ -24,8 +22,10 @@
             >关闭
           </el-button>
           <el-button
+            type="primary"
             class="float-right mg-l-r-10 confirm-btn pd-2"
             @click="generateAddress"
+            :disabled="isDisabled"
             >确认</el-button
           >
         </el-col>
@@ -37,10 +37,10 @@
         :rules="rules"
         ref="ruleForm"
         label-width="100px"
-        style="margin: 40px 0;width: 600px"
+        style="margin: 40px 0; width: 600px"
       >
         <el-form-item label="地址组名称" prop="groupName">
-          <el-input v-model="ruleForm.groupName" autocomplete="off"  ></el-input>
+          <el-input v-model="ruleForm.groupName" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="生成数量" prop="numWallet">
           <el-input v-model="ruleForm.numWallet" autocomplete="off"></el-input>
@@ -52,11 +52,12 @@
             autocomplete="off"
           ></el-input>
         </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="generateAddress('ruleForm')">提交</el-button
+        <!-- <el-form-item>
+          <el-button type="primary" :disabled="disabled" @click="generateAddress('ruleForm')"
+            >提交</el-button
           >
           <el-button @click="resetForm('ruleForm')">重置</el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
     </el-drawer>
   </div>
@@ -120,6 +121,7 @@ export default {
         numWallet: undefined,
       },
       rules: {},
+      isDisabled: false,
     };
   },
   methods: {
@@ -138,6 +140,7 @@ export default {
     generateAddress() {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
+          this.isDisabled = true;
           batchAddress(JSON.stringify(this.ruleForm), {
             headers: {
               "content-type": "application/json",
@@ -147,9 +150,11 @@ export default {
             this.addressModal = false;
             this.resetForm();
             this.$parent.getAddresses();
+            this.isDisabled = false;
           });
         } else {
           this.$message.error("请填写必填字段!");
+          this.isDisabled = false;
         }
       });
     },

front/admin-front/src/views/address/download.vue

@@ -22,8 +22,10 @@
             >关闭
           </el-button>
           <el-button
+            type="primary"
             class="float-right mg-l-r-10 confirm-btn pd-2"
             @click="downloadAddress"
+            :disabled="isDisabled"
             >确认</el-button
           >
         </el-col>
@@ -50,12 +52,12 @@
             autocomplete="off"
           ></el-input>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-button type="primary" @click="downloadAddress('ruleForm')"
             >提交</el-button
           >
           <el-button @click="resetForm('ruleForm')">重置</el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
     </el-drawer>
   </div>
@@ -107,7 +109,6 @@
 <script>
 import Axios from "axios";
 import AES from "@/utils/aes";
-import { Message } from "element-ui";
 export default {
   data() {
     return {
@@ -119,6 +120,7 @@ export default {
         groupName: undefined,
         address: undefined,
       },
+      isDisabled: false,
       rules: {},
     };
   },
@@ -141,6 +143,7 @@ export default {
       console.log("laodi");
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
+          this.isDisabled = true;
           console.log("url:::" + this.url);
           Axios.post(
             this.url + "ams/address/download/batch-keystore",
@@ -171,10 +174,12 @@ export default {
                 const data = JSON.parse(str);
                 this.$message.error(data.message);
               }
+              this.isDisabled = false;
             })
             .catch((e) => {
               console.log(e);
               this.$message.error(e);
+              this.isDisabled = false;
             });
         } else {
           this.$message.error("请填写必填字段!");
@@ -190,6 +195,7 @@ export default {
       link.download = this.ruleForm.groupName + ".zip";
       link.click();
       URL.revokeObjectURL(url); // 释放内存
+      this.downloadModal = false;
     },
   },
   created() {},

front/admin-front/src/views/address/index.vue

@@ -20,7 +20,7 @@
       </el-col>
     </el-row>
 
-    <div class="block-title">用户管理</div>
+    <div class="block-title">地址列表</div>
     <el-table :data="tableData" style="width: 100%">
       <el-table-column prop="address" label="地址账号" width="420">
         <template slot-scope="{ row }">

front/admin-front/src/views/login/index.vue

@@ -295,7 +295,7 @@ export default {
       });
     },
     getUrl() {
-      getParam("str_dv_adm_host").then((res) => {
+      getParam("str_ams_adm_host").then((res) => {
         this.url = res;
       });
     },

front/admin-front/src/views/user/index.vue

@@ -57,7 +57,7 @@
         </el-table-column>
         <el-table-column prop="username" label="用户名" width="">
         </el-table-column>
-        <el-table-column prop="address" label="地址" width="">
+        <el-table-column prop="email" label="邮箱" width="">
         </el-table-column>
         <el-table-column prop="nickname" label="昵称" width="">
         </el-table-column>

src/main/java/com/ichaoj/ams/constant/AmsConstant.java

@@ -15,7 +15,7 @@ public class AmsConstant {
     public static final String CACHE_ADDRESS_PREFIX = "ams:address";
 
     public static final String WALLET_FILE_PATH =
-            StrUtil.format("home{}ams{}wallet{}", File.separator, File.separator, File.separator);
+            StrUtil.format("{}home{}ams{}wallet{}", File.separator, File.separator, File.separator, File.separator);
 
     public enum TaskType {
         /**

src/main/java/com/ichaoj/ams/service/impl/AmsAddressAccountServiceImpl.java

@@ -58,15 +58,6 @@ import static com.ichaoj.ams.constant.AmsConstant.WALLET_FILE_PATH;
 @Slf4j
 public class AmsAddressAccountServiceImpl extends SuperWhaleServiceImpl<AmsAddressAccountMapper, AmsAddressAccount> implements IAmsAddressAccountService {
 
-    @Autowired(required = false)
-    private AmsAddressAccountMapper baseMapper;
-
-    @Resource
-    private DiskClient diskClient;
-
-    @Resource
-    private ZipService zipService;
-
     @Override
     public List<String> batchCreateAddress(BatchAddressRequest batchAddressRequest) {
         String userId = SuperWhaleContext.getContext(PublicUserInfo.class).getUserId();
@@ -82,16 +73,8 @@ public class AmsAddressAccountServiceImpl extends SuperWhaleServiceImpl<AmsAddre
         wallets.forEach(wallet -> {
             try {
                 String keystore = wallet.getKeystore();
-//                File file = FileUtil.createTempFile(new File(keystore));
-//                MultipartFile multipartFile = com.ichaoj.ccb.common.util.FileUtil.convertFileToMultipartFile(file);
-                // 上传服务器
-//                PublicResult<String> result = diskClient.uploadFile(multipartFile, "ccb_address_account", "keystore");
-//                String fileId = result.getData();
                 // 将生成的地址存入数据库
                 AmsAddressAccount addressAccount = getAddressCountInstance(userId, wallet.getAddress(), 1);
-//                if (result.isSuccess() && StrUtil.isNotBlank(fileId)) {
-//                    addressAccount.setKeystoreLocation(getLocation(fileId));
-//                }
                 addressAccount.setKeystore(keystore);
                 addressAccount.setGroupName(batchAddressRequest.getGroupName());
                 this.save(addressAccount);
@@ -122,22 +105,16 @@ public class AmsAddressAccountServiceImpl extends SuperWhaleServiceImpl<AmsAddre
     @Override
     public PublicPage<AddressResponse> pageAddress(PageAddressRequest pageAddressRequest) {
         LambdaQueryWrapper<AmsAddressAccount> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(StrUtil.isNotBlank(pageAddressRequest.getGroupName()), AmsAddressAccount::getGroupName, pageAddressRequest.getGroupName())
+        wrapper.eq(StrUtil.isNotBlank(pageAddressRequest.getGroupName())
+                        , AmsAddressAccount::getGroupName
+                        , pageAddressRequest.getGroupName())
+                .eq(AmsAddressAccount::getUserId, SuperWhaleContext.getContext(PublicUserInfo.class).getUserId())
                 .orderByDesc(AmsAddressAccount::getCreateTime);
 
         Page<AmsAddressAccount> result = this.page(this.buildPageObj(pageAddressRequest), wrapper);
         return this.convertPublicPage(result, resp -> BeanUtil.copyProperties(resp, AddressResponse.class));
     }
 
-    private String getLocation(String fileId) {
-        PublicResult<FileResponse> result = diskClient.getFileById(fileId);
-        FileResponse data = result.getData();
-        if (result.isSuccess() && data != null) {
-            return data.getFileUrl();
-        }
-        return null;
-    }
-
     /**
      * 添加精品号
      *
@@ -250,6 +227,4 @@ public class AmsAddressAccountServiceImpl extends SuperWhaleServiceImpl<AmsAddre
         account.setUserId(userId);
         return account;
     }
-
-
 }