Browse Source

用户管理调整2

zhoulisky 2 weeks ago
parent
commit
6205fbecdc

+ 0 - 42
doc/nacos/kd-dev.yaml

@@ -1,42 +0,0 @@
-#spring配置
-spring:
-  data:
-    redis:
-      ##redis 单机环境配置
-      host: 127.0.0.1
-      port: 6379
-      password: 123456
-      database: 0
-      ssl:
-        enabled: false
-      ##redis 集群环境配置
-      #cluster:
-      #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
-      #  commandTimeout: 5000
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    druid:
-      # MySql、PostgreSQL、SqlServer、DaMeng校验
-      validation-query: select 1
-
-#项目模块集中配置
-kd:
-  #分布式锁配置
-  lock:
-    enabled: false
-    address: redis://127.0.0.1:6379
-  #多团队协作服务配置
-  loadbalancer:
-    #开启配置
-    enabled: true
-    #负载均衡优先调用的ip段
-    prior-ip-pattern:
-      - 192.168.0.*
-      - 127.0.0.1
-  #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
-  datasource:
-    dev:
-      # MySql
-      url: jdbc:mysql://localhost:3306/kd_dev?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
-      username: root
-      password: 123456

+ 0 - 46
doc/nacos/kd-prod.yaml

@@ -1,46 +0,0 @@
-#spring配置
-spring:
-  data:
-    redis:
-      ##redis 单机环境配置
-      ##将docker脚本部署的redis服务映射为宿主机ip
-      ##生产环境推荐使用阿里云高可用redis服务并设置密码
-      host: 192.168.0.188
-      port: 3379
-      password:
-      database: 0
-      ssl:
-        enabled: false
-      ##redis 集群环境配置
-      #cluster:
-      #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
-      #  commandTimeout: 5000
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-      #driver-class-name: org.postgresql.Driver
-      #driver-class-name: oracle.jdbc.OracleDriver
-      #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-      #driver-class-name: dm.jdbc.driver.DmDriver
-      #driver-class-name: com.yashandb.jdbc.Driver
-    druid:
-      # MySql、PostgreSQL、SqlServer、DaMeng校验
-      validation-query: select 1
-      # Oracle、YashanDB校验
-      #oracle: true
-      #validation-query: select 1 from dual
-
-#项目模块集中配置
-kd:
-  #分布式锁配置
-  lock:
-    ##是否启用分布式锁
-    enabled: false
-    ##将docker脚本部署的redis服务映射为宿主机ip
-    ##生产环境推荐使用阿里云高可用redis服务并设置密码
-    address: redis://192.168.0.188:3379
-  #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
-  datasource:
-    prod:
-      url: jdbc:mysql://192.168.0.188:3306/kd_dev?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
-      username: root
-      password: root

+ 0 - 36
doc/nacos/kd-test.yaml

@@ -1,36 +0,0 @@
-#spring配置
-spring:
-  data:
-    redis:
-      ##redis 单机环境配置
-      ##将docker脚本部署的redis服务映射为宿主机ip
-      host: 192.168.0.188
-      port: 3379
-      password:
-      database: 0
-      ssl:
-        enabled: false
-      ##redis 集群环境配置
-      #cluster:
-      #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
-      #  commandTimeout: 5000
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    druid:
-      # MySql、PostgreSQL、SqlServer、DaMeng校验
-      validation-query: select 1
-
-#项目模块集中配置
-kd:
-  #分布式锁配置
-  lock:
-    ##是否启用分布式锁
-    enabled: false
-    ##将docker脚本部署的redis服务映射为宿主机ip
-    address: redis://192.168.0.188:3379
-  #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
-  datasource:
-    test:
-      url: jdbc:mysql://192.168.0.188:3306/kd_dev?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
-      username: root
-      password: root

+ 0 - 214
doc/nacos/kd.yaml

