huangchunmei
/
QRORDER
forked from guomin/QRORDER
1
0
Fork 0
Code Pull Requests Activity

Compare commits

merge into: huangchunmei:main
Branches Tags
huangchunmei:main
guomin:main
...
pull from: guomin:main
Branches Tags
guomin:main
huangchunmei:main

No commits in common. "main" and "main" have entirely different histories.
main ... main

3 changed files with 2 additions and 38 deletions
Show Stats Expand all files Collapse all files

27
.classpath
View File

@ -9,14 +9,12 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
@ -27,30 +25,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

11
.project
View File

@ -52,15 +52,4 @@
<nature>org.jboss.tools.jsf.jsfnature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
<filteredResources>
<filter>
<id>1774340688599</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

2
src/main/resources/config.properties
View File

@ -6,7 +6,7 @@ secret=544295d7c6444a688c7070e1caf246bc
#accessImgUrl=http://47.92.216.124:8081//prodimg/{0}/{1}
defaultImg=https://qrorder.ccc-chn.com/prodimg/default.png
accessImgUrl=https://qrorder.ccc-chn.com/prodimg/{0}/{1}
uploadImg=D:/apache-tomcat-9.0.113/webapps/prodimg/{0}
uploadImg=D:/apache-tomcat-9.0.87/webapps/prodimg/{0}
jiakeApiUrl=C:\jiake\jiakeApi.properties
aliPaymentCode=2
wxPaymentCode=1