1. 去除oss 中ocr 相关部分

2. 修改 配置文件信息

chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java

@@ -11,13 +11,10 @@ import com.chushang.oss.entity.dto.OcrDTO;
 import com.chushang.oss.entity.vo.FileSourceVo;
 import com.chushang.oss.enums.OcrTypeEnum;
 import com.chushang.oss.service.FileSourceService;
-import com.chushang.oss.service.OcrService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
 
 @RestController
 @RequestMapping(value = "/file")

chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/OcrService.java

@@ -1,9 +0,0 @@
-package com.chushang.oss.service;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.chushang.common.core.web.Result;
-import com.chushang.oss.entity.dto.OcrDTO;
-
-public interface OcrService {
-    Result<JSONObject> ocr(OcrDTO ocr);
-}

chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/impl/AliOcrServiceImpl.java

@@ -1,19 +0,0 @@
-package com.chushang.oss.service.impl;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.chushang.common.core.web.Result;
-import com.chushang.oss.entity.dto.OcrDTO;
-import com.chushang.oss.service.OcrService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Service;
-
-@Slf4j
-@Service("aliOcrService")
-@ConditionalOnExpression("'${ocr.service}'.equals('ali')")
-public class AliOcrServiceImpl implements OcrService {
-    @Override
-    public Result<JSONObject> ocr(OcrDTO ocr) {
-        return null;
-    }
-}

chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/impl/AliServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.List;
  */
 @Slf4j
 @Service("aliOssService")
-@ConditionalOnExpression("'${oss.storage}'.equals('ali')")
+@ConditionalOnExpression("'${config.oss.storage}'.equals('ali')")
 public class AliServiceImpl implements OssService {
 
     private OSS oss;

chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/impl/LocalServiceImpl.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @date: 2024/4/28 19:53
  */
 @Service
-@ConditionalOnExpression("'${oss.storage}'.equals('local')")
+@ConditionalOnExpression("'${config.oss.storage}'.equals('local')")
 public class LocalServiceImpl implements OssService {
     @Override
     public String upload(byte[] data, String path) {

chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/impl/MinioServiceImpl.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @date: 2024/4/28 19:52
  */
 @Service
-@ConditionalOnExpression("'${oss.storage}'.equals('minio')")
+@ConditionalOnExpression("'$config.{oss.storage}'.equals('minio')")
 public class MinioServiceImpl implements OssService {
     @Override
     public String upload(byte[] data, String path) {

chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/impl/WxOcrServiceImpl.java

@@ -1,19 +0,0 @@
-package com.chushang.oss.service.impl;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.chushang.common.core.web.Result;
-import com.chushang.oss.entity.dto.OcrDTO;
-import com.chushang.oss.service.OcrService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Service;
-
-@Slf4j
-@Service("wxOcrService")
-@ConditionalOnExpression("'${ocr.service}'.equals('wx')")
-public class WxOcrServiceImpl implements OcrService {
-    @Override
-    public Result<JSONObject> ocr(OcrDTO ocr) {
-        return null;
-    }
-}

chushang-modules/chushang-module-oss/oss-service/src/main/resources/application.yml

@@ -16,9 +16,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    username: ${conf.jdbc.cs.master.username}
+    username: ${conf.jdbc.master.oss.username}
-    password: ${conf.jdbc.cs.master.password}
+    password: ${conf.jdbc.master.oss.password}
-    url: jdbc:mysql://${conf.jdbc.cs.master.host}:${conf.jdbc.cs.master.port}/${conf.jdbc.cs.master.database}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://${conf.jdbc.master.oss.host}:${conf.jdbc.master.oss.port}/${conf.jdbc.master.oss.database}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
     hikari:
       # 最大线程池数量
       maximum-pool-size: 30

chushang-modules/chushang-module-oss/oss-service/src/main/resources/bootstrap.yml

@@ -33,7 +33,8 @@ spring:
         file-extension: yaml
         refresh-enabled: true
         shared-configs:
-          - dataId: application-common.${spring.cloud.nacos.config.file-extension}
+#       此处不应当 走common 了, 每个羡慕应该有自己单独的 db.yaml 文件 redis 可以使用公共
+          - dataId: db-common.${spring.cloud.nacos.config.file-extension}
             group: ${spring.cloud.nacos.discovery.group}
             refresh: ${spring.cloud.nacos.config.refresh-enabled}
   profiles:

chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/vo/SysUserOnline.java

@@ -16,7 +16,7 @@ public class SysUserOnline
     private String tokenId;
 
     /** 用户名称 */
-    private String userName;
+    private String username;
 
     /** 登录IP地址 */
     private String ipaddr;

chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysUserOnlineService.java

@@ -142,7 +142,7 @@ public class ISysUserOnlineService
         }
         SysUserOnline sysUserOnline = new SysUserOnline();
         sysUserOnline.setTokenId(user.getToken());
-        sysUserOnline.setUserName(user.getUsername());
+        sysUserOnline.setUsername(user.getUsername());
         sysUserOnline.setIpaddr(user.getIpaddr());
         sysUserOnline.setLoginTime(user.getLoginTime());
         sysUserOnline.setLoginLocation(IPUtils.getLocalCityInfo(user.getIpaddr()));

chushang-modules/chushang-module-system/system-service/src/main/resources/application.yml

@@ -16,9 +16,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    username: ${config.jdbc.cs.master.username}
+    username: ${config.jdbc.master.system.username}
-    password: ${config.jdbc.cs.master.password}
+    password: ${config.jdbc.master.system.password}
-    url: jdbc:mysql://${config.jdbc.cs.master.host}:${config.jdbc.cs.master.port}/${config.jdbc.cs.master.database}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://${config.jdbc.master.system.host}:${config.jdbc.master.system.port}/${config.jdbc.master.system.database}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
     hikari:
       # 最大线程池数量
       maximum-pool-size: 30