Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-admin/src/main/java/com/fs/his/controller/FsCompanyRechargeController.java

@@ -179,8 +179,8 @@ public class FsCompanyRechargeController extends BaseController
             companyRecharge.setStatus(1);
             SysConfig courseConfig = sysConfigMapper.selectConfigByConfigKey("course.config");
             CourseConfig config = JSON.parseObject(courseConfig.getConfigValue(), CourseConfig.class);
-            if(config.getDeptLimit() != null && config.getDeptLimit()){
-                SysDeptConfig deptConfig = sysDeptConfigService.getDeptConfig(company.getDeptId());
+            if(config.getDeptLimit() != null && config.getDeptLimit() && !loginUser.isAdmin()){
+                SysDeptConfig deptConfig = sysDeptConfigService.getDeptConfig(loginUser.getDeptId());
                 BigDecimal redPackage = deptConfig.getRedPackage();
                 BigDecimal nowMoney = redPackage.subtract(param.getMoney());
                 if(nowMoney.doubleValue() < 0){

fs-service/src/main/resources/application-config-druid-yjb.yml

@@ -41,8 +41,8 @@ wx:
       port: 6379
       timeout: 2000
     configs:
-      - appId: wx10c1004ec0596fbf # 第一个公众号的appid  //公众号名称:医健宝
-        secret: 7f4519ff3a287171214b66226b47acb1 # 公众号的appsecret--医健宝
+      - appId: wx87c9a7732263a6f5 # 第一个公众号的appid  //公众号名称:阜新枫汇服务
+        secret: 91eb1acd30c13d308525050471e0d5fc # 公众号的appsecret--阜新枫汇服务
         token: PPKOdAlCoMO # 接口配置里的Token值
         aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
 aifabu:  #爱链接
@@ -73,15 +73,15 @@ nuonuo:
 
 # 存储捅配置
 tencent_cloud_config:
-  secret_id: AKIDiMq9lDf2EOM9lIfqqfKo7FNgM5meD0sT
-  secret_key: u5SuS80342xzx8FRBukza9lVNHKNMSaB
+  secret_id: AKIDraAYkjVIvLch4ReiaIr0FTiyGPOGyUr2
+  secret_key: 3tcDi6QccQ971xoU0KRhpkSyIOIzSikZ
   bucket: bjyjb-1323137866
   app_id: 1323137866
   region: ap-chongqing
   proxy: bjyjb
 tmp_secret_config:
-  secret_id: AKIDCj7NSNAovtqeJpBau8GZ4CGB71thXIxX
-  secret_key: lTB5zwqqz7CNhzDOWivFWedgfTBgxgBT
+  secret_id: AKIDLl1tguyrZ6QddTCi2BLJ4e3OXVIuJVVK
+  secret_key: g9R6kLrMp8EDzXszylLispiQxHRN6cw5
   bucket: fs-1319721001
   app_id: 1319721001
   region: ap-chongqing

fs-user-app/src/main/java/com/fs/app/interceptor/AuthorizationInterceptor.java

@@ -56,10 +56,10 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
             throw new FSException(jwtUtils.getHeader() + "失效，请重新登录", HttpStatus.UNAUTHORIZED.value());
         }
         //查询用户的TOKEN是否和REDIS中的一样
-//        String redisToken=redisCache.getCacheObject("token:"+ Long.parseLong(claims.getSubject()));
-//        if(redisToken==null||!redisToken.equals(token)){
-//            throw new FSException(jwtUtils.getHeader() + "失效，请重新登录", HttpStatus.UNAUTHORIZED.value());
-//        }
+        String redisToken=redisCache.getCacheObject("token:"+ Long.parseLong(claims.getSubject()));
+        if(redisToken==null||!redisToken.equals(token)){
+            throw new FSException(jwtUtils.getHeader() + "失效，请重新登录", HttpStatus.UNAUTHORIZED.value());
+        }
         //设置userId到request里，后续根据userId，获取用户信息
         request.setAttribute(USER_KEY, Long.parseLong(claims.getSubject()));