diff --git a/README.md b/README.md new file mode 100644 index 0000000..55a509b --- /dev/null +++ b/README.md @@ -0,0 +1,53 @@ + + +## 启动设置 +### 金蝶Apusic应用服务器 +#### 安装jar包到本地仓库 +1. 进入aams-spring-boot-starter-all-2.4.0.jar所在目录（项目根目录 libs目录下） +2. 执行 mvn install:install-file -Dfile=aams-spring-boot-starter-all-2.4.0.jar -DgroupId=com.apusic -DartifactId=aams-spring-boot-starter-all -Dversion=2.4.0 -Dpackaging=jar +#### 排除tomcat（已完成） +```xml + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + +``` +#### 引入金蝶Apusic应用服务器（已完成） +```xml + + + com.apusic + aams-spring-boot-starter-all + 2.4.0 + +``` +#### 验证安装 +访问maven本地仓库 XXX\repository\com\apusic，可以在对应仓库地址中找到上述的jar包，此时即表示jar包部署到本地仓库成功。 +#### 设置VM参数（授权认证） +**找到Run->Edit Configuretion->Spring Boot中的项目启动类，在右边的VM options中输入 - +Duser.dir=xxxxxxxx ， xxxxxxxx 表示 license.xml 文件所在的目录；例如：D:xxx\rsks-boot\ruoyi-framework 其中D:\xxx为项目所在目录** + + + + +### 奇安信国密安全密码应用中间件 +#### 安装jar包到本地仓库 +1. 进入quickapi-client-java-1.5.11-SNAPSHOT-shaded.jar所在目录（项目根目录 libs目录下） +2. 执行 mvn install:install-file -Dfile=quickapi-client-java-1.5.11-SNAPSHOT-shaded.jar -DgroupId=org.quickssl -DartifactId=quickapi-client-java -Dversion=1.5.11-SNAPSHOT -Dpackaging=jar +#### 引入奇安信国密安全密码应用中间件（已完成） +```xml + + + org.quickssl + quickapi-client-java + 1.5.11-SNAPSHOT + +``` +#### 验证安装 +访问maven本地仓库 XXX\repository\org\quickssl，可以在对应仓库地址中找到上述的jar包，此时即表示jar包部署到本地仓库成功。 \ No newline at end of file diff --git a/libs/aams-spring-boot-starter-all-2.4.0.jar b/libs/aams-spring-boot-starter-all-2.4.0.jar new file mode 100644 index 0000000..963eb81 Binary files /dev/null and b/libs/aams-spring-boot-starter-all-2.4.0.jar differ diff --git a/libs/quickapi-client-java-1.5.11-SNAPSHOT.jar b/libs/quickapi-client-java-1.5.11-SNAPSHOT.jar new file mode 100644 index 0000000..0de2ab3 Binary files /dev/null and b/libs/quickapi-client-java-1.5.11-SNAPSHOT.jar differ diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 135b475..9e38a2a 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -1,16 +1,78 @@ -# 数据源配置 + +# 项目相关配置 +ruoyi: + # 名称 + name: RuoYi + # 版本 + version: 3.8.8 + # 版权年份 + copyrightYear: 2024 + # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + profile: D:/ruoyi/uploadPath + # 获取ip地址开关 + addressEnabled: false + # 验证码类型 math 数字计算 char 字符验证 + captchaType: math + +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 9091 + servlet: + # 应用的访问路径 + context-path: / + tomcat: + # tomcat的URI编码 + uri-encoding: UTF-8 + # 连接数满后的排队数，默认为100 + accept-count: 1000 + threads: + # tomcat最大线程数，默认为200 + max: 800 + # Tomcat启动初始化的线程数，默认值10 + min-spare: 100 + +# 日志配置 +logging: + level: + com.ruoyi: debug + org.springframework: warn + +# 用户配置 +user: + password: + # 密码最大错误次数 + maxRetryCount: 5 + # 密码锁定时间（默认10分钟） + lockTime: 10 + +# Spring配置 spring: + # 资源信息 + messages: + # 国际化资源文件路径 + basename: i18n/messages + # 文件上传 + servlet: + multipart: + # 单个文件大小 + max-file-size: 10MB + # 设置总上传的文件大小 + max-request-size: 20MB + # 服务模块 + devtools: + restart: + # 热部署开关 + enabled: true datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.highgo.jdbc.Driver druid: # 主库数据源 master: - url: jdbc:highgo://127.0.0.1:5866/highgo?useUnicode=true&characterEncoding=utf8¤tSchema=ks_db4&stringtype=unspecified - #username: syssso + url: jdbc:highgo://124.243.245.42:5866/highgo?useUnicode=true&characterEncoding=utf8¤tSchema=ks_db4&stringtype=unspecified username: sysdba password: ZKR2024@comzkr - # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -63,7 +125,7 @@ spring: multi-statement-allow: true redis: # 地址 - host: 127.0.0.1 + host: 124.243.245.42 # 端口，默认为6379 port: 5379 # 数据库索引 @@ -82,15 +144,193 @@ spring: max-active: 8 # #连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms + # redis 配置 +# token配置 +token: + # 令牌自定义标识 + header: Authorization + # 令牌密钥 + secret: Abc123!@#Def456$%^Ghi789&*()Jkl0+-=MnoPqrStuVwxYz987$%^654@#$321!@#ZyxWvu + # 令牌有效期（默认30分钟） + expireTime: 30 + +## MyBatis配置 +#mybatis: +# # 搜索指定包别名 +# typeAliasesPackage: com.ruoyi.**.domain +# # 配置mapper的扫描，找到所有的mapper.xml映射文件 +# mapperLocations: classpath*:mapper/**/*Mapper.xml +# # 加载全局的配置文件 +# configLocation: classpath:mybatis/mybatis-config.xml + +# PageHelper分页插件 +pagehelper: + helperDialect: oracle + supportMethodsArguments: true + params: count=countSql + +# Swagger配置 +swagger: + # 是否开启swagger + enabled: true + # 请求前缀 + pathMapping: + +# 防止XSS攻击 +xss: + # 过滤开关 + enabled: true + # 排除链接（多个用逗号分隔） + excludes: /system/notice + # 匹配链接 + urlPatterns: /system/*,/monitor/*,/tool/* + + +createSqlSessionFactory: + # 选择MyBatis配置方式，mybatis / mybatis-plus + use: mybatis-plus + +# MyBatis配置 +mybatis: + # 搜索指定包别名 + typeAliasesPackage: com.ruoyi.**.domain + # 配置mapper的扫描，找到所有的mapper.xml映射文件 + mapperLocations: classpath*:mapper/**/*Mapper.xml + # 加载全局的配置文件 + configLocation: classpath:mybatis/mybatis-config.xml + +# MyBatis Plus配置 +mybatis-plus: + # 搜索指定包别名 + typeAliasesPackage: com.ruoyi.**.domain + # 配置mapper的扫描，找到所有的mapper.xml映射文件 + mapperLocations: classpath*:mapper/**/*Mapper.xml + # 加载全局的配置文件 + configLocation: classpath:mybatis/mybatis-config.xml + global-config: + db-config: + # 标识逻辑删除的数据库字段名称 + logic-delete-field: delFlag + # 表示已逻辑删除的值(默认也是如此) + logic-delete-value: 2 + # 表示未逻辑删除的值(默认也是如此) + logic-not-delete-value: 0 + +file: + upload-dir: /data/file + +ocr: + ocr_url: http://127.0.0.1:9001/ocr + ocr_mutipart: https://qd.zhaopinzao8dian.com/ocr-api/ocr + # ocr_mutipart: http://10.98.80.141:9000/ocr + ocr_llm_url: http://39.98.44.136:6016/inner-ai/aicoapi/gateway/v2/chatbot/api_run/1763386387_d4c07131-a047-4c0d-9623-7e3c3a45bd7e + ocr_llm_apiKey: NfzPnFRtogHlYCAh2hHIB7ra5EsrSQEM + +cipher-security: + socket: 39.102.146.78:11028 + path: /data/downloadmodel/certTest +# socket: 10.98.80.223:8443 +# path: /data/downloadmodel/cert + +#nginx节点健康检查 +management: + endpoints: + web: + exposure: + include: health + +#微信小程序 +wx: + appid: wx4aa34488b965a331 + secret: 558780ecc2750f87e556b0e5496773c9 + # easy-es easy-es: enable: true banner: false - address: 127.0.0.1:9200 + address: 124.243.245.42:9200 global-config: process-index-mode: manual db-config: refresh-policy: immediate username: elastic - password: zkr2024@@.com \ No newline at end of file + password: zkr2024@@.com + +#短信服务 +sms: + #API密钥账号 + # secretName: kszhjyrcjt + secretName: kszhjypthydx + #API密钥 + # secretKey: Dwhc9c0IiHecvC5D + secretKey: asj1gze3BhG3QtaI + #短信模板ID + # templateId: 37446 + templateId: 49566 + +#统一门户认证 +oauth: + #客户端的ID + appid: 251112100000000015 + #授权码 + clientsecretkey: 2a44cb8d21dcf4b0777881ca11ea0d83ebea94bbe1ab1f405508db0873cdcc99 + #内网 + usptnw: + #获取访问令牌 + nwGatewayGetTokenUrl: http://10.98.80.146/uspt/serviceAPI/getToken + #获取用户信息 + nwGatewayGetUserInfoUrl: http://10.98.80.146/uspt/serviceAPI/getUserInfo + #外网 + usptww: + #门户注册 + wwRegisterPostUrl: http://10.98.80.50/uspt/webWhiteListServiceAPI/doWebRegister + #门户登录 + wwTokenPostUrl: http://10.98.80.50/uspt/webWhiteListServiceAPI/doWebLogon + #查询用户信息 + wwQueryWebUserInfo: http://10.98.80.50/uspt/webWhiteListServiceAPI/queryWebUserInfo + #查询个人信息 + wwQueryWebPersonalInfoPostUrl: http://10.98.80.50/uspt/webWhiteListServiceAPI/queryWebPersonalInfo + #查询单位信息 + wwQueryWebEnterpriseInfoPostUrl: http://10.98.80.50/uspt//webWhiteListServiceAPI/queryWebEnterpriseInfo + #用户新增接口 + tyAddUserUrl: http://10.98.80.146/qxgl_backend/security/add_user + #获取当前用户有权系统列表 + tyQueryUserSysListUrl: http://10.98.80.146/qxgl_backend/security/get_effective_app_list + #获取当前用户有权角色列表 + tyQueryUserRoleListUrl: http://10.98.80.146/qxgl_backend/security/get_role_by_userid + #获取角色功能权限信息 + tyQueryRoleInfoUrl: http://10.98.80.146/qxgl_backend/security/get_path_by_role + #获取用户详细信息 + tyQueryUserInfo: http://10.98.80.146/qxgl_backend/security/get_user_by_userid + #获取机构详细信息 + tyQueryUnitInfo: http://10.98.80.146/qxgl_backend/security/get_organization_by_organizationid + connect-timeout: 10 + read-timeout: 30 + write-timeout: 30 + +#浪潮 +lc: + #获取人员标签 + personTag: http://10.98.80.146/prod-api/dispatch/public/person/tag + +#ai +chat: + baseUrl: http://192.168.133.200:8080 + chatUrl: /v1/chat/completions + chatDetailUrl: /core/chat/getPaginationRecords + chatHistoryUrl: /core/chat/getHistories + updateNameUrl: /core/chat/updateHistory + stickChatUrl: /core/chat/updateHistory + delChatUrl: /core/chat/delHistory + delAllChatUrl: /core/chat/clearHistories + guestUrl: /v1/chat/completions + praiseUrl: /core/chat/feedback/updateUserFeedback + appId: 67cd49095e947ae0ca7fadd8 + apiKey: fastgpt-qMl63276wPZvKAxEkW77bur0sSJpmuC6Ngg9lzyEjufLhsBAurjT55j + model: qd-job-turbo + +audioText: + asr: http://192.168.133.200:8000/asr/file + #tts: http://192.168.133.200:19527/synthesize + tts: http://10.98.76.104:19528/synthesize diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-admin/src/main/resources/application-local.yml deleted file mode 100644 index 50c57e6..0000000 --- a/ruoyi-admin/src/main/resources/application-local.yml +++ /dev/null @@ -1,93 +0,0 @@ -# 数据源配置 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.highgo.jdbc.Driver - druid: - # 主库数据源 - master: - url: jdbc:highgo://124.243.245.42:5866/highgo?useUnicode=true&characterEncoding=utf8¤tSchema=ks_db4&stringtype=unspecified - username: sysdba - password: ZKR2024@comzkr - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - # 初始连接数 - initialSize: 10 - # 最小连接池数量 - minIdle: 30 - # 最大连接池数量 - maxActive: 50 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置连接超时时间 - connectTimeout: 30000 - # 配置网络超时时间 - socketTimeout: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间，单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT version() - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单，不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: ruoyi - login-password: 123456 - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true - redis: - # 地址 - host: 124.243.245.42 - # 端口，默认为6379 - port: 5379 - # 数据库索引 - database: 5 - # 密码 - password: ZKR2024@@.com - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 0 - # 连接池中的最大空闲连接 - max-idle: 8 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms -# easy-es -easy-es: - enable: true - banner: false - address: 124.243.245.42:9200 - global-config: - process-index-mode: manual - db-config: - refresh-policy: immediate - username: elastic - password: zkr2024@@.com diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml new file mode 100644 index 0000000..561f6bc --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -0,0 +1,333 @@ +# 项目相关配置 +ruoyi: + # 名称 + name: RuoYi + # 版本 + version: 3.8.8 + # 版权年份 + copyrightYear: 2024 + # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + profile: D:/ruoyi/uploadPath + # 获取ip地址开关 + addressEnabled: false + # 验证码类型 math 数字计算 char 字符验证 + captchaType: math + +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 9091 + servlet: + # 应用的访问路径 + context-path: / + tomcat: + # tomcat的URI编码 + uri-encoding: UTF-8 + # 连接数满后的排队数，默认为100 + accept-count: 1000 + threads: + # tomcat最大线程数，默认为200 + max: 800 + # Tomcat启动初始化的线程数，默认值10 + min-spare: 100 + +# 日志配置 +logging: + level: + com.ruoyi: debug + org.springframework: warn + +# 用户配置 +user: + password: + # 密码最大错误次数 + maxRetryCount: 5 + # 密码锁定时间（默认10分钟） + lockTime: 10 + +# Spring配置 +spring: + # 资源信息 + messages: + # 国际化资源文件路径 + basename: i18n/messages + # 文件上传 + servlet: + multipart: + # 单个文件大小 + max-file-size: 10MB + # 设置总上传的文件大小 + max-request-size: 20MB + # 服务模块 + devtools: + restart: + # 热部署开关 + enabled: true + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.highgo.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:highgo://124.243.245.42:5866/highgo?useUnicode=true&characterEncoding=utf8¤tSchema=ks_db4&stringtype=unspecified + username: sysdba + password: ZKR2024@comzkr + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 10 + # 最小连接池数量 + minIdle: 30 + # 最大连接池数量 + maxActive: 50 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT version() + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true + redis: + # 地址 + host: 124.243.245.42 + # 端口，默认为6379 + port: 5379 + # 数据库索引 + database: 5 + # 密码 + password: ZKR2024@@.com + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms +# token配置 +token: + # 令牌自定义标识 + header: Authorization + # 令牌密钥 + secret: Abc123!@#Def456$%^Ghi789&*()Jkl0+-=MnoPqrStuVwxYz987$%^654@#$321!@#ZyxWvu + # 令牌有效期（默认30分钟） + expireTime: 30 + +## MyBatis配置 +#mybatis: +# # 搜索指定包别名 +# typeAliasesPackage: com.ruoyi.**.domain +# # 配置mapper的扫描，找到所有的mapper.xml映射文件 +# mapperLocations: classpath*:mapper/**/*Mapper.xml +# # 加载全局的配置文件 +# configLocation: classpath:mybatis/mybatis-config.xml + +# PageHelper分页插件 +pagehelper: + helperDialect: oracle + supportMethodsArguments: true + params: count=countSql + +# Swagger配置 +swagger: + # 是否开启swagger + enabled: true + # 请求前缀 + pathMapping: + +# 防止XSS攻击 +xss: + # 过滤开关 + enabled: true + # 排除链接（多个用逗号分隔） + excludes: /system/notice + # 匹配链接 + urlPatterns: /system/*,/monitor/*,/tool/* + + +createSqlSessionFactory: + # 选择MyBatis配置方式，mybatis / mybatis-plus + use: mybatis-plus + +# MyBatis配置 +mybatis: + # 搜索指定包别名 + typeAliasesPackage: com.ruoyi.**.domain + # 配置mapper的扫描，找到所有的mapper.xml映射文件 + mapperLocations: classpath*:mapper/**/*Mapper.xml + # 加载全局的配置文件 + configLocation: classpath:mybatis/mybatis-config.xml + +# MyBatis Plus配置 +mybatis-plus: + # 搜索指定包别名 + typeAliasesPackage: com.ruoyi.**.domain + # 配置mapper的扫描，找到所有的mapper.xml映射文件 + mapperLocations: classpath*:mapper/**/*Mapper.xml + # 加载全局的配置文件 + configLocation: classpath:mybatis/mybatis-config.xml + global-config: + db-config: + # 标识逻辑删除的数据库字段名称 + logic-delete-field: delFlag + # 表示已逻辑删除的值(默认也是如此) + logic-delete-value: 2 + # 表示未逻辑删除的值(默认也是如此) + logic-not-delete-value: 0 + +file: + upload-dir: /data/file + +ocr: + ocr_url: http://127.0.0.1:9001/ocr + ocr_mutipart: https://qd.zhaopinzao8dian.com/ocr-api/ocr + # ocr_mutipart: http://10.98.80.141:9000/ocr + ocr_llm_url: http://39.98.44.136:6016/inner-ai/aicoapi/gateway/v2/chatbot/api_run/1763386387_d4c07131-a047-4c0d-9623-7e3c3a45bd7e + ocr_llm_apiKey: NfzPnFRtogHlYCAh2hHIB7ra5EsrSQEM + +cipher-security: + socket: 39.102.146.78:11028 + path: /data/downloadmodel/certTest +# socket: 10.98.80.223:8443 +# path: /data/downloadmodel/cert + +#nginx节点健康检查 +management: + endpoints: + web: + exposure: + include: health + +#微信小程序 +wx: + appid: wx4aa34488b965a331 + secret: 558780ecc2750f87e556b0e5496773c9 + +# easy-es +easy-es: + enable: true + banner: false + address: 124.243.245.42:9200 + global-config: + process-index-mode: manual + db-config: + refresh-policy: immediate + username: elastic + password: zkr2024@@.com + +#短信服务 +sms: + #API密钥账号 + # secretName: kszhjyrcjt + secretName: kszhjypthydx + #API密钥 + # secretKey: Dwhc9c0IiHecvC5D + secretKey: asj1gze3BhG3QtaI + #短信模板ID + # templateId: 37446 + templateId: 49566 + +#统一门户认证 +oauth: + #客户端的ID + appid: 251112100000000015 + #授权码 + clientsecretkey: 2a44cb8d21dcf4b0777881ca11ea0d83ebea94bbe1ab1f405508db0873cdcc99 + #内网 + usptnw: + #获取访问令牌 + nwGatewayGetTokenUrl: http://10.98.80.146/uspt/serviceAPI/getToken + #获取用户信息 + nwGatewayGetUserInfoUrl: http://10.98.80.146/uspt/serviceAPI/getUserInfo + #外网 + usptww: + #门户注册 + wwRegisterPostUrl: http://10.98.80.50/uspt/webWhiteListServiceAPI/doWebRegister + #门户登录 + wwTokenPostUrl: http://10.98.80.50/uspt/webWhiteListServiceAPI/doWebLogon + #查询用户信息 + wwQueryWebUserInfo: http://10.98.80.50/uspt/webWhiteListServiceAPI/queryWebUserInfo + #查询个人信息 + wwQueryWebPersonalInfoPostUrl: http://10.98.80.50/uspt/webWhiteListServiceAPI/queryWebPersonalInfo + #查询单位信息 + wwQueryWebEnterpriseInfoPostUrl: http://10.98.80.50/uspt//webWhiteListServiceAPI/queryWebEnterpriseInfo + #用户新增接口 + tyAddUserUrl: http://10.98.80.146/qxgl_backend/security/add_user + #获取当前用户有权系统列表 + tyQueryUserSysListUrl: http://10.98.80.146/qxgl_backend/security/get_effective_app_list + #获取当前用户有权角色列表 + tyQueryUserRoleListUrl: http://10.98.80.146/qxgl_backend/security/get_role_by_userid + #获取角色功能权限信息 + tyQueryRoleInfoUrl: http://10.98.80.146/qxgl_backend/security/get_path_by_role + #获取用户详细信息 + tyQueryUserInfo: http://10.98.80.146/qxgl_backend/security/get_user_by_userid + #获取机构详细信息 + tyQueryUnitInfo: http://10.98.80.146/qxgl_backend/security/get_organization_by_organizationid + connect-timeout: 10 + read-timeout: 30 + write-timeout: 30 + +#浪潮 +lc: + #获取人员标签 + personTag: http://10.98.80.146/prod-api/dispatch/public/person/tag + +#ai +chat: + baseUrl: http://192.168.133.200:8080 + chatUrl: /v1/chat/completions + chatDetailUrl: /core/chat/getPaginationRecords + chatHistoryUrl: /core/chat/getHistories + updateNameUrl: /core/chat/updateHistory + stickChatUrl: /core/chat/updateHistory + delChatUrl: /core/chat/delHistory + delAllChatUrl: /core/chat/clearHistories + guestUrl: /v1/chat/completions + praiseUrl: /core/chat/feedback/updateUserFeedback + appId: 67cd49095e947ae0ca7fadd8 + apiKey: fastgpt-qMl63276wPZvKAxEkW77bur0sSJpmuC6Ngg9lzyEjufLhsBAurjT55j + model: qd-job-turbo + +audioText: + asr: http://192.168.133.200:8000/asr/file + #tts: http://192.168.133.200:19527/synthesize + tts: http://10.98.76.104:19528/synthesize diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index fa69a2d..caf4dfc 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -1,244 +1,3 @@ -# 项目相关配置 -ruoyi: - # 名称 - name: RuoYi - # 版本 - version: 3.8.8 - # 版权年份 - copyrightYear: 2024 - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath - # 获取ip地址开关 - addressEnabled: false - # 验证码类型 math 数字计算 char 字符验证 - captchaType: math - -# 开发环境配置 -server: - # 服务器的HTTP端口，默认为8080 - port: 9091 - servlet: - # 应用的访问路径 - context-path: / - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # 连接数满后的排队数，默认为100 - accept-count: 1000 - threads: - # tomcat最大线程数，默认为200 - max: 800 - # Tomcat启动初始化的线程数，默认值10 - min-spare: 100 - -# 日志配置 -logging: - level: - com.ruoyi: debug - org.springframework: warn - -# 用户配置 -user: - password: - # 密码最大错误次数 - maxRetryCount: 5 - # 密码锁定时间（默认10分钟） - lockTime: 10 - -# Spring配置 spring: - # 资源信息 - messages: - # 国际化资源文件路径 - basename: i18n/messages profiles: - active: local - # 文件上传 - servlet: - multipart: - # 单个文件大小 - max-file-size: 10MB - # 设置总上传的文件大小 - max-request-size: 20MB - # 服务模块 - devtools: - restart: - # 热部署开关 - enabled: true - # redis 配置 -# token配置 -token: - # 令牌自定义标识 - header: Authorization - # 令牌密钥 - secret: Abc123!@#Def456$%^Ghi789&*()Jkl0+-=MnoPqrStuVwxYz987$%^654@#$321!@#ZyxWvu - # 令牌有效期（默认30分钟） - expireTime: 30 - -## MyBatis配置 -#mybatis: -# # 搜索指定包别名 -# typeAliasesPackage: com.ruoyi.**.domain -# # 配置mapper的扫描，找到所有的mapper.xml映射文件 -# mapperLocations: classpath*:mapper/**/*Mapper.xml -# # 加载全局的配置文件 -# configLocation: classpath:mybatis/mybatis-config.xml - -# PageHelper分页插件 -pagehelper: - helperDialect: oracle - supportMethodsArguments: true - params: count=countSql - -# Swagger配置 -swagger: - # 是否开启swagger - enabled: true - # 请求前缀 - pathMapping: - -# 防止XSS攻击 -xss: - # 过滤开关 - enabled: true - # 排除链接（多个用逗号分隔） - excludes: /system/notice - # 匹配链接 - urlPatterns: /system/*,/monitor/*,/tool/* - - -createSqlSessionFactory: - # 选择MyBatis配置方式，mybatis / mybatis-plus - use: mybatis-plus - -# MyBatis配置 -mybatis: - # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.**.domain - # 配置mapper的扫描，找到所有的mapper.xml映射文件 - mapperLocations: classpath*:mapper/**/*Mapper.xml - # 加载全局的配置文件 - configLocation: classpath:mybatis/mybatis-config.xml - -# MyBatis Plus配置 -mybatis-plus: - # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.**.domain - # 配置mapper的扫描，找到所有的mapper.xml映射文件 - mapperLocations: classpath*:mapper/**/*Mapper.xml - # 加载全局的配置文件 - configLocation: classpath:mybatis/mybatis-config.xml - global-config: - db-config: - # 标识逻辑删除的数据库字段名称 - logic-delete-field: delFlag - # 表示已逻辑删除的值(默认也是如此) - logic-delete-value: 2 - # 表示未逻辑删除的值(默认也是如此) - logic-not-delete-value: 0 - -file: - upload-dir: /data/file - -ocr: - ocr_url: http://127.0.0.1:9001/ocr - ocr_mutipart: https://qd.zhaopinzao8dian.com/ocr-api/ocr -# ocr_mutipart: http://10.98.80.141:9000/ocr - ocr_llm_url: http://39.98.44.136:6016/inner-ai/aicoapi/gateway/v2/chatbot/api_run/1763386387_d4c07131-a047-4c0d-9623-7e3c3a45bd7e - ocr_llm_apiKey: NfzPnFRtogHlYCAh2hHIB7ra5EsrSQEM - -cipher-security: - socket: 39.102.146.78:11028 - path: /data/downloadmodel/certTest -# socket: 10.98.80.223:8443 -# path: /data/downloadmodel/cert - -#nginx节点健康检查 -management: - endpoints: - web: - exposure: - include: health - -#微信小程序 -wx: - appid: wx4aa34488b965a331 - secret: 558780ecc2750f87e556b0e5496773c9 - -#短信服务 -sms: - #API密钥账号 -# secretName: kszhjyrcjt - secretName: kszhjypthydx - #API密钥 -# secretKey: Dwhc9c0IiHecvC5D - secretKey: asj1gze3BhG3QtaI - #短信模板ID -# templateId: 37446 - templateId: 49566 - -#统一门户认证 -oauth: - #客户端的ID - appid: 251112100000000015 - #授权码 - clientsecretkey: 2a44cb8d21dcf4b0777881ca11ea0d83ebea94bbe1ab1f405508db0873cdcc99 - #内网 - usptnw: - #获取访问令牌 - nwGatewayGetTokenUrl: http://10.98.80.146/uspt/serviceAPI/getToken - #获取用户信息 - nwGatewayGetUserInfoUrl: http://10.98.80.146/uspt/serviceAPI/getUserInfo - #外网 - usptww: - #门户注册 - wwRegisterPostUrl: http://10.98.80.50/uspt/webWhiteListServiceAPI/doWebRegister - #门户登录 - wwTokenPostUrl: http://10.98.80.50/uspt/webWhiteListServiceAPI/doWebLogon - #查询用户信息 - wwQueryWebUserInfo: http://10.98.80.50/uspt/webWhiteListServiceAPI/queryWebUserInfo - #查询个人信息 - wwQueryWebPersonalInfoPostUrl: http://10.98.80.50/uspt/webWhiteListServiceAPI/queryWebPersonalInfo - #查询单位信息 - wwQueryWebEnterpriseInfoPostUrl: http://10.98.80.50/uspt//webWhiteListServiceAPI/queryWebEnterpriseInfo - #用户新增接口 - tyAddUserUrl: http://10.98.80.146/qxgl_backend/security/add_user - #获取当前用户有权系统列表 - tyQueryUserSysListUrl: http://10.98.80.146/qxgl_backend/security/get_effective_app_list - #获取当前用户有权角色列表 - tyQueryUserRoleListUrl: http://10.98.80.146/qxgl_backend/security/get_role_by_userid - #获取角色功能权限信息 - tyQueryRoleInfoUrl: http://10.98.80.146/qxgl_backend/security/get_path_by_role - #获取用户详细信息 - tyQueryUserInfo: http://10.98.80.146/qxgl_backend/security/get_user_by_userid - #获取机构详细信息 - tyQueryUnitInfo: http://10.98.80.146/qxgl_backend/security/get_organization_by_organizationid - connect-timeout: 10 - read-timeout: 30 - write-timeout: 30 - -#浪潮 -lc: - #获取人员标签 - personTag: http://10.98.80.146/prod-api/dispatch/public/person/tag - -#ai -chat: - baseUrl: http://192.168.133.200:8080 - chatUrl: /v1/chat/completions - chatDetailUrl: /core/chat/getPaginationRecords - chatHistoryUrl: /core/chat/getHistories - updateNameUrl: /core/chat/updateHistory - stickChatUrl: /core/chat/updateHistory - delChatUrl: /core/chat/delHistory - delAllChatUrl: /core/chat/clearHistories - guestUrl: /v1/chat/completions - praiseUrl: /core/chat/feedback/updateUserFeedback - appId: 67cd49095e947ae0ca7fadd8 - apiKey: fastgpt-qMl63276wPZvKAxEkW77bur0sSJpmuC6Ngg9lzyEjufLhsBAurjT55j - model: qd-job-turbo - -audioText: - asr: http://192.168.133.200:8000/asr/file - #tts: http://192.168.133.200:19527/synthesize - tts: http://10.98.76.104:19528/synthesize \ No newline at end of file + active: dev \ No newline at end of file diff --git a/ruoyi-bussiness/pom.xml b/ruoyi-bussiness/pom.xml index 6ab2cd7..7f32f6d 100644 --- a/ruoyi-bussiness/pom.xml +++ b/ruoyi-bussiness/pom.xml @@ -71,20 +71,6 @@ easyexcel 4.0.3 - - org.springframework.boot - spring-boot-starter-web - - - org.elasticsearch.client - elasticsearch-rest-high-level-client - - - org.elasticsearch - elasticsearch - - - org.elasticsearch.client diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 0c77640..65643f5 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -120,15 +120,14 @@ UserAgentUtils - + org.quickssl quickapi-client-java 1.5.11-SNAPSHOT - shaded - compile + org.bouncycastle bcprov-jdk15on diff --git a/ruoyi-framework/license.xml b/ruoyi-framework/license.xml new file mode 100644 index 0000000..5ae207a --- /dev/null +++ b/ruoyi-framework/license.xml @@ -0,0 +1 @@ +{"license":"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","productId":"1662965666333905920","secretKey":"SK-YYFWQ","licenseEncodeType":"RAW","sign":"BTzbsxsDqFLOlR80N1rbQIu8VV/hVzCSgxIPFtw8pFjov1eBffl87Lg/n4MD3NS/cqnDyl9azAR1rPcFmyMXsWomFD/zI2ZJRv3z21Hxw5WXa+uSgllFqxAeGcjVVvuu7gb4kziujTA1npu48oM6OzFBWCRvLJSyKtXDcSeCmuM="} \ No newline at end of file diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 5c949bf..7281b24 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -18,9 +18,30 @@ - + org.springframework.boot spring-boot-starter-web + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + + + org.elasticsearch + elasticsearch + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + + + com.apusic + aams-spring-boot-starter-all + 2.4.0