新增地区拍摄权限控制

4dkankan-user-application/src/main/resources/application-dev.properties

@@ -1,15 +1,14 @@
 #应用名
 spring.application.name=4dkankan-user
 #注册中心
-spring.cloud.nacos.discovery.server-addr=192.168.0.98:8848
+spring.cloud.nacos.discovery.server-addr=10.71.114.237:8848
 
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.druid.url=jdbc:mysql://localhost:3306/4dkankan_hd?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-spring.datasource.druid.password=123456
-
+spring.datasource.druid.url=jdbc:mysql://10.71.114.237:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.username=user_4dhouse_rw
+spring.datasource.druid.password=kaKjbpZi1plmViyDVWhD
 
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.min-idle=10
@@ -27,11 +26,17 @@ spring.datasource.druid.stat-view-servlet.enabled=true
 
 #logging.file=log/xiaoan.log
 
-spring.redis.cluster.nodes=10.1.152.54:6379
+spring.redis.cluster.nodes=10.71.114.132:7000,10.71.114.132:7001,10.71.114.132:7002,10.71.114.132:7003,10.71.114.132:7004,10.71.114.132:7005
 spring.redis.database=0
-spring.redis.password=
+spring.redis.password=BN5Q40JsPHIGfUg5HTkU
 spring.redis.timeout=3000ms
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-wait=-1ms
+
+#log
+logging.path=/home/tomcat/4dkankan-user-8010/4dkankan-user-log
+logging.config=classpath:logback-spring.xml
+logging.level.com.fdkankan=debug
+

4dkankan-user-application/src/main/resources/application-pro.properties

@@ -35,3 +35,8 @@ spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-wait=-1ms
+
+#log
+logging.path=/home/tomcat/4dkankan-user-8010/4dkankan-user-log
+logging.config=classpath:logback-spring.xml
+logging.level.com.fdkankan=debug

4dkankan-user-application/src/main/resources/application-test.properties

@@ -35,3 +35,8 @@ spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-wait=-1ms
+
+#log
+logging.path=/home/tomcat/4dkankan-user-8010/4dkankan-user-log
+logging.config=classpath:logback-spring.xml
+logging.level.com.fdkankan=debug

4dkankan-user-application/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 server.port=8010
 
-spring.profiles.active=test
+spring.profiles.active=dev
 
 #mybatis
 #mybatis.mapper-locations=classpath:mapper/*.xml
@@ -15,7 +15,7 @@ pagehelper.reasonable=false
 pagehelper.support-methods-arguments=true
 
 #log
-logging.path=G:/javaProject/4dkankan_hd_user/4dkankan-user/log
-logging.config=classpath:logback-spring.xml
-logging.level.com.fdkankan=debug
+#logging.path=G:/javaProject/4dkankan_hd_user/4dkankan-user/log
+#logging.config=classpath:logback-spring.xml
+#logging.level.com.fdkankan=debug
 

4dkankan-user-common/pom.xml

@@ -73,6 +73,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
+        <!-- nacos配置中心 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
         <!-- nacos 依赖 -->
         <dependency>
             <groupId>com.alibaba.boot</groupId>

4dkankan-user-common/src/main/java/com/fdkankan/common/constant/MsgCode.java

