修改登录 账号同步级线上配置

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());

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<ZYUserInfo> zyUserInfoList,
+    public String checkOrCreateForexSimulationUser(@RequestBody List<ZYUserInfo> zyUserInfoList) {
-                                                   @RequestParam String systemOwner) {
-        System.out.println(systemOwner);
         List<UserInfo> users = new ArrayList<>();
         for (int i = 0; i < zyUserInfoList.size(); i++) {
             ZYUserInfo zyUserInfo = zyUserInfoList.get(i);

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}
+      password: ${DB_PWD:stztjy@2017.com}
-      driver-class-name: com.mysql.cj.jdbc.Driver
+#      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:/tianzeProject/money_management/uploadFile
-  path: D:/home
 timer:
   enable: false
 
 swagger:
-  enable: true
+  enable: false
   tokenHeader: Authorization
   title: 天择外汇模拟交易 • 接口文档
   description: 天择外汇模拟交易WebAPI接口文档

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}

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

src/main/resources/generatorConfig.xml

@@ -45,13 +45,13 @@
         <!--        <table tableName="case_cash_plan" domainObjectName="CaseCashPlan"/>-->
         <!--        <table tableName="case_distribution_of_property" domainObjectName="CaseDistributionOfProperty"/>-->
         <!--        <table tableName="case_insurance_plan" domainObjectName="CaseInsurancePlan"/>-->
-<!--                <table tableName="case_life_education_plan" domainObjectName="CaseLifeEducationPlan"/>-->
+                <table tableName="case_life_education_plan" domainObjectName="CaseLifeEducationPlan"/>
-<!--                <table tableName="case_retirement_plan" domainObjectName="CaseRetirementPlan"/>-->
+                <table tableName="case_retirement_plan" domainObjectName="CaseRetirementPlan"/>
         <!--        <table tableName="case_financial_ratios" domainObjectName="CaseFinancialRatios"/>-->
         <!--        <table tableName="case_heritage" domainObjectName="CaseHeritage"/>-->
-<!--                <table tableName="case_start_an_undertaking_plan" domainObjectName="CaseStartAnUndertakingPlan"/>-->
+                <table tableName="case_start_an_undertaking_plan" domainObjectName="CaseStartAnUndertakingPlan"/>
         <!--        <table tableName="case_tax_plan" domainObjectName="CaseTaxPlan"/>-->
-<!--                <table tableName="case_consumption_plan" domainObjectName="CaseConsumptionPlan"/>-->
+                <table tableName="case_consumption_plan" domainObjectName="CaseConsumptionPlan"/>
         <!--        <table tableName="case_cash_flow" domainObjectName="CaseCashFlow"/>-->
 <!--                <table tableName="case_distribution_of_property_family_records" domainObjectName="CaseDistributionOfPropertyFamilyRecords"/>-->
         <!--        <table tableName="case_finance_liability" domainObjectName="CaseFinanceLiability"/>-->
@@ -59,7 +59,7 @@
         <!--        <table tableName="case_info" domainObjectName="CaseInfo"/>-->
         <!--        <table tableName="case_risk_index" domainObjectName="CaseRiskIndex"/>-->
         <!--        <table tableName="bank_deposits" domainObjectName="BankDeposits"/>-->
-                <table tableName="chapter" domainObjectName="Chapter"/>
+        <!--        <table tableName="chapter" domainObjectName="Chapter"/>-->
         <!--        <table tableName="client_family_info" domainObjectName="ClientFamilyInfo"/>-->
         <!--        <table tableName="client_weight" domainObjectName="ClientWeight"/>-->
         <!--        <table tableName="com_case" domainObjectName="ComCase"/>-->