From 94fd03a36cca319e75f2a54b7ea05d35f27b6367 Mon Sep 17 00:00:00 2001 From: yz <3614508250@qq.com> Date: Wed, 11 Dec 2024 16:03:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=20?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=90=8C=E6=AD=A5=E7=BA=A7=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GradeController.java | 2 +- .../controller/common/UserController.java | 4 +--- src/main/resources/application-dev.yml | 14 ++++++++------ src/main/resources/application-pro.yml | 1 + src/main/resources/application.yml | 2 +- src/main/resources/generatorConfig.xml | 10 +++++----- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/sztzjy/money_management/controller/GradeController.java b/src/main/java/com/sztzjy/money_management/controller/GradeController.java index fed6332..bdf7ead 100644 --- a/src/main/java/com/sztzjy/money_management/controller/GradeController.java +++ b/src/main/java/com/sztzjy/money_management/controller/GradeController.java @@ -352,7 +352,7 @@ public class GradeController { } else { theoryReturnDto.setUseTime(stuTheoryRecord.getTotalDuration()); theoryReturnDto.setTrainingTotalScore(stuTheoryRecord.getAverageScore()); - theoryReturnDto.setTrainingTotalScore(stuTheoryRecord.getAverageScore().multiply(totalWeight.getLlkh())); + theoryReturnDto.setTrainingScore(stuTheoryRecord.getAverageScore().multiply(totalWeight.getLlkh())); } } theoryReturnDto.setScoreWight(totalWeight.getLlkh()); diff --git a/src/main/java/com/sztzjy/money_management/controller/common/UserController.java b/src/main/java/com/sztzjy/money_management/controller/common/UserController.java index 699e366..1439f63 100644 --- a/src/main/java/com/sztzjy/money_management/controller/common/UserController.java +++ b/src/main/java/com/sztzjy/money_management/controller/common/UserController.java @@ -110,9 +110,7 @@ public class UserController { @ApiOperation("根据用户Code查询该用户是否存在个人赛用户数据，存在则返回，不存在则新增后返回，用于智云3.0创建用户后调用该接口创建用户个人赛") @PostMapping("/checkOrCreateForexSimulationUser") @AnonymousAccess - public String checkOrCreateForexSimulationUser(@RequestBody List zyUserInfoList, - @RequestParam String systemOwner) { - System.out.println(systemOwner); + public String checkOrCreateForexSimulationUser(@RequestBody List zyUserInfoList) { List users = new ArrayList<>(); for (int i = 0; i < zyUserInfoList.size(); i++) { ZYUserInfo zyUserInfo = zyUserInfoList.get(i); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 06816ee..0a124bf 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,22 +2,24 @@ spring: datasource: druid: db-type: mysql - url: jdbc:mysql://${DB_HOST:118.31.7.2}:${DB_PORT:3306}/${DB_NAME:money_management}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true + url: jdbc:mysql://${DB_HOST:112.74.160.81}:${DB_PORT:3306}/${DB_NAME:money_management}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true username: ${DB_USER:root} - password: ${DB_PWD:sztzjy2017} - driver-class-name: com.mysql.cj.jdbc.Driver + password: ${DB_PWD:stztjy@2017.com} +# url: jdbc:mysql://${DB_HOST:202.121.173.164}:${DB_PORT:3306}/${DB_NAME:money_management}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true +# username: ${DB_USER:root} +# password: ${DB_PWD:sd@123!@#zz} +# driver-class-name: com.mysql.cj.jdbc.Driver # 文件存储 file: type: local -# path: /usr/local/tianzeProject/financial_bigdata/uploadFile - path: D:/home + path: D:/tianzeProject/money_management/uploadFile timer: enable: false swagger: - enable: true + enable: false tokenHeader: Authorization title: 天择外汇模拟交易 • 接口文档 description: 天择外汇模拟交易WebAPI接口文档 diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 23cf388..80367b6 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -4,6 +4,7 @@ spring: druid: db-type: mysql # url: jdbc:mysql://${DB_HOST:120.78.220.29}:${DB_PORT:3306}/${DB_NAME:money_management}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true +# url: jdbc:mysql://${DB_HOST:118.31.7.2}:${DB_PORT:3306}/${DB_NAME:money_copy}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true url: jdbc:mysql://${DB_HOST:118.31.7.2}:${DB_PORT:3306}/${DB_NAME:money_management}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true username: ${DB_USER:root} password: ${DB_PWD:sztzjy2017} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d046f3c..f325fb0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -13,7 +13,7 @@ spring: application: name: trading_system profiles: - active: pro + active: dev mvc: pathmatch: matching-strategy: ant_path_matcher diff --git a/src/main/resources/generatorConfig.xml b/src/main/resources/generatorConfig.xml index b150a1e..bec8b27 100644 --- a/src/main/resources/generatorConfig.xml +++ b/src/main/resources/generatorConfig.xml @@ -45,13 +45,13 @@ - - + +
- +
- +
@@ -59,7 +59,7 @@ -
+