Merge remote-tracking branch 'origin/master'

.idea/workspace.xml

@@ -1,255 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="29a6d56d-1aa9-48f9-a3d8-df24d70f5f78" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_9.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_6_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_11_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/KeyPairFactory.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/WxPayConfig.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/utils/PayUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/utils/WxSignV3Utils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/apiclient_cert.p12" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/apiclient_cert.pem" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/apiclient_key.pem" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/MP_verify_gA4G3oGfXoY3rFmg.txt" afterDir="false" />
+    <list default="true" id="29a6d56d-1aa9-48f9-a3d8-df24d70f5f78" name="Default Changelist" comment="提交">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/mybusiness.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/mybusiness.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/SessionHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/SessionHelper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/Token.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/Token.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/domain/HttpClientUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/utils/HttpClientUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/domain/WxPay.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/domain/WxPay.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/WxPayConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/WxPayConfig.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/controller/XhnController.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/controller/XhnController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/domain/WxUserInfo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/mapper/WxUserMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/service/WxService.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/service/WxService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/service/impl/WxServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/service/impl/WxServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhnnotsingle/registeruser/domain/XhnRegisterUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhnnotsingle/registeruser/domain/XhnRegisterUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhn/xhnIndex.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/xhnIndex.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhn/xhnlogin.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/xhnlogin.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/add.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/edit.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/matchmaker.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/matchmaker.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/config/SessionHelper.class" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/config/SessionHelper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/config/Token.class" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/config/Token.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/domain/HttpClientUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/domain/WxPay.class" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/domain/WxPay.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/xhn/controller/XhnController.class" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/xhn/controller/XhnController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/xhn/domain/WxUserInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/xhn/mapper/WxUserMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/xhn/service/WxService.class" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/xhn/service/WxService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/xhn/service/impl/WxServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/xhn/service/impl/WxServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/xhnnotsingle/registeruser/domain/XhnRegisterUser.class" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/target/classes/com/ruoyi/business/xhnnotsingle/registeruser/domain/XhnRegisterUser.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/templates/xhn/xhnIndex.html" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/templates/xhn/xhnlogin.html" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/templates/xhnnotsingle/matchmaker/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/target/classes/templates/xhnnotsingle/matchmaker/add.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/templates/xhnnotsingle/matchmaker/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/target/classes/templates/xhnnotsingle/matchmaker/edit.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/target/classes/templates/xhnnotsingle/matchmaker/matchmaker.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/target/classes/templates/xhnnotsingle/matchmaker/matchmaker.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/ruoyi-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/ruoyi-admin.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/beautifyhtml/beautifyhtml.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/beautifyhtml/beautifyhtml.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/blockUI/jquery.blockUI.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/blockUI/jquery.blockUI.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-editable.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-editable.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/cropper/cropper.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/cropper/cropper.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/cropper/cropper.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/cropper/cropper.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/cropper/cropper.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/cropper/cropper.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/cropper/cropper.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/cropper/cropper.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/cxselect/jquery.cxselect.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/cxselect/jquery.cxselect.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/flot/curvedLines.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/flot/curvedLines.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.pie.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.pie.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.resize.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.resize.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.spline.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.spline.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.symbol.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.symbol.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/fullscreen/jquery.fullscreen.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/fullscreen/jquery.fullscreen.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/custom.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/custom.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/icheck.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/icheck.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-layout/jquery.layout-latest.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-layout/jquery.layout-latest.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/zTreeStyle.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/zTreeStyle.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/zTreeStyle.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/zTreeStyle.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.excheck-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.excheck-3.5.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exedit-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exedit-3.5.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exhide-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exhide-3.5.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jsonview/jquery.jsonview.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jsonview/jquery.jsonview.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jsonview/jquery.jsonview.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/jsonview/jquery.jsonview.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/layer/layer.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/layer/layer.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/layer.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/layer.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/moon/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/moon/style.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.svg" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.svg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/laydate.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/laydate.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/suggest/bootstrap-suggest.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/suggest/bootstrap-suggest.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/suggest/bootstrap-suggest.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/suggest/bootstrap-suggest.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/font/summernote.eot" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/font/summernote.eot" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/font/summernote.ttf" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/font/summernote.ttf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/font/summernote.woff" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/font/summernote.woff" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/summernote-zh-CN.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/summernote-zh-CN.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/summernote.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/summernote.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/summernote.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/summernote.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/summernote.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/summernote/summernote.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/validate/additional-methods.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/validate/additional-methods.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/bootstrap.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/bootstrap.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/jquery.contextMenu.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/jquery.contextMenu.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/login.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/login.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/login.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/login.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/skins.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/skins.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/style.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/fonts/fontawesome-webfont.svg" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/fonts/fontawesome-webfont.svg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/fonts/glyphicons-halflings-regular.svg" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/fonts/glyphicons-halflings-regular.svg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/i18n/messages.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/i18n/messages.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/img/login-background.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/img/login-background.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/img/pay.png" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/img/pay.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/js/jquery.contextMenu.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/js/jquery.contextMenu.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/js/jquery.i18n.properties.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/js/jquery.i18n.properties.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/js/jquery.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/js/jquery.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/js/jquery.tmpl.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/js/jquery.tmpl.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/js/plugins/metisMenu/jquery.metisMenu.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/js/plugins/metisMenu/jquery.metisMenu.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/js/plugins/slimscroll/jquery.slimscroll.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/js/plugins/slimscroll/jquery.slimscroll.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/login.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/login.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/register.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/register.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/error/500.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/error/500.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/beautifyhtml/beautifyhtml.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/beautifyhtml/beautifyhtml.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/blockUI/jquery.blockUI.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/blockUI/jquery.blockUI.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/bootstrap-table.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/bootstrap-table.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/bootstrap-table.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/bootstrap-table.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-editable.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-editable.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cropper/cropper.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cropper/cropper.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cropper/cropper.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cropper/cropper.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cropper/cropper.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cropper/cropper.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cropper/cropper.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cropper/cropper.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cxselect/jquery.cxselect.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cxselect/jquery.cxselect.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/datapicker/bootstrap-datetimepicker.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/datapicker/bootstrap-datetimepicker.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/datapicker/bootstrap-datetimepicker.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/datapicker/bootstrap-datetimepicker.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/flot/curvedLines.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/flot/curvedLines.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/flot/jquery.flot.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/flot/jquery.flot.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/flot/jquery.flot.pie.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/flot/jquery.flot.pie.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/flot/jquery.flot.resize.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/flot/jquery.flot.resize.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/flot/jquery.flot.spline.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/flot/jquery.flot.spline.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/flot/jquery.flot.symbol.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/flot/jquery.flot.symbol.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/fullscreen/jquery.fullscreen.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/fullscreen/jquery.fullscreen.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/iCheck/custom.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/iCheck/custom.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/iCheck/icheck.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/iCheck/icheck.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jasny/jasny-bootstrap.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jasny/jasny-bootstrap.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jasny/jasny-bootstrap.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jasny/jasny-bootstrap.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-layout/jquery.layout-latest.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-layout/jquery.layout-latest.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/css/default/zTreeStyle.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/css/default/zTreeStyle.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/css/simple/zTreeStyle.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/css/simple/zTreeStyle.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.excheck-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.excheck-3.5.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exedit-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exedit-3.5.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exhide-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exhide-3.5.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jsonview/jquery.jsonview.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jsonview/jquery.jsonview.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jsonview/jquery.jsonview.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jsonview/jquery.jsonview.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layer/layer.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layer/layer.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layer/theme/default/layer.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layer/theme/default/layer.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layer/theme/moon/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layer/theme/moon/style.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.svg" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.svg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layui/css/modules/laydate/default/laydate.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layui/css/modules/laydate/default/laydate.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/suggest/bootstrap-suggest.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/suggest/bootstrap-suggest.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/suggest/bootstrap-suggest.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/suggest/bootstrap-suggest.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/font/summernote.eot" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/font/summernote.eot" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/font/summernote.ttf" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/font/summernote.ttf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/font/summernote.woff" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/font/summernote.woff" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/summernote-zh-CN.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/summernote-zh-CN.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/summernote.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/summernote.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/summernote.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/summernote.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/summernote.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/summernote.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/additional-methods.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/additional-methods.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/jquery.validate.extend.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/jquery.validate.extend.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/jquery.validate.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/jquery.validate.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/bootstrap.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/bootstrap.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/jquery.contextMenu.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/jquery.contextMenu.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/login.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/login.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/login.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/login.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/skins.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/skins.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/style.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/fonts/fontawesome-webfont.svg" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/fonts/fontawesome-webfont.svg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/fonts/glyphicons-halflings-regular.svg" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/fonts/glyphicons-halflings-regular.svg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/i18n/messages.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/i18n/messages.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/img/login-background.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/img/login-background.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/img/pay.png" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/img/pay.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery.contextMenu.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery.contextMenu.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery.i18n.properties.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery.i18n.properties.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery.tmpl.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery.tmpl.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/plugins/metisMenu/jquery.metisMenu.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/plugins/metisMenu/jquery.metisMenu.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/plugins/slimscroll/jquery.slimscroll.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/plugins/slimscroll/jquery.slimscroll.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/css/ry-ui.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/css/ry-ui.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/js/common.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/js/common.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/js/ry-ui.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/js/ry-ui.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/login.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/login.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/register.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/register.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/error/500.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/error/500.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/ruoyi-framework.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/ruoyi-framework.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/config/ShiroConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/config/ShiroConfig.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/shiro/realm/UserRealm.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/shiro/realm/UserRealm.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhnnotsingle/activityInfo/domain/XhnActivityInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhnnotsingle/activityInfo/domain/XhnActivityInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/xhnnotsingle/XhnActivityInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/xhnnotsingle/XhnActivityInfoMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/register.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/register.html" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/ruoyi-admin/target/" />
     <ignored path="$PROJECT_DIR$/ruoyi-common/target/" />
