Kaynağa Gözat

nginx、结算

xiongzhu 3 yıl önce
ebeveyn
işleme
a8ba4adb68

+ 1 - 0
src/main/java/com/izouma/nineth/config/WebMvcConfig.java

@@ -34,6 +34,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         // registry.addResourceHandler("/swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
         // registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+        registry.addResourceHandler("/.well-known/**").addResourceLocations("classpath:/well-known/");
         registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
         registry.addResourceHandler("/admin/**").addResourceLocations("classpath:/static/admin/");
         registry.addResourceHandler("/files/**").addResourceLocations("file:" + localPath);

+ 1 - 1
src/main/java/com/izouma/nineth/security/WebSecurityConfig.java

@@ -136,7 +136,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
         // AuthenticationTokenFilter will ignore the below paths
         web.ignoring()
                 .antMatchers("/auth/**")
-
+                .antMatchers("/.well-known/**")
                 // allow anonymous resource requests
                 .and()
                 .ignoring()

+ 22 - 0
src/main/resources/well-known/apple-app-site-association

@@ -0,0 +1,22 @@
+{
+    "applinks": {
+        "details": [
+            {
+                "appIDs": ["BS29FZN3J8.vip.raex.nft"],
+                "components": [
+                    {
+                        "/": "/9th/*",
+                        "comment": "Matches any URL whose path starts with /app/"
+                    },
+                    {
+                        "/": "/app/*",
+                        "comment": "Matches any URL whose path starts with /app/"
+                    }
+                ]
+            }
+        ]
+    },
+    "webcredentials": {
+        "apps": ["G8J2VH4A2S.vip.raex.nft"]
+    }
+}

+ 19 - 16
src/main/vue/src/views/UserBalance.vue

@@ -37,7 +37,12 @@
             <el-button class="filter-item" type="primary" @click="exportWithdraw" :loading="downloading" size="mini">
                 全部提现并导出Excel
             </el-button>
-            <el-button class="filter-item" type="primary" @click="(showHisotryDialog = true), getHistory()" size="mini">
+            <el-button
+                class="filter-item"
+                type="primary"
+                @click="(showHisotryDialog = true), (history.page = 1), getHistory()"
+                size="mini"
+            >
                 历史记录
             </el-button>
             <el-button class="filter-item" type="primary" @click="showImportDialog = true" size="mini">
@@ -106,7 +111,7 @@
             </div>
         </el-dialog>
 
-        <el-dialog :visible.sync="showRecordDialog" title="余额记录" width="600">
+        <el-dialog :visible.sync="showRecordDialog" title="余额记录" width="600px">
             <el-table :data="record.list" height="calc(100vh - 500px)" v-loading="record.loading">
                 <el-table-column prop="createdAt" label="时间"></el-table-column>
                 <el-table-column prop="amount" label="金额">
@@ -133,10 +138,12 @@
             ></el-pagination>
         </el-dialog>
 
-        <el-dialog :visible.sync="showHisotryDialog" title="历史记录" width="500">
+        <el-dialog :visible.sync="showHisotryDialog" title="历史记录" width="600px">
             <el-table :data="history.list" height="calc(100vh - 500px)" v-loading="history.loading">
-                <el-table-column prop="createdAt" label="时间"></el-table-column>
-                <el-table-column prop="lastBalance" label="操作" width="100">
+                <el-table-column prop="createdAt" label="时间" width="150"></el-table-column>
+                <el-table-column prop="total" label="总数"></el-table-column>
+                <el-table-column prop="sum" label="总金额"></el-table-column>
+                <el-table-column prop="lastBalance" label="操作" width="80">
                     <template v-slot="{ row }">
                         <el-button @click="download(row)" type="text">下载</el-button>
                     </template>
@@ -266,7 +273,7 @@ export default {
                 .post('/userBalance/exportWithdraw')
                 .then(res => {
                     this.downloading = false;
-                    window.open(res.url, '_blank');
+                    //window.open(res.url, '_blank');
                     this.getData();
                 })
                 .catch(e => {
@@ -310,7 +317,7 @@ export default {
             this.userId = userId;
             this.record.list = [];
             this.showRecordDialog = true;
-            this.page = 1;
+            this.record.page = 1;
             this.getRecords();
         },
         getRecords() {
@@ -356,15 +363,11 @@ export default {
         getHistory() {
             this.history.loading = true;
             this.$http
-                .post(
-                    '/userBalance/exportHistory',
-                    {
-                        page: this.history.page - 1,
-                        size: this.history.pageSize,
-                        sort: 'id,desc'
-                    },
-                    { body: 'json' }
-                )
+                .post('/userBalance/exportHistory', {
+                    page: this.history.page - 1,
+                    size: this.history.pageSize,
+                    sort: 'createdAt,desc'
+                })
                 .then(res => {
                     this.history.loading = false;
                     this.history.list = res.content;