@@ -1,214 +0,0 @@
-#服务器配置
-server:
-  undertow:
-    threads:
-      # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
-      io: 16
-      # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
-      worker: 400
-    # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理
-    buffer-size: 1024
-    # 是否分配的直接内存
-    direct-buffers: true
-
-#spring配置
-spring:
-  cloud:
-    nacos:
-      discovery:
-        # 禁用云命名空间解析,防止和云平台环境变量冲突
-        isUseCloudNamespaceParsing: false
-      config:
-        # 禁用云命名空间解析,防止和云平台环境变量冲突
-        isUseCloudNamespaceParsing: false
-    sentinel:
-      eager: true
-  devtools:
-    restart:
-      log-condition-evaluation-delta: false
-    livereload:
-      port: 23333
-
-#feign配置
-feign:
-  sentinel:
-    enabled: true
-  okhttp:
-    enabled: true
-  httpclient:
-    enabled: false
-
-#对外暴露端口
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    health:
-      show-details: always
-
-#springdoc-openapi配置
-springdoc:
-  default-flat-param-object: true
-
-#knife4j配置
-knife4j:
-  #基础认证
-  basic:
-    enable: false
-    username: blade
-    password: blade
-  #增强配置
-  setting:
-    enableSwaggerModels: true
-    enableDocumentManage: true
-    enableHost: false
-    enableHostText: http://localhost
-    enableRequestCache: true
-    enableFilterMultipartApis: false
-    enableFilterMultipartApiMethodType: POST
-    language: zh_cn
-    enableFooter: false
-    enableFooterCustom: true
-    footerCustomContent: Copyright © 2025 Kd All Rights Reserved
-
-#swagger公共信息
-swagger:
-  title:  接口文档系统
-  description:  接口文档系统
-  version: 4.5.0.RELEASE
-  license: Powered By Kd
-  license-url: https://www.baidu.com
-  terms-of-service-url: https://www.baidu.com
-  contact:
-    name: sky
-    email: 111@qq.com
-    url: https://www.baidu.com
-
-kd:
-  #oauth2配置
-  oauth2:
-    #启用 oauth2
-    enabled: true
-    #使用 @org.sky.test.Sm2KeyGenerator 获取,用于国密sm2验签,需和前端保持一致
-    public-key: ${KD_OAUTH2_PUBLIC_KEY}
-    #使用 @org.sky.test.Sm2KeyGenerator 获取,用于国密sm2解密,前端无需配置
-    private-key: ${KD_OAUTH2_PRIVATE_KEY}
-  #token配置
-  token:
-    #是否有状态
-    state: false
-    #是否单用户登录
-    single: false
-    #单用户登录范围
-    single-level: all
-    #token签名 使用kd-auth服务 @org.sky.test.SignKeyGenerator 获取
-    sign-key: ${KD_TOKEN_SIGN_KEY}
-    #token加密 使用kd-auth服务 @org.sky.test.CryptoKeyGenerator 获取
-    crypto-key: ${KD_TOKEN_CRYPTO_KEY}
-  #接口配置
-  api:
-    #报文加密配置
-    crypto:
-      #启用报文加密配置
-      enabled: false
-      #使用kd-auth服务 @org.sky.test.CryptoKeyGenerator 获取,需和前端保持一致
-      aes-key: ${KD_API_CRYPTO_AES_KEY}
-      #使用kd-auth服务 @org.sky.test.CryptoKeyGenerator 获取,需和前端保持一致
-      des-key: ${KD_API_CRYPTO_DES_KEY}
-  #jackson配置
-  jackson:
-    #null自动转空值
-    null-to-empty: true
-    #大数字自动转字符串
-    big-num-to-string: true
-    #支持text文本请求,与报文加密同时开启
-    support-text-plain: false
-  #redis序列化方式
-  redis:
-    serializer-type: protostuff
-  #日志配置
-  log:
-    request:
-      #开启控制台请求日志
-      enabled: true
-      #控制台请求日志忽略
-      skip-url:
-        - /notice/list
-        - /wechat/**
-      #开启错误日志入库
-      error-log: true
-  #xss配置
-  xss:
-    enabled: true
-    skip-url:
-      - /wechat
-      - /qq
-  #安全框架配置
-  secure:
-    #严格模式
-    #缺失令牌字段则取消授权
-    strict-token: true
-    #缺失请求头则取消授权
-    strict-header: true
-    #接口放行
-    skip-url:
-      - /test/**
-    #授权认证配置
-    auth:
-      - method: ALL
-        pattern: /chat/wechat/**
-        expression: "hasAuth()"
-      - method: ALL
-        pattern: /chat/qq/**
-        expression: "hasStrictToken()"
-      - method: ALL
-        pattern: /chat/ding/**
-        expression: "hasStrictHeader()"
-      - method: ALL
-        pattern: /dashboard/notice
-        expression: "hasMenu('notice')"
-      - method: POST
-        pattern: /dashboard/upload
-        expression: "hasTimeAuth(9, 17)"
-      - method: POST
-        pattern: /dashboard/submit
-        expression: "hasAnyRole('administrator', 'admin', 'user')"
-    #基础认证配置
-    basic:
-      - method: ALL
-        pattern: /dashboard/info
-        username: "blade"
-        password: "blade"
-    #动态签名认证配置
-    sign:
-      - method: ALL
-        pattern: /dashboard/sign
-        crypto: "sha1"
-    #多终端认证配置
-    client:
-      - client-id: sword
-        path-patterns:
-          - /sword/**
-      - client-id: saber
-        path-patterns:
-          - /saber/**
-  #多租户配置
-  tenant:
-    #多租户增强
-    enhance: true
-    #多租户授权保护
-    license: false
-    #动态数据源功能
-    dynamic-datasource: false
-    #动态数据源全局扫描
-    dynamic-global: false
-    #多租户字段名
-    column: tenant_id
-    #排除多租户逻辑
-    exclude-tables:
-      - kd_user
-  #分库分表配置
-  sharding:
-    enabled: false

BIN
doc/nacos/nacos_config_export_dev.zip


BIN
doc/nacos/nacos_config_export_prod.zip


BIN
doc/nacos/nacos_config_export_test.zip


+ 0 - 28
doc/nacos/routes/blade-gateway-dev.json

@@ -1,28 +0,0 @@
-[
-  {
-    "id": "desk-route",
-    "order": 0,
-    "predicates": [
-      {
-        "name": "Path",
-        "args": {
-          "pattern": "/kd-desk/**"
-        }
-      }
-    ],
-    "filters": [],
-    "uri": "lb://kd-desk-me"
-  },
-  {
-    "id": "example-route",
-    "order": 0,
-    "predicates": [{
-      "name": "Path",
-      "args": {
-        "pattern": "/example"
-      }
-    }],
-    "filters": [],
-    "uri": "http://www.example.com"
-  }
-]

+ 0 - 50
doc/sql/kd_salary.sql

@@ -1,56 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : 本机
- Source Server Type    : MySQL
- Source Server Version : 50741
- Source Host           : localhost:3306
- Source Schema         : kd_dev
-
- Target Server Type    : MySQL
- Target Server Version : 50741
- File Encoding         : 65001
-
- Date: 19/06/2025 19:53:49
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
-DROP TABLE IF EXISTS `kd_salary`;
-CREATE TABLE `kd_salary`  (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
-  `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '姓名',
-  `number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工号',
-  `identity_card` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '身份证号码',
-  `department` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门',
-  `year_and_month` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属年月,只需要年份,如2025',
-  `personnel_type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '人员类型',
-  `average_monthly_salary` decimal(10, 2) NULL DEFAULT NULL COMMENT '上一年度月均工资(元)',
-  `pension_insurance` decimal(10, 2) NULL DEFAULT NULL COMMENT '上一年度月均单位承担部分养老保险',
-  `medical_insurance` decimal(10, 2) NULL DEFAULT NULL COMMENT '上一年度月均单位承担部分医疗保险',
-  `unemployment_insurance` decimal(10, 2) NULL DEFAULT NULL COMMENT '上一年度月均单位承担部分失业保险',
-  `injury_insurance` decimal(10, 2) NULL DEFAULT NULL COMMENT '上一年度月均单位承担部分工伤保险',
-  `maternity_insurance` decimal(10, 2) NULL DEFAULT NULL COMMENT '上一年度月均单位承担部分生育保险',
-  `provident_fund` decimal(10, 2) NULL DEFAULT NULL COMMENT '上一年度月均单位承担部分公积金',
-  `create_user` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_dept` bigint(20) NULL DEFAULT NULL COMMENT '创建部门',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-  `update_user` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
-  `status` int(11) NULL DEFAULT 1 COMMENT '状态',
-  `is_deleted` int(11) NULL DEFAULT 0 COMMENT '是否已删除',
-  `average_monthly_salary_edit` tinyint(1) NULL DEFAULT NULL COMMENT '上一年度月均工资(元),是否修改过,0:否,1:是',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1935631410673958914 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '技术人员工资表' ROW_FORMAT = DYNAMIC;
-
-INSERT INTO `kd_salary` VALUES (1935631410673958913, '000000', '张三', 'zhangsan', '430122198901266026', '技术中心', NULL, '研发人员', 8000.00, 100.00, 80.00, 20.00, 60.00, 20.00, 960.00, 1123598821738675201, 1123598813738675201, '2025-06-19 17:31:05', 1123598821738675201, '2025-06-19 17:31:05', 1, 0, NULL);
-
-SET FOREIGN_KEY_CHECKS = 1;

BIN
doc/科研平台-服务器信息.xlsx


+ 3 - 3
kd-ops/kd-resource/src/main/resources/application-dev.yml

@@ -6,6 +6,6 @@ spring:
     password: ${kd.datasource.dev.password}
 
 #oss默认配置
-oss:
-  #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址
-  transform-endpoint: http://47.99.150.200/oss/
+#oss:
+#  #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址
+#  transform-endpoint: http://47.99.150.200/oss/

+ 4 - 4
kd-ops/kd-resource/src/main/resources/application-home.yml

@@ -4,7 +4,7 @@ spring:
     url: ${kd.datasource.test.url}
     username: ${kd.datasource.test.username}
     password: ${kd.datasource.test.password}
-#oss默认配置
-oss:
-  #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址
-  transform-endpoint: http://47.99.150.200/oss/
+##oss默认配置
+#oss:
+#  #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址
+#  transform-endpoint: http://47.99.150.200/oss/

+ 4 - 4
kd-ops/kd-resource/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ spring:
     username: ${kd.datasource.prod.username}
     password: ${kd.datasource.prod.password}
 
-#oss默认配置
-oss:
-  #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址
-  transform-endpoint: http://116.62.106.199/oss/
+##oss默认配置
+#oss:
+#  #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址
+#  transform-endpoint: http://116.62.106.199/oss/

+ 4 - 4
kd-ops/kd-resource/src/main/resources/application-test.yml

@@ -4,7 +4,7 @@ spring:
     url: ${kd.datasource.test.url}
     username: ${kd.datasource.test.username}
     password: ${kd.datasource.test.password}
-#oss默认配置
-oss:
-  #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址
-  transform-endpoint: http://47.99.150.200/oss/
+##oss默认配置
+#oss:
+#  #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址
+#  transform-endpoint: http://47.99.150.200/oss/

+ 20 - 20
kd-ops/kd-resource/src/main/resources/application.yml

@@ -2,23 +2,23 @@
 server:
   port: 8010
 
-#oss默认配置
-oss:
-  #开启oss配置
-  enabled: true
-  #开启oss类型
-  #minio、s3、qiniu、alioss、huaweiobs、tencentcos
-  name: minio
-  #租户模式
-  tenant-mode: true
-  #oss服务地址
-  endpoint: http://116.62.106.199:9000
-  #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址
-  transform-endpoint:
-#  http://47.99.150.200/oss/
-  #访问key
-  access-key: gHKW6DdkaD5TI4cHL0mH
-  #密钥key
-  secret-key: flvNYILEhLuGjpzadhkAddBN6XYrUkZzrKwauVK9
-  #存储桶
-  bucket-name: kd-kypt
+##oss默认配置
+#oss:
+#  #开启oss配置
+#  enabled: true
+#  #开启oss类型
+#  #minio、s3、qiniu、alioss、huaweiobs、tencentcos
+#  name: minio
+#  #租户模式
+#  tenant-mode: true
+#  #oss服务地址
+#  endpoint: http://116.62.106.199:9000
+#  #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址
+#  transform-endpoint:
+#  #http://47.99.150.200/oss/
+#  #访问key
+#  access-key: gHKW6DdkaD5TI4cHL0mH
+#  #密钥key
+#  secret-key: flvNYILEhLuGjpzadhkAddBN6XYrUkZzrKwauVK9
+#  #存储桶
+#  bucket-name: kd-kypt