配置文件

2026-03-23 11:34:58 +08:00 · 2026-03-23 11:34:58 +08:00 · 108d0570fa
parent cc05663f52
commit 108d0570fa
7 changed files with 221 additions and 13 deletions
--- a/start/src/main/resources/bootstrap.yml
+++ b/start/src/main/resources/bootstrap.yml
@ -3,4 +3,8 @@ spring:
    import:
      - classpath:nacos.yml
      - classpath:sdk.yml
+#      - classpath:nacos-prod.yml
+#      - classpath:sdk-prod.yml
+#      - classpath:nacos-prod2.yml
+#      - classpath:sdk-prod2.yml
      - classpath:swagger.yml
--- a/start/src/main/resources/nacos-prod.yml
+++ b/start/src/main/resources/nacos-prod.yml
@ -0,0 +1,45 @@
+nacos:
+  url: prod-nacos:8848
+  namespace: jjb-dragon
+application:
+  name: jjb-saas-zcloud-basic-info
+  version:
+  gateway: basicInfo
+  cn-name: 统一用户管理
+spring:
+  application:
+    name: ${application.name}${application.version}
+  profiles:
+    # 环境配置
+    active: prod
+  cloud:
+    nacos:
+      config:
+        username: nacos
+        password: u9Hc7tLFBY
+        namespace: ${nacos.namespace}
+        server-addr: ${nacos.url}
+        file-extension: yml
+        shared-configs:
+          - config-common.yml
+          - config-port.yml
+          - config-mq.yml
+          - config-log.yml
+          - config-sdk-server.yml
+          - config-actuator.yml
+          - config-job.yml
+          - config-mysql.yml
+          - config-redis.yml
+          - config-cache.yml
+          - config-spring.yml
+          - config-mybatis.yml
+          - config-sdk.yml
+          - config-flyway.yml
+      discovery:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}
+        username: nacos
+        password: u9Hc7tLFBY
+
+
+
--- a/start/src/main/resources/nacos-prod2.yml
+++ b/start/src/main/resources/nacos-prod2.yml
@ -0,0 +1,44 @@
+nacos:
+  url: prod-nacos:8848
+  namespace: jjb-dragon
+application:
+  name: jjb-saas-zcloud-basic-info
+  version:
+  gateway: basicInfo
+  cn-name: 统一用户管理
+spring:
+  application:
+    name: ${application.name}${application.version}
+  profiles:
+    # 环境配置
+    active: prod
+  cloud:
+    nacos:
+      config:
+        username: nacos
+        password: u9Hc7tLFBY
+        namespace: ${nacos.namespace}
+        server-addr: ${nacos.url}
+        file-extension: yml
+        shared-configs:
+          - config-common.yml
+          - config-port.yml
+          - config-mq.yml
+          - config-log.yml
+          - config-sdk-server.yml
+          - config-actuator.yml
+          - config-job.yml
+          - config-mysql.yml
+          - config-redis.yml
+          - config-cache.yml
+          - config-spring.yml
+          - config-mybatis.yml
+          - config-sdk.yml
+          - config-flyway.yml
+      discovery:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}
+        username: nacos
+        password: u9Hc7tLFBY
+
+
--- a/start/src/main/resources/nacos.yml
+++ b/start/src/main/resources/nacos.yml
@ -36,5 +36,3 @@ spring:
      discovery:
        server-addr: ${spring.cloud.nacos.config.server-addr}
        namespace: ${spring.cloud.nacos.config.namespace}