@@ -54,6 +54,12 @@ public class MsgCode {
     public static final int FAILURE_CODE_4011 = 4011;
     public static final String FAILURE_MSG_4011 = "用户不存在";
 
+    public static final int FAILURE_CODE_4012 = 4012;
+    public static final String FAILURE_MSG_4012 = "请填写姓名，50字以内";
+
+    public static final int FAILURE_CODE_4013 = 4013;
+    public static final String FAILURE_MSG_4013 = "请输入旧密码";
+
     //500x是部门模块的
     public static final int FAILURE_CODE_5001 = 5001;
     public static final String FAILURE_MSG_5001 = "公司已存在";

4dkankan-user-dao/src/main/java/com/fdkankan/dao/backend/provider/UserProvider.java

@@ -23,7 +23,10 @@ public class UserProvider {
             sql.append(" and a.user_name like CONCAT('%', #{userName}, '%') ");
         }
         if(StringUtil.isNotEmpty(param.getDepartmentId())){
-            sql.append(" and a.department_id = #{departmentId}");
+            sql.append(" and a.department_id = #{departmentId} ");
+        }
+        if(StringUtil.isNotEmpty(param.getRoleKey()) && !"admin".equals(param.getRoleKey())){
+            sql.append(" and d.role_key != 'admin ' ");
         }
         sql.append(" ORDER BY a.create_time DESC");
         return sql.toString();

4dkankan-user-domain/src/main/java/com/fdkankan/domain/dto/request/UserRequest.java

@@ -31,4 +31,6 @@ public class UserRequest extends PageDto{
 
     private String key;
 
+    private String roleKey;
+
 }

4dkankan-user-web/src/main/java/com/fdkankan/web/backend/DepartmentController.java

@@ -63,7 +63,7 @@ public class DepartmentController {
         String redisToken = redisTemplate.opsForValue().get(request.getHeader("token"));
         if(StringUtils.isNotEmpty(redisToken)){
             JSONObject tokenJson = JSON.parseObject(redisToken);
-            if("region".equals(tokenJson.getString("roleKey"))){
+            if("region".equals(tokenJson.getString("roleKey")) || "regionShoot".equals(tokenJson.getString("roleKey"))){
                 List<DepartmentEntity> list = new ArrayList<>();
                 list.add(departmentService.findById(tokenJson.getString("departmentId")));
                 return Result.success(list);

4dkankan-user-web/src/main/java/com/fdkankan/web/backend/IndexController.java

@@ -193,6 +193,7 @@ public class IndexController {
 //        result.put("resources", resourcesByUserMenu);
         result.put("token", token);
         result.put("resourcesTreeByUserPermission", resourcesTreeByUserPermission);
+        result.put("roleKey", roleKey);
         return Result.success(result);
     }
 

4dkankan-user-web/src/main/java/com/fdkankan/web/backend/UserController.java

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
 
 
 /**
@@ -53,6 +54,13 @@ public class UserController extends BaseController {
 //    @WebControllerLog(description = "用户管理---获取用户列表")
     @CheckCurrentUser()
     public Result list(@RequestBody UserRequest param){
+        String jsonStr = redisTemplate.opsForValue().get(request.getHeader("token"));
+        JSONObject user = null;
+        if (StringUtil.isNotEmpty(jsonStr)) {
+            user = JSONObject.parseObject(jsonStr);
+            param.setRoleKey(user.getString("roleKey"));
+        }
+
         PageInfo<UserResponse> page =  new PageInfo<UserResponse>(userService.findAllBySearchKey(param));
         return Result.success(page);
     }
@@ -95,6 +103,10 @@ public class UserController extends BaseController {
             throw new BaseRuntimeException(MsgCode.FAILURE_CODE_4005, MsgCode.FAILURE_MSG_4005);
         }
 
+        if(param.getNickName().length() > 50){
+            throw new BaseRuntimeException(MsgCode.FAILURE_CODE_4012, MsgCode.FAILURE_MSG_4012);
+        }
+
         int n = 0;
         userEntity = userService.findByUserName(param.getUserName());
         if(userEntity != null){
@@ -141,6 +153,10 @@ public class UserController extends BaseController {
             throw new BaseRuntimeException(MsgCode.FAILURE_CODE_3001, MsgCode.FAILURE_MSG_3001);
         }
 
+        if(param.getNickName().length() > 50){
+            throw new BaseRuntimeException(MsgCode.FAILURE_CODE_4012, MsgCode.FAILURE_MSG_4012);
+        }
+
         if(StringUtil.isNotEmpty(param.getUserName())){
             if(!RegexUtils.validateMobilePhone(param.getUserName())){
                 throw new BaseRuntimeException(MsgCode.FAILURE_CODE_4005, MsgCode.FAILURE_MSG_4005);
@@ -236,18 +252,22 @@ public class UserController extends BaseController {
         if(StringUtil.isEmpty(getTokenUserName())){
             throw new BaseRuntimeException(MsgCode.FAILURE_CODE_3004, MsgCode.FAILURE_MSG_3004);
         }
+
+        if(StringUtil.isEmpty(param.getOldPassword())){
+            throw new BaseRuntimeException(MsgCode.FAILURE_CODE_4013, MsgCode.FAILURE_MSG_4013);
+        }
         UserEntity userEntity = userService.findByUserName(getTokenUserName());
 
         //对前端传的密码解密
         if(param.getPassword().length() < 25){
-            throw new BaseRuntimeException(MsgCode.FAILURE_CODE_4001, MsgCode.FAILURE_MSG_4001);
+            throw new BaseRuntimeException(MsgCode.FAILURE_CODE_4002, MsgCode.FAILURE_MSG_4002);
         }
         String password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
         param.setPassword(password);
 
         //对前端传的密码解密
         if(param.getOldPassword().length() < 25){
-            throw new BaseRuntimeException(MsgCode.FAILURE_CODE_4001, MsgCode.FAILURE_MSG_4001);
+            throw new BaseRuntimeException(MsgCode.FAILURE_CODE_4002, MsgCode.FAILURE_MSG_4002);
         }
         String oldPassword = Base64Converter.decode(Base64Converter.subText(param.getOldPassword()));
         param.setOldPassword(oldPassword);
@@ -282,4 +302,5 @@ public class UserController extends BaseController {
         return Result.success();
     }
 
+
 }

pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.3.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -33,7 +33,7 @@
         <java.version>1.8</java.version>
         <spring.boot.version>2.1.0.RELEASE</spring.boot.version>
         <fdkankan.version>1.0.0</fdkankan.version>
-        <fastjson.version>1.2.51</fastjson.version>
+        <fastjson.version>1.2.75</fastjson.version>
         <druid.version>1.1.14</druid.version>
         <hutool.version>5.1.0</hutool.version>
         <lombok.version>1.18.2</lombok.version>