From ff4f5e796040d9bd6b4599e4c69f79af3dca9f55 Mon Sep 17 00:00:00 2001
From: admin <417727563@qq.com>
Date: Sat, 20 Jul 2024 16:30:36 +0800
Subject: [PATCH] =?UTF-8?q?20-=E4=BF=AE=E6=94=B9=E6=9C=BA=E7=94=B5?=
 =?UTF-8?q?=E6=8F=90=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/demo/annual/controller/AnnualController.java    | 2 +-
 .../demo/annualcomp/controller/AnnualCompController.java    | 2 +-
 .../controller/AnnualCompAwardController.java               | 2 +-
 .../AnnualCompetitionProjectRegistrationController.java     | 2 +-
 .../demo/basicsskill/controller/BasicsskillController.java  | 2 +-
 .../modules/demo/compexp/controller/CompExpController.java  | 2 +-
 .../demo/compskill/controller/CompskillController.java      | 2 +-
 .../demo/objLevel/controller/ObjLevelController.java        | 2 +-
 .../upfile_persion/controller/UpfilePersionController.java  | 2 +-
 .../src/main/resources/application-dev.yml                  | 6 +++---
 .../academy/AnnualCompetitionProjectRegistrationList.vue    | 2 +-
 .../audited/AnnualCompetitionProjectRegistrationList.vue    | 2 +-
 .../rejected/AnnualCompetitionProjectRegistrationList.vue   | 2 +-
 .../AnnualCompetitionProjectRegistrationList.vue            | 2 +-
 .../AnnualCompetitionProjectRegistrationList.vue            | 2 +-
 .../AnnualCompetitionProjectRegistrationList.vue            | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/controller/AnnualController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/controller/AnnualController.java
