Skip to content

R
run-score
提交 ed53a40a authored 作者: jacksmith1988's avatar jacksmith1988
浏览文件
操作

//init

上级 e46c4e20
隐藏空白字符变更
内嵌 并排
正在显示 包含 231 行增加 和 16 行删除
.idea/compiler.xml
浏览文件 @ ed53a40a
...@@ -2,14 +2,15 @@ ...@@ -2,14 +2,15 @@
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<annotationProcessing> <annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true"> <profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" /> <sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" /> <outputRelativeToContentRoot value="true" />
<module name="runscore-mobile" />
<module name="runscore-merchant" />
<module name="runscore-admin" /> <module name="runscore-admin" />
<module name="runscore-api" /> <module name="runscore-api" />
<module name="runscore-merchant" />
<module name="runscore-mobile" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel> <bytecodeTargetLevel>
...@@ -20,4 +21,12 @@ ...@@ -20,4 +21,12 @@
<module name="runscore-mobile" target="1.8" /> <module name="runscore-mobile" target="1.8" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
</component> </component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="runscore-admin" options="-parameters" />
<module name="runscore-api" options="-parameters" />
<module name="runscore-merchant" options="-parameters" />
<module name="runscore-mobile" options="-parameters" />
</option>
</component>
</project> </project>
\ No newline at end of file
.idea/encodings.xml
浏览文件 @ ed53a40a
...@@ -3,8 +3,12 @@ ...@@ -3,8 +3,12 @@
<component name="Encoding"> <component name="Encoding">
<file url="file://$PROJECT_DIR$" charset="UTF-8" /> <file url="file://$PROJECT_DIR$" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/runscore-admin" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/runscore-admin" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/runscore-admin/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/runscore-api" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/runscore-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/runscore-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/runscore-merchant" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/runscore-merchant" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/runscore-merchant/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/runscore-mobile" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/runscore-mobile" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/runscore-mobile/src/main/java" charset="UTF-8" />
</component> </component>
</project> </project>
\ No newline at end of file
.idea/jarRepositories.xml 0 → 100644
浏览文件 @ ed53a40a
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>
\ No newline at end of file
.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_1_RELEASE.xml 0 → 100644
浏览文件 @ ed53a40a
<component name="libraryTable">
<library name="Maven: org.springframework.boot:spring-boot-devtools:2.1.1.RELEASE">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.1.1.RELEASE/spring-boot-devtools-2.1.1.RELEASE.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.1.1.RELEASE/spring-boot-devtools-2.1.1.RELEASE-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.1.1.RELEASE/spring-boot-devtools-2.1.1.RELEASE-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/workspace.xml 0 → 100644
浏览文件 @ ed53a40a
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="fa441105-28ac-4d2d-9dc2-4bc566ac0243" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_1_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/runscore-admin/runscore-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/runscore-admin/runscore-admin.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/runscore-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/runscore-admin/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/runscore-api/runscore-api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/runscore-api/runscore-api.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/runscore-api/src/main/java/me/zohar/runscore/statisticalanalysis/domain/TodayAccountReceiveOrderSituation.java" beforeDir="false" afterPath="$PROJECT_DIR$/runscore-api/src/main/java/me/zohar/runscore/statisticalanalysis/domain/TodayAccountReceiveOrderSituation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/runscore-merchant/runscore-merchant.iml" beforeDir="false" afterPath="$PROJECT_DIR$/runscore-merchant/runscore-merchant.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/runscore-merchant/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/runscore-merchant/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/runscore-mobile/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/runscore-mobile/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/runscore-mobile/runscore-mobile.iml" beforeDir="false" afterPath="$PROJECT_DIR$/runscore-mobile/runscore-mobile.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/runscore-mobile/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/runscore-mobile/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/runscore-mobile/src/main/resources/templates/gathering-code.html" beforeDir="false" afterPath="$PROJECT_DIR$/runscore-mobile/src/main/resources/templates/gathering-code.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/runscore-mobile/src/main/resources/templates/recharge.html" beforeDir="false" afterPath="$PROJECT_DIR$/runscore-mobile/src/main/resources/templates/recharge.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="CompilerWorkspaceConfiguration">
<option name="MAKE_PROJECT_ON_SAVE" value="true" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="GitSEFilterConfiguration">
<file-type-list>
<filtered-out-file-type name="LOCAL_BRANCH" />
<filtered-out-file-type name="REMOTE_BRANCH" />
<filtered-out-file-type name="TAG" />
<filtered-out-file-type name="COMMIT_BY_MESSAGE" />
</file-type-list>
</component>
<component name="ProjectId" id="1zkMHxdgtEUGu7UbNPKC6TyLrAL" />
<component name="ProjectViewState">
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="settings.editor.selected.configurable" value="project.propCompiler" />
</component>
<component name="RunManager" selected="Spring Boot.MobileApplication">
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
<option name="arquillianRunConfiguration">
<value>
<option name="containerStateName" value="" />
</value>
</option>
<option name="TEST_OBJECT" value="class" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="AdminApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="runscore-admin" />
<option name="SPRING_BOOT_MAIN_CLASS" value="me.zohar.AdminApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="MerchantApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="runscore-merchant" />
<option name="SPRING_BOOT_MAIN_CLASS" value="me.zohar.MerchantApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="MobileApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="runscore-mobile" />
<option name="SPRING_BOOT_MAIN_CLASS" value="me.zohar.MobileApplication" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
<option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<list>
<item itemvalue="Spring Boot.AdminApplication" />
<item itemvalue="Spring Boot.MerchantApplication" />
<item itemvalue="Spring Boot.MobileApplication" />
</list>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="fa441105-28ac-4d2d-9dc2-4bc566ac0243" name="Default Changelist" comment="" />
<created>1634687550336</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1634687550336</updated>
<workItem from="1634687551787" duration="10691000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
</project>
\ No newline at end of file
runscore-admin/runscore-admin.iml
浏览文件 @ ed53a40a
...@@ -13,6 +13,14 @@ ...@@ -13,6 +13,14 @@
</sourceRoots> </sourceRoots>
</configuration> </configuration>
</facet> </facet>
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping />
<naming-strategy-map />
</configuration>
</facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
......
runscore-admin/src/main/resources/application.yml
浏览文件 @ ed53a40a
...@@ -8,7 +8,7 @@ spring: ...@@ -8,7 +8,7 @@ spring:
datasource: datasource:
url: jdbc:mysql://127.0.0.1:3306/runscore?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://127.0.0.1:3306/runscore?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root username: root
password: root password: 123456
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
hikari: hikari:
minimum-idle: 3 minimum-idle: 3
...@@ -19,7 +19,7 @@ spring: ...@@ -19,7 +19,7 @@ spring:
show-sql: true show-sql: true
generate-ddl: true generate-ddl: true
hibernate: hibernate:
ddl-auto: none ddl-auto: update
database-platform: org.hibernate.dialect.MySQL5InnoDBDialect database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
properties: properties:
javax: javax:
......
runscore-api/runscore-api.iml
浏览文件 @ ed53a40a
...@@ -9,6 +9,14 @@ ...@@ -9,6 +9,14 @@
<webroots /> <webroots />
</configuration> </configuration>
</facet> </facet>
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping />
<naming-strategy-map />
</configuration>
</facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
......
runscore-api/src/main/java/me/zohar/runscore/statisticalanalysis/domain/TodayAccountReceiveOrderSituation.java
浏览文件 @ ed53a40a
...@@ -35,6 +35,6 @@ public class TodayAccountReceiveOrderSituation { ...@@ -35,6 +35,6 @@ public class TodayAccountReceiveOrderSituation {
private Long paidOrderNum; private Long paidOrderNum;
private Double rebateAmount; //private Double rebateAmount;
} }
runscore-merchant/runscore-merchant.iml
浏览文件 @ ed53a40a
...@@ -13,6 +13,14 @@ ...@@ -13,6 +13,14 @@
</sourceRoots> </sourceRoots>
</configuration> </configuration>
</facet> </facet>
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping />
<naming-strategy-map />
</configuration>
</facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
......
runscore-merchant/src/main/resources/application.yml
浏览文件 @ ed53a40a
...@@ -8,7 +8,7 @@ spring: ...@@ -8,7 +8,7 @@ spring:
datasource: datasource:
url: jdbc:mysql://127.0.0.1:3306/runscore?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://127.0.0.1:3306/runscore?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root username: root
password: root password: 123456
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
hikari: hikari:
minimum-idle: 3 minimum-idle: 3
...@@ -19,7 +19,7 @@ spring: ...@@ -19,7 +19,7 @@ spring:
show-sql: true show-sql: true
generate-ddl: true generate-ddl: true
hibernate: hibernate:
ddl-auto: none ddl-auto: update
database-platform: org.hibernate.dialect.MySQL5InnoDBDialect database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
properties: properties:
javax: javax:
......
runscore-mobile/pom.xml
浏览文件 @ ed53a40a
...@@ -37,6 +37,11 @@ ...@@ -37,6 +37,11 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId> <artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
runscore-mobile/runscore-mobile.iml
浏览文件 @ ed53a40a
...@@ -9,6 +9,14 @@ ...@@ -9,6 +9,14 @@
<webroots /> <webroots />
</configuration> </configuration>
</facet> </facet>
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping />
<naming-strategy-map />
</configuration>
</facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
...@@ -56,7 +64,6 @@ ...@@ -56,7 +64,6 @@
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.31.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.31.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.31.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.31.Final" level="project" />
<orderEntry type="library" name="Maven: com.zengtengpeng:redisson-spring-boot-starter:1.0.2" level="project" /> <orderEntry type="library" name="Maven: com.zengtengpeng:redisson-spring-boot-starter:1.0.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.redisson:redisson:3.10.5" level="project" /> <orderEntry type="library" name="Maven: org.redisson:redisson:3.10.5" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.31.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.31.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.31.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.31.Final" level="project" />
...@@ -95,7 +102,6 @@ ...@@ -95,7 +102,6 @@
<orderEntry type="library" name="Maven: org.objenesis:objenesis:2.5.1" level="project" /> <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.1.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.1.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.1.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
...@@ -133,5 +139,8 @@ ...@@ -133,5 +139,8 @@
<orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.2.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.1.RELEASE" level="project" />
</component> </component>
</module> </module>
\ No newline at end of file
runscore-mobile/src/main/resources/application.yml
浏览文件 @ ed53a40a
...@@ -8,7 +8,7 @@ spring: ...@@ -8,7 +8,7 @@ spring:
datasource: datasource:
url: jdbc:mysql://127.0.0.1:3306/runscore?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://127.0.0.1:3306/runscore?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root username: root
password: root password: 123456
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
hikari: hikari:
minimum-idle: 3 minimum-idle: 3
...@@ -21,8 +21,13 @@ spring: ...@@ -21,8 +21,13 @@ spring:
hibernate: hibernate:
ddl-auto: none ddl-auto: none
database-platform: org.hibernate.dialect.MySQL5InnoDBDialect database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
devtools:
restart:
enabled: false
thymeleaf: thymeleaf:
cache: false cache: false
redis: redis:
port: 6379 port: 6379
host: 127.0.0.1 host: 127.0.0.1
......
runscore-mobile/src/main/resources/templates/gathering-code.html
浏览文件 @ ed53a40a
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<div class="container" style="margin-top: 1.3rem;"> <div class="container" style="margin-top: 1.3rem;">
<form> <form>
<div class="form-group"> <div class="form-group">
<label>收款渠道:</label> <select class="form-control" v-model="editGatheringCode.gatheringChannelCode"> <label>收款渠道:</label> <select class="form-control" v-model="editGatheringCode.gatheringChannelCode" @change="alert(editGatheringCode.gatheringChannelCode);">
<option value="">请选择</option> <option value="">请选择</option>
<option v-for="dictItem in gatheringChannelDictItems" :value="dictItem.dictItemCode">{{dictItem.dictItemName}}</option> <option v-for="dictItem in gatheringChannelDictItems" :value="dictItem.dictItemCode">{{dictItem.dictItemName}}</option>
</select> </select>
...@@ -114,22 +114,26 @@ ...@@ -114,22 +114,26 @@
<option v-for="dictItem in gatheringCodeStateDictItems" :value="dictItem.dictItemCode">{{dictItem.dictItemName}}</option> <option v-for="dictItem in gatheringCodeStateDictItems" :value="dictItem.dictItemCode">{{dictItem.dictItemName}}</option>
</select> </select>
</div> </div>
<div class="form-group"> <!--<div class="form-group">
<label> <span> 收款金额:</span> <label> <span> 收款金额:</span>
<div class="custom-control custom-checkbox custom-control-inline" v-on:click="switchGatheringAmountMode"> <div class="custom-control custom-checkbox custom-control-inline" v-on:click="switchGatheringAmountMode">
<input type="checkbox" id="fixedGatheringAmount" class="custom-control-input" v-model="editGatheringCode.fixedGatheringAmount"> <label for="fixedGatheringAmount" class="custom-control-label">固定收款金额</label> <input type="checkbox" id="fixedGatheringAmount" class="custom-control-input" v-model="editGatheringCode.fixedGatheringAmount">
<label for="fixedGatheringAmount" class="custom-control-label">固定收款金额</label>
</div> </div>
</label> <input type="number" class="form-control" v-model="editGatheringCode.gatheringAmount" :disabled="!editGatheringCode.fixedGatheringAmount"> </label> <input type="number" class="form-control" v-model="editGatheringCode.gatheringAmount" :disabled="!editGatheringCode.fixedGatheringAmount">
</div> </div>-->
<div class="form-group"> <div class="form-group">
<label>收款人:</label> <input type="text" class="form-control" v-model="editGatheringCode.payee"> <label>收款人:</label> <input type="text" class="form-control" v-model="editGatheringCode.payee">
</div> </div>
<div class="form-group"> <div class="form-group" v-show="editGatheringCode.gatheringChannelCode == 'bankcard'" style=""><label>银行卡号:</label> <input type="text" class="form-control"> <label>开户行:</label> <input type="text" class="form-control"> <label>卡姓名:</label> <input type="text" class="form-control"></div>
<div class="form-group" v-show="editGatheringCode.gatheringChannelCode != 'bankcard'">
<label>收款码:</label> <input type="file" class="form-control gathering-code-pic"> <label>收款码:</label> <input type="file" class="form-control gathering-code-pic">
</div> </div>
<button type="button" class="btn btn-danger btn-lg btn-block" v-on:click="addOrUpdateGatheringCode">保存</button> <button type="button" class="btn btn-danger btn-lg btn-block" v-on:click="addOrUpdateGatheringCode">保存</button>
<button type="button" class="btn btn-light btn-lg btn-block" v-on:click="hideEditGatheringCodePage">返回</button> <button type="button" class="btn btn-light btn-lg btn-block" v-on:click="hideEditGatheringCodePage">返回</button>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
......
runscore-mobile/src/main/resources/templates/recharge.html
浏览文件 @ ed53a40a
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<div class="recharge-form" v-show="selectedPayType.bankCardFlag"> <div class="recharge-form" v-show="selectedPayType.bankCardFlag">
<div class="row"> <div class="row">
<div class="col-sm-9 offset-sm-3 recharge-form-item"> <div class="col-sm-9 offset-sm-3 recharge-form-item">
<label>选择银行</label> <span><select v-model="selectedPayChannel"> <label>选择钱包</label> <span><select v-model="selectedPayChannel">
<option value="">请选择</option> <option value="">请选择</option>
<option v-for="payChannel in payChannels" :value="payChannel" v-show="selectedPayType.id == payChannel.payTypeId">{{payChannel.bankName + '-' + payChannel.accountHolder}}</option> <option v-for="payChannel in payChannels" :value="payChannel" v-show="selectedPayType.id == payChannel.payTypeId">{{payChannel.bankName + '-' + payChannel.accountHolder}}</option>
</select></span> </select></span>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论