@@ -331,58 +90,61 @@
     <session id="-164937364">
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="html" value="209" />
-          <entry key="java" value="1170" />
+          <entry key="html" value="628" />
+          <entry key="java" value="1215" />
           <entry key="properties" value="1" />
           <entry key="txt" value="2" />
-          <entry key="xml" value="10" />
+          <entry key="xml" value="55" />
           <entry key="yml" value="46" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="HTML" value="209" />
-          <entry key="JAVA" value="1170" />
+          <entry key="HTML" value="628" />
+          <entry key="JAVA" value="1215" />
           <entry key="PLAIN_TEXT" value="2" />
           <entry key="Properties" value="1" />
-          <entry key="XML" value="10" />
+          <entry key="SQL" value="1" />
+          <entry key="XML" value="54" />
           <entry key="YAML" value="46" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="html" value="11" />
-          <entry key="java" value="68" />
+          <entry key="html" value="14" />
+          <entry key="java" value="75" />
           <entry key="js" value="1" />
           <entry key="p12" value="2" />
           <entry key="pem" value="6" />
+          <entry key="png" value="2" />
           <entry key="properties" value="1" />
           <entry key="txt" value="1" />
-          <entry key="xml" value="2" />
+          <entry key="xml" value="3" />
           <entry key="yml" value="6" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="HTML" value="11" />
