diff --git a/package.json b/package.json index e2df031b8..9bd4ea6cd 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "immer": "^9.0.19", "jsonwebtoken": "^9.0.0", "mongoose": "^6.10.0", + "nanoid": "^4.0.1", "next": "13.1.6", "nodemailer": "^6.9.1", "nprogress": "^0.2.0", @@ -43,7 +44,6 @@ "sass": "^1.58.3", "sharp": "^0.31.3", "tunnel": "^0.0.6", - "uuid": "^9.0.0", "zustand": "^4.3.5" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7fca8c44d..cc8858574 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,6 +32,7 @@ specifiers: jsonwebtoken: ^9.0.0 lint-staged: ^13.1.2 mongoose: ^6.10.0 + nanoid: ^4.0.1 next: 13.1.6 nodemailer: ^6.9.1 nprogress: ^0.2.0 @@ -49,7 +50,6 @@ specifiers: sharp: ^0.31.3 tunnel: ^0.0.6 typescript: 4.9.5 - uuid: ^9.0.0 zustand: ^4.3.5 dependencies: @@ -70,6 +70,7 @@ dependencies: immer: registry.npmmirror.com/immer/9.0.19 jsonwebtoken: registry.npmmirror.com/jsonwebtoken/9.0.0 mongoose: registry.npmmirror.com/mongoose/6.10.0 + nanoid: registry.npmmirror.com/nanoid/4.0.1 next: registry.npmmirror.com/next/13.1.6_wiv434v7erz4aedd5whhdwmpv4 nodemailer: registry.npmmirror.com/nodemailer/6.9.1 nprogress: registry.npmmirror.com/nprogress/0.2.0 @@ -85,7 +86,6 @@ dependencies: sass: registry.npmmirror.com/sass/1.58.3 sharp: registry.npmmirror.com/sharp/0.31.3 tunnel: registry.npmmirror.com/tunnel/0.0.6 - uuid: registry.npmmirror.com/uuid/9.0.0 zustand: registry.npmmirror.com/zustand/4.3.5_immer@9.0.19+react@18.2.0 devDependencies: @@ -8496,6 +8496,14 @@ packages: hasBin: true dev: false + registry.npmmirror.com/nanoid/4.0.1: + resolution: {integrity: sha512-udKGtCCUafD3nQtJg9wBhRP3KMbPglUsgV5JVsXhvyBs/oefqb4sqMEhKBBgqZncYowu58p1prsZQBYvAj/Gww==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nanoid/-/nanoid-4.0.1.tgz} + name: nanoid + version: 4.0.1 + engines: {node: ^14 || ^16 || >=18} + hasBin: true + dev: false + registry.npmmirror.com/napi-build-utils/1.0.2: resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz} name: napi-build-utils @@ -10335,13 +10343,6 @@ packages: dev: false optional: true - registry.npmmirror.com/uuid/9.0.0: - resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uuid/-/uuid-9.0.0.tgz} - name: uuid - version: 9.0.0 - hasBin: true - dev: false - registry.npmmirror.com/uvu/0.5.6: resolution: {integrity: sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uvu/-/uvu-0.5.6.tgz} name: uvu diff --git a/public/imgs/wxcode.jpg b/public/imgs/wxcode.jpg new file mode 100644 index 000000000..9656a9630 Binary files /dev/null and b/public/imgs/wxcode.jpg differ diff --git a/public/qrcode.min.js b/public/qrcode.min.js new file mode 100644 index 000000000..993e88f39 --- /dev/null +++ b/public/qrcode.min.js @@ -0,0 +1 @@ +var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j=0?p.get(q):0}}for(var r=0,m=0;mm;m++)for(var j=0;jm;m++)for(var j=0;j=0;)b^=f.G15<=0;)b^=f.G18<>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;cf;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=[''],h=0;d>h;h++){g.push("");for(var i=0;d>i;i++)g.push('');g.push("")}g.push("
"),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}(); \ No newline at end of file diff --git a/src/api/user.ts b/src/api/user.ts index 19b7f631a..d568860ae 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -55,3 +55,12 @@ export const getUserBills = (data: RequestPaging) => ...res, data: res.data.map((bill) => adaptBill(bill)) })); + +export const getPayCode = (amount: number) => + GET<{ + codeUrl: string; + orderId: string; + }>(`/user/getPayCode?amount=${amount}`); + +export const checkPayResult = (orderId: string) => + GET(`/user/checkPayResult?orderId=${orderId}`); diff --git a/src/components/Icon/icons/pay.svg b/src/components/Icon/icons/pay.svg new file mode 100644 index 000000000..eaf4cdd51 --- /dev/null +++ b/src/components/Icon/icons/pay.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/Icon/index.tsx b/src/components/Icon/index.tsx index c0abd88b8..124564f71 100644 --- a/src/components/Icon/index.tsx +++ b/src/components/Icon/index.tsx @@ -7,7 +7,8 @@ const map = { model: require('./icons/model.svg').default, share: require('./icons/share.svg').default, home: require('./icons/home.svg').default, - menu: require('./icons/menu.svg').default + menu: require('./icons/menu.svg').default, + pay: require('./icons/pay.svg').default }; export type IconName = keyof typeof map; diff --git a/src/components/Layout/auth.tsx b/src/components/Layout/auth.tsx index 682f99a66..950a58fde 100644 --- a/src/components/Layout/auth.tsx +++ b/src/components/Layout/auth.tsx @@ -1,7 +1,6 @@ import React from 'react'; import { useRouter } from 'next/router'; import { useToast } from '@chakra-ui/react'; -import { getTokenLogin } from '@/api/user'; import { useUserStore } from '@/store/user'; import { useGlobalStore } from '@/store/global'; import { useQuery } from '@tanstack/react-query'; @@ -19,7 +18,7 @@ const Auth = ({ children }: { children: JSX.Element }) => { position: 'top', status: 'warning' }); - const { userInfo, setUserInfo } = useUserStore(); + const { userInfo, initUserInfo } = useUserStore(); const { setLoading } = useGlobalStore(); useQuery( @@ -29,15 +28,10 @@ const Auth = ({ children }: { children: JSX.Element }) => { return setLoading(false); } else { setLoading(true); - return getTokenLogin(); + return initUserInfo(); } }, { - onSuccess(user) { - if (user) { - setUserInfo(user); - } - }, onError(error) { console.log('error->', error); router.push('/login'); diff --git a/src/constants/model.ts b/src/constants/model.ts index 34983ab0a..782e62071 100644 --- a/src/constants/model.ts +++ b/src/constants/model.ts @@ -24,7 +24,7 @@ export const ModelList: ModelConstantsData[] = [ trainName: 'turbo', maxToken: 4000, maxTemperature: 2, - price: 2 + price: 5 }, { serviceCompany: 'openai', @@ -33,7 +33,7 @@ export const ModelList: ModelConstantsData[] = [ trainName: 'davinci', maxToken: 4000, maxTemperature: 2, - price: 20 + price: 50 } ]; diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index d27927988..336d020a4 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -39,6 +39,7 @@ export default function App({ Component, pageProps }: AppProps) { + diff --git a/src/pages/api/user/checkPayResult.ts b/src/pages/api/user/checkPayResult.ts new file mode 100644 index 000000000..5b3a98488 --- /dev/null +++ b/src/pages/api/user/checkPayResult.ts @@ -0,0 +1,63 @@ +import type { NextApiRequest, NextApiResponse } from 'next'; +import { jsonRes } from '@/service/response'; +import axios from 'axios'; +import { connectToDatabase, User, Pay } from '@/service/mongo'; +import { authToken } from '@/service/utils/tools'; +import { formatPrice } from '@/utils/user'; + +export default async function handler(req: NextApiRequest, res: NextApiResponse) { + try { + const { authorization } = req.headers; + let { orderId } = req.query as { orderId: string }; + + const userId = await authToken(authorization); + + const { data } = await axios.get( + `https://sif268.laf.dev/wechat-order-query?order_number=${orderId}&api_key=${process.env.WXPAYCODE}` + ); + + if (data.trade_state === 'SUCCESS') { + await connectToDatabase(); + + // 重复记录校验 + const count = await Pay.count({ + orderId + }); + + if (count > 0) { + throw new Error('订单重复，请刷新'); + } + + // 计算实际充值。把分转成数据库的值 + const price = data.amount.total * 0.01 * 100000; + let payId; + try { + // 充值记录 +1 + const payRecord = await Pay.create({ + userId, + price, + orderId + }); + payId = payRecord._id; + // 充钱 + await User.findByIdAndUpdate(userId, { + $inc: { balance: price } + }); + } catch (error) { + payId && Pay.findByIdAndDelete(payId); + } + + jsonRes(res, { + data: 'success' + }); + } else { + throw new Error(data.trade_state_desc); + } + } catch (err) { + console.log(err); + jsonRes(res, { + code: 500, + error: err + }); + } +} diff --git a/src/pages/api/user/getPayCode.ts b/src/pages/api/user/getPayCode.ts new file mode 100644 index 000000000..1a2c391b3 --- /dev/null +++ b/src/pages/api/user/getPayCode.ts @@ -0,0 +1,45 @@ +// Next.js API route support: https://nextjs.org/docs/api-routes/introduction +import type { NextApiRequest, NextApiResponse } from 'next'; +import { jsonRes } from '@/service/response'; +import axios from 'axios'; +import { authToken } from '@/service/utils/tools'; +import { customAlphabet } from 'nanoid'; +const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 20); + +export default async function handler(req: NextApiRequest, res: NextApiResponse) { + try { + const { authorization } = req.headers; + let { amount = 0 } = req.query as { amount: string }; + amount = +amount; + + if (!authorization) { + throw new Error('缺少登录凭证'); + } + await authToken(authorization); + + const id = nanoid(); + + const response = await axios({ + url: 'https://sif268.laf.dev/wechat-pay', + method: 'POST', + data: { + trade_order_number: id, + amount: amount * 100, + api_key: process.env.WXPAYCODE + } + }); + + jsonRes(res, { + data: { + orderId: id, + codeUrl: response.data?.code_url + } + }); + } catch (err) { + console.log(err); + jsonRes(res, { + code: 500, + error: err + }); + } +} diff --git a/src/pages/chat/components/SlideBar.tsx b/src/pages/chat/components/SlideBar.tsx index 97e63c617..7e40e3006 100644 --- a/src/pages/chat/components/SlideBar.tsx +++ b/src/pages/chat/components/SlideBar.tsx @@ -32,6 +32,7 @@ import { useCopyData } from '@/utils/tools'; import Markdown from '@/components/Markdown'; import { shareHint } from '@/constants/common'; import { getChatSiteId } from '@/api/chat'; +import Image from 'next/image'; const SlideBar = ({ name, @@ -53,6 +54,7 @@ const SlideBar = ({ const { chatHistory, removeChatHistoryByWindowId } = useChatStore(); const [hasReady, setHasReady] = useState(false); const { isOpen: isOpenShare, onOpen: onOpenShare, onClose: onCloseShare } = useDisclosure(); + const { isOpen: isOpenWx, onOpen: onOpenWx, onClose: onCloseWx } = useDisclosure(); const { isSuccess } = useQuery(['init'], getMyModels, { cacheTime: 5 * 60 * 1000 @@ -113,7 +115,13 @@ const SlideBar = ({ ); - const RenderButton = ({ onClick, children }: { onClick: () => void; children: JSX.Element }) => ( + const RenderButton = ({ + onClick, + children + }: { + onClick: () => void; + children: JSX.Element | string; + }) => ( + router.push('/number/setting')}> + <> + + 充值 + + - + + + 交流群 + : } aria-label={''} @@ -242,7 +259,7 @@ const SlideBar = ({ }} onClick={toggleColorMode} /> - + {/* 分享提示modal */} @@ -287,6 +304,35 @@ const SlideBar = ({ + {/* wx 联系 */} + + + + wx交流群 + + + + + 微信号:{' '} + + YNyiqi + + + + + + + + + ); }; diff --git a/src/pages/model/components/CreateModel.tsx b/src/pages/model/components/CreateModel.tsx index 5e368acdc..ec4e396a0 100644 --- a/src/pages/model/components/CreateModel.tsx +++ b/src/pages/model/components/CreateModel.tsx @@ -1,4 +1,4 @@ -import React, { Dispatch, useState, useCallback } from 'react'; +import React, { Dispatch, useState, useCallback, useMemo } from 'react'; import { Modal, ModalOverlay, @@ -12,12 +12,14 @@ import { Button, useToast, Input, - Select + Select, + Box } from '@chakra-ui/react'; import { useForm } from 'react-hook-form'; import { postCreateModel } from '@/api/model'; import type { ModelSchema } from '@/types/mongoSchema'; import { ModelList } from '@/constants/model'; +import { formatPrice } from '@/utils/user'; interface CreateFormType { name: string; @@ -37,6 +39,7 @@ const CreateModel = ({ position: 'top' }); const { + getValues, register, handleSubmit, formState: { errors } @@ -105,6 +108,12 @@ const CreateModel = ({ {!!errors.serviceModelName && errors.serviceModelName.message} + + {formatPrice( + ModelList.find((item) => item.model === getValues('serviceModelName'))?.price || 0 + ) * 1000} + 元/1000字(包括上下文和标点符号) + diff --git a/src/pages/number/components/PayModal.tsx b/src/pages/number/components/PayModal.tsx new file mode 100644 index 000000000..5a6f0e5dc --- /dev/null +++ b/src/pages/number/components/PayModal.tsx @@ -0,0 +1,138 @@ +import React, { useState, useCallback } from 'react'; +import { + Modal, + ModalOverlay, + ModalContent, + ModalHeader, + ModalFooter, + ModalBody, + ModalCloseButton, + Button, + Input, + Box, + Grid +} from '@chakra-ui/react'; +import { getPayCode, checkPayResult } from '@/api/user'; +import { useToast } from '@/hooks/useToast'; +import { useQuery } from '@tanstack/react-query'; +import { useUserStore } from '@/store/user'; + +const PayModal = ({ onClose }: { onClose: () => void }) => { + const { toast } = useToast(); + const { initUserInfo } = useUserStore(); + const [inputVal, setInputVal] = useState(''); + const [loading, setLoading] = useState(false); + const [orderId, setOrderId] = useState(''); + + const handleClickPay = useCallback(async () => { + if (!inputVal || inputVal <= 0 || isNaN(+inputVal)) return; + setLoading(true); + try { + // 获取支付二维码 + const res = await getPayCode(inputVal); + new QRCode(document.getElementById('payQRCode'), { + text: res.codeUrl, + width: 128, + height: 128, + colorDark: '#000000', + colorLight: '#ffffff', + correctLevel: QRCode.CorrectLevel.H + }); + setOrderId(res.orderId); + } catch (error) { + toast({ + title: '出现了一些意外...', + status: 'error' + }); + console.log(error); + } + setLoading(false); + }, [inputVal, toast]); + + useQuery( + [orderId], + () => { + if (!orderId) return null; + return checkPayResult(orderId); + }, + { + refetchInterval: 2000, + onSuccess(res) { + if (!res) return; + onClose(); + initUserInfo(); + toast({ + title: '充值成功', + status: 'success' + }); + } + } + ); + + return ( + <> + { + if (orderId) return; + onClose(); + }} + > + + + 充值 + {!orderId && } + + + {!orderId && ( + <> + + {[5, 10, 20, 50].map((item) => ( + + ))} + + + { + setInputVal(Math.floor(+e.target.value)); + }} + > + + + )} + {/* 付费二维码 */} + + {orderId && 请微信扫码支付: {inputVal}元，请勿关闭页面} + + + + + + {!orderId && ( + <> + + + + )} + + + + + ); +}; + +export default PayModal; diff --git a/src/pages/number/setting.tsx b/src/pages/number/setting.tsx index 2e0fa5f65..c0c9557a2 100644 --- a/src/pages/number/setting.tsx +++ b/src/pages/number/setting.tsx @@ -1,4 +1,4 @@ -import React, { useCallback } from 'react'; +import React, { useCallback, useState } from 'react'; import { Card, Box, @@ -25,13 +25,18 @@ import { useUserStore } from '@/store/user'; import { UserType } from '@/types/user'; import { usePaging } from '@/hooks/usePaging'; import type { UserBillType } from '@/types/user'; +import { useQuery } from '@tanstack/react-query'; +import dynamic from 'next/dynamic'; + +const PayModal = dynamic(() => import('./components/PayModal')); const NumberSetting = () => { - const { userInfo, updateUserInfo } = useUserStore(); + const { userInfo, updateUserInfo, initUserInfo } = useUserStore(); const { setLoading } = useGlobalStore(); const { register, handleSubmit, control } = useForm({ defaultValues: userInfo as UserType }); + const [showPay, setShowPay] = useState(false); const { toast } = useToast(); const { fields: accounts, @@ -43,9 +48,9 @@ const NumberSetting = () => { }); const { setPageNum, data: bills } = usePaging({ api: getUserBills, - pageSize: 20 + pageSize: 30 }); - console.log(bills); + const onclickSave = useCallback( async (data: UserUpdateParams) => { setLoading(true); @@ -62,6 +67,8 @@ const NumberSetting = () => { [setLoading, toast, updateUserInfo] ); + useQuery(['init'], initUserInfo); + return ( <> @@ -80,9 +87,9 @@ const NumberSetting = () => { {userInfo?.balance} 元 - {/* */} + @@ -181,6 +188,7 @@ const NumberSetting = () => { + {showPay && setShowPay(false)} />} ); }; diff --git a/src/service/events/bill.ts b/src/service/events/bill.ts index 79645fd4a..db2ec25ee 100644 --- a/src/service/events/bill.ts +++ b/src/service/events/bill.ts @@ -36,6 +36,6 @@ export const pushBill = async ({ $inc: { balance: -price } }); } catch (error) { - Bill.findByIdAndDelete(billId); + billId && Bill.findByIdAndDelete(billId); } }; diff --git a/src/service/models/pay.ts b/src/service/models/pay.ts new file mode 100644 index 000000000..f93374656 --- /dev/null +++ b/src/service/models/pay.ts @@ -0,0 +1,23 @@ +import { Schema, model, models } from 'mongoose'; + +const PaySchema = new Schema({ + userId: { + type: Schema.Types.ObjectId, + ref: 'user', + required: true + }, + time: { + type: Number, + default: () => Date.now() + }, + price: { + type: Number, + required: true + }, + orderId: { + type: String, + required: true + } +}); + +export const Pay = models['pay'] || model('pay', PaySchema); diff --git a/src/service/models/user.ts b/src/service/models/user.ts index 32e932c19..3cf5a250e 100644 --- a/src/service/models/user.ts +++ b/src/service/models/user.ts @@ -16,7 +16,7 @@ const UserSchema = new Schema({ }, balance: { type: Number, - default: 0 + default: 0.5 }, accounts: [ { diff --git a/src/service/mongo.ts b/src/service/mongo.ts index 5fc6f5b4c..11773eae8 100644 --- a/src/service/mongo.ts +++ b/src/service/mongo.ts @@ -31,3 +31,4 @@ export * from './models/model'; export * from './models/user'; export * from './models/training'; export * from './models/bill'; +export * from './models/pay'; diff --git a/src/service/utils/tools.ts b/src/service/utils/tools.ts index eec171d0e..b15914454 100644 --- a/src/service/utils/tools.ts +++ b/src/service/utils/tools.ts @@ -22,8 +22,12 @@ export const generateToken = (userId: string) => { }; /* 校验 token */ -export const authToken = (token: string): Promise => { +export const authToken = (token?: string): Promise => { return new Promise((resolve, reject) => { + if (!token) { + reject('缺少登录凭证'); + return; + } const key = process.env.TOKEN_KEY as string; jwt.verify(token, key, function (err, decoded: any) { diff --git a/src/store/user.ts b/src/store/user.ts index a127c545e..ec5bf538b 100644 --- a/src/store/user.ts +++ b/src/store/user.ts @@ -6,9 +6,11 @@ import type { ModelSchema } from '@/types/mongoSchema'; import { setToken } from '@/utils/user'; import { getMyModels } from '@/api/model'; import { formatPrice } from '@/utils/user'; +import { getTokenLogin } from '@/api/user'; type State = { userInfo: UserType | null; + initUserInfo: () => Promise; setUserInfo: (user: UserType, token?: string) => void; updateUserInfo: (user: UserUpdateParams) => void; myModels: ModelSchema[]; @@ -20,6 +22,11 @@ export const useUserStore = create()( devtools( immer((set, get) => ({ userInfo: null, + async initUserInfo() { + const res = await getTokenLogin(); + get().setUserInfo(res); + return null; + }, setUserInfo(user: UserType, token?: string) { set((state) => { state.userInfo = { diff --git a/src/types/index.d.ts b/src/types/index.d.ts index 2f38065e9..6c4cda107 100644 --- a/src/types/index.d.ts +++ b/src/types/index.d.ts @@ -2,6 +2,7 @@ import type { Mongoose } from 'mongoose'; declare global { var mongodb: Mongoose | string | null; + var QRCode: any; } export type PagingData = { diff --git a/src/types/user.d.ts b/src/types/user.d.ts index 85c49be75..f1573226d 100644 --- a/src/types/user.d.ts +++ b/src/types/user.d.ts @@ -14,6 +14,7 @@ export interface UserType { } export interface UserUpdateParams { + balance?: number; accounts?: { type: string; value: string;