From 4e4e0948e7905c11d40d0f7a92f2d448e417ed48 Mon Sep 17 00:00:00 2001 From: fhv Date: Thu, 17 Oct 2024 22:25:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E6=8A=A5=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 71 +++++++++++-------- .../projectApplication/kejigongguan/data.ts | 30 ++------ .../project/ProjectList.vue | 18 ++--- 3 files changed, 59 insertions(+), 60 deletions(-) diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml index af00dc4..c71c11b 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 18086 tomcat: max-swallow-size: -1 error: @@ -23,7 +23,7 @@ spring: # flyway配置 flyway: # 是否启用flyway - enabled: false + enabled: true # 编码格式，默认UTF-8 encoding: UTF-8 # 迁移sql脚本文件存放路径，官方默认db/migration @@ -63,7 +63,7 @@ spring: job-store-type: jdbc initialize-schema: embedded #定时任务启动开关，true-开 false-关 - auto-startup: true + auto-startup: false #延迟1秒启动定时任务 startup-delay: 1s #启动时更新己存在的Job @@ -90,10 +90,10 @@ spring: jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 - aop: - proxy-target-class: true jpa: open-in-view: false + aop: + proxy-target-class: true #配置freemarker freemarker: # 设置模板后缀名 @@ -143,7 +143,7 @@ spring: timeBetweenEvictionRunsMillis: 60000 # 配置一个连接在池中最小生存的时间，单位是毫秒 minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL + validationQuery: SELECT 1 testWhileIdle: true testOnBorrow: false testOnReturn: false @@ -161,9 +161,9 @@ spring: slow-sql-millis: 5000 datasource: master: - url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://182.92.169.222:3306/zmd_kejiju?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: root + password: ycwl2022. driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -173,10 +173,10 @@ spring: #driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: - database: 0 - host: 192.168.1.188 + database: 5 + host: 182.92.169.222 port: 6379 - password: '' + password: 'redis@ycwl2022.' #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml @@ -184,13 +184,13 @@ mybatis-plus: # 关闭MP3.0自带的banner banner: false db-config: - #主键类型 + #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)"; id-type: ASSIGN_ID # 默认数据库表下划线命名 table-underline: true configuration: # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 call-setters-on-nulls: true #jeecg专用配置 @@ -207,7 +207,7 @@ jeecg: signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a #签名拦截接口 signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys,/sys/sendChangePwdSms,/sys/user/sendChangePhoneSms,/sys/sms,/desform/api/sendVerifyCode - # local\minio\alioss + # 本地：local、Minio：minio、阿里云：alioss uploadType: local # 前端访问地址 domainUrl: @@ -215,9 +215,9 @@ jeecg: app: http://localhost:8051 path: #文件上传根目录 设置 - upload: D://opt//upFiles + upload: /opt/upFiles #webapp文件路径 - webapp: D://opt//webapp + webapp: /opt/webapp shiro: excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 @@ -226,30 +226,29 @@ jeecg: secretKey: ?? endpoint: oss-cn-beijing.aliyuncs.com bucketName: jeecgdev - staticDomain: https://static.jeecg.com - # ElasticSearch 设置 + # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES - cluster-nodes: 192.168.1.188:9200 + cluster-nodes: 127.0.0.1:9200 check-enabled: false # 在线预览文件服务器地址配置 - file-view-domain: http://127.0.0.1:8012 + file-view-domain: http://fileview.jeecg.com # minio文件上传 minio: minio_url: http://minio.jeecg.com minio_name: ?? minio_pass: ?? - bucketName: ?? + bucketName: otatest #大屏报表参数设置 jmreport: #多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增) - saasMode: + saasMode: # 平台上线安全配置(v1.6.2+ 新增) firewall: # 数据源安全 (开启后，不允许使用平台数据源、SQL解析加签并且不允许查询数据库) - dataSourceSafe: true + dataSourceSafe: false # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制） - lowCodeMode: prod + lowCodeMode: dev #xxl-job配置 xxljob: enabled: false @@ -267,20 +266,34 @@ jeecg: password: type: STANDALONE enabled: true + # ai-chat + ai-chat: + # 是否开启；必须。 + enabled: false + # openAi接口秘钥，填写自己的apiKey；必须。 + apiKey: "？？？？" + # openAi域名，有代理就填代理的域名。默认：openAI官方apiHost + apiHost: "https://api.openai.com" + # 超时时间单位:s。默认 60s + timeout: 60 + # 本地代理地址 + # proxy: + # host: "http://127.0.0.1" + # port: "7890" # 百度开放API配置 baidu-api: app-id: ?? api-key: ?? secret-key: ?? +#cas单点登录 +cas: + prefixUrl: http://cas.example.org:8443/cas #Mybatis输出sql日志 logging: level: org.flywaydb: debug - org.jeecg.modules.system.mapper: info -#cas单点登录 -cas: - prefixUrl: http://cas.example.org:8443/cas + org.jeecg.modules.system.mapper: debug #swagger knife4j: #开启增强配置 @@ -288,7 +301,7 @@ knife4j: #开启生产环境屏蔽 production: false basic: - enable: true + enable: false username: jeecg password: jeecg1314 #第三方登录 diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts index 5d63245..0eca28a 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts +++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts @@ -1,26 +1,6 @@ import { FormSchema } from '@/components/Form'; +import { useUserStore } from '/@/store/modules/user'; -/*const basicOptions: LabelValueOptions = [ - { - label: '付晓晓222', - value: '1', - }, - { - label: '周毛毛333', - value: '2', - }, -]; - -const storeTypeOptions: LabelValueOptions = [ - { - label: '私密', - value: '1', - }, - { - label: '公开', - value: '2', - }, -];*/ //项目基本信息schema export const projectBaseInfoSchemas: FormSchema[] = [ @@ -111,6 +91,8 @@ export const userSchemas: FormSchema[] = [ component: 'Input', label: '姓名', required: true, + defaultValue: useUserStore().getUserInfo?.realname, + dynamicDisabled: true }, { field: 'sex', @@ -120,6 +102,7 @@ export const userSchemas: FormSchema[] = [ dictCode: 'sex', // stringToNumber: true, }, + defaultValue: useUserStore().getUserInfo?.sex, }, { field: 'age', @@ -174,10 +157,11 @@ export const userSchemas: FormSchema[] = [ //单位信息schema export const departSchemas: FormSchema[] = [ { - field: 'org_name', + field: 'orgName', component: 'Input', label: '单位名称', - // required: true, + required: true, + defaultValue: useUserStore().getUserInfo?.orgCode }, { field: 'category', diff --git a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue index 26ccf1c..eb2ac05 100644 --- a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue +++ b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue @@ -5,7 +5,7 @@