-          <entry key="JAVA" value="68" />
+          <entry key="HTML" value="14" />
+          <entry key="Image" value="2" />
+          <entry key="JAVA" value="75" />
           <entry key="JavaScript" value="1" />
           <entry key="PLAIN_TEXT" value="9" />
           <entry key="Properties" value="1" />
-          <entry key="XML" value="2" />
+          <entry key="XML" value="3" />
           <entry key="YAML" value="6" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="6" />
+          <entry key="project.closed" value="7" />
           <entry key="project.open.time.0" value="1" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.1" value="3" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.8" value="1" />
-          <entry key="project.opened" value="5" />
+          <entry key="project.opened" value="7" />
         </counts>
       </usages-collector>
     </session>
@@ -390,37 +152,37 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/edit.html">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/controller/XhnController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="361">
-              <caret line="43" column="14" lean-forward="true" selection-start-line="35" selection-start-column="8" selection-end-line="43" selection-end-column="14" />
+            <state relative-caret-position="219">
+              <caret line="618" column="59" selection-start-line="618" selection-start-column="52" selection-end-line="618" selection-end-column="59" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/controller/XhnController.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3059">
-              <caret line="191" column="30" selection-start-line="191" selection-start-column="30" selection-end-line="191" selection-end-column="30" />
+            <state relative-caret-position="387">
+              <caret line="432" column="19" lean-forward="true" selection-start-line="432" selection-start-column="19" selection-end-line="432" selection-end-column="19" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/xhnIndex.html">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/register.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="70" column="45" selection-start-line="70" selection-start-column="45" selection-end-line="70" selection-end-column="45" />
+            <state relative-caret-position="376">
+              <caret line="226" column="9" lean-forward="true" selection-start-line="226" selection-start-column="9" selection-end-line="226" selection-end-column="9" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/matchmaker.html">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/WxPayConfig.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="271">
-              <caret line="16" column="40" lean-forward="true" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" />
+            <state relative-caret-position="323">
+              <caret line="50" column="102" lean-forward="true" selection-start-line="50" selection-start-column="102" selection-end-line="50" selection-end-column="102" />
             </state>
           </provider>
         </entry>
@@ -437,8 +199,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/add.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="448">
-              <caret line="31" column="14" lean-forward="true" selection-start-line="23" selection-start-column="8" selection-end-line="31" selection-end-column="14" />
+            <state relative-caret-position="566">
+              <caret line="44" column="14" selection-start-line="44" selection-start-column="14" selection-end-line="44" selection-end-column="14" />
             </state>
           </provider>
         </entry>
