Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

build.sh

@@ -2,11 +2,14 @@ git checkout
 git pull
 (cd src/main/vue && yarn)
 (cd src/main/vue && yarn build)
+rsync -av --delete src/main/vue/dist/ /var/www/9th/admin/
 (cd src/main/nine-space && yarn)
 (cd src/main/nine-space && yarn build)
+rsync -av --delete src/main/nine-space/dist/ /var/www/9th/9th/
 (cd src/main/pc-space && yarn)
 (cd src/main/pc-space && yarn build)
+rsync -av --delete src/main/pc-space/dist/ /var/www/9th/9th-pc/
 mvn clean package
 systemctl stop 9th
-cp target/9th-0.0.1-SNAPSHOT.jar /var/www/9th/9th-0.0.1-SNAPSHOT.jar
+mv -f target/9th-0.0.1-SNAPSHOT.jar /var/www/9th/9th-0.0.1-SNAPSHOT.jar
 systemctl start 9th

src/main/resources/access.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCgyCUCqd8oIR9x
-0EEPTH6gOAI7LH63MnVm9zfB5IzQrr1rZjwfui+9H/TXHzXDNJVoSddzoWr5p2Wc
-mBVgqqwRNtgdA1kQPOHAEmsGPHJ87EK7cFGTGML1ACNOfePZN7Fe1NmiGGKqP+1B
-YzizWvfRoFFwb2v419BdxVaPBeFe/F4yACKGoTaJU4PZEwwcEFjvKem1Enbmdmo0
-JykUty4naujryZU/wYa8PhQmrs1UCue7n33Xt6907t8MDpcqnBkColFwks6EgXAx
-yaPJfzHJzUqGrC2bN5B19a/TPgdy8AN8H5IqbXbyoXHcv/Zc0jvAo3x9uxD9ee39
-PVX3hxtZAgMBAAECggEAUGPCHZLSAT6OelmmLgARUAqxEuUsdmzERrdVKZ0cyzqT
-ex+i8DonpGhWAzmXqAKisYI6N5Z95lXMeH+SMMMlRXYmmFsULQpD1cVfvb57f/qh
-YxbFssaus9Fd1eEcC3/NL509M879hiJwfkEeGI9jWWzPS2hqlAFULY59uQU3qkW5
-WQbxsEtC2x3uz785nlf/Qh/Mc8er51y0Bl428MWqeg7e7+ijLKs9F1qC7p2/sAVm
-HFt1P4whlyeBEPQwVI9bNqx7Qc0+658VLP7dsD+/xg07FLwrPQ4n3/HlMNw4whtx
-GZWXvW/363QrdbiR7BNrpoXieyMHO3a+eXqnIRkAAQKBgQDbEJcABmPcdcZHuYIO
-A0qOzh2fRZ13Pil8LnYgR1FpjYb23QfWXM76vU/uIVa1ISgyM9plUD3BSPcH9fr4
-LpfgG1e8tvgMMHEY2oLWnDHrslyTQC9nHRJDjfvF/w+5Q+0Y6sqbRqg4bS2QAxdv
-bSfDc2QHwgeos6Fmfp8d2/go7wKBgQC74+iNEcNzxsuoRDTrXaKO7M4tSEzASju3
-P4yOL2yOGnFAETKYuFW4eb7xcxa7l1iJREH1UXcr5WWmpSkcaoTZWzsw3QnA4lRV
-vx63zxJmC9a1Ao5Gi7KDC8Zfjqt68lqEJ0eUPbXTzpu0BeB3pl/I2VxiuahjjNyT
-niv25A6wNwKBgDb8aQqGkBZMMaLbO3vM86/4qJLL5ISDw+H5v4jGnfbCoXfhbxAt
-Z36keiWplJwOYIqJXW5Ev9t+NxN2eLJG77Q+6LzjqEtW9WxpnKHFvvoMYRRM7hkR
-wP3X67R9GzNDi4XPmV90UtEnBmK5g+5iFbMHibowx79ep0qUydey2Q1dAoGADwCu
-w/zkH22DO4detmB+p2zvNZxtTHlg9UvkvEG7KEmiO1xkLt+hMJ7ACWWILihykFtb
-7Ou5WU7y4/CSLMuwme539nnf2n/3/fTJziGBtZZCaaevlqB2+5HIID8zIBkT8zNz
-urmGuEfqFODXQJaPVWlNwDBU6sYHot3hYtBo/9cCgYA0RL8iQ9VczPZk4BysmaYo
-OcN3E+zQ2qJgAaDD+pDDtp7Iyg7wfMJIDnUbvlhf/huv9dSFBBO6tXiXfWVMqZGD
-StblLz0CmKgfY26pPXZXqlaYhJHmOoTVCt9cICCPGuZBIzALAFyo5vcBz6cohG9d
-LqHETf25LXDxzZ4wXQMHyg==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCv4l+/2POs5Znj
+zJumYMEJ/fJ59+DLZImIJWGa1ClKUrl+Jb4QHA79t3LUUs6PK0FjC7YUrH31yG5N
+EiXikA3SEVwzJ3Sc5+XQvIr1WTp3dMt/JJ7GFcHKxO3X3E/ZpG15rMa9d9P+bEwG
+c4wAgNbS6i0JBYuzSxnsE2yrdoQpblxzoJ/fqOnzpzo2cg41zmv5/XrARqQ/lD1K
+L8l5L/2kLMktwStNf8U7zLrKRS1UB37a29fcAyPvehqAskeDjBj+OR677eQemp8J
+pd6jd0YETyiGeTb9LRpyjIwW9cV3DO3X7WpbQVQ01SRH7qBql//vgstv5Bt5l2wa
+5Y8/IqJDAgMBAAECggEAE65jo36d6dN5cG21Xx1FjJ4vk2li7K+P2j3Amcgy5J+0
+JQMJLRlOriJohYzMk2W2N+SYF+EjaSzn9tTYi20uNrr9k7XPDT2/0CdA72pwKezW
+VqBc6fKGUG/P449CGisVmv9z78CoZrhsm24zlNzV7R0KNA+8TbBSMsILr3YgHNiO
+klIhy0jGz5jzS4TPG2wwDb4N4lA9J/yuyK+zZ40qyh5vljy1xdP9VknJcAtchotY
+k1mqAjFkPImI3kQmhLD6RVxqB7e9lEYoxZSiawc4VIq0tHOPCNbhaRR5tA+YbJSX
+ZFmMvnh8D0VsEtQLqcx9kxZ0+QA3dv/f2Hq4CDBVJQKBgQDeWworh205TxntC6b/
+nFUHu5RuytAiSkRzmzojZLTHuVWQsFa0m+Zzk+8xEagrVHIiBJMNSW7bcJapmzdu
+AlSc6SClVsHOk+mtUgoiTeV44C/KXX8MRTvRS2Cxnx0/JlJ+T7mDFohZR9/kCNYe
+TBrsfHpAiD2+qTIiNPEVb5H4JQKBgQDKf0Nry4hlzcUAWj9VCU9hWU2smA+9GjuZ
+827HAdZ3aawRG3hkRz3afI6sGCEiHgco1ZPrO/moyu08b6np3WRpue0WRLuiWAfq
+qElwfYRrP8TFrNWH9k8lO9dLrKtItqjylHCs6yPQ4xjYa6Jy3p5UntMhe7ln/p6u
+7ZAPzCqQRwKBgQCuE2Hr4BMPWbD3VjcAR/h9nEnBTwAQyEm8o9qpGM86yQqGwrau
+oJqTA06wAJ3ChlLv9NrW/RVPsF4THBQSCLsLOKu5JSmHO18mtGKAprEup3xilj2/
+cng5CyUBCYtRBARzJKEcUkiedNl/4bcXcwdk+rKO0Npd6IH6K65N1NHXDQKBgEIY
+Hdp+WWvZKPb/ffJ0kntU2bx++YwgltmeEkdUezsIu8ftrnMUqcS5qRvU2GO5Z17V
+r201azzD14FFdTFHOPIlZJRDJPdNQnA+M5JK9cDH1KMs0ZmKNLUTfidOGa4nKKfc
++ZYHPe59YWuqXiCeNxGpsYIZTx/5hLPWCJKPckkbAoGBAMVp1Wkt88j/Uj9sSeSY
+SL8p+oajciQt3cKJorToeF09bjDpY+2WHy3jI/lebvwE4vOZ8pMRrNhjFk0FLySI
+d3wL6EqpFiolLA1yT5g8Z5Wd6YUkEFyxluIlLB/MfdxPjoHSu6f1Bm7mo/0Xl14i
+CKHDb5auQhZXzlAQGfMCzOq8
 -----END PRIVATE KEY-----

