Merge branch 'feature' into 'release'

用户权限开通调整

See merge request !347

src/main/java/com/zhiwei/brandkbs2/service/impl/CommonServiceImpl.java

@@ -166,6 +166,10 @@ public class CommonServiceImpl implements CommonService {
         Date date = Tools.truncDate(new Date(), Constant.DAY_PATTERN);
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
+        // 如果是周日
+        if (calendar.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) {
+            calendar.add(Calendar.DAY_OF_YEAR, -1);
+        }
         calendar.set(Calendar.DAY_OF_WEEK, 1);
         startTime = calendar.getTime().getTime();
         calendar.set(Calendar.DAY_OF_WEEK, 7);

src/main/java/com/zhiwei/brandkbs2/service/impl/UserServiceImpl.java

@@ -171,12 +171,12 @@ public class UserServiceImpl implements UserService {
                 newUser.setNickname(userDTO.getNickname());
                 newUser.setRoles(Collections.singletonList(UserRole.createFromUserDto(userDTO)));
                 newUser.setSuperAdmin(false);
-                userDao.insertOne(newUser);
-                userCenterService.addProduct(newUser.getId());
             } else {
                 newUser = User.createFromUserDTO(userDTO, nickname);
-                userDao.insertOne(newUser);
             }
+            userDao.insertOne(newUser);
+            // 通知用户中心开通权限
+            userCenterService.addProduct(newUser.getId());
             return ResponseResult.success();
         }
         List<UserRole> roles = user.getRoles();

src/main/resources/application-local.properties

@@ -87,8 +87,8 @@ crisis.event.url =https://crisis.zhiweidata.com/event/{1}/general?share={2}
 trends.longTimeInListSearchByInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/longTimeInListSearchByInner?sortType={1}&type={2}&day={3}
 trends.findHotSearchESDataInTimeByInner.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findHotSearchESDataInTimeByInner?limit={1}&page={2}&type={3}&word={4}
 trends.longTimeInListSearch.url=https://trends.zhiweidata.com/hotSearchTrend/search/longTimeInListSearch?type={1}&sortType=realTime
-trends.getHotSearchFromEsInTimeAndTypeOrWord.url=http://192.168.0.192:9091/hotsearch/hotSearch/getHotSearchFromEsInTimeAndTypeOrWord?limit={1}&page={2}&type={3}&word={4}&sort={5}&accurateWord={6}
-trends.queryHotSearchTrendInner.url=http://192.168.27.203:9094/hotSearchTrend/inner/queryHotSearchTrendInner?name={1}&startTime={2}&type={3}
+trends.getHotSearchFromEsInTimeAndTypeOrWord.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/getHotSearchFromEsInTimeAndTypeOrWord?limit={1}&page={2}&type={3}&word={4}&sort={5\}&accurateWord={6}
+trends.queryHotSearchTrendInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/queryHotSearchTrendInner?name={1}&startTime={2}&type={3}
 trends.getHotSearchSnapshot.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/getHotSearchSnapshot?type={1}&time={2}&rank={3}
 
 #\u4E8B\u4EF6\u5E93\u5916\u90E8\u63A5\u53E3