@@ -455,27 +217,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>getSignMap</find>
-      <find>buildMessage</find>
-      <find>timeStamp</find>
-      <find>amount</find>
-      <find>HttpPost</find>
-      <find>verifier</find>
-      <find>wxUserMapper</find>
-      <find>WxUserInfo</find>
-      <find>imgConfig</find>
-      <find>debugger</find>
-      <find>kv-file-content</find>
-      <find>tOther</find>
-      <find>nowImgTotal</find>
-      <find>fileinput</find>
-      <find>newFilePs</find>
-      <find>uploadAsync</find>
-      <find>autoReplace</find>
-      <find>allowedFileExtensions</find>
-      <find>file-upload</find>
-      <find>getImgUrl</find>
-      <find>uploadImageArray</find>
       <find>image</find>
       <find>prefix</find>
       <find>common</find>
@@ -485,6 +226,27 @@
       <find>wechatUrl</find>
       <find>fileP</find>
       <find>getMeg</find>
+      <find>selectXhnActivityInfoList</find>
+      <find>selectXhnActivityInfoVo</find>
+      <find>daohang</find>
+      <find>pageNum</find>
+      <find>cardtest</find>
+      <find>constellation</find>
+      <find>isMarried</find>
+      <find>character</find>
+      <find>workNature</find>
+      <find>education</find>
+      <find>occupation</find>
+      <find>longDistanceLove</find>
+      <find>noAccepted</find>
+      <find>idealType</find>
+      <find>wechatCode</find>
+      <find>wechatArgot</find>
+      <find>getBoxList</find>
+      <find>lookHuodonng</find>
+      <find>userTable</find>
+      <find>div</find>
+      <find>ind_sx</find>
     </findStrings>
     <replaceStrings>
       <replace>ruoyi</replace>
@@ -538,9 +300,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-druid.yml" />
-        <option value="$PROJECT_DIR$/ruoyi-admin/pom.xml" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/java/business/zhnc/drugsArchives/domain/SyglDrugsArchives.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/business/domain/SysFileInfo.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/business/xhn/controller/XhnController.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/domain/HttpDeleteWithBody.java" />
@@ -572,7 +331,6 @@
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/KeyPairFactory.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/utils/PayUtils.java" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/WxPayConfig.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/domain/HttpClientUtil.java" />
         <option value="$PROJECT_DIR$/mybusiness/pom.xml" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/WxSignV3Utils.java" />
@@ -587,7 +345,12 @@
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/matchmaker.html" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/add.html" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/edit.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/WxPayConfig.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhnnotsingle/activityInfo/domain/XhnActivityInfo.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/controller/XhnController.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/xhnnotsingle/XhnActivityInfoMapper.xml" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/register.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/index.html" />
       </list>
     </option>
   </component>
@@ -605,7 +368,17 @@
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand />
+      <expand>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="ruoyi" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+        </path>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="ruoyi" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+          <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
+        </path>
+      </expand>
       <select />
     </treeState>
   </component>
@@ -621,8 +394,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -723,49 +494,14 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="xhnnotsingle" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ruoyi" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BlindDate_H" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="xhnnotsingle" type="462c0819:PsiDirectoryNode" />
-              <item name="matchmaker" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ruoyi" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BlindDate_H" type="462c0819:PsiDirectoryNode" />
-              <item name="ruoyi-admin" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ruoyi" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BlindDate_H" type="462c0819:PsiDirectoryNode" />
-              <item name="ruoyi-admin" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ruoyi" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BlindDate_H" type="462c0819:PsiDirectoryNode" />
-              <item name="ruoyi-admin" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ruoyi" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BlindDate_H" type="462c0819:PsiDirectoryNode" />
-              <item name="ruoyi-admin" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="appxhn" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -776,7 +512,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1669339927754" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1671439957998" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../wechatpay-apache-httpclient-master" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -885,6 +621,8 @@
       <workItem from="1669339088181" duration="946000" />
       <workItem from="1669341522445" duration="18000" />
       <workItem from="1670478223609" duration="206000" />
+      <workItem from="1671432912523" duration="3231000" />
+      <workItem from="1671500338831" duration="6968000" />
     </task>
     <task id="LOCAL-00001" summary="提交">
       <created>1669181573911</created>
@@ -893,17 +631,38 @@
       <option name="project" value="LOCAL" />
       <updated>1669181573911</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="提交">
+      <created>1671433123503</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1671433123504</updated>
+    </task>
+    <task id="LOCAL-00003" summary="提交">
+      <created>1671434488692</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1671434488692</updated>
+    </task>
+    <task id="LOCAL-00004" summary="提交">
+      <created>1671435359766</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1671435359766</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="83133000" />
+    <option name="totallyTimeSpent" value="93332000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1912" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26119402" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26652452" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -913,17 +672,17 @@
       <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.17305586" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.31651956" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32968238" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.24315444" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Build" order="7" visible="true" weight="0.19605696" />