index 73d74282..b18efd54 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/controller/AnnualController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/controller/AnnualController.java
@@ -177,7 +177,7 @@ public class AnnualController extends JeecgController<Annual, IAnnualService> {
     * @param request
     * @param annual
     */
-    @RequiresPermissions("annual:annual:exportXls")
+//    @RequiresPermissions("annual:annual:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, Annual annual) {
         return super.exportXls(request, annual, Annual.class, "年度管理");
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java
index 3f5a0fcb..fe8eb3d7 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java
@@ -549,7 +549,7 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
      * @param request
      * @param annualComp
      */
-    @RequiresPermissions("annualcomp:annual_comp:exportXls")
+//    @RequiresPermissions("annualcomp:annual_comp:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AnnualComp annualComp) {
         return super.exportXls(request, annualComp, AnnualComp.class, "年度比赛管理");
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java
index fa72f3d5..ee01aae9 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java
@@ -250,7 +250,7 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
      * @param request
      * @param annualCompAward
      */
-    @RequiresPermissions("annualcompaward:annual_comp_award:exportXls")
+//    @RequiresPermissions("annualcompaward:annual_comp_award:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AnnualCompAward annualCompAward) {
         return super.exportXls(request, annualCompAward, AnnualCompAward.class, "年度比赛奖项设置");
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
index 23a46017..1bd29021 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
@@ -872,7 +872,7 @@ public class AnnualCompetitionProjectRegistrationController {
      * @param request
      * @param annualCompetitionProjectRegistration
      */
-    @RequiresPermissions("annualcompetitionprojectregistration:annual_competition_project_registration:exportXls")
+//    @RequiresPermissions("annualcompetitionprojectregistration:annual_competition_project_registration:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration) {
         // Step.1 组装查询条件查询数据
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
index 460c034d..25b2e387 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
@@ -297,7 +297,7 @@ public class BasicsskillController extends JeecgController<Basicsskill, IBasicss
     * @param request
     * @param basicsskill
     */
-    @RequiresPermissions("basicsskill:basicsskill:exportXls")
+//    @RequiresPermissions("basicsskill:basicsskill:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, Basicsskill basicsskill) {
 		return super.exportXls(request, basicsskill, Basicsskill.class, "基础能力设置");
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compexp/controller/CompExpController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compexp/controller/CompExpController.java
index 7b94cdf1..85dd10ab 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compexp/controller/CompExpController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compexp/controller/CompExpController.java
@@ -156,7 +156,7 @@ public class CompExpController extends JeecgController<CompExp, ICompExpService>
     * @param request
     * @param compExp
     */
-    @RequiresPermissions("compexp:comp_exp:exportXls")
+//    @RequiresPermissions("compexp:comp_exp:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, CompExp compExp) {
         return super.exportXls(request, compExp, CompExp.class, "比赛专家");
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java
index c9258dac..1f2d530a 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java
@@ -237,7 +237,7 @@ public class CompskillController extends JeecgController<Compskill, ICompskillSe
      * @param request
      * @param compskill
      */
-    @RequiresPermissions("compskill:compskill:exportXls")
+//    @RequiresPermissions("compskill:compskill:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, Compskill compskill) {
         return super.exportXls(request, compskill, Compskill.class, "项目能力设置");
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/objLevel/controller/ObjLevelController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/objLevel/controller/ObjLevelController.java
index b40c53a1..a272514e 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/objLevel/controller/ObjLevelController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/objLevel/controller/ObjLevelController.java
@@ -156,7 +156,7 @@ public class ObjLevelController extends JeecgController<ObjLevel, IObjLevelServi
     * @param request
     * @param objLevel
     */
-    @RequiresPermissions("objLevel:obj_level:exportXls")
+//    @RequiresPermissions("objLevel:obj_level:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ObjLevel objLevel) {
         return super.exportXls(request, objLevel, ObjLevel.class, "obj_level");
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/controller/UpfilePersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/controller/UpfilePersionController.java
index c46c2e03..9a9abb31 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/controller/UpfilePersionController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/controller/UpfilePersionController.java
@@ -295,7 +295,7 @@ public class UpfilePersionController extends JeecgController<UpfilePersion, IUpf
    * @param request
    * @param upfilePersion
    */
-  @RequiresPermissions("upfile_persion:upfile_persion:exportXls")
+//  @RequiresPermissions("upfile_persion:upfile_persion:exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, UpfilePersion upfilePersion) {
     return super.exportXls(request, upfilePersion, UpfilePersion.class, "upfile_persion");
diff --git a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
index 28ff842c..aed75ca4 100644
--- a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
+++ b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
@@ -137,11 +137,11 @@ spring:
           username: root
           password: ycwl2022.
           driver-class-name: com.mysql.cj.jdbc.Driver
-          # 多数据源配置
+          # 多数据源配置  10.121.0.28
           #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          #url: jdbc:mysql://182.92.169.222:3306:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           #username: root
-          #password: root
+          #password: ycwl2022.
           #driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
diff --git a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/academy/AnnualCompetitionProjectRegistrationList.vue b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/academy/AnnualCompetitionProjectRegistrationList.vue
index 345d351c..1cca3d96 100644
--- a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/academy/AnnualCompetitionProjectRegistrationList.vue
+++ b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/academy/AnnualCompetitionProjectRegistrationList.vue
@@ -6,7 +6,7 @@
       <template #tableTitle>
         <!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 报名</a-button>-->
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+<!--        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
diff --git a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/audited/AnnualCompetitionProjectRegistrationList.vue b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/audited/AnnualCompetitionProjectRegistrationList.vue
index 053820ab..cd22d7e9 100644
--- a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/audited/AnnualCompetitionProjectRegistrationList.vue
+++ b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/audited/AnnualCompetitionProjectRegistrationList.vue
@@ -6,7 +6,7 @@
       <template #tableTitle>
 <!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 报名</a-button>-->
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+<!--        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
diff --git a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/rejected/AnnualCompetitionProjectRegistrationList.vue b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/rejected/AnnualCompetitionProjectRegistrationList.vue
index e0aee0fd..d7b787a3 100644
--- a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/rejected/AnnualCompetitionProjectRegistrationList.vue
+++ b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/rejected/AnnualCompetitionProjectRegistrationList.vue
@@ -6,7 +6,7 @@
       <template #tableTitle>
 <!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 报名</a-button>-->
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+<!--        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
diff --git a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/requestdenied/AnnualCompetitionProjectRegistrationList.vue b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/requestdenied/AnnualCompetitionProjectRegistrationList.vue
index 9f0735e3..28080704 100644
--- a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/requestdenied/AnnualCompetitionProjectRegistrationList.vue
+++ b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/requestdenied/AnnualCompetitionProjectRegistrationList.vue
@@ -6,7 +6,7 @@
       <template #tableTitle>
 <!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 报名</a-button>-->
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+<!--        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
diff --git a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/tobereviewed/AnnualCompetitionProjectRegistrationList.vue b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/tobereviewed/AnnualCompetitionProjectRegistrationList.vue
index 7ff9aa7f..ea43da07 100644
--- a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/tobereviewed/AnnualCompetitionProjectRegistrationList.vue
+++ b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/tobereviewed/AnnualCompetitionProjectRegistrationList.vue
@@ -6,7 +6,7 @@
       <template #tableTitle>
 <!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 报名</a-button>-->
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+<!--        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
diff --git a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/tobesubmitted/AnnualCompetitionProjectRegistrationList.vue b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/tobesubmitted/AnnualCompetitionProjectRegistrationList.vue
index fd95946c..cd430929 100644
--- a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/tobesubmitted/AnnualCompetitionProjectRegistrationList.vue
+++ b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/administration/tobesubmitted/AnnualCompetitionProjectRegistrationList.vue
@@ -6,7 +6,7 @@
       <template #tableTitle>
 <!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 报名</a-button>-->
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+<!--        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>