依赖包整理

dq-financial-hrms-auth/pom.xml

@@ -31,11 +31,23 @@
             <artifactId>jjwt</artifactId>
             <version>0.7.0</version>
         </dependency>
-        <!--<dependency>
+
-            <groupId>com.daqing.framework</groupId>
+        <dependency>
-            <artifactId>dq-framework-model</artifactId>
+            <groupId>org.springframework.boot</groupId>
-            <version>1.0-SNAPSHOT</version>
+            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>-->
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security.oauth</groupId>
+            <artifactId>spring-security-oauth2</artifactId>
+            <!-- 指明版本，解决redis存储出现的问题：java.lang.NoSuchMethodError: org.springframework.data.redis.connection.RedisConnection.set([B[B)V问题 -->
+            <version>2.3.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>

dq-financial-hrms-auth/src/main/resources/bootstrap.properties

@@ -27,13 +27,13 @@ spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 
-#微信开放平台配置
+##微信开放平台配置
 #wxopen.appid=wx3b7bca679da34921
 #wxopen.appsecret=c8de113c18052b4e2173d913511e486d
-#回调地址
+##回调地址
 #wxopen.redirect_url=http://www.occupationlab.com/apiHrmsAuth/hrms/auth/userlogin/user/callback
-
+#
-# 正式环境（prod）
+##正式环境（prod）
 #spring.application.name=dq-financial-hrms-auth
 #
 #spring.cloud.nacos.config.server-addr=120.78.127.12:8848

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java

@@ -1,5 +1,8 @@
 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.hrms.EmployeeEntity;
@@ -30,7 +33,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,

dq-govern-gateway/src/main/resources/bootstrap.properties

@@ -18,9 +18,8 @@ spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 
-
+## 正式环境（prod）
-# 正式环境（prod）
+##服务名称
-#服务名称
 #spring.application.name=dq-govern-gateway
 ##配置中心地址
 #spring.cloud.nacos.config.server-addr=120.78.127.12:8848
@@ -29,7 +28,7 @@ spring.redis.jedis.pool.min-idle=0
 #spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
 #spring.cloud.nacos.config.ext-config[0].group=prod
 #spring.cloud.nacos.config.ext-config[0].refresh=true
-
+#
 #spring.redis.host=127.0.0.1
 #spring.redis.port=6379
 #spring.redis.password=dq123456

dq-govern-gateway/src/main/resources/jwt.properties

@@ -1,8 +1,10 @@
 jwt.ignoreUrlList=/apiHrmsAuth/hrms/auth/userlogin/getBackPwd,\
   /apiHrmsAuth/hrms/auth/userlogin/login,\
   /apiHrmsAuth/hrms/auth/userlogin/verifyMobile,\
+  /apiHrmsAuth/hrms/auth/userlogin/wxLoginUrl,\
+  /apiHrmsAuth/hrms/auth/userlogin/user/callback,\
+  /apiHrmsAuth/hrms/auth/userlogin/wxLoginUrl,\
   /api-crms/sweagger-ui.html,\
   /api-crms/crms/customer/excelTemplate,\
   /api-crms/crms/customer/excelExport,\
-  /api-crms/crms/customer/excelImport,\
+  /api-crms/crms/customer/excelImport
-  /apiHrmsAuth/hrms/auth/userlogin/wxLoginUrl