+      <window_info anchor="bottom" id="Build" order="7" weight="0.19605696" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" weight="0.32968238" />
       <window_info anchor="bottom" id="Docker" order="10" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="12" weight="0.32968238" />
+      <window_info anchor="bottom" id="Messages" order="12" weight="0.19605696" />
       <window_info anchor="bottom" id="Java Enterprise" order="13" />
       <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="15" show_stripe_button="false" />
@@ -1041,40 +800,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/tools/BasepathUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/JDK/1.8.0_211/src.zip!/java/security/Signature.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="527" column="41" selection-start-line="527" selection-start-column="31" selection-end-line="527" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/JDK/1.8.0_211/src.zip!/java/security/PrivateKey.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="58" column="17" selection-start-line="58" selection-start-column="17" selection-end-line="58" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/util/PemUtil.java" />
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/auth/CertificatesVerifier.java" />
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/auth/PrivateKeySigner.java" />
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/auth/Signer.java" />
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/auth/WechatPay2Credentials.java" />
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/wxpay.properties" />
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/wechat/pay/contrib/apache/httpclient/util/CertSerializeUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="532">
-          <caret line="64" lean-forward="true" selection-start-line="64" selection-end-line="64" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-druid.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-6" />
@@ -1185,13 +910,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/WxPayConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2413">
-          <caret line="127" column="34" selection-start-line="127" selection-start-column="34" selection-end-line="127" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/domain/WxUserInfo.java" />
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhnnotsingle/registeruser/domain/XhnRegisterUser.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1280,10 +998,31 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/controller/XhnController.java">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/edit.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1254">
+          <caret line="66" column="14" selection-start-line="66" selection-start-column="14" selection-end-line="66" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/xhnIndex.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1330">
+          <caret line="70" column="45" selection-start-line="70" selection-start-column="45" selection-end-line="70" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/matchmaker.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="190">
+          <caret line="10" column="41" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/utils/AliyunSendSmsUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3059">
-          <caret line="191" column="30" selection-start-line="191" selection-start-column="30" selection-end-line="191" selection-end-column="30" />
+        <state relative-caret-position="190">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
         </state>
       </provider>
     </entry>
@@ -1294,31 +1033,85 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/xhnIndex.html">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhnnotsingle/activityInfo/service/impl/XhnActivityInfoServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="70" column="45" selection-start-line="70" selection-start-column="45" selection-end-line="70" selection-end-column="45" />
+        <state relative-caret-position="209">
+          <caret line="39" column="33" selection-start-line="39" selection-start-column="33" selection-end-line="39" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhnnotsingle/activityInfo/service/IXhnActivityInfoService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="209">
+          <caret line="27" column="33" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/tuodanweb/images/td_index_03.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/tuodanweb/images/td_index_07.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhnnotsingle/activityInfo/domain/XhnActivityInfo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="319">
+          <caret line="203" column="32" selection-start-line="203" selection-start-column="27" selection-end-line="203" selection-end-column="32" />
+          <folding>
+            <element signature="e#5263#5264#0" expanded="true" />
+            <element signature="e#5307#5308#0" expanded="true" />
+            <element signature="e#5357#5358#0" expanded="true" />
+            <element signature="e#5407#5408#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/xhnnotsingle/XhnActivityInfoMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="262">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/add.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="448">
-          <caret line="31" column="14" lean-forward="true" selection-start-line="23" selection-start-column="8" selection-end-line="31" selection-end-column="14" />
+        <state relative-caret-position="566">
+          <caret line="44" column="14" selection-start-line="44" selection-start-column="14" selection-end-line="44" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/edit.html">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/xhn/controller/XhnController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="618" column="59" selection-start-line="618" selection-start-column="52" selection-end-line="618" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/utils/QRCodeUtils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="361">
-          <caret line="43" column="14" lean-forward="true" selection-start-line="35" selection-start-column="8" selection-end-line="43" selection-end-column="14" />
+          <caret line="59" column="17" selection-start-line="59" selection-start-column="17" selection-end-line="59" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/xhnnotsingle/matchmaker/matchmaker.html">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/ruoyi/business/config/WxPayConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <caret line="50" column="102" lean-forward="true" selection-start-line="50" selection-start-column="102" selection-end-line="50" selection-end-column="102" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/register.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="376">
+          <caret line="226" column="9" lean-forward="true" selection-start-line="226" selection-start-column="9" selection-end-line="226" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/appxhn/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="271">
-          <caret line="16" column="40" lean-forward="true" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" />
+        <state relative-caret-position="387">
+          <caret line="432" column="19" lean-forward="true" selection-start-line="432" selection-start-column="19" selection-end-line="432" selection-end-column="19" />
         </state>
       </provider>
     </entry>