-    inetutils:
-      preferred-networks: 192.168.10.28
--- a/start/src/main/resources/sdk-prod.yml
+++ b/start/src/main/resources/sdk-prod.yml
@ -0,0 +1,58 @@
+sdk:
+  server:
+    app-key: 61c9426ccfaa4656ab27d2341d5e99ea
+  client:
+    gateway:
+      url: ${common.gateway.network.http.external}
+      route:
+        - client:
+            system-code: ${application.name}
+            name: ${application.cn-name}-后端
+            group-code: public_api
+          service:
+            system-code: ${application.name}
+            name: ${application.cn-name}-后端
+            group-code: public_api
+            strip-prefix: 0
+            uri: http://${application.name}
+            path: /${application.gateway}/**
+        - client:
+            system-code: ${application.name}-container
+            name: ${application.cn-name}-前端
+            group-code: public_api
+          service:
+            system-code: ${application.name}-container
+            name: ${application.cn-name}-前端
+            group-code: public_api
+            strip-prefix: 0
+            uri: http://jjb-saas-base
+            path: /${application.gateway}/container/**
+            order: -2
+openapi:
+  appId: 1871106785124999168
+  appKey: 7314ecfc11ff4d5fad1ac19284ed2ac3
+  appSecret: 7565ab15-a2ae-4830-9b4d-fb382cd5fb30
+  appPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d03420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f
+  appPrivateKey: 308193020100301306072a8648ce3d020106082a811ccf5501822d0479307702010104206b6abc8e717b7d042f1e8531190a7c18113e4a701417f2770d2150d33ba97779a00a06082a811ccf5501822da14403420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f
+  encryptType: SM2
+  platform:
+    - name: default
+      openPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d034200045b5d8fcad91e113910406db4caf0f5c6688048e0f46742d55f872a25855316803ddb177cc9bb5906ff0b2ad4d6b1f1378a49109104613e79b5b5512e3710e88f
+      url: ${common.gateway.network.http.intranet}
+      protocol: HTTP
+      defaultPlatform: true
+      ##ciphertext plaintext
+      type: plaintext
+  apiPlatform:
+    - name: default
+      #多个可以逗号隔开
+      apiCode: test:01
+      #多个可以逗号隔开，可以为空
+      tenantIds: 1838408702262321152
+smb:
+  host: 39.100.115.58
+  port: 22
+  user: root
+  password: '@EwLEkf56oTYP-gU'
+  basePath: /mnt/gbsfile/gwj/file/
+
--- a/start/src/main/resources/sdk-prod2.yml
+++ b/start/src/main/resources/sdk-prod2.yml
@ -0,0 +1,58 @@
+sdk:
+  server:
+    app-key: 61c9426ccfaa4656ab27d2341d5e99ea
+  client:
+    gateway:
+      url: ${common.gateway.network.http.external}
+      route:
+        - client:
+            system-code: ${application.name}
+            name: ${application.cn-name}-后端
+            group-code: public_api
+          service:
+            system-code: ${application.name}
+            name: ${application.cn-name}-后端
+            group-code: public_api
+            strip-prefix: 0
+            uri: http://${application.name}
+            path: /${application.gateway}/**
+        - client:
+            system-code: ${application.name}-container
+            name: ${application.cn-name}-前端
+            group-code: public_api
+          service:
+            system-code: ${application.name}-container
+            name: ${application.cn-name}-前端
+            group-code: public_api
+            strip-prefix: 0
+            uri: http://jjb-saas-base
+            path: /${application.gateway}/container/**
+            order: -2
+openapi:
+  appId: 1871106785124999168
+  appKey: 7314ecfc11ff4d5fad1ac19284ed2ac3
+  appSecret: 7565ab15-a2ae-4830-9b4d-fb382cd5fb30
+  appPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d03420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f
+  appPrivateKey: 308193020100301306072a8648ce3d020106082a811ccf5501822d0479307702010104206b6abc8e717b7d042f1e8531190a7c18113e4a701417f2770d2150d33ba97779a00a06082a811ccf5501822da14403420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f
+  encryptType: SM2
+  platform:
+    - name: default
+      openPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d034200045b5d8fcad91e113910406db4caf0f5c6688048e0f46742d55f872a25855316803ddb177cc9bb5906ff0b2ad4d6b1f1378a49109104613e79b5b5512e3710e88f
+      url: ${common.gateway.network.http.intranet}
+      protocol: HTTP
+      defaultPlatform: true
+      ##ciphertext plaintext
+      type: plaintext
+  apiPlatform:
+    - name: default
+      #多个可以逗号隔开
+      apiCode: test:01
+      #多个可以逗号隔开，可以为空
+      tenantIds: 1838408702262321152
+smb:
+  host: 192.168.192.201
+  port: 22
+  user: root
+  password: 'SJSKaqhb@20240131'
+  basePath: /mnt/vdc2/qask/file/uploadFiles2/
+
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
@ -17,8 +17,6 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.framework.event.producer.RemoteEventPublisher;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
-import com.jjb.saas.message.client.message.facede.MessageFacade;
-import com.jjb.saas.message.client.todotask.facade.BusTodoTaskFacade;
 import com.jjb.saas.system.client.role.facade.RoleFacade;
 import com.jjb.saas.system.client.role.response.RoleCO;
 import com.jjb.saas.system.client.user.facade.UserFacade;
@ -34,8 +32,9 @@ import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO;
 import com.zcloud.basic.info.persistence.dataobject.UserDO;
 import com.zcloud.basic.info.persistence.mapper.UserMapper;
 import com.zcloud.basic.info.persistence.repository.UserRepository;
-import com.zcloud.gbscommon.utils.*;
-import com.zcloud.gbscommon.zclouddepartment.face.ZcloudDepartmentFacade;
+import com.zcloud.gbscommon.utils.PageQueryHelper;
+import com.zcloud.gbscommon.utils.Query;
+import com.zcloud.gbscommon.utils.Tools;
 import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@ -47,8 +46,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;

-import javax.annotation.Resource;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;

 /**
@ -161,11 +162,11 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
    @DubboReference
    private ZcloudImgFilesFacade zcloudImgFilesFacade;

-    @DubboReference
-    private MessageFacade messageFacade;
-
-    @DubboReference
-    private BusTodoTaskFacade busTodoTaskFacade;
+//    @DubboReference
+//    private MessageFacade messageFacade;
+//
+//    @DubboReference
+//    private BusTodoTaskFacade busTodoTaskFacade;

 //    @DubboReference
 //    private ZcloudDepartmentFacade zcloudDepartmentFacade;