ymnets 5 months ago
parent 68404c252a
commit 9093dad670

@ -5,21 +5,10 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ef55dc1b-11d9-4203-81db-14a06469a368" name="更改" comment=""> <list default="true" id="ef55dc1b-11d9-4203-81db-14a06469a368" name="更改" comment="">
<change afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/.idea/easyCodeTableSetting.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-business/src/main/java/com/hc/business/dto/ZccmQrAccessoryDto.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-business/src/main/java/com/hc/business/mapper/ZccmQrAccessoryMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-business/src/main/java/com/hc/business/model/ZccmQrAccessory.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-business/src/main/java/com/hc/business/service/ZccmQrAccessoryService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-business/src/main/java/com/hc/business/service/impl/ZccmQrAccessoryServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-business/src/main/resources/mapper/ZccmQrAccessoryMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/src/main/java/com/hc/web/controller/browser/app/AppQrAccessoryController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-web/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/gp-web/src/main/resources/application.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/target/classes/application-pro.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/target/classes/application-pro.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-business/src/main/resources/mapper/ZccmUserInvoicesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-business/src/main/resources/mapper/ZccmUserInvoicesMapper.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/target/classes/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-business/src/main/resources/mapper/ZccmUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-business/src/main/resources/mapper/ZccmUserMapper.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/target/classes/com/hc/web/aspect/AppUserAspect.class" beforeDir="false" afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/target/classes/com/hc/web/aspect/AppUserAspect.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/src/main/java/com/hc/web/aspect/AppUserAspect.java" beforeDir="false" afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/src/main/java/com/hc/web/aspect/AppUserAspect.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/src/main/resources/application-pro.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/src/main/resources/application-pro.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../JAVA_MYSQL_ZC/jxjy-web/src/main/resources/application.yml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -114,7 +103,7 @@
<workItem from="1730775057656" duration="322000" /> <workItem from="1730775057656" duration="322000" />
<workItem from="1730786878796" duration="2909000" /> <workItem from="1730786878796" duration="2909000" />
<workItem from="1730888299302" duration="12000" /> <workItem from="1730888299302" duration="12000" />
<workItem from="1731032769092" duration="927000" /> <workItem from="1731032769092" duration="2187000" />
</task> </task>
<task id="LOCAL-00001" summary="更改表名字"> <task id="LOCAL-00001" summary="更改表名字">
<created>1730470371982</created> <created>1730470371982</created>

@ -1,9 +1,9 @@
spring: spring:
profiles: pro profiles: pro
datasource: datasource:
url: jdbc:mysql://rm-m5e856330s821071w.mysql.rds.aliyuncs.com:3306/zcgp_cmtrain?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC&allowMultiQueries=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true url: jdbc:mysql://rm-m5e856330s821071w.mysql.rds.aliyuncs.com:3306/gp_union?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC&allowMultiQueries=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
username: zcgp_cmtrain username: gp_union
password: Cmtrain123# password: gpUnion!123
redis: redis:
host: r-bp1h7n8p0tcur9ilzy.redis.rds.aliyuncs.com host: r-bp1h7n8p0tcur9ilzy.redis.rds.aliyuncs.com
database: 3 database: 3

@ -4,7 +4,7 @@ spring:
resources: resources:
static-locations: classpath:/static/,classpath:/resources/ static-locations: classpath:/static/,classpath:/resources/
profiles: profiles:
active: dev active: pro
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver

Loading…
Cancel
Save