mybusiness/src/main/java/com/ruoyi/business/config/WxPayConfig.java

@@ -16,6 +16,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
@@ -47,8 +48,8 @@ public class WxPayConfig {
     private PrivateKey getPrivateKey(String fail) {
         try {
             //示例：私钥存储在文件
-//            return PemUtil.loadPrivateKey(new FileInputStream(new ClassPathResource(fail).getFile()));
-            return PemUtil.loadPrivateKey(new FileInputStream(new File("D://tuodan/"+fail)));
+            return PemUtil.loadPrivateKey(new FileInputStream(new ClassPathResource(fail).getFile()));
+//            return PemUtil.loadPrivateKey(new FileInputStream(new File("D://tuodan/"+fail)));
         } catch (FileNotFoundException e) {
             throw new RuntimeException("私钥文件不存在", e);
         } catch (IOException e) {

mybusiness/src/main/java/com/ruoyi/business/xhn/controller/XhnController.java

@@ -163,6 +163,7 @@ public class XhnController extends BaseController {
     {
         XhnActivityInfo daohang = new XhnActivityInfo();
         daohang.setType("1");
+        daohang.setLimit("5");
         mmap.put("daohang",xhnActivityInfoService.selectXhnActivityInfoList(daohang));
         RegisteruserUnpaid appuser = new RegisteruserUnpaid();
         appuser.setOpenid(SessionHelper.getCurrentUserId());

mybusiness/src/main/java/com/ruoyi/business/xhnnotsingle/activityInfo/domain/XhnActivityInfo.java

@@ -200,4 +200,17 @@ public String toString(){
             .append("name" ,getName())
         .toString();
         }
+
+            private String limit;
+
+            public String getLimit() {
+                return limit;
+            }
+
+            public void setLimit(String limit) {
+                this.limit = limit;
+            }
         }
+
+
+

mybusiness/src/main/resources/mapper/xhnnotsingle/XhnActivityInfoMapper.xml

@@ -60,6 +60,7 @@
                             and name = #{name}
                         </if>
         </where>
+        <if test="limit != null and limit != ''">order by activityStartDateYm LIMIT 5</if>
     </select>
 
     <select id="selectXhnActivityInfoById" parameterType="String"

mybusiness/src/main/resources/templates/appxhn/index.html

@@ -20,17 +20,16 @@
 			<!-- 图片轮播 -->
 			<div class="m-slider" data-ydui-slider>
 				<div class="slider-wrapper">
-					<div class="slider-item">
+					<div class="slider-item" th:each="dh : ${daohang}">
 						<a href="javascript:;">
-							<img th:src="@{/tuodanweb/images/td_index_03.png}">
+							<img th:src="${dh.zsPath}">
 						</a>
 					</div>
-					<div class="slider-item">
-						<a href="javascript:;">
-							<img th:src="@{/tuodanweb/images/td_index_07.png}">
-						</a>
-					</div>
-
+					<!--<div class="slider-item">-->
+						<!--<a href="javascript:;">-->
+							<!--<img th:src="@{/tuodanweb/images/td_index_07.png}">-->
+						<!--</a>-->
+					<!--</div>-->
 				</div>
 				<div class="slider-pagination"></div>
 			</div>
@@ -88,6 +87,7 @@
 						</th:block>
 					</div>
 				</div>
+				<button type="button" onclick="pageAdd()">下一页</button>
 			</div>
 			<!-- 盲盒列表 结束 -->
 			<!-- 活动列表 开始 -->
@@ -607,6 +607,78 @@
 
 			})
 
+			function pageAdd() {
+                pageNum++;
+                var workNature = '';
+                var keytext = document.getElementsByName("education");
+                for (var i = 0; i < keytext.length; i++){
+                    var obj = keytext[i];
+                    if (obj.type == "checkbox" && obj.checked) {
+                        var code = obj.value;//获取checkbox的值
+                        workNature += code+",";  //组合完了
+                    }
+                }
+                if(workNature.length > 0){workNature = workNature.substring(0,workNature.length-1)}
+                var sex = $('input:radio[name="sex"]:checked').val();
+                var taLocation = '';
+                if(provinceName != ''){
+                    if(cityName != ''){
+                        if(areaName != ''){
+                            taLocation = provinceName+'-'+cityName+'-'+areaName;
+                        }else{
+                            taLocation = provinceName+'-'+cityName;
+                        }
+                    }else{
+                        taLocation = provinceName;
+                    }
+                }
+                $.ajax({
+                    type: "get",
+                    url: ctx + "xhn/getBoxList",
+                    data: {
+                        code:$("#boxCode").val(),
+                        sex:sex,
+                        startAge:startAge,
+                        endAge:endAge,
+                        workNature:workNature,
+                        taLocation:taLocation,
+                        startHeight:startHeight,
+                        endHeight:endHeight,
+                        pageNum:pageNum
+                    },
+                    success: function (res) {
+                        if(res.code == 0 && res.data.length > 0){
+                            var userTable = "";
+                            for (var i in res.data){
+                                userTable+="<div class=\"mh_div rz " ;
+                                if(res.data[i].sex == '1'){
+                                    userTable+="nan ";
+                                }else{
+                                    userTable+="nv ";
+                                }
+                                userTable+="vip\" onclick=\"lookChaitamh('"+res.data[i].openid+"')\">\n";
+                                userTable+="<div class=\"mh_img fl\"></div>\n";
+                                userTable+="<div class=\"mh_txt fl\">\n";
+                                userTable+="<div class=\"tit\">\n";
+                                userTable+="<span>编号："+res.data[i].code+"</span>\n";
+                                userTable+="<i></i>\n";
+                                userTable+="<u></u>\n";
+                                userTable+="</div>\n";
+                                userTable+="<h5>"+res.data[i].birthDate.substring(0,4)+" "+res.data[i].constellation+" "+res.data[i].workNature+" "+res.data[i].isMarried+" "+res.data[i].location.split('-')[0]+"内</h5>\n";
+                                if(res.data[i].idealType.length > 20){
+                                    userTable+="<p>"+res.data[i].idealType.substring(0,20)+"...</p>\n";
+                                }else{
+                                    userTable+="<p>"+res.data[i].idealType+"</p>\n";
+                                }
+                                userTable+="</div>\n";
+                                userTable+="</div>"
+                            }
+                            $("#userTable").append(userTable);
+                        }
+                    }
+                });
+            }
+
             /**
 			 * 点击盲盒跳转盲盒的详情信息
              * @param openid

mybusiness/src/main/resources/templates/appxhn/register.html

@@ -32,9 +32,9 @@
                 <h1 class="zc_title">昵称</h1>
                 <input type="text" class="date2" th:value="${user.wechatName}" id="wechatName" name="wechatName">
                 <h1 class="zc_title">真实姓名</h1>
-                <input type="text" class="date2" value="" name="name">
+                <input type="text" class="date2" value="" name="name" id="name">
                 <h1 class="zc_title">身份证号</h1>
-                <input type="text" class="date2" value="" name="idCard" onchange="cardtest(this.value)">
+                <input type="text" class="date2" value="" name="idCard" id="idCard" onchange="cardtest(this.value)">
                 <h1 class="zc_title">出生年月</h1>
                 <input type="text" class="date2" value="" name="birthDate" id="birthDate" readonly>
                 <h1 class="zc_title">年龄</h1>
@@ -46,9 +46,9 @@
                     <div class="clear"></div>
                 </div>
                 <h1 class="zc_title">常驻地址</h1>
-                <input type="text" class="select-value form-control" value="广东省-东莞市" name="location">
+                <input type="text" class="select-value form-control" value="广东省-东莞市" name="location" id="location">
                 <h1 class="zc_title">星座</h1>
-                <select class="xingzuo" name="constellation">
+                <select class="xingzuo" name="constellation" id="constellation">
                     <option value="水瓶座">水瓶座</option>
                     <option value="双鱼座">双鱼座</option>
                     <option value="白羊座">白羊座</option>
@@ -63,7 +63,7 @@
                     <option value="摩羯座">摩羯座</option>
                 </select>
                 <h1 class="zc_title">身高CM</h1>
-                <input type="text" class="date2" name="height">
+                <input type="text" class="date2" name="height" id="height">
 
                 <h1 class="zc_title">婚姻状态</h1>
                 <div class="xingbie">
@@ -72,14 +72,14 @@
                     <div class="clear"></div>
                 </div>
                 <h1 class="zc_title">体重Kg</h1>
-                <input type="text" class="date2" name="weight">
+                <input type="text" class="date2" name="weight" id="weight">
 
                 <h1 class="zc_title">性格介绍</h1>
                 <div class="xinggeJS">
-                    <textarea name="character"></textarea>
+                    <textarea name="character" id="character"></textarea>
                 </div>
                 <h1 class="zc_title">工作性质</h1>
-                <select class="xingzuo" name="workNature">
+                <select class="xingzuo" name="workNature" id="workNature">
                     <option value="私企">私企</option>
                     <option value="国企">国企</option>
                     <option value="央企">央企</option>
@@ -94,7 +94,7 @@
                     <option value="学生">学生</option>
                 </select>
                 <h1 class="zc_title">学历</h1>
-                <select class="xingzuo" name="education">
+                <select class="xingzuo" name="education" id="education">
                     <option value="博士研究生">博士研究生</option>
                     <option value="硕士研究生">硕士研究生</option>
                     <option value="本科">本科</option>
@@ -106,7 +106,7 @@
                 </select>
                 <h1 class="zc_title">职业</h1>
                 <div class="xinggeJS">
-                    <textarea name="occupation"></textarea>
+                    <textarea name="occupation" id="occupation"></textarea>
                 </div>
                 <h1 class="zc_title">是否接受异地</h1>
                 <div class="xingbie">
@@ -115,27 +115,27 @@
                     <div class="clear"></div>
                 </div>
                 <h1 class="zc_title">理想TA所在地</h1>
-                <input type="text" class="select-value01 form-control" value="广东省-东莞市" name="taLocation">
+                <input type="text" class="select-value01 form-control" value="广东省-东莞市" name="taLocation"  id="taLocation">
                 <h1 class="zc_title">不接受的TA</h1>
                 <div class="xinggeJS">
-                    <textarea name="noAccepted"></textarea>
+                    <textarea name="noAccepted"  id="noAccepted"></textarea>
                 </div>
                 <h1 class="zc_title">理想型的TA</h1>
                 <div class="xinggeJS">
-                    <textarea name="idealType"></textarea>
+                    <textarea name="idealType"  id="idealType"></textarea>
                 </div>
                 <h1 class="zc_title">微信号或微信绑定手机号</h1>
                 <div class="weixin">
-                    <textarea name="wechatCode"></textarea>
+                    <textarea name="wechatCode"  id="wechatCode"></textarea>
                 </div>
                 <h1 class="zc_title">微信添加暗号</h1>
                 <div class="weixin">
-                    <textarea name="wechatArgot"></textarea>
+                    <textarea name="wechatArgot"  id="wechatArgot"></textarea>
                 </div>
                 <h1 class="zc_title">手机号<input type="button" id="btn" value="获取验证码" onclick="sendSmsVerify(this)" /></h1>
-                <input type="text" class="date2" id="phone" name="phone">
+                <input type="text" class="date2" id="phone" name="phone" onchange="phonetest(this.value)">
                 <h1 class="zc_title">验证码</h1>
-                <input type="text" class="date2" name="shortMsg">
+                <input type="text" class="date2" name="shortMsg" id="shortMsg">
                 <input type="button" class="next" value="保存" onclick="submitUser()"/>
             </div>
         </div>
@@ -234,6 +234,23 @@
      * 保存个人信息
      */
     function submitUser() {
+        if($("#name").val()==''){alert("请填写姓名");return ;}
+        if($("#idCard").val()==''){alert("请填写身份证号");return ;}
+        if($("#sex").val()==''){alert("请选择性别");return ;}
+        if($("#location").val()==''){alert("请填写住地");return ;}
+        if($("#height").val()==''){alert("请填写身高");return ;}
+        if($('input:radio[name="isMarried"]:checked').val()==''){alert("请选择婚姻状态");return ;}
+        if($("#character").val()==''){alert("请填写性格介绍");return ;}
+        if($("#workNature").val()==''){alert("请选择工作性质");return ;}
+        if($("#education").val()==''){alert("请选择学历");return ;}
+        if($("#occupation").val()==''){alert("请填写职业");return ;}
+        if($('input:radio[name="longDistanceLove"]:checked').val()==''){alert("请选择是否接受异地");return ;}
+        if($("#noAccepted").val()==''){alert("请填写不接受的TA");return ;}
+        if($("#idealType").val()==''){alert("请填写理想型的TA");return ;}
+        if($("#wechatCode").val()==''){alert("请填写微信号");return ;}
+        if($("#wechatArgot").val()==''){alert("请填写微信暗号");return ;}
+        if($("#phone").val()==''){alert("请填写手机号");return ;}
+        if($("#shortMsg").val()==''){alert("请填写验证码");return ;}
         $.ajax({
             type: "post",
             url: ctx + "xhn/updateRegisterUser",
@@ -259,6 +276,13 @@
             alert('身份证不正确');
         }
     };
+
+    var regs = /^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(16[0-9])|(17[0-9])|(18[0-9])|(19[0-9]))\d{8}$/;
+    function phonetest(value){
+        if (!regs.test(value)){
+            alert('手机号不正确');
+        }
+    }
 </script>
 </body>
 </html>