From 9e6d06469d712b5a28a75d59645fc5d3d3dfa235 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 24 十月 2023 08:46:01 +0800 Subject: [PATCH] 羚羊配置问卷 --- server/src/main/resources/application.yml | 2 +- server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 2 ++ server/src/main/resources/application-standardLingyang.yml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletions(-) diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java index ed3ee89..a9265ac 100644 --- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java +++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java @@ -137,6 +137,8 @@ for(WorkorderRecordExtListVO model : result){ //鏌ヨ鐢熶骇浜哄憳濮撳悕 initProUser(user,model,allDepartList); +// int s= Constants.formatIntegerNum(model.getSalary()); +// model.setSalaryYuan(new BigDecimal(s).divide(new BigDecimal(100),2)); } } return PageData.from(new PageInfo<>(result)); diff --git a/server/src/main/resources/application-standardLingyang.yml b/server/src/main/resources/application-standardLingyang.yml new file mode 100644 index 0000000..3ea0111 --- /dev/null +++ b/server/src/main/resources/application-standardLingyang.yml @@ -0,0 +1,54 @@ +# WEB鏈嶅姟鍣ㄩ厤缃� 婕旂ず鐜 +server: + port: 10021 + servlet: + session: + timeout: PT3H #琛ㄧず12灏忔椂 + +spring: + # 鏁版嵁婧愰厤缃� + + datasource: + url: jdbc:mysql://192.168.10.147:3306/doumee_mes_standard?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: Doumee@168_com + driver-class-name: com.mysql.cj.jdbc.Driver + type: com.alibaba.druid.pool.DruidDataSource + + # rabbitmq: + # host: amqp-cn-7mz2o4ddz00c.cn-hangzhou.amqp-2.net.mq.amqp.aliyuncs.com + # port: 5672 + # username: MjphbXFwLWNuLTdtejJvNGRkejAwYzpMVEFJNXQ3QzFjdXJUNnlleGNoc1hMZWo= + # password: RkEwNjMzNUM5MTBENzE2QjQyQzE4OTc1ODREMEU5NzA4ODFBMkQ2NjoxNjUwOTU0NjI4MjYx + # virtual-host: mqtest + + # redis: + # # database: 0 + # host: r-m5ece8e1y7649odr2xpd.redis.rds.aliyuncs.com + # port: 6379 + # password: doumee:doumee@168 + # timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺� + redis: + # database: 0 + host: 192.168.10.186 + port: 6379 + password: Doumee@168_com + timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺� +knife4j: + enable: true + basic: + enable: true + username: admin + password: doumee@168.com +debug_model: true + +captcha_check: true + +# Swagger閰嶇疆 +swagger: + host: + title: ${project.name}鎺ュ彛鏂囨。 + description: ${project.name}鎺ュ彛鏂囨。 + enabled: true + # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧� + redirect-uri: / \ No newline at end of file diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index c86705c..ae670ec 100644 --- a/server/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -9,7 +9,7 @@ # application: # name: doumeemes profiles: - active: standard + active: standardLingyang # JSON杩斿洖閰嶇疆 jackson: # 榛樿鏃跺尯 -- Gitblit v1.9.3