Merge remote-tracking branch 'origin/master'

cash-api/account-server/src/main/java/com/czg/controller/FeignController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/feign")
 public class FeignController {
 
-    @DubboReference
+//    @DubboReference
     private SysParamsService sysParamsService;
 
     @RequestMapping("/test")

cash-api/account-server/src/main/java/com/czg/controller/UserAuthorizationController.java

@@ -5,6 +5,7 @@ import com.czg.account.dto.auth.UserAuthorizationLoginDTO;
 import com.czg.account.service.UserAuthorizationService;
 import com.czg.resp.CzgResult;
 import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -23,7 +24,7 @@ public class UserAuthorizationController {
      * @return 登录信息
      */
     @PostMapping("/login")
-    public CzgResult<LoginTokenDTO> login(UserAuthorizationLoginDTO userAuthorizationLoginDTO) {
+    public CzgResult<LoginTokenDTO> login(@RequestBody @Validated UserAuthorizationLoginDTO userAuthorizationLoginDTO) {
         return CzgResult.success(userAuthorizationService.login(userAuthorizationLoginDTO));
     }
 }

cash-api/system-server/src/main/java/com/czg/controller/SysParamController.java

@@ -1,5 +1,6 @@
 package com.czg.controller;
 
+import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.resp.CzgResult;
 import com.czg.system.dto.SysParamsDTO;
 import com.czg.system.service.SysParamsService;
@@ -28,6 +29,7 @@ public class SysParamController {
      * @return 新增结果
      */
     @PostMapping
+    @SaAdminCheckPermission("sysParams:add")
     public CzgResult<String> insertParams(@RequestBody @Validated({InsertGroup.class}) SysParamsDTO paramsDTO) {
         return sysParamsService.insertParams(paramsDTO);
     }
@@ -38,6 +40,7 @@ public class SysParamController {
      * @return 修改结果
      */
     @PutMapping
+    @SaAdminCheckPermission("sysParams:update")
     public CzgResult<String> updateParams(@RequestBody @Validated({UpdateGroup.class}) SysParamsDTO paramsDTO) {
         return sysParamsService.updateParams(paramsDTO);
     }
@@ -48,6 +51,7 @@ public class SysParamController {
      * @return 删除结果
      */
     @DeleteMapping("/{code}")
+    @SaAdminCheckPermission("sysParams:delete")
     public CzgResult<Boolean> deleteParams(@PathVariable String code) {
         return sysParamsService.deleteParams(code);
     }
@@ -58,6 +62,7 @@ public class SysParamController {
      * @return  参数
      */
     @GetMapping("/code/{code}")
+    @SaAdminCheckPermission("sysParams:get:code")
     public CzgResult<SysParamsDTO> deleteCode(@PathVariable String code) {
         return sysParamsService.getParamsByCode(code);
     }
@@ -68,6 +73,7 @@ public class SysParamController {
      * @return  参数列表
      */
     @GetMapping("/type/{type}")
+    @SaAdminCheckPermission("sysParams:get:type")
     public CzgResult<List<SysParamsDTO>> deleteType(@PathVariable String type) {
         return sysParamsService.getParamsByType(Integer.valueOf(type));
     }

cash-common/cash-common-api-config/pom.xml

@@ -54,6 +54,12 @@
             <artifactId>cash-common-sa-token</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.mybatis-flex</groupId>
+            <artifactId>mybatis-flex-spring-boot-starter</artifactId>
+            <version>1.10.6</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

cash-common/cash-common-api-config/src/main/java/com/czg/config/MyConfigurationCustomizer.java

@@ -1,4 +1,4 @@
-package com.czg.dto;
+package com.czg.config;
 
 import com.mybatisflex.core.mybatis.FlexConfiguration;
 import com.mybatisflex.spring.boot.ConfigurationCustomizer;

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java

@@ -9,7 +9,9 @@ import com.czg.account.dto.auth.UserAuthorizationLoginDTO;
 import com.czg.account.dto.auth.WechatRawDataDTO;
 import com.czg.account.entity.UserInfo;
 import com.czg.account.service.UserAuthorizationService;
+import com.czg.enums.StatusEnum;
 import com.czg.enums.UserAuthSourceEnum;
+import com.czg.exception.CzgException;
 import com.czg.sa.StpKit;
 import com.czg.account.service.UserInfoService;
 import com.czg.utils.AlipayUtil;
@@ -32,31 +34,35 @@ public class UserAuthorizationServiceImpl implements UserAuthorizationService {
 
     @Override
     public LoginTokenDTO login(UserAuthorizationLoginDTO userAuthorizationLoginDTO) {
+
         UserInfo userInfo;
         String openId;
         if (UserAuthSourceEnum.WECHAT.getValue().equals(userAuthorizationLoginDTO.getSource())) {
             openId = wechatAuthUtil.getSessionKeyOrOpenId(userAuthorizationLoginDTO.getCode());
             userInfo = userInfoService.queryChain().eq(UserInfo::getWechatOpenId, openId).one();
-        }else {
-            openId = alipayUtil.getOpenId(userAuthorizationLoginDTO.getCode());
-            userInfo = userInfoService.queryChain().eq(UserInfo::getAlipayOpenId, openId).one();
-        }
-
-        if (ObjectUtil.isNull(userInfo)) {
-            userInfo = new UserInfo();
+            userInfo = userInfo == null ? new UserInfo() : userInfo;
             if (StrUtil.isNotBlank(userAuthorizationLoginDTO.getRawData())) {
                 WechatRawDataDTO wechatRawDataDTO = JSONObject.parseObject(userAuthorizationLoginDTO.getRawData(), WechatRawDataDTO.class);
                 userInfo.setHeadImg(wechatRawDataDTO.getAvatarUrl());
                 userInfo.setNickName(StrUtil.isNotBlank(wechatRawDataDTO.getNickName()) ? wechatRawDataDTO.getNickName() : "微信用户");
+            } else {
+                userInfo.setNickName("微信用户");
             }
             userInfo.setWechatOpenId(openId);
-            userInfo.setStatus(1);
-            userInfo.setLastLoginTime(DateUtil.date().toLocalDateTime());
         } else {
-            userInfo.setLastLoginTime(DateUtil.date().toLocalDateTime());
+            openId = alipayUtil.getOpenId(userAuthorizationLoginDTO.getCode());
+            userInfo = userInfoService.queryChain().eq(UserInfo::getAlipayOpenId, openId).one();
+            userInfo = userInfo == null ? new UserInfo() : userInfo;
+            userInfo.setNickName("支付宝用户");
+            userInfo.setAlipayOpenId(openId);
         }
-        userInfoService.saveOrUpdate(userInfo);
 
+        if (StatusEnum.DISABLE.value() == userInfo.getStatus()) {
+            throw new CzgException("账号已禁用");
+        }
+
+        userInfo.setLastLoginTime(DateUtil.date().toLocalDateTime());
+        userInfoService.saveOrUpdate(userInfo);
         StpKit.USER.login(userInfo.getId());
         return new LoginTokenDTO(StpKit.USER.getTokenValue(), userInfo);
     }