src/main/resources/application.yaml

@@ -85,6 +85,17 @@ aliyun:
   oss-domain: https://9space-2021.oss-cn-shenzhen.aliyuncs.com
 general:
   host: https://nft.9space.vip
+#mychain:
+#  rest:
+#    bizid: a00e36c5
+#    cipher-suit: ec
+#    rest-url: https://rest.baas.alipay.com
+#    access-id: VB4osv3QHEHBGVZM
+#    access-secret: access.key
+#    tenantid: HEHBGVZM
+#    read-file-from-ext: false
+#    account: nine-space-official
+#    kmsId: m9U4I0R2HEHBGVZM1635922538317
 mychain:
   rest:
     bizid: a00e36c5

src/main/vue/package.json

@@ -8,7 +8,6 @@
     "build-theme": "npx et -o src/styles/element_theme"
   },
   "dependencies": {
-    "@download/blockies": "https://github.com/download13/blockies.git",
     "@fortawesome/fontawesome": "^1.1.8",
     "@fortawesome/fontawesome-free-solid": "^5.0.13",
     "@fortawesome/vue-fontawesome": "^0.1.7",

src/main/vue/src/views/AdminEdit.vue

@@ -65,8 +65,6 @@
     </div>
 </template>
 <script>
-import { toSvg } from 'jdenticon';
-import { createIcon } from '@download/blockies';
 import faker from 'faker';
 faker.locale = 'zh_CN';
 console.log(faker);
@@ -190,13 +188,6 @@ export default {
                 .catch(() => {});
         },
         gen() {
-            const icon = createIcon({
-                size: 10,
-                scale: 20
-            });
-            this.$http.post('/upload/base64', { base64: icon.toDataURL() }).then(res => {
-                this.formData.avatar = res;
-            });
             const card = faker.helpers.createCard();
             this.formData.username = card.username;
             this.formData.nickname = card.name;

src/main/vue/src/views/BannerEdit.vue

@@ -43,10 +43,12 @@
                         <el-switch v-model="formData.link"></el-switch>
                     </el-form-item>
                     <el-form-item prop="linkType" label="跳转类型">
-                        <el-input v-model="formData.linkType"></el-input>
+                        <el-select v-model="formData.linkType">
+                            <el-option label="藏品/盲盒" value="collection"></el-option>
+                        </el-select>
                     </el-form-item>
                     <el-form-item prop="linkContent" label="跳转内容">
-                        <el-input v-model="formData.linkContent"></el-input>
+                        <el-input v-model="formData.linkContent" placeholder="输入ID"></el-input>
                     </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>

src/main/vue/src/views/MinterEdit.vue

@@ -79,8 +79,6 @@
     </div>
 </template>
 <script>
-import { toSvg } from 'jdenticon';
-import { createIcon } from '@download/blockies';
 import randomstring from 'randomstring';
 import faker from 'faker';
 faker.locale = 'zh_CN';
@@ -221,13 +219,6 @@ export default {
                 .catch(() => {});
         },
         gen() {
-            const icon = createIcon({
-                size: 10,
-                scale: 20
-            });
-            this.$http.post('/upload/base64', { base64: icon.toDataURL() }).then(res => {
-                this.formData.avatar = res;
-            });
             const card = faker.helpers.createCard();
             this.formData.username = card.username;
             this.formData.nickname = card.name;

src/main/vue/src/views/UserEdit.vue

@@ -67,8 +67,6 @@
     </div>
 </template>
 <script>
-import { toSvg } from 'jdenticon';
-import { createIcon } from '@download/blockies';
 import faker from 'faker';
 faker.locale = 'zh_CN';
 console.log(faker);
@@ -187,13 +185,6 @@ export default {
                 .catch(() => {});
         },
         gen() {
-            const icon = createIcon({
-                size: 10,
-                scale: 20
-            });
-            this.$http.post('/upload/base64', { base64: icon.toDataURL() }).then(res => {
-                this.formData.avatar = res;
-            });
             const card = faker.helpers.createCard();
             this.formData.username = card.username;
             this.formData.nickname = card.name;

src/main/vue/yarn.lock

@@ -822,10 +822,6 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@download/blockies@https://github.com/download13/blockies.git":
-  version "1.0.3"
-  resolved "https://github.com/download13/blockies.git#55518d38203582cd4a7b55204b7a26f8032ea07e"
-
 "@fortawesome/fontawesome-common-types@^0.1.7":
   version "0.1.7"
   resolved "https://registry.npm.taobao.org/@fortawesome/fontawesome-common-types/download/@fortawesome/fontawesome-common-types-0.1.7.tgz#4336c4b06d0b5608ff1215464b66fcf9f4795284"