From d18b905343ff969963756eff8f5a38e754c822aa Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Thu, 24 Dec 2020 11:42:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dq-financial-hrms-auth/pom.xml                | 22 +++++++++++++++++++
 dq-financial-hrms/pom.xml                     | 14 ++++++++++--
 .../hrms/controller/EmployeeController.java   |  5 ++++-
 .../hrms/controller/UserController.java       |  2 ++
 dq-framework-common/pom.xml                   |  1 -
 dq-govern-gateway/pom.xml                     | 10 +++++++++
 6 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/dq-financial-hrms-auth/pom.xml b/dq-financial-hrms-auth/pom.xml
index d306dcd8..4ca343e4 100644
--- a/dq-financial-hrms-auth/pom.xml
+++ b/dq-financial-hrms-auth/pom.xml
@@ -72,6 +72,16 @@
             <version>5.3.4.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+
+<!--        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.8.1</version>
+        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -91,7 +101,19 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration >
+                    <classifier>exec</classifier>
+                </configuration>
             </plugin>
+<!--            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>-->
         </plugins>
     </build>
 
diff --git a/dq-financial-hrms/pom.xml b/dq-financial-hrms/pom.xml
index b06a34fd..dd7ecb82 100644
--- a/dq-financial-hrms/pom.xml
+++ b/dq-financial-hrms/pom.xml
@@ -39,12 +39,12 @@
             <artifactId>ooxml-schemas</artifactId>
             <version>1.0</version>
         </dependency>
-        <!--<dependency>
+        <dependency>
             <groupId>com.daqing.financial</groupId>
             <artifactId>dq-financial-hrms-auth</artifactId>
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
-        </dependency>-->
+        </dependency>
 <!--        <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
@@ -70,6 +70,16 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java
index bf563dbe..d6568ebe 100644
--- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java
+++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java
@@ -1,6 +1,9 @@
 package com.daqing.financial.hrms.controller;
 
 
+import com.daqing.financial.hrauth.annotation.Log;
+import com.daqing.financial.hrauth.enums.OperationType;
+import com.daqing.financial.hrauth.enums.OperationUnit;
 import com.daqing.financial.hrms.EmployeeControllerApi;
 import com.daqing.financial.hrms.service.EmployeeService;
 import com.daqing.framework.domain.crms.request.EmployeeDisableRequest;
@@ -41,7 +44,7 @@ public class EmployeeController implements EmployeeControllerApi {
     private EmployeeService employeeService;
 
     @GetMapping("/list")
-    //@Log(detail = "员工列表",level = 3,operationUnit = OperationUnit.ROLE,operationType = OperationType.INSERT)
+    @Log(detail = "员工列表",level = 3,operationUnit = OperationUnit.ROLE,operationType = OperationType.INSERT)
     //@RequiresPermissions("hrms:employee:info")
     public ResponseResult list(@RequestParam("page") Integer page,
                                @RequestParam("size") Integer size,
diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/UserController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/UserController.java
index 8f927d49..befb8bb4 100644
--- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/UserController.java
+++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/UserController.java
@@ -125,6 +125,8 @@ public class UserController implements UserControllerApi {
      * @return
      */
 /*    @GetMapping(value = "get")
+    // 访问路径`/admin` 具有`ADMIN`角色权限   【这种是写死方式】
+//    @PreAuthorize("hasPermission('/admin','ADMIN')")
     @PreAuthorize("hasAnyRole('ROLE_ADMIN')")
     public Object get(Authentication authentication){
         //Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
diff --git a/dq-framework-common/pom.xml b/dq-framework-common/pom.xml
index 6b2e895c..9d5e4477 100644
--- a/dq-framework-common/pom.xml
+++ b/dq-framework-common/pom.xml
@@ -26,7 +26,6 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 
diff --git a/dq-govern-gateway/pom.xml b/dq-govern-gateway/pom.xml
index 4218219e..f6b16892 100644
--- a/dq-govern-gateway/pom.xml
+++ b/dq-govern-gateway/pom.xml
@@ -78,6 +78,16 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>