diff --git a/ruoyi-admin/src/main/resources/static/web/res/layui/qrcode.js b/ruoyi-admin/src/main/resources/static/web/res/layui/qrcode.js new file mode 100644 index 000000000..5507c154f --- /dev/null +++ b/ruoyi-admin/src/main/resources/static/web/res/layui/qrcode.js @@ -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 http://www.d-project.com/ + * @see http://jeromeetienne.github.com/jquery-qrcode/ + */ +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=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>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>>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;itotalDataCount*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=0)?modPoly.get(modIndex):0;}} + var totalCodeCount=0;for(var i=0;i=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;i5){lostPoint+=(3+sameCount-5);}}} + for(var row=0;row=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<>>(7-index%8))&1)==1;},put:function(num,length){for(var i=0;i>>(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 = ['']; + + for (var row = 0; row < nCount; row++) { + aHTML.push(''); + + for (var col = 0; col < nCount; col++) { + aHTML.push(''); + } + + aHTML.push(''); + } + + aHTML.push('
'); + _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; +})(); diff --git a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java index 9583154c6..fd6ef0841 100644 --- a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java +++ b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java @@ -14,6 +14,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 +43,9 @@ public class CmsController { @Autowired private ITrainCourseService trainCourseService; + @Autowired + private ITrainCourseUserService trainCourseUserService; + @Autowired private ITrainCourseCategoryService trainCourseCategoryService; @@ -68,21 +72,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 list = trainCourseService.selectTrainCoursePage( trainCourseVO ); map.put( "trainCourse", list ); @@ -104,10 +108,14 @@ public class CmsController { ExamPractice examPractice = new ExamPractice(); examPractice.setTrainCourseId( id ); List examPractices = examPracticeService.selectExamPracticeList( examPractice ); + if (ShiroUtils.getSysUser() != null) { + boolean b = trainCourseUserService.authority( ShiroUtils.getSysUser().getUserId(), id ); + map.put( "user", ShiroUtils.getSysUser() ); + map.put( "courseAuth",b); + } map.put( "trainCourse", trainCourse ); map.put( "trainCourseSections", trainCourseSections ); map.put( "examPractices", examPractices ); - map.put( "user", ShiroUtils.getSysUser() ); return prefix + "/course/courseInfo"; } diff --git a/ruoyi-cms/src/main/resources/templates/web/course/courseInfo.html b/ruoyi-cms/src/main/resources/templates/web/course/courseInfo.html index c08c4fa8d..759bfcc0d 100644 --- a/ruoyi-cms/src/main/resources/templates/web/course/courseInfo.html +++ b/ruoyi-cms/src/main/resources/templates/web/course/courseInfo.html @@ -178,8 +178,8 @@
- - 有效期:永久 + + 有效期:${config.getKey("course.days")}(天)
@@ -202,9 +202,12 @@
@@ -226,11 +229,79 @@
+ + + + + - \ No newline at end of file + + diff --git a/ruoyi-cms/src/main/resources/templates/web/index.html b/ruoyi-cms/src/main/resources/templates/web/index.html index 638b86437..9dd781346 100644 --- a/ruoyi-cms/src/main/resources/templates/web/index.html +++ b/ruoyi-cms/src/main/resources/templates/web/index.html @@ -1,5 +1,6 @@ - + diff --git a/ruoyi-train/pom.xml b/ruoyi-train/pom.xml index 7cec0c342..e9cdb0027 100644 --- a/ruoyi-train/pom.xml +++ b/ruoyi-train/pom.xml @@ -30,6 +30,11 @@ ruoyi-framework ${ruoyi.version} + + com.ruoyi + ruoyi-weixin + ${ruoyi.version} + com.aliyun aliyun-java-sdk-core diff --git a/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java b/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java index 7341510d1..a95454e85 100644 --- a/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java +++ b/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java @@ -1,18 +1,21 @@ package com.ruoyi.train.course.controller; import cn.hutool.json.JSONObject; +import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; +import com.github.binarywang.wxpay.exception.WxPayException; +import com.github.binarywang.wxpay.service.WxPayService; 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 +32,8 @@ import java.util.List; public class ApiTrainCourseController extends BaseController { @Autowired private ITrainCourseService trainCourseService; - + @Autowired + private ITrainCourseUserService trainCourseUserService ; @Autowired private ITrainCourseCategoryService trainCourseCategoryService; @@ -38,6 +42,16 @@ public class ApiTrainCourseController extends BaseController { @Autowired private ISysUserService sysUserService; + /** + * 查询课程列表 + */ + @GetMapping("/trainCourse/category") + public AjaxResult list( TrainCourseCategory category) { + List trainCourseCategories = trainCourseCategoryService.selectCategoryList( category ); + AjaxResult success = success( "查询成功" ); + success.put( "data", trainCourseCategories ); + return success; + } /** * 查询课程列表 */ @@ -95,4 +109,16 @@ public class ApiTrainCourseController extends BaseController { success.put( "data", trainCourseSections ); return success; } + @Autowired + private WxPayService wxService; + @PostMapping("/notify/order") + public AjaxResult parseOrderNotifyResult(@RequestBody String xmlData) throws WxPayException { + final WxPayOrderNotifyResult notifyResult = this.wxService.parseOrderNotifyResult(xmlData); + TrainCourseUser courseUser = new TrainCourseUser(); + courseUser.setVipUserId( ShiroUtils.getUserId().intValue() ); + + trainCourseUserService.insert(courseUser); + // TODO 根据自己业务场景需要构造返回对象 + return AjaxResult.success("成功"); + } } diff --git a/ruoyi-train/src/main/java/com/ruoyi/train/course/mapper/TrainCourseUserMapper.java b/ruoyi-train/src/main/java/com/ruoyi/train/course/mapper/TrainCourseUserMapper.java index 25e9a96cb..e55c9a336 100644 --- a/ruoyi-train/src/main/java/com/ruoyi/train/course/mapper/TrainCourseUserMapper.java +++ b/ruoyi-train/src/main/java/com/ruoyi/train/course/mapper/TrainCourseUserMapper.java @@ -22,5 +22,12 @@ public interface TrainCourseUserMapper extends MyMapper * @return 课程使用对象集合 */ public List selectTrainCourseUserList(TrainCourseUser trainCourseUser); - + + /** + * 判断是否有权限 + * @param userId + * @param trainCourseId + * @return + */ + List authority(Long userId, Integer trainCourseId,Integer days); } \ No newline at end of file diff --git a/ruoyi-train/src/main/java/com/ruoyi/train/course/service/ITrainCourseUserService.java b/ruoyi-train/src/main/java/com/ruoyi/train/course/service/ITrainCourseUserService.java index 339300a17..2fe391473 100644 --- a/ruoyi-train/src/main/java/com/ruoyi/train/course/service/ITrainCourseUserService.java +++ b/ruoyi-train/src/main/java/com/ruoyi/train/course/service/ITrainCourseUserService.java @@ -28,5 +28,10 @@ public interface ITrainCourseUserService extends AbstractBaseService selectTrainCourseUserList(TrainCourseUser trainCourseUser); - + /** + * 判断是否有权限 + * @param userId 会员id + * @param trainCourseId 课程id + */ + boolean authority(Long userId, Integer trainCourseId); } diff --git a/ruoyi-train/src/main/java/com/ruoyi/train/course/service/impl/TrainCourseUserServiceImpl.java b/ruoyi-train/src/main/java/com/ruoyi/train/course/service/impl/TrainCourseUserServiceImpl.java index 3a2b78e6a..bb5387cdd 100644 --- a/ruoyi-train/src/main/java/com/ruoyi/train/course/service/impl/TrainCourseUserServiceImpl.java +++ b/ruoyi-train/src/main/java/com/ruoyi/train/course/service/impl/TrainCourseUserServiceImpl.java @@ -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 implements ITrainCourseUserService -{ - @Autowired - private TrainCourseUserMapper trainCourseUserMapper; +public class TrainCourseUserServiceImpl extends AbstractBaseServiceImpl implements ITrainCourseUserService { + @Autowired + private TrainCourseUserMapper trainCourseUserMapper; - - /** + @Autowired + private ISysConfigService configService; + + /** * 查询课程使用对象列表 - * + * * @param trainCourseUser 课程使用对象信息 * @return 课程使用对象集合 */ - @Override - public List selectTrainCourseUserList(TrainCourseUser trainCourseUser) - { - return trainCourseUserMapper.selectTrainCourseUserList(trainCourseUser); - } + @Override + public List 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 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 selectTrainCourseUserPage(TrainCourseUser trainCourseUser) - { + public List selectTrainCourseUserPage(TrainCourseUser trainCourseUser) { startPage(); - return trainCourseUserMapper.selectTrainCourseUserList(trainCourseUser); + return trainCourseUserMapper.selectTrainCourseUserList( trainCourseUser ); } } diff --git a/ruoyi-train/src/main/resources/mapper/train/course/TrainCourseUserMapper.xml b/ruoyi-train/src/main/resources/mapper/train/course/TrainCourseUserMapper.xml index c9e70563f..870130d40 100644 --- a/ruoyi-train/src/main/resources/mapper/train/course/TrainCourseUserMapper.xml +++ b/ruoyi-train/src/main/resources/mapper/train/course/TrainCourseUserMapper.xml @@ -35,6 +35,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and del_flag = #{delFlag} + + - \ No newline at end of file diff --git a/ruoyi-weixin/src/main/java/com/ruoyi/wx/pay/controller/WxPayController.java b/ruoyi-weixin/src/main/java/com/ruoyi/wx/pay/controller/WxPayController.java index 1d7199754..594ca4c13 100644 --- a/ruoyi-weixin/src/main/java/com/ruoyi/wx/pay/controller/WxPayController.java +++ b/ruoyi-weixin/src/main/java/com/ruoyi/wx/pay/controller/WxPayController.java @@ -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 createOrder(@RequestBody WxPayUnifiedOrderRequest request) throws WxPayException { + request.setOutTradeNo( IdUtil.simpleUUID()); + request.setSpbillCreateIp( IpUtils.getIpAddr( ServletUtils.getRequest())); return this.wxService.createOrder(request); }