---正式版

card-laas/laas-userbac/userbac-business/src/main/java/cn/wise/sc/pay/laas/userbac/business/config/DTNFIX.java

@@ -11,6 +11,7 @@ import org.springframework.context.annotation.Configuration;
 @Data
 @Configuration
 public class DTNFIX {
+
     @Value("${spring.datasource.dtn.userbac.prefix:}")
      String prefix;
 

card-paas/paas-cashier/cashiers-business/src/main/resources/bootstrap.yml

@@ -10,14 +10,14 @@ spring:
     nacos:
       discovery:
         server-addr: ${nacos.ip}:8848
-#        namespace: 34ec6c41-14f8-4f0f-a565-6039e5c49b22
+        namespace: 34ec6c41-14f8-4f0f-a565-6039e5c49b22
       config:
         server-addr:  ${nacos.ip}:8848
         file-extension: yaml
         #共享文件设置
         shared-dataids: common.yaml
         refreshable-dataids: common.yaml
-#        namespace: 34ec6c41-14f8-4f0f-a565-6039e5c49b22
+        namespace: 34ec6c41-14f8-4f0f-a565-6039e5c49b22
 #变量名字
 nacos:
   ip: 81.68.92.175 #nacosd地址

card-paas/paas-cashier/cashiers-business/src/main/resources/sentry.properties

-release=1.0.0
-dist=x86
-servername=oxo-cashiers
-dsn=http://b387f3764bbf462889e9477b75320617@81.68.92.175/4
\ No newline at end of file
+#release=1.0.0
+#dist=x86
+#servername=oxo-cashiers
+#dsn=http://b387f3764bbf462889e9477b75320617@81.68.92.175/4
\ No newline at end of file

card-saas/saas-association/association-api/src/main/java/cn/wise/sc/pay/api/association/service/ArticleCommentServiceImpl.java

@@ -5,7 +5,7 @@ import cn.wise.sc.pay.common.core.model.BaseResponse;
 import cn.wise.sc.pay.common.core.query.PageQuery;
 import org.springframework.stereotype.Component;
 
-@Component
+@Component("ArticleCommentServiceImpl")
 public class ArticleCommentServiceImpl implements IArticleCommentService {
     @Override
     public BaseResponse addComment(Comment comment) {

card-saas/saas-association/association-api/src/main/java/cn/wise/sc/pay/api/association/service/ArticleServiceImpl.java

@@ -13,7 +13,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Map;
 
-@Component
+@Component("ArticleServiceImpl")
 public class ArticleServiceImpl implements IArticleService {
     Logger logger = LoggerFactory.getLogger(this.getClass());
 

card-saas/saas-association/association-api/src/main/java/cn/wise/sc/pay/api/association/service/BannerServiceImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 
-@Component
+@Component(value = "BannerServiceImpl")
 public class BannerServiceImpl implements IBannerService {
 
     Logger logger = LoggerFactory.getLogger(this.getClass());

card-saas/saas-association/association-api/src/main/java/cn/wise/sc/pay/api/association/service/BlacklistServiceImpl.java

@@ -7,7 +7,7 @@ import cn.wise.sc.pay.domain.association.query.BlacklistQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Component;
 
-@Component
+@Component("BlacklistServiceImpl")
 public class BlacklistServiceImpl implements IBlacklistService {
     @Override
     public BaseResponse<Page<Blacklist>> list(String userName, PageQuery pageQuery) {

card-saas/saas-association/association-api/src/main/java/cn/wise/sc/pay/api/association/service/CollectionServiceImpl.java

@@ -3,6 +3,6 @@ package cn.wise.sc.pay.api.association.service;
 import cn.wise.sc.pay.api.association.service.ICollectionService;
 import org.springframework.stereotype.Component;
 
-@Component
+@Component("CollectionServiceImpl")
 public class CollectionServiceImpl implements ICollectionService {
 }

card-saas/saas-association/association-api/src/main/java/cn/wise/sc/pay/api/association/service/CommentReplyServiceImpl.java

@@ -4,7 +4,7 @@ import cn.wise.sc.pay.business.comment.bean.Reply;
 import cn.wise.sc.pay.common.core.model.BaseResponse;
 import org.springframework.stereotype.Component;
 
-@Component
+@Component("CommentReplyServiceImpl")
 public class CommentReplyServiceImpl implements ICommentReplyService {
     @Override
     public BaseResponse inserReply(Reply reply) {

card-saas/saas-association/association-api/src/main/java/cn/wise/sc/pay/api/association/service/ConcernServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 import java.util.Map;
 
-@Component
+@Component("ConcernServiceImpl")
 public class ConcernServiceImpl implements IConcernService {
     @Override
     public ResponseEntity addConcern(Concern concern) {

card-saas/saas-association/association-api/src/main/java/cn/wise/sc/pay/api/association/service/TopicServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 
-@Component
+@Component("TopicServiceImpl")
 public class TopicServiceImpl implements ITopicService {
 
     @Override

card-saas/saas-association/association-business/src/main/java/cn/wise/sc/pay/business/association/configure/FastDFSUtils.java

@@ -46,6 +46,10 @@ public class FastDFSUtils {
         return host + relativeUrl;
     }
 
+    public String getHost(){
+        return environment.getProperty("fdfs.imgaddress");
+    }
+
     /**
      * 文件上传
      *

card-saas/saas-association/association-business/src/main/java/cn/wise/sc/pay/business/association/service/impl/ArticleServiceImpl.java

@@ -101,7 +101,7 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article>
                         .title(articleQuery.getTitle())
                         .content(articleQuery.getContent())
                         .coverImage(articleQuery.getCoverImage())
-                        .createTime(System.currentTimeMillis())
+                        .createTime(articleQuery.getCreateTime() == 0L ? System.currentTimeMillis() : articleQuery.getCreateTime())
                         .updateTime(System.currentTimeMillis())
                         .type(articleQuery.getType())
                         .build();
@@ -314,7 +314,6 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article>
     @Override
     public BaseResponse uploadPic(MultipartFile file) {
         Map<String, String> map = new HashMap<>();
-        map.put("host", fastDFSUtils.fullUrl(""));
         String path = "";
         if (file != null && StringUtils.isNotEmpty(file.getOriginalFilename())) {
             try {
@@ -324,6 +323,7 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article>
             }
         }
         map.put("uri", path);
+        map.put("host", fastDFSUtils.getHost());
         return BaseResponse.ok(map);
     }
 

card-saas/saas-association/association-business/src/main/resources/bootstrap.yml

@@ -10,12 +10,14 @@ spring:
     nacos:
       discovery:
         server-addr: ${nacos.ip}:8848
+#        namespace: 34ec6c41-14f8-4f0f-a565-6039e5c49b22
       config:
         server-addr:  ${nacos.ip}:8848
         file-extension: yaml
         #共享文件设置
         shared-dataids: common.yaml
         refreshable-dataids: common.yaml
+#        namespace: 34ec6c41-14f8-4f0f-a565-6039e5c49b22
 
 #用的的变量名字
 nacos:

card-saas/saas-association/association-domain/src/main/java/cn/wise/sc/pay/domain/association/query/ArticleQuery.java

@@ -38,4 +38,6 @@ public class ArticleQuery {
   private byte type;
   /** 发布地址 */
   private String address;
+
+  private Long createTime = 0L;
 }

card-saas/saas-merchant/merchant-business/src/main/resources/bootstrap.yml

@@ -10,12 +10,14 @@ spring:
     nacos:
       discovery:
         server-addr: ${nacos.ip}:8848
+        namespace: 34ec6c41-14f8-4f0f-a565-6039e5c49b22
       config:
         server-addr:  ${nacos.ip}:8848
         file-extension: yaml
         #共享文件设置
         shared-dataids: common.yaml
         refreshable-dataids: common.yaml
+        namespace: 34ec6c41-14f8-4f0f-a565-6039e5c49b22
 #用的的变量名字
 nacos:
   ip: 81.68.92.175 #nacosd地址