解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/7407.6964a3ef.async.js b/ruoyi-admin/src/main/resources/static/7407.6964a3ef.async.js
new file mode 100644
index 0000000..14b28aa
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/7407.6964a3ef.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[7407],{94162:function(z,I,n){var u=n(64599),h=n.n(u),D=n(67294),y=n(66309),v=n(85893),E=function(c){function R(a){switch(a){case"primary":return"blue";case"success":return"success";case"info":return"green";case"warning":return"warning";case"danger":return"error";case"default":default:return"default"}}function $(a){if(a===void 0)return"";if(c.enums){var m=c.enums[a];return m.label}if(c.options){if(!Array.isArray(c.options))return console.log("DictTag options is no array!"),"";var s=h()(c.options),g;try{for(s.s();!(g=s.n()).done;){var p=g.value;if(p.value===a)return p.text}}catch(o){s.e(o)}finally{s.f()}}return String(c.value)}function O(a){if(a===void 0)return"default";if(c.enums){var m=c.enums[a];return m.listClass||"default"}if(c.options){if(!Array.isArray(c.options))return console.log("DictTag options is no array!"),"default";var s=h()(c.options),g;try{for(s.s();!(g=s.n()).done;){var p=g.value;if(p.value===a)return p.listClass||"default"}}catch(o){s.e(o)}finally{s.f()}}return String(c.value)}var j=function(){return R(O(c.value).toLowerCase())},L=function(){return $(c.value)};return(0,v.jsx)(y.Z,{color:j(),children:L()})};I.Z=E},38002:function(z,I,n){n.d(I,{KF:function(){return p},Ny:function(){return g},Q6:function(){return s},U0:function(){return M},jw:function(){return a}});var u=n(15009),h=n.n(u),D=n(99289),y=n.n(D),v=n(76772),E=n(30964);function M(o){return c.apply(this,arguments)}function c(){return c=y()(h()().mark(function o(b){return h()().wrap(function(i){for(;;)switch(i.prev=i.next){case 0:return i.abrupt("return",(0,v.request)("/api/monitor/logininfor/list",{method:"GET",headers:{"Content-Type":"application/json;charset=UTF-8"},params:b}));case 1:case"end":return i.stop()}},o)})),c.apply(this,arguments)}function R(o){return request("/api/monitor/logininfor/".concat(o),{method:"GET"})}function $(o){return O.apply(this,arguments)}function O(){return O=_asyncToGenerator(_regeneratorRuntime().mark(function o(b){return _regeneratorRuntime().wrap(function(i){for(;;)switch(i.prev=i.next){case 0:return i.abrupt("return",request("/api/monitor/logininfor",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:b}));case 1:case"end":return i.stop()}},o)})),O.apply(this,arguments)}function j(o){return L.apply(this,arguments)}function L(){return L=_asyncToGenerator(_regeneratorRuntime().mark(function o(b){return _regeneratorRuntime().wrap(function(i){for(;;)switch(i.prev=i.next){case 0:return i.abrupt("return",request("/api/monitor/logininfor",{method:"PUT",headers:{"Content-Type":"application/json;charset=UTF-8"},data:b}));case 1:case"end":return i.stop()}},o)})),L.apply(this,arguments)}function a(o){return m.apply(this,arguments)}function m(){return m=y()(h()().mark(function o(b){return h()().wrap(function(i){for(;;)switch(i.prev=i.next){case 0:return i.abrupt("return",(0,v.request)("/api/monitor/logininfor/".concat(b),{method:"DELETE"}));case 1:case"end":return i.stop()}},o)})),m.apply(this,arguments)}function s(o){return(0,E.su)("/api/monitor/logininfor/export",{params:o},"logininfor_".concat(new Date().getTime(),".xlsx"))}function g(o){return(0,v.request)("/api/monitor/logininfor/unlock/"+o,{method:"get"})}function p(){return(0,v.request)("/api/monitor/logininfor/clean",{method:"delete"})}},30964:function(z,I,n){n.d(I,{p6:function(){return $},su:function(){return O}});var u=n(15009),h=n.n(u),D=n(97857),y=n.n(D),v=n(99289),E=n.n(v),M=n(76772),c={xlsx:"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",zip:"application/zip"};function R(a,m){var s=document.createElement("a"),g=new Blob([a.data],{type:m}),p=new RegExp("filename=([^;]+\\.[^\\.;]+);*"),o=decodeURI(a.headers["content-disposition"]),b=p.exec(o),_=b?b[1]:"file";_=_.replace(/"/g,""),s.style.display="none",s.href=URL.createObjectURL(g),s.setAttribute("download",_),document.body.appendChild(s),s.click(),URL.revokeObjectURL(s.href),document.body.removeChild(s)}function $(a){(0,M.request)(a,{method:"GET",responseType:"blob",getResponse:!0}).then(function(m){R(m,c.zip)})}function O(a,m,s){return j.apply(this,arguments)}function j(){return j=E()(h()().mark(function a(m,s,g){return h()().wrap(function(o){for(;;)switch(o.prev=o.next){case 0:return o.abrupt("return",(0,M.request)(m,y()(y()({},s),{},{method:"POST",responseType:"blob"})).then(function(b){var _=document.createElement("a"),i=b;_.style.display="none",_.href=URL.createObjectURL(i),_.setAttribute("download",g),document.body.appendChild(_),_.click(),URL.revokeObjectURL(_.href),document.body.removeChild(_)}));case 1:case"end":return o.stop()}},a)})),j.apply(this,arguments)}function L(a){window.location.href="/api/common/download?fileName=".concat(encodeURI(a),"&delete=",!0)}},66309:function(z,I,n){n.d(I,{Z:function(){return se}});var u=n(67294),h=n(93967),D=n.n(h),y=n(98423),v=n(98787),E=n(69760),M=n(96159),c=n(45353),R=n(53124),$=n(11568),O=n(15063),j=n(14747),L=n(83262),a=n(83559);const m=e=>{const{paddingXXS:l,lineWidth:d,tagPaddingHorizontal:r,componentCls:t,calc:T}=e,f=T(r).sub(d).equal(),A=T(l).sub(d).equal();return{[t]:Object.assign(Object.assign({},(0,j.Wf)(e)),{display:"inline-block",height:"auto",marginInlineEnd:e.marginXS,paddingInline:f,fontSize:e.tagFontSize,lineHeight:e.tagLineHeight,whiteSpace:"nowrap",background:e.defaultBg,border:`${(0,$.bf)(e.lineWidth)} ${e.lineType} ${e.colorBorder}`,borderRadius:e.borderRadiusSM,opacity:1,transition:`all ${e.motionDurationMid}`,textAlign:"start",position:"relative",[`&${t}-rtl`]:{direction:"rtl"},"&, a, a:hover":{color:e.defaultColor},[`${t}-close-icon`]:{marginInlineStart:A,fontSize:e.tagIconSize,color:e.colorTextDescription,cursor:"pointer",transition:`all ${e.motionDurationMid}`,"&:hover":{color:e.colorTextHeading}},[`&${t}-has-color`]:{borderColor:"transparent",[`&, a, a:hover, ${e.iconCls}-close, ${e.iconCls}-close:hover`]:{color:e.colorTextLightSolid}},"&-checkable":{backgroundColor:"transparent",borderColor:"transparent",cursor:"pointer",[`&:not(${t}-checkable-checked):hover`]:{color:e.colorPrimary,backgroundColor:e.colorFillSecondary},"&:active, &-checked":{color:e.colorTextLightSolid},"&-checked":{backgroundColor:e.colorPrimary,"&:hover":{backgroundColor:e.colorPrimaryHover}},"&:active":{backgroundColor:e.colorPrimaryActive}},"&-hidden":{display:"none"},[`> ${e.iconCls} + span, > span + ${e.iconCls}`]:{marginInlineStart:f}}),[`${t}-borderless`]:{borderColor:"transparent",background:e.tagBorderlessBg}}},s=e=>{const{lineWidth:l,fontSizeIcon:d,calc:r}=e,t=e.fontSizeSM;return(0,L.IX)(e,{tagFontSize:t,tagLineHeight:(0,$.bf)(r(e.lineHeightSM).mul(t).equal()),tagIconSize:r(d).sub(r(l).mul(2)).equal(),tagPaddingHorizontal:8,tagBorderlessBg:e.defaultBg})},g=e=>({defaultBg:new O.t(e.colorFillQuaternary).onBackground(e.colorBgContainer).toHexString(),defaultColor:e.colorText});var p=(0,a.I$)("Tag",e=>{const l=s(e);return m(l)},g),o=function(e,l){var d={};for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&l.indexOf(r)<0&&(d[r]=e[r]);if(e!=null&&typeof Object.getOwnPropertySymbols=="function")for(var t=0,r=Object.getOwnPropertySymbols(e);t<r.length;t++)l.indexOf(r[t])<0&&Object.prototype.propertyIsEnumerable.call(e,r[t])&&(d[r[t]]=e[r[t]]);return d},_=u.forwardRef((e,l)=>{const{prefixCls:d,style:r,className:t,checked:T,onChange:f,onClick:A}=e,x=o(e,["prefixCls","style","className","checked","onChange","onClick"]),{getPrefixCls:w,tag:S}=u.useContext(R.E_),H=K=>{f==null||f(!T),A==null||A(K)},B=w("tag",d),[F,G,P]=p(B),V=D()(B,`${B}-checkable`,{[`${B}-checkable-checked`]:T},S==null?void 0:S.className,t,G,P);return F(u.createElement("span",Object.assign({},x,{ref:l,style:Object.assign(Object.assign({},r),S==null?void 0:S.style),className:V,onClick:H})))}),i=n(98719);const re=e=>(0,i.Z)(e,(l,d)=>{let{textColor:r,lightBorderColor:t,lightColor:T,darkColor:f}=d;return{[`${e.componentCls}${e.componentCls}-${l}`]:{color:r,background:T,borderColor:t,"&-inverse":{color:e.colorTextLightSolid,background:f,borderColor:f},[`&${e.componentCls}-borderless`]:{borderColor:"transparent"}}}});var oe=(0,a.bk)(["Tag","preset"],e=>{const l=s(e);return re(l)},g);function te(e){return typeof e!="string"?e:e.charAt(0).toUpperCase()+e.slice(1)}const N=(e,l,d)=>{const r=te(d);return{[`${e.componentCls}${e.componentCls}-${l}`]:{color:e[`color${d}`],background:e[`color${r}Bg`],borderColor:e[`color${r}Border`],[`&${e.componentCls}-borderless`]:{borderColor:"transparent"}}}};var ae=(0,a.bk)(["Tag","status"],e=>{const l=s(e);return[N(l,"success","Success"),N(l,"processing","Info"),N(l,"error","Error"),N(l,"warning","Warning")]},g),le=function(e,l){var d={};for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&l.indexOf(r)<0&&(d[r]=e[r]);if(e!=null&&typeof Object.getOwnPropertySymbols=="function")for(var t=0,r=Object.getOwnPropertySymbols(e);t<r.length;t++)l.indexOf(r[t])<0&&Object.prototype.propertyIsEnumerable.call(e,r[t])&&(d[r[t]]=e[r[t]]);return d};const Q=u.forwardRef((e,l)=>{const{prefixCls:d,className:r,rootClassName:t,style:T,children:f,icon:A,color:x,onClose:w,bordered:S=!0,visible:H}=e,B=le(e,["prefixCls","className","rootClassName","style","children","icon","color","onClose","bordered","visible"]),{getPrefixCls:F,direction:G,tag:P}=u.useContext(R.E_),[V,K]=u.useState(!0),ie=(0,y.Z)(B,["closeIcon","closable"]);u.useEffect(()=>{H!==void 0&&K(H)},[H]);const J=(0,v.o2)(x),Y=(0,v.yT)(x),Z=J||Y,ce=Object.assign(Object.assign({backgroundColor:x&&!Z?x:void 0},P==null?void 0:P.style),T),C=F("tag",d),[ue,de,_e]=p(C),me=D()(C,P==null?void 0:P.className,{[`${C}-${x}`]:Z,[`${C}-has-color`]:x&&!Z,[`${C}-hidden`]:!V,[`${C}-rtl`]:G==="rtl",[`${C}-borderless`]:!S},r,t,de,_e),k=U=>{U.stopPropagation(),w==null||w(U),!U.defaultPrevented&&K(!1)},[,ge]=(0,E.Z)((0,E.w)(e),(0,E.w)(P),{closable:!1,closeIconRender:U=>{const be=u.createElement("span",{className:`${C}-close-icon`,onClick:k},U);return(0,M.wm)(U,be,W=>({onClick:ne=>{var X;(X=W==null?void 0:W.onClick)===null||X===void 0||X.call(W,ne),k(ne)},className:D()(W==null?void 0:W.className,`${C}-close-icon`)}))}}),fe=typeof B.onClick=="function"||f&&f.type==="a",q=A||null,pe=q?u.createElement(u.Fragment,null,q,f&&u.createElement("span",null,f)):f,ee=u.createElement("span",Object.assign({},ie,{ref:l,className:me,style:ce}),pe,ge,J&&u.createElement(oe,{key:"preset",prefixCls:C}),Y&&u.createElement(ae,{key:"status",prefixCls:C}));return ue(fe?u.createElement(c.Z,{component:"Tag"},ee):ee)});Q.CheckableTag=_;var se=Q}}]);