Merge remote-tracking branch 'origin/master'
# Conflicts: # ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java # ruoyi-cms/src/main/resources/templates/web/index.html
This commit is contained in:
flower
commit
8a0736d8fe
|
|
@ -25,7 +25,9 @@ public class SysIndexController extends BaseController
|
|||
@GetMapping({"","/"})
|
||||
public String cmsindex(ModelMap mmap)
|
||||
{
|
||||
|
||||
// 取身份信息
|
||||
SysUser user = getSysUser();
|
||||
mmap.put("user", user);
|
||||
return "web";
|
||||
}
|
||||
// 系统首页
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ gen:
|
|||
# 作者
|
||||
author: zhujj
|
||||
# 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
|
||||
packageName: com.ruoyi.exam
|
||||
packageName: com.ruoyi.vip
|
||||
# 自动去除表前缀，默认是true
|
||||
autoRemovePre: false
|
||||
# 表前缀(类名不会包含表前缀)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,614 @@
|
|||
/**
|
||||
* @fileoverview
|
||||
* - Using the 'QRCode for Javascript library'
|
||||
* - Fixed dataset of 'QRCode for Javascript library' for support full-spec.
|
||||
* - this library has no dependencies.
|
||||
*
|
||||
* @author davidshimjs
|
||||
* @see <a href="http://www.d-project.com/" target="_blank">http://www.d-project.com/</a>
|
||||
* @see <a href="http://jeromeetienne.github.com/jquery-qrcode/" target="_blank">http://jeromeetienne.github.com/jquery-qrcode/</a>
|
||||
*/
|
||||
var QRCode;
|
||||
|
||||
(function () {
|
||||
//---------------------------------------------------------------------
|
||||
// QRCode for JavaScript
|
||||
//
|
||||
// Copyright (c) 2009 Kazuhiko Arase
|
||||
//
|
||||
// URL: http://www.d-project.com/
|
||||
//
|
||||
// Licensed under the MIT license:
|
||||
// http://www.opensource.org/licenses/mit-license.php
|
||||
//
|
||||
// The word "QR Code" is registered trademark of
|
||||
// DENSO WAVE INCORPORATED
|
||||
// http://www.denso-wave.com/qrcode/faqpatent-e.html
|
||||
//
|
||||
//---------------------------------------------------------------------
|
||||
function QR8bitByte(data) {
|
||||
this.mode = QRMode.MODE_8BIT_BYTE;
|
||||
this.data = data;
|
||||
this.parsedData = [];
|
||||
|
||||
// Added to support UTF-8 Characters
|
||||
for (var i = 0, l = this.data.length; i < l; i++) {
|
||||
var byteArray = [];
|
||||
var code = this.data.charCodeAt(i);
|
||||
|
||||
if (code > 0x10000) {
|
||||
byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18);
|
||||
byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12);
|
||||
byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6);
|
||||
byteArray[3] = 0x80 | (code & 0x3F);
|
||||
} else if (code > 0x800) {
|
||||
byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12);
|
||||
byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6);
|
||||
byteArray[2] = 0x80 | (code & 0x3F);
|
||||
} else if (code > 0x80) {
|
||||
byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6);
|
||||
byteArray[1] = 0x80 | (code & 0x3F);
|
||||
} else {
|
||||
byteArray[0] = code;
|
||||
}
|
||||
|
||||
this.parsedData.push(byteArray);
|
||||
}
|
||||
|
||||
this.parsedData = Array.prototype.concat.apply([], this.parsedData);
|
||||
|
||||
if (this.parsedData.length != this.data.length) {
|
||||
this.parsedData.unshift(191);
|
||||
this.parsedData.unshift(187);
|
||||
this.parsedData.unshift(239);
|
||||
}
|
||||
}
|
||||
|
||||
QR8bitByte.prototype = {
|
||||
getLength: function (buffer) {
|
||||
return this.parsedData.length;
|
||||
},
|
||||
write: function (buffer) {
|
||||
for (var i = 0, l = this.parsedData.length; i < l; i++) {
|
||||
buffer.put(this.parsedData[i], 8);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
function QRCodeModel(typeNumber, errorCorrectLevel) {
|
||||
this.typeNumber = typeNumber;
|
||||
this.errorCorrectLevel = errorCorrectLevel;
|
||||
this.modules = null;
|
||||
this.moduleCount = 0;
|
||||
this.dataCache = null;
|
||||
this.dataList = [];
|
||||
}
|
||||
|
||||
QRCodeModel.prototype={addData:function(data){var newData=new QR8bitByte(data);this.dataList.push(newData);this.dataCache=null;},isDark:function(row,col){if(row<0||this.moduleCount<=row||col<0||this.moduleCount<=col){throw new Error(row+","+col);}
|
||||
return this.modules[row][col];},getModuleCount:function(){return this.moduleCount;},make:function(){this.makeImpl(false,this.getBestMaskPattern());},makeImpl:function(test,maskPattern){this.moduleCount=this.typeNumber*4+17;this.modules=new Array(this.moduleCount);for(var row=0;row<this.moduleCount;row++){this.modules[row]=new Array(this.moduleCount);for(var col=0;col<this.moduleCount;col++){this.modules[row][col]=null;}}
|
||||
this.setupPositionProbePattern(0,0);this.setupPositionProbePattern(this.moduleCount-7,0);this.setupPositionProbePattern(0,this.moduleCount-7);this.setupPositionAdjustPattern();this.setupTimingPattern();this.setupTypeInfo(test,maskPattern);if(this.typeNumber>=7){this.setupTypeNumber(test);}
|
||||
if(this.dataCache==null){this.dataCache=QRCodeModel.createData(this.typeNumber,this.errorCorrectLevel,this.dataList);}
|
||||
this.mapData(this.dataCache,maskPattern);},setupPositionProbePattern:function(row,col){for(var r=-1;r<=7;r++){if(row+r<=-1||this.moduleCount<=row+r)continue;for(var c=-1;c<=7;c++){if(col+c<=-1||this.moduleCount<=col+c)continue;if((0<=r&&r<=6&&(c==0||c==6))||(0<=c&&c<=6&&(r==0||r==6))||(2<=r&&r<=4&&2<=c&&c<=4)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}},getBestMaskPattern:function(){var minLostPoint=0;var pattern=0;for(var i=0;i<8;i++){this.makeImpl(true,i);var lostPoint=QRUtil.getLostPoint(this);if(i==0||minLostPoint>lostPoint){minLostPoint=lostPoint;pattern=i;}}
|
||||
return pattern;},createMovieClip:function(target_mc,instance_name,depth){var qr_mc=target_mc.createEmptyMovieClip(instance_name,depth);var cs=1;this.make();for(var row=0;row<this.modules.length;row++){var y=row*cs;for(var col=0;col<this.modules[row].length;col++){var x=col*cs;var dark=this.modules[row][col];if(dark){qr_mc.beginFill(0,100);qr_mc.moveTo(x,y);qr_mc.lineTo(x+cs,y);qr_mc.lineTo(x+cs,y+cs);qr_mc.lineTo(x,y+cs);qr_mc.endFill();}}}
|
||||
return qr_mc;},setupTimingPattern:function(){for(var r=8;r<this.moduleCount-8;r++){if(this.modules[r][6]!=null){continue;}
|
||||
this.modules[r][6]=(r%2==0);}
|
||||
for(var c=8;c<this.moduleCount-8;c++){if(this.modules[6][c]!=null){continue;}
|
||||
this.modules[6][c]=(c%2==0);}},setupPositionAdjustPattern:function(){var pos=QRUtil.getPatternPosition(this.typeNumber);for(var i=0;i<pos.length;i++){for(var j=0;j<pos.length;j++){var row=pos[i];var col=pos[j];if(this.modules[row][col]!=null){continue;}
|
||||
for(var r=-2;r<=2;r++){for(var c=-2;c<=2;c++){if(r==-2||r==2||c==-2||c==2||(r==0&&c==0)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}}}},setupTypeNumber:function(test){var bits=QRUtil.getBCHTypeNumber(this.typeNumber);for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[Math.floor(i/3)][i%3+this.moduleCount-8-3]=mod;}
|
||||
for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[i%3+this.moduleCount-8-3][Math.floor(i/3)]=mod;}},setupTypeInfo:function(test,maskPattern){var data=(this.errorCorrectLevel<<3)|maskPattern;var bits=QRUtil.getBCHTypeInfo(data);for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<6){this.modules[i][8]=mod;}else if(i<8){this.modules[i+1][8]=mod;}else{this.modules[this.moduleCount-15+i][8]=mod;}}
|
||||
for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<8){this.modules[8][this.moduleCount-i-1]=mod;}else if(i<9){this.modules[8][15-i-1+1]=mod;}else{this.modules[8][15-i-1]=mod;}}
|
||||
this.modules[this.moduleCount-8][8]=(!test);},mapData:function(data,maskPattern){var inc=-1;var row=this.moduleCount-1;var bitIndex=7;var byteIndex=0;for(var col=this.moduleCount-1;col>0;col-=2){if(col==6)col--;while(true){for(var c=0;c<2;c++){if(this.modules[row][col-c]==null){var dark=false;if(byteIndex<data.length){dark=(((data[byteIndex]>>>bitIndex)&1)==1);}
|
||||
var mask=QRUtil.getMask(maskPattern,row,col-c);if(mask){dark=!dark;}
|
||||
this.modules[row][col-c]=dark;bitIndex--;if(bitIndex==-1){byteIndex++;bitIndex=7;}}}
|
||||
row+=inc;if(row<0||this.moduleCount<=row){row-=inc;inc=-inc;break;}}}}};QRCodeModel.PAD0=0xEC;QRCodeModel.PAD1=0x11;QRCodeModel.createData=function(typeNumber,errorCorrectLevel,dataList){var rsBlocks=QRRSBlock.getRSBlocks(typeNumber,errorCorrectLevel);var buffer=new QRBitBuffer();for(var i=0;i<dataList.length;i++){var data=dataList[i];buffer.put(data.mode,4);buffer.put(data.getLength(),QRUtil.getLengthInBits(data.mode,typeNumber));data.write(buffer);}
|
||||
var totalDataCount=0;for(var i=0;i<rsBlocks.length;i++){totalDataCount+=rsBlocks[i].dataCount;}
|
||||
if(buffer.getLengthInBits()>totalDataCount*8){throw new Error("code length overflow. ("
|
||||
+buffer.getLengthInBits()
|
||||
+">"
|
||||
+totalDataCount*8
|
||||
+")");}
|
||||
if(buffer.getLengthInBits()+4<=totalDataCount*8){buffer.put(0,4);}
|
||||
while(buffer.getLengthInBits()%8!=0){buffer.putBit(false);}
|
||||
while(true){if(buffer.getLengthInBits()>=totalDataCount*8){break;}
|
||||
buffer.put(QRCodeModel.PAD0,8);if(buffer.getLengthInBits()>=totalDataCount*8){break;}
|
||||
buffer.put(QRCodeModel.PAD1,8);}
|
||||
return QRCodeModel.createBytes(buffer,rsBlocks);};QRCodeModel.createBytes=function(buffer,rsBlocks){var offset=0;var maxDcCount=0;var maxEcCount=0;var dcdata=new Array(rsBlocks.length);var ecdata=new Array(rsBlocks.length);for(var r=0;r<rsBlocks.length;r++){var dcCount=rsBlocks[r].dataCount;var ecCount=rsBlocks[r].totalCount-dcCount;maxDcCount=Math.max(maxDcCount,dcCount);maxEcCount=Math.max(maxEcCount,ecCount);dcdata[r]=new Array(dcCount);for(var i=0;i<dcdata[r].length;i++){dcdata[r][i]=0xff&buffer.buffer[i+offset];}
|
||||
offset+=dcCount;var rsPoly=QRUtil.getErrorCorrectPolynomial(ecCount);var rawPoly=new QRPolynomial(dcdata[r],rsPoly.getLength()-1);var modPoly=rawPoly.mod(rsPoly);ecdata[r]=new Array(rsPoly.getLength()-1);for(var i=0;i<ecdata[r].length;i++){var modIndex=i+modPoly.getLength()-ecdata[r].length;ecdata[r][i]=(modIndex>=0)?modPoly.get(modIndex):0;}}
|
||||
var totalCodeCount=0;for(var i=0;i<rsBlocks.length;i++){totalCodeCount+=rsBlocks[i].totalCount;}
|
||||
var data=new Array(totalCodeCount);var index=0;for(var i=0;i<maxDcCount;i++){for(var r=0;r<rsBlocks.length;r++){if(i<dcdata[r].length){data[index++]=dcdata[r][i];}}}
|
||||
for(var i=0;i<maxEcCount;i++){for(var r=0;r<rsBlocks.length;r++){if(i<ecdata[r].length){data[index++]=ecdata[r][i];}}}
|
||||
return data;};var QRMode={MODE_NUMBER:1<<0,MODE_ALPHA_NUM:1<<1,MODE_8BIT_BYTE:1<<2,MODE_KANJI:1<<3};var QRErrorCorrectLevel={L:1,M:0,Q:3,H:2};var QRMaskPattern={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7};var QRUtil={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:(1<<10)|(1<<8)|(1<<5)|(1<<4)|(1<<2)|(1<<1)|(1<<0),G18:(1<<12)|(1<<11)|(1<<10)|(1<<9)|(1<<8)|(1<<5)|(1<<2)|(1<<0),G15_MASK:(1<<14)|(1<<12)|(1<<10)|(1<<4)|(1<<1),getBCHTypeInfo:function(data){var d=data<<10;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)>=0){d^=(QRUtil.G15<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)));}
|
||||
return((data<<10)|d)^QRUtil.G15_MASK;},getBCHTypeNumber:function(data){var d=data<<12;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)>=0){d^=(QRUtil.G18<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)));}
|
||||
return(data<<12)|d;},getBCHDigit:function(data){var digit=0;while(data!=0){digit++;data>>>=1;}
|
||||
return digit;},getPatternPosition:function(typeNumber){return QRUtil.PATTERN_POSITION_TABLE[typeNumber-1];},getMask:function(maskPattern,i,j){switch(maskPattern){case QRMaskPattern.PATTERN000:return(i+j)%2==0;case QRMaskPattern.PATTERN001:return i%2==0;case QRMaskPattern.PATTERN010:return j%3==0;case QRMaskPattern.PATTERN011:return(i+j)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(i/2)+Math.floor(j/3))%2==0;case QRMaskPattern.PATTERN101:return(i*j)%2+(i*j)%3==0;case QRMaskPattern.PATTERN110:return((i*j)%2+(i*j)%3)%2==0;case QRMaskPattern.PATTERN111:return((i*j)%3+(i+j)%2)%2==0;default:throw new Error("bad maskPattern:"+maskPattern);}},getErrorCorrectPolynomial:function(errorCorrectLength){var a=new QRPolynomial([1],0);for(var i=0;i<errorCorrectLength;i++){a=a.multiply(new QRPolynomial([1,QRMath.gexp(i)],0));}
|
||||
return a;},getLengthInBits:function(mode,type){if(1<=type&&type<10){switch(mode){case QRMode.MODE_NUMBER:return 10;case QRMode.MODE_ALPHA_NUM:return 9;case QRMode.MODE_8BIT_BYTE:return 8;case QRMode.MODE_KANJI:return 8;default:throw new Error("mode:"+mode);}}else if(type<27){switch(mode){case QRMode.MODE_NUMBER:return 12;case QRMode.MODE_ALPHA_NUM:return 11;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 10;default:throw new Error("mode:"+mode);}}else if(type<41){switch(mode){case QRMode.MODE_NUMBER:return 14;case QRMode.MODE_ALPHA_NUM:return 13;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 12;default:throw new Error("mode:"+mode);}}else{throw new Error("type:"+type);}},getLostPoint:function(qrCode){var moduleCount=qrCode.getModuleCount();var lostPoint=0;for(var row=0;row<moduleCount;row++){for(var col=0;col<moduleCount;col++){var sameCount=0;var dark=qrCode.isDark(row,col);for(var r=-1;r<=1;r++){if(row+r<0||moduleCount<=row+r){continue;}
|
||||
for(var c=-1;c<=1;c++){if(col+c<0||moduleCount<=col+c){continue;}
|
||||
if(r==0&&c==0){continue;}
|
||||
if(dark==qrCode.isDark(row+r,col+c)){sameCount++;}}}
|
||||
if(sameCount>5){lostPoint+=(3+sameCount-5);}}}
|
||||
for(var row=0;row<moduleCount-1;row++){for(var col=0;col<moduleCount-1;col++){var count=0;if(qrCode.isDark(row,col))count++;if(qrCode.isDark(row+1,col))count++;if(qrCode.isDark(row,col+1))count++;if(qrCode.isDark(row+1,col+1))count++;if(count==0||count==4){lostPoint+=3;}}}
|
||||
for(var row=0;row<moduleCount;row++){for(var col=0;col<moduleCount-6;col++){if(qrCode.isDark(row,col)&&!qrCode.isDark(row,col+1)&&qrCode.isDark(row,col+2)&&qrCode.isDark(row,col+3)&&qrCode.isDark(row,col+4)&&!qrCode.isDark(row,col+5)&&qrCode.isDark(row,col+6)){lostPoint+=40;}}}
|
||||
for(var col=0;col<moduleCount;col++){for(var row=0;row<moduleCount-6;row++){if(qrCode.isDark(row,col)&&!qrCode.isDark(row+1,col)&&qrCode.isDark(row+2,col)&&qrCode.isDark(row+3,col)&&qrCode.isDark(row+4,col)&&!qrCode.isDark(row+5,col)&&qrCode.isDark(row+6,col)){lostPoint+=40;}}}
|
||||
var darkCount=0;for(var col=0;col<moduleCount;col++){for(var row=0;row<moduleCount;row++){if(qrCode.isDark(row,col)){darkCount++;}}}
|
||||
var ratio=Math.abs(100*darkCount/moduleCount/moduleCount-50)/5;lostPoint+=ratio*10;return lostPoint;}};var QRMath={glog:function(n){if(n<1){throw new Error("glog("+n+")");}
|
||||
return QRMath.LOG_TABLE[n];},gexp:function(n){while(n<0){n+=255;}
|
||||
while(n>=256){n-=255;}
|
||||
return QRMath.EXP_TABLE[n];},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)};for(var i=0;i<8;i++){QRMath.EXP_TABLE[i]=1<<i;}
|
||||
for(var i=8;i<256;i++){QRMath.EXP_TABLE[i]=QRMath.EXP_TABLE[i-4]^QRMath.EXP_TABLE[i-5]^QRMath.EXP_TABLE[i-6]^QRMath.EXP_TABLE[i-8];}
|
||||
for(var i=0;i<255;i++){QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]]=i;}
|
||||
function QRPolynomial(num,shift){if(num.length==undefined){throw new Error(num.length+"/"+shift);}
|
||||
var offset=0;while(offset<num.length&&num[offset]==0){offset++;}
|
||||
this.num=new Array(num.length-offset+shift);for(var i=0;i<num.length-offset;i++){this.num[i]=num[i+offset];}}
|
||||
QRPolynomial.prototype={get:function(index){return this.num[index];},getLength:function(){return this.num.length;},multiply:function(e){var num=new Array(this.getLength()+e.getLength()-1);for(var i=0;i<this.getLength();i++){for(var j=0;j<e.getLength();j++){num[i+j]^=QRMath.gexp(QRMath.glog(this.get(i))+QRMath.glog(e.get(j)));}}
|
||||
return new QRPolynomial(num,0);},mod:function(e){if(this.getLength()-e.getLength()<0){return this;}
|
||||
var ratio=QRMath.glog(this.get(0))-QRMath.glog(e.get(0));var num=new Array(this.getLength());for(var i=0;i<this.getLength();i++){num[i]=this.get(i);}
|
||||
for(var i=0;i<e.getLength();i++){num[i]^=QRMath.gexp(QRMath.glog(e.get(i))+ratio);}
|
||||
return new QRPolynomial(num,0).mod(e);}};function QRRSBlock(totalCount,dataCount){this.totalCount=totalCount;this.dataCount=dataCount;}
|
||||
QRRSBlock.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];QRRSBlock.getRSBlocks=function(typeNumber,errorCorrectLevel){var rsBlock=QRRSBlock.getRsBlockTable(typeNumber,errorCorrectLevel);if(rsBlock==undefined){throw new Error("bad rs block @ typeNumber:"+typeNumber+"/errorCorrectLevel:"+errorCorrectLevel);}
|
||||
var length=rsBlock.length/3;var list=[];for(var i=0;i<length;i++){var count=rsBlock[i*3+0];var totalCount=rsBlock[i*3+1];var dataCount=rsBlock[i*3+2];for(var j=0;j<count;j++){list.push(new QRRSBlock(totalCount,dataCount));}}
|
||||
return list;};QRRSBlock.getRsBlockTable=function(typeNumber,errorCorrectLevel){switch(errorCorrectLevel){case QRErrorCorrectLevel.L:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+0];case QRErrorCorrectLevel.M:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+1];case QRErrorCorrectLevel.Q:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+2];case QRErrorCorrectLevel.H:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+3];default:return undefined;}};function QRBitBuffer(){this.buffer=[];this.length=0;}
|
||||
QRBitBuffer.prototype={get:function(index){var bufIndex=Math.floor(index/8);return((this.buffer[bufIndex]>>>(7-index%8))&1)==1;},put:function(num,length){for(var i=0;i<length;i++){this.putBit(((num>>>(length-i-1))&1)==1);}},getLengthInBits:function(){return this.length;},putBit:function(bit){var bufIndex=Math.floor(this.length/8);if(this.buffer.length<=bufIndex){this.buffer.push(0);}
|
||||
if(bit){this.buffer[bufIndex]|=(0x80>>>(this.length%8));}
|
||||
this.length++;}};var QRCodeLimitLength=[[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]];
|
||||
|
||||
function _isSupportCanvas() {
|
||||
return typeof CanvasRenderingContext2D != "undefined";
|
||||
}
|
||||
|
||||
// android 2.x doesn't support Data-URI spec
|
||||
function _getAndroid() {
|
||||
var android = false;
|
||||
var sAgent = navigator.userAgent;
|
||||
|
||||
if (/android/i.test(sAgent)) { // android
|
||||
android = true;
|
||||
var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i);
|
||||
|
||||
if (aMat && aMat[1]) {
|
||||
android = parseFloat(aMat[1]);
|
||||
}
|
||||
}
|
||||
|
||||
return android;
|
||||
}
|
||||
|
||||
var svgDrawer = (function() {
|
||||
|
||||
var Drawing = function (el, htOption) {
|
||||
this._el = el;
|
||||
this._htOption = htOption;
|
||||
};
|
||||
|
||||
Drawing.prototype.draw = function (oQRCode) {
|
||||
var _htOption = this._htOption;
|
||||
var _el = this._el;
|
||||
var nCount = oQRCode.getModuleCount();
|
||||
var nWidth = Math.floor(_htOption.width / nCount);
|
||||
var nHeight = Math.floor(_htOption.height / nCount);
|
||||
|
||||
this.clear();
|
||||
|
||||
function makeSVG(tag, attrs) {
|
||||
var el = document.createElementNS('http://www.w3.org/2000/svg', tag);
|
||||
for (var k in attrs)
|
||||
if (attrs.hasOwnProperty(k)) el.setAttribute(k, attrs[k]);
|
||||
return el;
|
||||
}
|
||||
|
||||
var svg = makeSVG("svg" , {'viewBox': '0 0 ' + String(nCount) + " " + String(nCount), 'width': '100%', 'height': '100%', 'fill': _htOption.colorLight});
|
||||
svg.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink");
|
||||
_el.appendChild(svg);
|
||||
|
||||
svg.appendChild(makeSVG("rect", {"fill": _htOption.colorLight, "width": "100%", "height": "100%"}));
|
||||
svg.appendChild(makeSVG("rect", {"fill": _htOption.colorDark, "width": "1", "height": "1", "id": "template"}));
|
||||
|
||||
for (var row = 0; row < nCount; row++) {
|
||||
for (var col = 0; col < nCount; col++) {
|
||||
if (oQRCode.isDark(row, col)) {
|
||||
var child = makeSVG("use", {"x": String(col), "y": String(row)});
|
||||
child.setAttributeNS("http://www.w3.org/1999/xlink", "href", "#template")
|
||||
svg.appendChild(child);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
Drawing.prototype.clear = function () {
|
||||
while (this._el.hasChildNodes())
|
||||
this._el.removeChild(this._el.lastChild);
|
||||
};
|
||||
return Drawing;
|
||||
})();
|
||||
|
||||
var useSVG = document.documentElement.tagName.toLowerCase() === "svg";
|
||||
|
||||
// Drawing in DOM by using Table tag
|
||||
var Drawing = useSVG ? svgDrawer : !_isSupportCanvas() ? (function () {
|
||||
var Drawing = function (el, htOption) {
|
||||
this._el = el;
|
||||
this._htOption = htOption;
|
||||
};
|
||||
|
||||
/**
|
||||
* Draw the QRCode
|
||||
*
|
||||
* @param {QRCode} oQRCode
|
||||
*/
|
||||
Drawing.prototype.draw = function (oQRCode) {
|
||||
var _htOption = this._htOption;
|
||||
var _el = this._el;
|
||||
var nCount = oQRCode.getModuleCount();
|
||||
var nWidth = Math.floor(_htOption.width / nCount);
|
||||
var nHeight = Math.floor(_htOption.height / nCount);
|
||||
var aHTML = ['<table style="border:0;border-collapse:collapse;">'];
|
||||
|
||||
for (var row = 0; row < nCount; row++) {
|
||||
aHTML.push('<tr>');
|
||||
|
||||
for (var col = 0; col < nCount; col++) {
|
||||
aHTML.push('<td style="border:0;border-collapse:collapse;padding:0;margin:0;width:' + nWidth + 'px;height:' + nHeight + 'px;background-color:' + (oQRCode.isDark(row, col) ? _htOption.colorDark : _htOption.colorLight) + ';"></td>');
|
||||
}
|
||||
|
||||
aHTML.push('</tr>');
|
||||
}
|
||||
|
||||
aHTML.push('</table>');
|
||||
_el.innerHTML = aHTML.join('');
|
||||
|
||||
// Fix the margin values as real size.
|
||||
var elTable = _el.childNodes[0];
|
||||
var nLeftMarginTable = (_htOption.width - elTable.offsetWidth) / 2;
|
||||
var nTopMarginTable = (_htOption.height - elTable.offsetHeight) / 2;
|
||||
|
||||
if (nLeftMarginTable > 0 && nTopMarginTable > 0) {
|
||||
elTable.style.margin = nTopMarginTable + "px " + nLeftMarginTable + "px";
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Clear the QRCode
|
||||
*/
|
||||
Drawing.prototype.clear = function () {
|
||||
this._el.innerHTML = '';
|
||||
};
|
||||
|
||||
return Drawing;
|
||||
})() : (function () { // Drawing in Canvas
|
||||
function _onMakeImage() {
|
||||
this._elImage.src = this._elCanvas.toDataURL("image/png");
|
||||
this._elImage.style.display = "block";
|
||||
this._elCanvas.style.display = "none";
|
||||
}
|
||||
|
||||
// Android 2.1 bug workaround
|
||||
// http://code.google.com/p/android/issues/detail?id=5141
|
||||
if (this._android && this._android <= 2.1) {
|
||||
var factor = 1 / window.devicePixelRatio;
|
||||
var drawImage = CanvasRenderingContext2D.prototype.drawImage;
|
||||
CanvasRenderingContext2D.prototype.drawImage = function (image, sx, sy, sw, sh, dx, dy, dw, dh) {
|
||||
if (("nodeName" in image) && /img/i.test(image.nodeName)) {
|
||||
for (var i = arguments.length - 1; i >= 1; i--) {
|
||||
arguments[i] = arguments[i] * factor;
|
||||
}
|
||||
} else if (typeof dw == "undefined") {
|
||||
arguments[1] *= factor;
|
||||
arguments[2] *= factor;
|
||||
arguments[3] *= factor;
|
||||
arguments[4] *= factor;
|
||||
}
|
||||
|
||||
drawImage.apply(this, arguments);
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Check whether the user's browser supports Data URI or not
|
||||
*
|
||||
* @private
|
||||
* @param {Function} fSuccess Occurs if it supports Data URI
|
||||
* @param {Function} fFail Occurs if it doesn't support Data URI
|
||||
*/
|
||||
function _safeSetDataURI(fSuccess, fFail) {
|
||||
var self = this;
|
||||
self._fFail = fFail;
|
||||
self._fSuccess = fSuccess;
|
||||
|
||||
// Check it just once
|
||||
if (self._bSupportDataURI === null) {
|
||||
var el = document.createElement("img");
|
||||
var fOnError = function() {
|
||||
self._bSupportDataURI = false;
|
||||
|
||||
if (self._fFail) {
|
||||
self._fFail.call(self);
|
||||
}
|
||||
};
|
||||
var fOnSuccess = function() {
|
||||
self._bSupportDataURI = true;
|
||||
|
||||
if (self._fSuccess) {
|
||||
self._fSuccess.call(self);
|
||||
}
|
||||
};
|
||||
|
||||
el.onabort = fOnError;
|
||||
el.onerror = fOnError;
|
||||
el.onload = fOnSuccess;
|
||||
el.src = "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="; // the Image contains 1px data.
|
||||
return;
|
||||
} else if (self._bSupportDataURI === true && self._fSuccess) {
|
||||
self._fSuccess.call(self);
|
||||
} else if (self._bSupportDataURI === false && self._fFail) {
|
||||
self._fFail.call(self);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Drawing QRCode by using canvas
|
||||
*
|
||||
* @constructor
|
||||
* @param {HTMLElement} el
|
||||
* @param {Object} htOption QRCode Options
|
||||
*/
|
||||
var Drawing = function (el, htOption) {
|
||||
this._bIsPainted = false;
|
||||
this._android = _getAndroid();
|
||||
|
||||
this._htOption = htOption;
|
||||
this._elCanvas = document.createElement("canvas");
|
||||
this._elCanvas.width = htOption.width;
|
||||
this._elCanvas.height = htOption.height;
|
||||
el.appendChild(this._elCanvas);
|
||||
this._el = el;
|
||||
this._oContext = this._elCanvas.getContext("2d");
|
||||
this._bIsPainted = false;
|
||||
this._elImage = document.createElement("img");
|
||||
this._elImage.alt = "Scan me!";
|
||||
this._elImage.style.display = "none";
|
||||
this._el.appendChild(this._elImage);
|
||||
this._bSupportDataURI = null;
|
||||
};
|
||||
|
||||
/**
|
||||
* Draw the QRCode
|
||||
*
|
||||
* @param {QRCode} oQRCode
|
||||
*/
|
||||
Drawing.prototype.draw = function (oQRCode) {
|
||||
var _elImage = this._elImage;
|
||||
var _oContext = this._oContext;
|
||||
var _htOption = this._htOption;
|
||||
|
||||
var nCount = oQRCode.getModuleCount();
|
||||
var nWidth = _htOption.width / nCount;
|
||||
var nHeight = _htOption.height / nCount;
|
||||
var nRoundedWidth = Math.round(nWidth);
|
||||
var nRoundedHeight = Math.round(nHeight);
|
||||
|
||||
_elImage.style.display = "none";
|
||||
this.clear();
|
||||
|
||||
for (var row = 0; row < nCount; row++) {
|
||||
for (var col = 0; col < nCount; col++) {
|
||||
var bIsDark = oQRCode.isDark(row, col);
|
||||
var nLeft = col * nWidth;
|
||||
var nTop = row * nHeight;
|
||||
_oContext.strokeStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight;
|
||||
_oContext.lineWidth = 1;
|
||||
_oContext.fillStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight;
|
||||
_oContext.fillRect(nLeft, nTop, nWidth, nHeight);
|
||||
|
||||
// 안티 앨리어싱 방지 처리
|
||||
_oContext.strokeRect(
|
||||
Math.floor(nLeft) + 0.5,
|
||||
Math.floor(nTop) + 0.5,
|
||||
nRoundedWidth,
|
||||
nRoundedHeight
|
||||
);
|
||||
|
||||
_oContext.strokeRect(
|
||||
Math.ceil(nLeft) - 0.5,
|
||||
Math.ceil(nTop) - 0.5,
|
||||
nRoundedWidth,
|
||||
nRoundedHeight
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
this._bIsPainted = true;
|
||||
};
|
||||
|
||||
/**
|
||||
* Make the image from Canvas if the browser supports Data URI.
|
||||
*/
|
||||
Drawing.prototype.makeImage = function () {
|
||||
if (this._bIsPainted) {
|
||||
_safeSetDataURI.call(this, _onMakeImage);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Return whether the QRCode is painted or not
|
||||
*
|
||||
* @return {Boolean}
|
||||
*/
|
||||
Drawing.prototype.isPainted = function () {
|
||||
return this._bIsPainted;
|
||||
};
|
||||
|
||||
/**
|
||||
* Clear the QRCode
|
||||
*/
|
||||
Drawing.prototype.clear = function () {
|
||||
this._oContext.clearRect(0, 0, this._elCanvas.width, this._elCanvas.height);
|
||||
this._bIsPainted = false;
|
||||
};
|
||||
|
||||
/**
|
||||
* @private
|
||||
* @param {Number} nNumber
|
||||
*/
|
||||
Drawing.prototype.round = function (nNumber) {
|
||||
if (!nNumber) {
|
||||
return nNumber;
|
||||
}
|
||||
|
||||
return Math.floor(nNumber * 1000) / 1000;
|
||||
};
|
||||
|
||||
return Drawing;
|
||||
})();
|
||||
|
||||
/**
|
||||
* Get the type by string length
|
||||
*
|
||||
* @private
|
||||
* @param {String} sText
|
||||
* @param {Number} nCorrectLevel
|
||||
* @return {Number} type
|
||||
*/
|
||||
function _getTypeNumber(sText, nCorrectLevel) {
|
||||
var nType = 1;
|
||||
var length = _getUTF8Length(sText);
|
||||
|
||||
for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) {
|
||||
var nLimit = 0;
|
||||
|
||||
switch (nCorrectLevel) {
|
||||
case QRErrorCorrectLevel.L :
|
||||
nLimit = QRCodeLimitLength[i][0];
|
||||
break;
|
||||
case QRErrorCorrectLevel.M :
|
||||
nLimit = QRCodeLimitLength[i][1];
|
||||
break;
|
||||
case QRErrorCorrectLevel.Q :
|
||||
nLimit = QRCodeLimitLength[i][2];
|
||||
break;
|
||||
case QRErrorCorrectLevel.H :
|
||||
nLimit = QRCodeLimitLength[i][3];
|
||||
break;
|
||||
}
|
||||
|
||||
if (length <= nLimit) {
|
||||
break;
|
||||
} else {
|
||||
nType++;
|
||||
}
|
||||
}
|
||||
|
||||
if (nType > QRCodeLimitLength.length) {
|
||||
throw new Error("Too long data");
|
||||
}
|
||||
|
||||
return nType;
|
||||
}
|
||||
|
||||
function _getUTF8Length(sText) {
|
||||
var replacedText = encodeURI(sText).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a');
|
||||
return replacedText.length + (replacedText.length != sText ? 3 : 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* @class QRCode
|
||||
* @constructor
|
||||
* @example
|
||||
* new QRCode(document.getElementById("test"), "http://jindo.dev.naver.com/collie");
|
||||
*
|
||||
* @example
|
||||
* var oQRCode = new QRCode("test", {
|
||||
* text : "http://naver.com",
|
||||
* width : 128,
|
||||
* height : 128
|
||||
* });
|
||||
*
|
||||
* oQRCode.clear(); // Clear the QRCode.
|
||||
* oQRCode.makeCode("http://map.naver.com"); // Re-create the QRCode.
|
||||
*
|
||||
* @param {HTMLElement|String} el target element or 'id' attribute of element.
|
||||
* @param {Object|String} vOption
|
||||
* @param {String} vOption.text QRCode link data
|
||||
* @param {Number} [vOption.width=256]
|
||||
* @param {Number} [vOption.height=256]
|
||||
* @param {String} [vOption.colorDark="#000000"]
|
||||
* @param {String} [vOption.colorLight="#ffffff"]
|
||||
* @param {QRCode.CorrectLevel} [vOption.correctLevel=QRCode.CorrectLevel.H] [L|M|Q|H]
|
||||
*/
|
||||
QRCode = function (el, vOption) {
|
||||
this._htOption = {
|
||||
width : 256,
|
||||
height : 256,
|
||||
typeNumber : 4,
|
||||
colorDark : "#000000",
|
||||
colorLight : "#ffffff",
|
||||
correctLevel : QRErrorCorrectLevel.H
|
||||
};
|
||||
|
||||
if (typeof vOption === 'string') {
|
||||
vOption = {
|
||||
text : vOption
|
||||
};
|
||||
}
|
||||
|
||||
// Overwrites options
|
||||
if (vOption) {
|
||||
for (var i in vOption) {
|
||||
this._htOption[i] = vOption[i];
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof el == "string") {
|
||||
el = document.getElementById(el);
|
||||
}
|
||||
|
||||
if (this._htOption.useSVG) {
|
||||
Drawing = svgDrawer;
|
||||
}
|
||||
|
||||
this._android = _getAndroid();
|
||||
this._el = el;
|
||||
this._oQRCode = null;
|
||||
this._oDrawing = new Drawing(this._el, this._htOption);
|
||||
|
||||
if (this._htOption.text) {
|
||||
this.makeCode(this._htOption.text);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Make the QRCode
|
||||
*
|
||||
* @param {String} sText link data
|
||||
*/
|
||||
QRCode.prototype.makeCode = function (sText) {
|
||||
this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel);
|
||||
this._oQRCode.addData(sText);
|
||||
this._oQRCode.make();
|
||||
this._el.title = sText;
|
||||
this._oDrawing.draw(this._oQRCode);
|
||||
this.makeImage();
|
||||
};
|
||||
|
||||
/**
|
||||
* Make the Image from Canvas element
|
||||
* - It occurs automatically
|
||||
* - Android below 3 doesn't support Data-URI spec.
|
||||
*
|
||||
* @private
|
||||
*/
|
||||
QRCode.prototype.makeImage = function () {
|
||||
if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) {
|
||||
this._oDrawing.makeImage();
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Clear the QRCode
|
||||
*/
|
||||
QRCode.prototype.clear = function () {
|
||||
this._oDrawing.clear();
|
||||
};
|
||||
|
||||
/**
|
||||
* @name QRCode.CorrectLevel
|
||||
*/
|
||||
QRCode.CorrectLevel = QRErrorCorrectLevel;
|
||||
})();
|
||||
|
|
@ -33,5 +33,16 @@
|
|||
<artifactId>ruoyi-exam</artifactId>
|
||||
<version>${ruoyi.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-vip</artifactId>
|
||||
<version>${ruoyi.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-weixin</artifactId>
|
||||
<version>${ruoyi.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,148 @@
|
|||
package com.ruoyi.cms.controller;
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
|
||||
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
|
||||
import com.github.binarywang.wxpay.bean.notify.WxScanPayNotifyResult;
|
||||
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
|
||||
import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult;
|
||||
import com.github.binarywang.wxpay.exception.WxPayException;
|
||||
import com.github.binarywang.wxpay.service.WxPayService;
|
||||
import com.ruoyi.common.base.AjaxResult;
|
||||
import com.ruoyi.common.utils.IpUtils;
|
||||
import com.ruoyi.framework.jwt.JwtUtil;
|
||||
import com.ruoyi.framework.web.base.BaseController;
|
||||
import com.ruoyi.framework.web.util.ServletUtils;
|
||||
import com.ruoyi.framework.web.util.ShiroUtils;
|
||||
import com.ruoyi.system.domain.SysUser;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
import com.ruoyi.train.course.domain.*;
|
||||
import com.ruoyi.train.course.service.ITrainCourseCategoryService;
|
||||
import com.ruoyi.train.course.service.ITrainCourseSectionService;
|
||||
import com.ruoyi.train.course.service.ITrainCourseService;
|
||||
import com.ruoyi.train.course.service.ITrainCourseUserService;
|
||||
import com.ruoyi.vip.domain.VipUserOrders;
|
||||
import com.ruoyi.vip.service.IVipUserOrdersService;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 课程 信息操作处理
|
||||
*
|
||||
* @author zhujj
|
||||
* @date 2018-12-23
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/wx/pay")
|
||||
public class ApiWxPayController extends BaseController {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger( ApiWxPayController.class );
|
||||
@Autowired
|
||||
private ITrainCourseUserService trainCourseUserService ;
|
||||
|
||||
@Autowired
|
||||
private IVipUserOrdersService vipUserOrdersService;
|
||||
|
||||
@Autowired
|
||||
private WxPayService wxService;
|
||||
@PostMapping("/notify/order")
|
||||
public String parseOrderNotifyResult(@RequestBody String xmlData) throws WxPayException {
|
||||
|
||||
final WxPayOrderNotifyResult notifyResult = this.wxService.parseOrderNotifyResult(xmlData);
|
||||
log.debug("-------------------------------支付回调中----------------------------");
|
||||
if (null != notifyResult && notifyResult.getReturnCode().equals("SUCCESS")) {
|
||||
VipUserOrders userOrders = new VipUserOrders();
|
||||
userOrders.setId(notifyResult.getOutTradeNo());
|
||||
userOrders.setDelFlag("1");
|
||||
vipUserOrdersService.updateSelectiveById(userOrders);
|
||||
VipUserOrders vipUserOrders = vipUserOrdersService.selectById(notifyResult.getOutTradeNo());
|
||||
TrainCourseUser courseUser = new TrainCourseUser();
|
||||
courseUser.setVipUserId(vipUserOrders.getVipUserId());
|
||||
courseUser.setTrainCourseId(vipUserOrders.getTrainCourseId());
|
||||
courseUser.setDelFlag("0");
|
||||
courseUser.setCreateDate(new Date());
|
||||
courseUser.setUpdateDate(new Date());
|
||||
courseUser.setRemarks("微信支付成功回调，订单ID:"+vipUserOrders.getId());
|
||||
trainCourseUserService.insertSelective(courseUser);
|
||||
}
|
||||
return WxPayNotifyResponse.success("成功");
|
||||
}
|
||||
|
||||
@ApiOperation(value = "扫码支付回调通知处理")
|
||||
@PostMapping("/notify/scanpay")
|
||||
public String parseScanPayNotifyResult(String xmlData) throws WxPayException {
|
||||
final WxScanPayNotifyResult result = this.wxService.parseScanPayNotifyResult(xmlData);
|
||||
|
||||
// TODO 根据自己业务场景需要构造返回对象
|
||||
return WxPayNotifyResponse.success("成功");
|
||||
}
|
||||
/**
|
||||
* 调用统一下单接口，并组装生成支付所需参数对象.
|
||||
*
|
||||
* @param request 统一下单请求参数
|
||||
* @param <T> 请使用{@link com.github.binarywang.wxpay.bean.order}包下的类
|
||||
* @return 返回 {@link com.github.binarywang.wxpay.bean.order}包下的类对象
|
||||
*
|
||||
* 示例参数
|
||||
* {
|
||||
"body":"测试商品",
|
||||
"outTradeNo":"12344324242342342342554",
|
||||
"totalFee":1.01,
|
||||
"spbillCreateIp":"1.80.82.241",
|
||||
"notifyUrl":"http://www.baidu.com",
|
||||
"tradeType":"NATIVE",
|
||||
"productId":"13652b4a71df2f49e3647c55c8e31a88"
|
||||
}
|
||||
返回
|
||||
{
|
||||
"codeUrl": "weixin://wxpay/bizpayurl?pr=pK0R74G"
|
||||
}
|
||||
*/
|
||||
@ApiOperation(value = "统一下单，并组装所需支付参数")
|
||||
@PostMapping("/createOrder")
|
||||
public <T> T createOrder(@RequestBody WxPayUnifiedOrderRequest request) throws WxPayException {
|
||||
request.setOutTradeNo( IdUtil.simpleUUID());
|
||||
request.setSpbillCreateIp( IpUtils.getIpAddr( ServletUtils.getRequest()));
|
||||
VipUserOrders userOrders = new VipUserOrders();
|
||||
userOrders.setId(request.getOutTradeNo());
|
||||
userOrders.setVipUserId(Integer.parseInt(request.getOpenid()));
|
||||
userOrders.setTrainCourseId(Integer.parseInt(request.getProductId()));
|
||||
userOrders.setPrice(new BigDecimal(request.getTotalFee().intValue()/100));
|
||||
//未支付订单
|
||||
userOrders.setDelFlag("0");
|
||||
vipUserOrdersService.insert(userOrders);
|
||||
//零时存放我们自己的用户id,这儿清空
|
||||
request.setOpenid(null);
|
||||
return this.wxService.createOrder(request);
|
||||
}
|
||||
|
||||
/**
|
||||
* 统一下单(详见https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1)
|
||||
* 在发起微信支付前，需要调用统一下单接口，获取"预支付交易会话标识"
|
||||
* 接口地址：https://api.mch.weixin.qq.com/pay/unifiedorder
|
||||
*
|
||||
* @param request 请求对象，注意一些参数如appid、mchid等不用设置，方法内会自动从配置对象中获取到（前提是对应配置中已经设置）
|
||||
*/
|
||||
@ApiOperation(value = "原生的统一下单接口")
|
||||
@PostMapping("/unifiedOrder")
|
||||
public WxPayUnifiedOrderResult unifiedOrder(@RequestBody WxPayUnifiedOrderRequest request) throws WxPayException {
|
||||
request.setOutTradeNo( IdUtil.simpleUUID());
|
||||
request.setSpbillCreateIp( IpUtils.getIpAddr( ServletUtils.getRequest()));
|
||||
VipUserOrders userOrders = new VipUserOrders();
|
||||
userOrders.setId(request.getOutTradeNo());
|
||||
userOrders.setVipUserId(ShiroUtils.getUserId().intValue());
|
||||
userOrders.setTrainCourseId(Integer.parseInt(request.getProductId()));
|
||||
userOrders.setPrice(new BigDecimal(request.getTotalFee().intValue()/100));
|
||||
//未支付订单
|
||||
userOrders.setDelFlag("0");
|
||||
vipUserOrdersService.insert(userOrders);
|
||||
return this.wxService.unifiedOrder(request);
|
||||
}
|
||||
}
|
||||
|
|
@ -6,6 +6,7 @@ import com.ruoyi.common.utils.file.FileUtils;
|
|||
import com.ruoyi.exam.domain.ExamPractice;
|
||||
import com.ruoyi.exam.service.IExamPracticeService;
|
||||
import com.ruoyi.framework.web.util.ShiroUtils;
|
||||
import com.ruoyi.system.service.ISysConfigService;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
import com.ruoyi.train.course.domain.TrainCourse;
|
||||
import com.ruoyi.train.course.domain.TrainCourseCategory;
|
||||
|
|
@ -14,6 +15,7 @@ import com.ruoyi.train.course.domain.TrainCourseVO;
|
|||
import com.ruoyi.train.course.service.ITrainCourseCategoryService;
|
||||
import com.ruoyi.train.course.service.ITrainCourseSectionService;
|
||||
import com.ruoyi.train.course.service.ITrainCourseService;
|
||||
import com.ruoyi.train.course.service.ITrainCourseUserService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
|
@ -42,6 +44,9 @@ public class CmsController {
|
|||
@Autowired
|
||||
private ITrainCourseService trainCourseService;
|
||||
|
||||
@Autowired
|
||||
private ITrainCourseUserService trainCourseUserService;
|
||||
|
||||
@Autowired
|
||||
private ITrainCourseCategoryService trainCourseCategoryService;
|
||||
|
||||
|
|
@ -53,6 +58,9 @@ public class CmsController {
|
|||
@Autowired
|
||||
private IExamPracticeService examPracticeService;
|
||||
|
||||
@Autowired
|
||||
private ISysConfigService configService;
|
||||
|
||||
@RequestMapping({"", "/index", "/index.html"})
|
||||
@GetMapping()
|
||||
public String index(String parentIds, ModelMap map) {
|
||||
|
|
@ -68,21 +76,21 @@ public class CmsController {
|
|||
courseCategory.setParentId( parentId );
|
||||
courseCategories2 = trainCourseCategoryService.selectCategoryList( courseCategory );
|
||||
|
||||
map.put( "selectCategoryId1",parentId);
|
||||
map.put( "selectCategoryId1", parentId );
|
||||
}
|
||||
if (StrUtil.isNotBlank( parentIds ) && parentIds.split( "," ).length >= 4) {//三级分类
|
||||
Long parentId = new Long( parentIds.split( "," )[3] );
|
||||
courseCategory.setParentId( parentId );
|
||||
courseCategories3 = trainCourseCategoryService.selectCategoryList( courseCategory );
|
||||
//当前选中的分类id
|
||||
map.put( "selectCategoryId2",parentId);
|
||||
map.put( "selectCategoryId2", parentId );
|
||||
Long parentId1 = new Long( parentIds.split( "," )[2] );
|
||||
map.put( "selectCategoryId1",parentId1);
|
||||
map.put( "selectCategoryId1", parentId1 );
|
||||
}
|
||||
if (StrUtil.isNotBlank( parentIds )) {
|
||||
trainCourseVO.setTrainCourseCategoryId( new Integer( parentIds.split( "," )[parentIds.split( "," ).length - 1] ) );
|
||||
//当前选中的分类id
|
||||
map.put( "selectCategoryId", parentIds.split( "," )[parentIds.split( "," ).length - 1] );
|
||||
map.put( "selectCategoryId", parentIds.split( "," )[parentIds.split( "," ).length - 1] );
|
||||
}
|
||||
List<TrainCourseVO> list = trainCourseService.selectTrainCoursePage( trainCourseVO );
|
||||
map.put( "trainCourse", list );
|
||||
|
|
@ -104,10 +112,18 @@ public class CmsController {
|
|||
ExamPractice examPractice = new ExamPractice();
|
||||
examPractice.setTrainCourseId( id );
|
||||
List<ExamPractice> examPractices = examPracticeService.selectExamPracticeList( examPractice );
|
||||
|
||||
boolean courseAuth=false;
|
||||
String s = configService.selectConfigByKey( "course.days" );
|
||||
if (ShiroUtils.getSysUser() != null) {
|
||||
courseAuth = trainCourseUserService.authority( ShiroUtils.getSysUser().getUserId(), id );
|
||||
}
|
||||
map.put( "courseAuth",courseAuth);
|
||||
map.put( "user", ShiroUtils.getSysUser() );
|
||||
map.put( "courseDays", s );
|
||||
map.put( "trainCourse", trainCourse );
|
||||
map.put( "trainCourseSections", trainCourseSections );
|
||||
map.put( "examPractices", examPractices );
|
||||
map.put( "user", ShiroUtils.getSysUser() );
|
||||
return prefix + "/course/courseInfo";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,15 @@ package com.ruoyi.cms.controller;
|
|||
|
||||
import com.ruoyi.common.base.AjaxResult;
|
||||
import com.ruoyi.exam.domain.*;
|
||||
import cn.hutool.extra.servlet.ServletUtil;
|
||||
import com.ruoyi.exam.domain.ExamPractice;
|
||||
import com.ruoyi.exam.domain.ExamUserErrorQuestion;
|
||||
import com.ruoyi.exam.domain.ExamUserErrorQuestionVO;
|
||||
import com.ruoyi.exam.service.IExamPracticeService;
|
||||
import com.ruoyi.exam.service.IExamUserCollectionQuestionService;
|
||||
import com.ruoyi.exam.service.IExamUserErrorQuestionService;
|
||||
import com.ruoyi.framework.jwt.JwtUtil;
|
||||
import com.ruoyi.framework.web.util.ServletUtils;
|
||||
import com.ruoyi.framework.web.util.ShiroUtils;
|
||||
import com.ruoyi.system.domain.SysUser;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
|
|
@ -15,6 +20,7 @@ import com.ruoyi.train.course.domain.TrainCourseVO;
|
|||
import com.ruoyi.train.course.service.ITrainCourseCategoryService;
|
||||
import com.ruoyi.train.course.service.ITrainCourseSectionService;
|
||||
import com.ruoyi.train.course.service.ITrainCourseService;
|
||||
import org.apache.shiro.web.servlet.SimpleCookie;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
|
@ -24,7 +30,9 @@ import org.springframework.web.bind.annotation.GetMapping;
|
|||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.servlet.http.Cookie;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -56,8 +64,6 @@ public class CmsUserController {
|
|||
return prefix + "/user/login";
|
||||
}
|
||||
|
||||
|
||||
|
||||
@RequestMapping("/user/reg.html")
|
||||
public String reg(ModelMap map) {
|
||||
map.put( "user", ShiroUtils.getSysUser() );
|
||||
|
|
|
|||
|
|
@ -168,7 +168,9 @@
|
|||
<div class="image" id="courseImage">
|
||||
<div id="view_flv" style="display:none;"></div>
|
||||
<div class="course-pro0"></div>
|
||||
<img th:src="${trainCourse.cover}" class="course-cover" onerror="this.src='/sysimg/nopic.gif'" width="480" height="290">
|
||||
<img th:if="${#strings.isEmpty(trainCourse.cover)}" th:src="@{/web/res/images/no_img.png}" th:alt="${trainCourse.name}" class="course-cover" width="480" height="290">
|
||||
<img th:if="${not #strings.isEmpty(trainCourse.cover)}" th:src="${trainCourse.cover}" th:alt="${trainCourse.name}" class="course-cover" width="480" height="290">
|
||||
|
||||
</div>
|
||||
<div class="courseInfo-right">
|
||||
<div class="name" th:text="${trainCourse.name}">
|
||||
|
|
@ -177,9 +179,15 @@
|
|||
<div class="price">
|
||||
<span class="price-info"><span th:text="'¥'+${trainCourse.price}"></span></span>
|
||||
</div>
|
||||
<div class="button">
|
||||
<input type="submit" onclick="return Logincart('551')" class="hb-ui-btn" value="立刻购买">
|
||||
<em>有效期:<span id="shixian">永久</span></em>
|
||||
<div class="button" th:if="${trainCourse.price>0 && !courseAuth}">
|
||||
<input type="button" onclick="shop()" class="hb-ui-btn" value="立刻购买">
|
||||
</div>
|
||||
<div class="button" th:if="${trainCourse.price==0||courseAuth}">
|
||||
<input type="button" onclick="goStudy()" class="hb-ui-btn" value="加入学习">
|
||||
<em>有效期:
|
||||
<span id="shixian" th:if="${trainCourse.price==0}" th:text="'永久'"></span>
|
||||
<span id="shixian" th:if="${trainCourse.price>0}" th:text="${courseDays}+'(天)'"></span>
|
||||
</em>
|
||||
</div>
|
||||
<div class="remark" th:text="${trainCourse.description}">
|
||||
|
||||
|
|
@ -201,9 +209,12 @@
|
|||
<div class="layui-tab-content">
|
||||
<div class="layui-tab-item layui-show">
|
||||
<ul >
|
||||
<li th:each="sections:${trainCourseSections}" >
|
||||
<a th:href="@{'/web/course/courseSections.html/'+${sections.id}}">
|
||||
<span th:text="${sections.name}"> </span>
|
||||
<li th:if="trainCourseSections" th:each="sections,obj:${trainCourseSections}" >
|
||||
<a th:if="${trainCourse.price==0 || courseAuth}" th:id="'section'+${obj.index+1}" th:href="@{'/web/course/courseSections.html/'+${sections.id}}">
|
||||
<span th:text="${sections.name}+'2'"> </span>
|
||||
</a>
|
||||
<a th:if="!${courseAuth}" onclick="shop()">
|
||||
<span th:text="${sections.name}"> </span>
|
||||
</a>
|
||||
<hr>
|
||||
</li>
|
||||
|
|
@ -226,11 +237,86 @@
|
|||
|
||||
<div class="fly-footer" th:replace="web/index::cmsBottom">
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
layui.use('element', function(){
|
||||
var element = layui.element;
|
||||
<link rel="stylesheet" th:href="@{/web/res/layui/css/layui.css}">
|
||||
<script th:src="@{/js/jquery.min.js}"></script>
|
||||
<script th:src="@{/web/res/layui/layui.js}"></script>
|
||||
<script th:src="@{/web/res/layui/qrcode.js}"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
layui.use(['element','layer'], function(){
|
||||
var $ = layui.jquery, layer = layui.layer; //独立版的layer无需执行这一句
|
||||
});
|
||||
function goStudy() {
|
||||
document.getElementById("section1").click();
|
||||
}
|
||||
function shop() {
|
||||
var userId="[[${user?.userId}]]";
|
||||
if(userId){
|
||||
var data={
|
||||
"body":"[[${trainCourse.name}]]",
|
||||
"outTradeNo":"12344324242342342342554",
|
||||
"totalFee":[[${trainCourse.price*100}]],
|
||||
"spbillCreateIp":"1.80.82.241",
|
||||
"notifyUrl":"http://ceshi4.yqhl.cc/api/v1/wx/pay/notify/order",
|
||||
"tradeType":"NATIVE",
|
||||
"productId":"[[${trainCourse.id}]]",
|
||||
"openid":userId
|
||||
};
|
||||
$.ajax({
|
||||
type: 'post',
|
||||
url: "/api/v1/wx/pay/createOrder",
|
||||
contentType: "application/json",
|
||||
dataType : 'json',
|
||||
data:JSON.stringify(data),
|
||||
success: function (result) {
|
||||
if(!result.code){
|
||||
alertPayQrcode(result.codeUrl)
|
||||
}else {
|
||||
layer.msg('生成支付二维码失败',{
|
||||
time: 2000, //20s后自动关闭
|
||||
btn: ['明白了']
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}else{
|
||||
location.href="/web/user/login.html"
|
||||
}
|
||||
|
||||
}
|
||||
function alertPayQrcode(codeUrl) {
|
||||
//弹出购买框
|
||||
layer.open({
|
||||
type: 1
|
||||
,title: false //不显示标题栏
|
||||
,closeBtn: false
|
||||
,area: '300px;'
|
||||
,shade: 0.8
|
||||
,id: 'LAY_layuipro' //设定一个id，防止重复弹出
|
||||
,btn: ['付款成功', '不购买']
|
||||
,btnAlign: 'c'
|
||||
,moveType: 1 //拖拽模式，0或者1
|
||||
,content: '<div style="padding: 40px; line-height: 22px; background-color: #fff;">' +
|
||||
'<div id="qrcode"></div>' +
|
||||
'<div style="text-align: center;margin-top:10px;">微信扫码支付<span style="color: red;">￥[[${trainCourse.price}]]</span>（元）购买</div>' +
|
||||
'</div>'
|
||||
,success: function(layero){
|
||||
var btn = layero.find('.layui-layer-btn');
|
||||
btn.click(function(){
|
||||
|
||||
});
|
||||
}
|
||||
});
|
||||
var qrcode = new QRCode('qrcode', {
|
||||
text: codeUrl,
|
||||
width: 200,
|
||||
height: 200,
|
||||
colorDark: '#000000',
|
||||
colorLight: '#ffffff',
|
||||
correctLevel: QRCode.CorrectLevel.H
|
||||
});
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@
|
|||
<dd><a th:href="@{/web/user/set.html}"><i class="layui-icon"></i>基本设置</a></dd>
|
||||
<dd><a th:href="@{/web/user/set.html}"><i class="layui-icon" style="margin-left: 2px; font-size: 22px;"></i>更多...</a></dd>
|
||||
<!--<dd><a th:href="@{/web/user/collectquestion.html}"><i class="layui-icon" style="margin-left: 2px; font-size: 22px;"></i>我的收藏</a></dd>-->
|
||||
<dd><a href="" style="text-align: center;">退出</a></dd>
|
||||
dd><a th:href="@{/logout}" style="text-align: center;">退出</a></dd>
|
||||
</dl>
|
||||
</li>
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -58,7 +58,9 @@ public class OnlineSessionFilter extends AccessControlFilter
|
|||
{
|
||||
onlineSession.setUserId(user.getUserId());
|
||||
onlineSession.setLoginName(user.getLoginName());
|
||||
onlineSession.setDeptName(user.getDept().getDeptName());
|
||||
if (null != user.getDept()) {
|
||||
onlineSession.setDeptName(user.getDept().getDeptName());
|
||||
}
|
||||
onlineSession.markAttributeChanged();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,14 +52,14 @@ public abstract interface AbstractBaseService<T> {
|
|||
public Long selectCount(T entity);
|
||||
|
||||
/**
|
||||
* 保存
|
||||
* 保存(并且自动给填充用户信息)
|
||||
* @param entity
|
||||
* @return
|
||||
*/
|
||||
public int insert(T entity);
|
||||
|
||||
/**
|
||||
* 保存不为null的数据
|
||||
* 保存不为null的数据(并且自动给填充用户信息)
|
||||
* @param entity
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -88,7 +88,7 @@ public abstract interface AbstractBaseService<T> {
|
|||
public int deleteByIds(String ids);
|
||||
|
||||
/**
|
||||
* 根据编码ID全部字段更新
|
||||
* 根据编码ID全部字段更新（自动填充用户信息）
|
||||
* 包含（NULL）
|
||||
* @param entity
|
||||
* @return
|
||||
|
|
@ -96,7 +96,7 @@ public abstract interface AbstractBaseService<T> {
|
|||
public int updateById(T entity) ;
|
||||
|
||||
/**
|
||||
* 根据编码ID更新
|
||||
* 根据编码ID更新（自动填充用户信息）
|
||||
* 不包含（NULL）
|
||||
* @param entity
|
||||
* @return
|
||||
|
|
|
|||
|
|
@ -97,7 +97,6 @@ public abstract class AbstractBaseServiceImpl<M extends MyMapper<T>, T> implemen
|
|||
EntityUtils.setUpdatedInfo(entity);
|
||||
return mapper.updateByPrimaryKeySelective(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<T> selectByExample(Object example) {
|
||||
return mapper.selectByExample(example);
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ public class EntityUtils {
|
|||
* @author 王浩彬
|
||||
*/
|
||||
public static <T> void setCreateAndUpdateInfo(T entity) {
|
||||
setCreateInfo( entity );
|
||||
setUpdatedInfo( entity );
|
||||
setCreateInfo(entity);
|
||||
setUpdatedInfo(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -35,12 +35,14 @@ public class EntityUtils {
|
|||
try {
|
||||
Method[] methods = entity.getClass().getMethods();
|
||||
for (Method m : methods) {
|
||||
if (m.getName().equals( "setCreateBy" )) {
|
||||
m.invoke( entity,com.ruoyi.framework.web.util.ShiroUtils.getLoginName() );
|
||||
} else if (m.getName().equals( "setCreateDate" )) {
|
||||
m.invoke( entity, new Date() );
|
||||
} else if (m.getName().equals( "setCreateTime" )) {
|
||||
m.invoke( entity, new Date() );
|
||||
if (m.getName().equals("setCreateBy")) {
|
||||
if (null != com.ruoyi.framework.web.util.ShiroUtils.getSysUser()) {
|
||||
m.invoke(entity, com.ruoyi.framework.web.util.ShiroUtils.getLoginName());
|
||||
}
|
||||
} else if (m.getName().equals("setCreateDate")) {
|
||||
m.invoke(entity, new Date());
|
||||
} else if (m.getName().equals("setCreateTime")) {
|
||||
m.invoke(entity, new Date());
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -60,12 +62,14 @@ public class EntityUtils {
|
|||
try {
|
||||
Method[] methods = entity.getClass().getMethods();
|
||||
for (Method m : methods) {
|
||||
if (m.getName().equals( "setUpdateBy" )) {
|
||||
m.invoke( entity,com.ruoyi.framework.web.util.ShiroUtils.getLoginName());
|
||||
} else if (m.getName().equals( "setUpdateDate" )) {
|
||||
m.invoke( entity, new Date() );
|
||||
} else if (m.getName().equals( "setUpdateTime" )) {
|
||||
m.invoke( entity, new Date() );
|
||||
if (m.getName().equals("setUpdateBy")) {
|
||||
if (null != com.ruoyi.framework.web.util.ShiroUtils.getSysUser()) {
|
||||
m.invoke(entity, com.ruoyi.framework.web.util.ShiroUtils.getLoginName());
|
||||
}
|
||||
} else if (m.getName().equals("setUpdateDate")) {
|
||||
m.invoke(entity, new Date());
|
||||
} else if (m.getName().equals("setUpdateTime")) {
|
||||
m.invoke(entity, new Date());
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
|
|
|
|||
|
|
@ -4,15 +4,14 @@ import cn.hutool.json.JSONObject;
|
|||
import com.ruoyi.common.base.AjaxResult;
|
||||
import com.ruoyi.framework.jwt.JwtUtil;
|
||||
import com.ruoyi.framework.web.base.BaseController;
|
||||
import com.ruoyi.framework.web.util.ShiroUtils;
|
||||
import com.ruoyi.system.domain.SysUser;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
import com.ruoyi.train.course.domain.TrainCourse;
|
||||
import com.ruoyi.train.course.domain.TrainCourseCategory;
|
||||
import com.ruoyi.train.course.domain.TrainCourseSection;
|
||||
import com.ruoyi.train.course.domain.TrainCourseVO;
|
||||
import com.ruoyi.train.course.domain.*;
|
||||
import com.ruoyi.train.course.service.ITrainCourseCategoryService;
|
||||
import com.ruoyi.train.course.service.ITrainCourseSectionService;
|
||||
import com.ruoyi.train.course.service.ITrainCourseService;
|
||||
import com.ruoyi.train.course.service.ITrainCourseUserService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
|
|
@ -29,7 +28,8 @@ import java.util.List;
|
|||
public class ApiTrainCourseController extends BaseController {
|
||||
@Autowired
|
||||
private ITrainCourseService trainCourseService;
|
||||
|
||||
@Autowired
|
||||
private ITrainCourseUserService trainCourseUserService ;
|
||||
@Autowired
|
||||
private ITrainCourseCategoryService trainCourseCategoryService;
|
||||
|
||||
|
|
@ -38,6 +38,16 @@ public class ApiTrainCourseController extends BaseController {
|
|||
|
||||
@Autowired
|
||||
private ISysUserService sysUserService;
|
||||
/**
|
||||
* 查询课程列表
|
||||
*/
|
||||
@GetMapping("/trainCourse/category")
|
||||
public AjaxResult list( TrainCourseCategory category) {
|
||||
List<TrainCourseCategory> trainCourseCategories = trainCourseCategoryService.selectCategoryList( category );
|
||||
AjaxResult success = success( "查询成功" );
|
||||
success.put( "data", trainCourseCategories );
|
||||
return success;
|
||||
}
|
||||
/**
|
||||
* 查询课程列表
|
||||
*/
|
||||
|
|
@ -95,4 +105,5 @@ public class ApiTrainCourseController extends BaseController {
|
|||
success.put( "data", trainCourseSections );
|
||||
return success;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ public class TrainCourseController extends BaseController
|
|||
@ResponseBody
|
||||
public AjaxResult editSave(TrainCourse trainCourse)
|
||||
{
|
||||
return toAjax(trainCourseService.updateById(trainCourse));
|
||||
return toAjax(trainCourseService.updateSelectiveById(trainCourse));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.ruoyi.train.course.mapper;
|
|||
|
||||
import com.ruoyi.framework.web.base.MyMapper;
|
||||
import com.ruoyi.train.course.domain.TrainCourseUser;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -22,5 +23,13 @@ public interface TrainCourseUserMapper extends MyMapper<TrainCourseUser>
|
|||
* @return 课程使用对象集合
|
||||
*/
|
||||
public List<TrainCourseUser> selectTrainCourseUserList(TrainCourseUser trainCourseUser);
|
||||
|
||||
|
||||
/**
|
||||
* 判断是否有权限
|
||||
* @param vipUserId
|
||||
* @param trainCourseId
|
||||
* @param days 有效期
|
||||
* @return
|
||||
*/
|
||||
List<TrainCourseUser> authority(@Param("vipUserId") Long vipUserId, @Param("trainCourseId") Integer trainCourseId, @Param("days") Integer days);
|
||||
}
|
||||
|
|
@ -28,5 +28,10 @@ public interface ITrainCourseUserService extends AbstractBaseService<TrainCourse
|
|||
*/
|
||||
public List<TrainCourseUser> selectTrainCourseUserList(TrainCourseUser trainCourseUser);
|
||||
|
||||
|
||||
/**
|
||||
* 判断是否有权限
|
||||
* @param userId 会员id
|
||||
* @param trainCourseId 课程id
|
||||
*/
|
||||
boolean authority(Long userId, Integer trainCourseId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
package com.ruoyi.train.course.service.impl;
|
||||
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.framework.web.base.AbstractBaseServiceImpl;
|
||||
import com.ruoyi.system.service.ISysConfigService;
|
||||
import com.ruoyi.train.course.domain.TrainCourseUser;
|
||||
import com.ruoyi.train.course.mapper.TrainCourseUserMapper;
|
||||
import com.ruoyi.train.course.service.ITrainCourseUserService;
|
||||
|
|
@ -11,28 +13,51 @@ import java.util.List;
|
|||
|
||||
/**
|
||||
* 课程使用对象 服务层实现
|
||||
*
|
||||
*
|
||||
* @author zhujj
|
||||
* @date 2018-12-23
|
||||
*/
|
||||
@Service
|
||||
public class TrainCourseUserServiceImpl extends AbstractBaseServiceImpl<TrainCourseUserMapper,TrainCourseUser> implements ITrainCourseUserService
|
||||
{
|
||||
@Autowired
|
||||
private TrainCourseUserMapper trainCourseUserMapper;
|
||||
public class TrainCourseUserServiceImpl extends AbstractBaseServiceImpl<TrainCourseUserMapper, TrainCourseUser> implements ITrainCourseUserService {
|
||||
@Autowired
|
||||
private TrainCourseUserMapper trainCourseUserMapper;
|
||||
|
||||
|
||||
/**
|
||||
@Autowired
|
||||
private ISysConfigService configService;
|
||||
|
||||
/**
|
||||
* 查询课程使用对象列表
|
||||
*
|
||||
*
|
||||
* @param trainCourseUser 课程使用对象信息
|
||||
* @return 课程使用对象集合
|
||||
*/
|
||||
@Override
|
||||
public List<TrainCourseUser> selectTrainCourseUserList(TrainCourseUser trainCourseUser)
|
||||
{
|
||||
return trainCourseUserMapper.selectTrainCourseUserList(trainCourseUser);
|
||||
}
|
||||
@Override
|
||||
public List<TrainCourseUser> selectTrainCourseUserList(TrainCourseUser trainCourseUser) {
|
||||
return trainCourseUserMapper.selectTrainCourseUserList( trainCourseUser );
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断是否已经购买有权限
|
||||
*
|
||||
* @param userId 会员id
|
||||
* @param trainCourseId 课程id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public boolean authority(Long userId, Integer trainCourseId) {
|
||||
String s = configService.selectConfigByKey( "course.days" );
|
||||
int days = 0;
|
||||
if (StringUtils.isNotEmpty( s )) {
|
||||
days = Integer.parseInt( s );
|
||||
}
|
||||
List<TrainCourseUser> list = trainCourseUserMapper.authority( userId, trainCourseId, days );
|
||||
if (list != null && list.size() > 0) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询课程使用对象分页列表
|
||||
*
|
||||
|
|
@ -40,10 +65,9 @@ public class TrainCourseUserServiceImpl extends AbstractBaseServiceImpl<TrainCou
|
|||
* @return 课程使用对象集合
|
||||
*/
|
||||
@Override
|
||||
public List<TrainCourseUser> selectTrainCourseUserPage(TrainCourseUser trainCourseUser)
|
||||
{
|
||||
public List<TrainCourseUser> selectTrainCourseUserPage(TrainCourseUser trainCourseUser) {
|
||||
startPage();
|
||||
return trainCourseUserMapper.selectTrainCourseUserList(trainCourseUser);
|
||||
return trainCourseUserMapper.selectTrainCourseUserList( trainCourseUser );
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="delFlag != null and delFlag != '' "> and del_flag = #{delFlag}</if>
|
||||
</where>
|
||||
</select>
|
||||
<select id="authority" resultMap="TrainCourseUserResult">
|
||||
select
|
||||
<include refid="selectTrainCourseUserVo"/>
|
||||
from train_course_user
|
||||
<where>
|
||||
train_course_id = #{trainCourseId}
|
||||
and vip_user_id = #{vipUserId}
|
||||
<if test="days>0" >
|
||||
and ABS(DATEDIFF(create_date,now())) <![CDATA[
|
||||
<=#{days}
|
||||
]]>
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,126 @@
|
|||
package com.ruoyi.vip.controller;
|
||||
|
||||
import java.util.List;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.vip.domain.VipUserOrders;
|
||||
import com.ruoyi.vip.service.IVipUserOrdersService;
|
||||
import com.ruoyi.framework.web.base.BaseController;
|
||||
import com.ruoyi.framework.web.page.TableDataInfo;
|
||||
import com.ruoyi.common.base.AjaxResult;
|
||||
import com.ruoyi.common.utils.ExcelUtil;
|
||||
|
||||
/**
|
||||
* 我的订单 信息操作处理
|
||||
*
|
||||
* @author zhujj
|
||||
* @date 2019-01-25
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/vip/vipUserOrders")
|
||||
public class VipUserOrdersController extends BaseController
|
||||
{
|
||||
private String prefix = "vip/vipUserOrders";
|
||||
|
||||
@Autowired
|
||||
private IVipUserOrdersService vipUserOrdersService;
|
||||
|
||||
@RequiresPermissions("vip:vipUserOrders:view")
|
||||
@GetMapping()
|
||||
public String vipUserOrders()
|
||||
{
|
||||
return prefix + "/vipUserOrders";
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询我的订单列表
|
||||
*/
|
||||
@RequiresPermissions("vip:vipUserOrders:list")
|
||||
@PostMapping("/list")
|
||||
@ResponseBody
|
||||
public TableDataInfo list(VipUserOrders vipUserOrders)
|
||||
{
|
||||
List<VipUserOrders> list = vipUserOrdersService.selectVipUserOrdersPage(vipUserOrders);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 导出我的订单列表
|
||||
*/
|
||||
@RequiresPermissions("vip:vipUserOrders:export")
|
||||
@PostMapping("/export")
|
||||
@ResponseBody
|
||||
public AjaxResult export(VipUserOrders vipUserOrders)
|
||||
{
|
||||
List<VipUserOrders> list = vipUserOrdersService.selectVipUserOrdersList(vipUserOrders);
|
||||
ExcelUtil<VipUserOrders> util = new ExcelUtil<VipUserOrders>(VipUserOrders.class);
|
||||
return util.exportExcel(list, "vipUserOrders");
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增我的订单
|
||||
*/
|
||||
@GetMapping("/add")
|
||||
public String add()
|
||||
{
|
||||
return prefix + "/add";
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增保存我的订单
|
||||
*/
|
||||
@RequiresPermissions("vip:vipUserOrders:add")
|
||||
@Log(title = "我的订单", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/add")
|
||||
@ResponseBody
|
||||
public AjaxResult addSave(VipUserOrders vipUserOrders)
|
||||
{
|
||||
return toAjax(vipUserOrdersService.insert(vipUserOrders));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改我的订单
|
||||
*/
|
||||
@GetMapping("/edit/{id}")
|
||||
public String edit(@PathVariable("id") String id, ModelMap mmap)
|
||||
{
|
||||
VipUserOrders vipUserOrders = vipUserOrdersService.selectById(id);
|
||||
mmap.put("vipUserOrders", vipUserOrders);
|
||||
return prefix + "/edit";
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改保存我的订单
|
||||
*/
|
||||
@RequiresPermissions("vip:vipUserOrders:edit")
|
||||
@Log(title = "我的订单", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/edit")
|
||||
@ResponseBody
|
||||
public AjaxResult editSave(VipUserOrders vipUserOrders)
|
||||
{
|
||||
return toAjax(vipUserOrdersService.updateById(vipUserOrders));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除我的订单
|
||||
*/
|
||||
@RequiresPermissions("vip:vipUserOrders:remove")
|
||||
@Log(title = "我的订单", businessType = BusinessType.DELETE)
|
||||
@PostMapping( "/remove")
|
||||
@ResponseBody
|
||||
public AjaxResult remove(String ids)
|
||||
{
|
||||
return toAjax(vipUserOrdersService.deleteByIds(ids));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,167 @@
|
|||
package com.ruoyi.vip.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.base.BaseEntity;
|
||||
import javax.persistence.Id;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 我的订单表 vip_user_orders
|
||||
*
|
||||
* @author zhujj
|
||||
* @date 2019-01-25
|
||||
*/
|
||||
public class VipUserOrders
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 订单号 */
|
||||
@Id
|
||||
private String id;
|
||||
/** 会员代码 */
|
||||
private Integer vipUserId;
|
||||
/** 练习题代码 */
|
||||
private Integer trainCourseId;
|
||||
/** 支付金额 */
|
||||
private BigDecimal price;
|
||||
/** 创建者 */
|
||||
private String createBy;
|
||||
/** 创建时间 */
|
||||
private Date createDate;
|
||||
/** 更新者 */
|
||||
private String updateBy;
|
||||
/** 更新时间 */
|
||||
private Date updateDate;
|
||||
/** 备注信息 */
|
||||
private String remarks;
|
||||
/** 订单状态（0-默认，未支付 1-已支付） */
|
||||
private String delFlag;
|
||||
|
||||
/** 设置订单号 */
|
||||
public void setId(String id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
/** 获取订单号 */
|
||||
public String getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
/** 设置会员代码 */
|
||||
public void setVipUserId(Integer vipUserId)
|
||||
{
|
||||
this.vipUserId = vipUserId;
|
||||
}
|
||||
|
||||
/** 获取会员代码 */
|
||||
public Integer getVipUserId()
|
||||
{
|
||||
return vipUserId;
|
||||
}
|
||||
/** 设置练习题代码 */
|
||||
public void setTrainCourseId(Integer trainCourseId)
|
||||
{
|
||||
this.trainCourseId = trainCourseId;
|
||||
}
|
||||
|
||||
/** 获取练习题代码 */
|
||||
public Integer getTrainCourseId()
|
||||
{
|
||||
return trainCourseId;
|
||||
}
|
||||
/** 设置支付金额 */
|
||||
public void setPrice(BigDecimal price)
|
||||
{
|
||||
this.price = price;
|
||||
}
|
||||
|
||||
/** 获取支付金额 */
|
||||
public BigDecimal getPrice()
|
||||
{
|
||||
return price;
|
||||
}
|
||||
/** 设置创建者 */
|
||||
public void setCreateBy(String createBy)
|
||||
{
|
||||
this.createBy = createBy;
|
||||
}
|
||||
|
||||
/** 获取创建者 */
|
||||
public String getCreateBy()
|
||||
{
|
||||
return createBy;
|
||||
}
|
||||
/** 设置创建时间 */
|
||||
public void setCreateDate(Date createDate)
|
||||
{
|
||||
this.createDate = createDate;
|
||||
}
|
||||
|
||||
/** 获取创建时间 */
|
||||
public Date getCreateDate()
|
||||
{
|
||||
return createDate;
|
||||
}
|
||||
/** 设置更新者 */
|
||||
public void setUpdateBy(String updateBy)
|
||||
{
|
||||
this.updateBy = updateBy;
|
||||
}
|
||||
|
||||
/** 获取更新者 */
|
||||
public String getUpdateBy()
|
||||
{
|
||||
return updateBy;
|
||||
}
|
||||
/** 设置更新时间 */
|
||||
public void setUpdateDate(Date updateDate)
|
||||
{
|
||||
this.updateDate = updateDate;
|
||||
}
|
||||
|
||||
/** 获取更新时间 */
|
||||
public Date getUpdateDate()
|
||||
{
|
||||
return updateDate;
|
||||
}
|
||||
/** 设置备注信息 */
|
||||
public void setRemarks(String remarks)
|
||||
{
|
||||
this.remarks = remarks;
|
||||
}
|
||||
|
||||
/** 获取备注信息 */
|
||||
public String getRemarks()
|
||||
{
|
||||
return remarks;
|
||||
}
|
||||
/** 设置订单状态（0-默认，未支付 1-已支付） */
|
||||
public void setDelFlag(String delFlag)
|
||||
{
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
|
||||
/** 获取订单状态（0-默认，未支付 1-已支付） */
|
||||
public String getDelFlag()
|
||||
{
|
||||
return delFlag;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("vipUserId", getVipUserId())
|
||||
.append("trainCourseId", getTrainCourseId())
|
||||
.append("price", getPrice())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createDate", getCreateDate())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateDate", getUpdateDate())
|
||||
.append("remarks", getRemarks())
|
||||
.append("delFlag", getDelFlag())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
package com.ruoyi.vip.mapper;
|
||||
|
||||
import com.ruoyi.vip.domain.VipUserOrders;
|
||||
import java.util.List;
|
||||
import com.ruoyi.framework.web.base.MyMapper;
|
||||
|
||||
/**
|
||||
* 我的订单 数据层
|
||||
*
|
||||
* @author zhujj
|
||||
* @date 2019-01-25
|
||||
*/
|
||||
public interface VipUserOrdersMapper extends MyMapper<VipUserOrders>
|
||||
{
|
||||
|
||||
/**
|
||||
* 查询我的订单列表
|
||||
*
|
||||
* @param vipUserOrders 我的订单信息
|
||||
* @return 我的订单集合
|
||||
*/
|
||||
public List<VipUserOrders> selectVipUserOrdersList(VipUserOrders vipUserOrders);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
package com.ruoyi.vip.service;
|
||||
|
||||
import com.ruoyi.vip.domain.VipUserOrders;
|
||||
import java.util.List;
|
||||
import com.ruoyi.framework.web.base.AbstractBaseService;
|
||||
/**
|
||||
* 我的订单 服务层
|
||||
*
|
||||
* @author zhujj
|
||||
* @date 2019-01-25
|
||||
*/
|
||||
public interface IVipUserOrdersService extends AbstractBaseService<VipUserOrders>
|
||||
{
|
||||
/**
|
||||
* 查询我的订单分页列表
|
||||
*
|
||||
* @param vipUserOrders 我的订单信息
|
||||
* @return 我的订单集合
|
||||
*/
|
||||
public List<VipUserOrders> selectVipUserOrdersPage(VipUserOrders vipUserOrders);
|
||||
/**
|
||||
* 查询我的订单列表
|
||||
*
|
||||
* @param vipUserOrders 我的订单信息
|
||||
* @return 我的订单集合
|
||||
*/
|
||||
public List<VipUserOrders> selectVipUserOrdersList(VipUserOrders vipUserOrders);
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
package com.ruoyi.vip.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.vip.mapper.VipUserOrdersMapper;
|
||||
import com.ruoyi.vip.domain.VipUserOrders;
|
||||
import com.ruoyi.vip.service.IVipUserOrdersService;
|
||||
import com.ruoyi.common.support.Convert;
|
||||
import com.ruoyi.framework.web.base.AbstractBaseServiceImpl;
|
||||
/**
|
||||
* 我的订单 服务层实现
|
||||
*
|
||||
* @author zhujj
|
||||
* @date 2019-01-25
|
||||
*/
|
||||
@Service
|
||||
public class VipUserOrdersServiceImpl extends AbstractBaseServiceImpl<VipUserOrdersMapper,VipUserOrders> implements IVipUserOrdersService
|
||||
{
|
||||
@Autowired
|
||||
private VipUserOrdersMapper vipUserOrdersMapper;
|
||||
|
||||
|
||||
/**
|
||||
* 查询我的订单列表
|
||||
*
|
||||
* @param vipUserOrders 我的订单信息
|
||||
* @return 我的订单集合
|
||||
*/
|
||||
@Override
|
||||
public List<VipUserOrders> selectVipUserOrdersList(VipUserOrders vipUserOrders)
|
||||
{
|
||||
return vipUserOrdersMapper.selectVipUserOrdersList(vipUserOrders);
|
||||
}
|
||||
/**
|
||||
* 查询我的订单分页列表
|
||||
*
|
||||
* @param vipUserOrders 我的订单信息
|
||||
* @return 我的订单集合
|
||||
*/
|
||||
@Override
|
||||
public List<VipUserOrders> selectVipUserOrdersPage(VipUserOrders vipUserOrders)
|
||||
{
|
||||
startPage();
|
||||
return vipUserOrdersMapper.selectVipUserOrdersList(vipUserOrders);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.vip.mapper.VipUserOrdersMapper">
|
||||
|
||||
<resultMap type="VipUserOrders" id="VipUserOrdersResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="vipUserId" column="vip_user_id" />
|
||||
<result property="trainCourseId" column="train_course_id" />
|
||||
<result property="price" column="price" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createDate" column="create_date" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateDate" column="update_date" />
|
||||
<result property="remarks" column="remarks" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectVipUserOrdersVo">
|
||||
id, vip_user_id, train_course_id, price, create_by, create_date, update_by, update_date, remarks, del_flag </sql>
|
||||
|
||||
<select id="selectVipUserOrdersList" parameterType="VipUserOrders" resultMap="VipUserOrdersResult">
|
||||
select
|
||||
<include refid="selectVipUserOrdersVo"/>
|
||||
from vip_user_orders
|
||||
<where>
|
||||
<if test="id != null and id != '' "> and id = #{id}</if>
|
||||
<if test="vipUserId != null "> and vip_user_id = #{vipUserId}</if>
|
||||
<if test="trainCourseId != null "> and train_course_id = #{trainCourseId}</if>
|
||||
<if test="price != null "> and price = #{price}</if>
|
||||
<if test="createBy != null and createBy != '' "> and create_by = #{createBy}</if>
|
||||
<if test="createDate != null "> and create_date = #{createDate}</if>
|
||||
<if test="updateBy != null and updateBy != '' "> and update_by = #{updateBy}</if>
|
||||
<if test="updateDate != null "> and update_date = #{updateDate}</if>
|
||||
<if test="remarks != null and remarks != '' "> and remarks = #{remarks}</if>
|
||||
<if test="delFlag != null and delFlag != '' "> and del_flag = #{delFlag}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,82 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
|
||||
<meta charset="utf-8">
|
||||
<head th:include="include :: header"></head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-vipUserOrders-add">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">会员代码：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="vipUserId" name="vipUserId" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">练习题代码：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="trainCourseId" name="trainCourseId" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">支付金额：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="price" name="price" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">创建者：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="createBy" name="createBy" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">创建时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="createDate" name="createDate" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">更新者：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="updateBy" name="updateBy" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">更新时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="updateDate" name="updateDate" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">备注信息：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="remarks" name="remarks" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">订单状态（0-默认，未支付 1-已支付）：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="delFlag" name="delFlag" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div th:include="include::footer"></div>
|
||||
<script type="text/javascript">
|
||||
var prefix = ctx + "vip/vipUserOrders"
|
||||
$("#form-vipUserOrders-add").validate({
|
||||
rules:{
|
||||
xxxx:{
|
||||
required:true,
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/add", $('#form-vipUserOrders-add').serialize());
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
|
||||
<meta charset="utf-8">
|
||||
<head th:include="include :: header"></head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-vipUserOrders-edit" th:object="${vipUserOrders}">
|
||||
<input id="id" name="id" th:field="*{id}" type="hidden">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">会员代码：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="vipUserId" name="vipUserId" th:field="*{vipUserId}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">练习题代码：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="trainCourseId" name="trainCourseId" th:field="*{trainCourseId}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">支付金额：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="price" name="price" th:field="*{price}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">创建者：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="createBy" name="createBy" th:field="*{createBy}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">创建时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="createDate" name="createDate" th:field="*{createDate}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">更新者：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="updateBy" name="updateBy" th:field="*{updateBy}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">更新时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="updateDate" name="updateDate" th:field="*{updateDate}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">备注信息：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="remarks" name="remarks" th:field="*{remarks}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">订单状态（0-默认，未支付 1-已支付）：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="delFlag" name="delFlag" th:field="*{delFlag}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div th:include="include::footer"></div>
|
||||
<script type="text/javascript">
|
||||
var prefix = ctx + "vip/vipUserOrders"
|
||||
$("#form-vipUserOrders-edit").validate({
|
||||
rules:{
|
||||
xxxx:{
|
||||
required:true,
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/edit", $('#form-vipUserOrders-edit').serialize());
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,161 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
||||
<meta charset="utf-8">
|
||||
<head th:include="include :: header"></head>
|
||||
<body class="gray-bg">
|
||||
|
||||
<div class="container-div">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 search-collapse">
|
||||
<form id="formId">
|
||||
<div class="select-list">
|
||||
<ul>
|
||||
<li>
|
||||
会员代码：<input type="text" name="vipUserId"/>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
练习题代码：<input type="text" name="trainCourseId"/>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
支付金额：<input type="text" name="price"/>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
创建者：<input type="text" name="createBy"/>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
创建时间：<input type="text" name="createDate"/>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
更新者：<input type="text" name="updateBy"/>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
更新时间：<input type="text" name="updateDate"/>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
备注信息：<input type="text" name="remarks"/>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
订单状态（0-默认，未支付 1-已支付）：<input type="text" name="delFlag"/>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
||||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
|
||||
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="vip:vipUserOrders:add">
|
||||
<i class="fa fa-plus"></i> 添加
|
||||
</a>
|
||||
<a class="btn btn-primary btn-edit disabled" onclick="$.operate.edit()" shiro:hasPermission="vip:vipUserOrders:edit">
|
||||
<i class="fa fa-edit"></i> 修改
|
||||
</a>
|
||||
<a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="vip:vipUserOrders:remove">
|
||||
<i class="fa fa-remove"></i> 删除
|
||||
</a>
|
||||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="vip:vipUserOrders:export">
|
||||
<i class="fa fa-download"></i> 导出
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<table id="bootstrap-table" data-mobile-responsive="true"></table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div th:include="include :: footer"></div>
|
||||
<script th:inline="javascript">
|
||||
var editFlag = [[${@permission.hasPermi('vip:vipUserOrders:edit')}]];
|
||||
var removeFlag = [[${@permission.hasPermi('vip:vipUserOrders:remove')}]];
|
||||
var prefix = ctx + "vip/vipUserOrders";
|
||||
|
||||
$(function() {
|
||||
var options = {
|
||||
url: prefix + "/list",
|
||||
createUrl: prefix + "/add",
|
||||
updateUrl: prefix + "/edit/{id}",
|
||||
removeUrl: prefix + "/remove",
|
||||
exportUrl: prefix + "/export",
|
||||
modalName: "我的订单",
|
||||
search: false,
|
||||
showExport: true,
|
||||
columns: [{
|
||||
checkbox: true
|
||||
},
|
||||
{
|
||||
field : 'id',
|
||||
title : '订单号',
|
||||
visible: false
|
||||
},
|
||||
{
|
||||
field : 'vipUserId',
|
||||
title : '会员代码',
|
||||
sortable: true
|
||||
},
|
||||
{
|
||||
field : 'trainCourseId',
|
||||
title : '练习题代码',
|
||||
sortable: true
|
||||
},
|
||||
{
|
||||
field : 'price',
|
||||
title : '支付金额',
|
||||
sortable: true
|
||||
},
|
||||
{
|
||||
field : 'createBy',
|
||||
title : '创建者',
|
||||
sortable: true
|
||||
},
|
||||
{
|
||||
field : 'createDate',
|
||||
title : '创建时间',
|
||||
sortable: true
|
||||
},
|
||||
{
|
||||
field : 'updateBy',
|
||||
title : '更新者',
|
||||
sortable: true
|
||||
},
|
||||
{
|
||||
field : 'updateDate',
|
||||
title : '更新时间',
|
||||
sortable: true
|
||||
},
|
||||
{
|
||||
field : 'remarks',
|
||||
title : '备注信息',
|
||||
sortable: true
|
||||
},
|
||||
{
|
||||
field : 'delFlag',
|
||||
title : '订单状态（0-默认，未支付 1-已支付）',
|
||||
sortable: true
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
align: 'center',
|
||||
formatter: function(value, row, index) {
|
||||
var actions = [];
|
||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
||||
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||
return actions.join('');
|
||||
}
|
||||
}]
|
||||
};
|
||||
$.table.init(options);
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -2,7 +2,11 @@ package com.ruoyi.wx.pay.controller;
|
|||
|
||||
import java.io.File;
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.ruoyi.common.utils.IpUtils;
|
||||
import com.ruoyi.framework.web.util.ServletUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
|
|
@ -142,6 +146,8 @@ public class WxPayController {
|
|||
@ApiOperation(value = "统一下单，并组装所需支付参数")
|
||||
@PostMapping("/createOrder")
|
||||
public <T> T createOrder(@RequestBody WxPayUnifiedOrderRequest request) throws WxPayException {
|
||||
request.setOutTradeNo( IdUtil.simpleUUID());
|
||||
request.setSpbillCreateIp( IpUtils.getIpAddr( ServletUtils.getRequest()));
|
||||
return this.wxService.createOrder(request);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue