flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -114,7 +114,7 @@ config.setRoleIds(2+""); config.setCreateTime(LocalDateTime.now()); config.setUpdateTime(LocalDateTime.now()); config.setUserId(Snowflake.getId()); config.setUserId(Snowflake.getId()+""); return toAjax(IUserService.insertConfig(config)); }
@@ -45,7 +45,7 @@ @PostMapping("/update") @Authorization ResultData update(@RequestBody AutomessageSysSettings automessageSysSettings,@CurrentUser SysUser sysUser){ automessageSysSettings.setUpdateUserId(sysUser.getUserId().intValue()); automessageSysSettings.setUpdateUserId(sysUser.getUserId()); automessageSysSettings.setUpdateTime(LocalDateTime.now()); return sysSettingsService.update(automessageSysSettings); } flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -224,7 +224,7 @@ config.setCreateBy(sysUser.getUserId()+""); config.setUserId(Snowflake.getId()); config.setUserId(Snowflake.getId()+""); config.setUserType("3"); config.setCreateTime(LocalDateTime.now()); flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettings.java
@@ -66,7 +66,7 @@ * 修改人id */ @ApiModelProperty("修改人id") private Integer updateUserId; private String updateUserId; /** * 小程序二维码 flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettingsRecord.java
@@ -43,7 +43,7 @@ /** * 创建人id（及修改设置的人员） */ private Integer createUserId; private String createUserId;
@@ -37,7 +37,7 @@ * 用户id */ @ApiModelProperty("用户id") private Long userId; private String userId; /** * 访问时间 flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java
@@ -34,7 +34,7 @@ @ApiModelProperty(name = "userId", value = "主键用户id") @JsonSerialize(using = ToStringSerializer.class) @TableId(value = "user_id", type = IdType.AUTO) private Long userId; private String userId; /** * 登录账户 flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java
@@ -114,7 +114,7 @@ * 修改人 */ @ApiModelProperty("修改人") private Long updateUserId; private String updateUserId; /** * 修改人 flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
@@ -42,8 +42,7 @@ */ @ApiModelProperty("用户id") @JsonSerialize(using = ToStringSerializer.class) @JsonFormat(shape =JsonFormat.Shape.STRING ) private Long userId; private String userId; /** flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -66,7 +66,7 @@ request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken)); System.out.println("花城用户id："+manager.getHCUserId(HCtoken)); HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","",""); if(huaChengSysUser!=null && huaChengSysUser.getUserId()!=0 ) if(huaChengSysUser!=null && !StringUtils.isEmpty(huaChengSysUser.getUserId()) ) { SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone()); if(sysUser==null) flower_city/src/main/java/com/dg/core/manager/RedisTokenManager.java
@@ -31,7 +31,7 @@ } @Override public String createToken(long userId, long userRole) { public String createToken(String userId, String userRole) { //使用uuid作为源token String uuid = UUID.randomUUID().toString().replace("-", ""); String token = DigestUtils.sha1DigestAsHex(uuid + userId + "e23ktjsdf") + "-" + userRole; @@ -116,8 +116,8 @@ } @Override public String getTokenByUserId(long userId) { return redis.boundValueOps(String.valueOf(userId)).get(); public String getTokenByUserId(String userId) { return redis.boundValueOps(userId).get(); } } flower_city/src/main/java/com/dg/core/manager/TokenManager.java
@@ -7,7 +7,7 @@ * @param userId 指定用户的id * @return 生成的token */ public String createToken(long userId, long role); public String createToken(String userId, String role); /** * 检查token是否有效 @@ -29,5 +29,5 @@ public void deleteToken(String token); public String getTokenByUserId(long userId); public String getTokenByUserId(String userId); } flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -69,7 +69,7 @@ if(huaChengSysUser==null) { SysUser newUser = new SysUser(); newUser.setUserId(Snowflake.getId()); newUser.setUserId(Snowflake.getId()+""); newUser.setLoginName(phonenumber); newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户"); newUser.setUserType("3"); @@ -82,7 +82,7 @@ else { SysUser newUser = new SysUser(); newUser.setUserId(huaChengSysUser.getUserId()); newUser.setUserId(huaChengSysUser.getUserId()+""); newUser.setLoginName(huaChengSysUser.getPhone()); newUser.setUserName(huaChengSysUser.getNickName()); newUser.setUserType("3"); @@ -158,7 +158,7 @@ SysUser newUser = new SysUser(); if(huaChengSysUser==null) { newUser.setUserId(Snowflake.getId()); newUser.setUserId(Snowflake.getId()+""); newUser.setLoginName(phonenumber); newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户"); newUser.setUserType("3");
