Skip to content

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

//init

上级 d3b8a353
流水线 #204 已失败 于阶段
      全部展开 隐藏空白字符变更
      内嵌 并排
      正在显示 包含 97 行增加 和 82 行删除
      .idea/workspace.xml
      浏览文件 @ 4b7950a7
      ......@@ -5,21 +5,25 @@
      </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" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/runscore.sql" beforeDir="false" afterPath="$PROJECT_DIR$/实施输出/runscore.sql" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/1.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/10.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/11.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/12.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/2.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/20191020211928.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/20191020212020.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/20191021112252.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/3.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/4.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/5.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/6.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/7.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/8.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/实施输出/截图/9.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/账号密码.txt" beforeDir="false" afterPath="$PROJECT_DIR$/账号密码.txt" afterDir="false" />
      </list>
      <option name="SHOW_DIALOG" value="false" />
      <option name="HIGHLIGHT_CONFLICTS" value="true" />
      ......@@ -54,16 +58,40 @@
      <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
      <property name="WebServerToolWindowFactoryState" value="false" />
      <property name="aspect.path.notification.shown" value="true" />
      <property name="last_opened_file_path" value="$PROJECT_DIR$/实施输出" />
      <property name="settings.editor.selected.configurable" value="project.propCompiler" />
      </component>
      <component name="ReactorSettings">
      <option name="notificationShown" value="true" />
      </component>
      <component name="RecentsManager">
      <key name="CopyFile.RECENT_KEYS">
      <recent name="$PROJECT_DIR$/实施输出" />
      </key>
      </component>
      <component name="RunManager" selected="Spring Boot.MobileApplication">
      <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
      <configuration name="StartOrderTest" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="me.zohar.runscore.test.StartOrderTest" />
      <module name="runscore-merchant" />
      <extension name="coverage">
      <pattern>
      <option name="PATTERN" value="me.zohar.runscore.test.*" />
      <option name="ENABLED" value="true" />
      </pattern>
      </extension>
      <method v="2">
      <option name="Make" enabled="true" />
      </method>
      </configuration>
      <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
      <option name="arquillianRunConfiguration">
      <value>
      <option name="containerStateName" value="" />
      </value>
      </option>
      <option name="TEST_OBJECT" value="class" />
      <option name="TEST_OBJECT" value="CLASS" />
      <properties />
      <listeners />
      <method v="2">
      <option name="Make" enabled="true" />
      </method>
      ......@@ -93,10 +121,16 @@
      </method>
      </configuration>
      <list>
      <item itemvalue="Application.StartOrderTest" />
      <item itemvalue="Spring Boot.AdminApplication" />
      <item itemvalue="Spring Boot.MerchantApplication" />
      <item itemvalue="Spring Boot.MobileApplication" />
      </list>
      <recent_temporary>
      <list>
      <item itemvalue="Application.StartOrderTest" />
      </list>
      </recent_temporary>
      </component>
      <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
      <component name="TaskManager">
      ......@@ -106,11 +140,47 @@
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
      <updated>1634687550336</updated>
      <workItem from="1634687551787" duration="10691000" />
      <workItem from="1634687551787" duration="24257000" />
      <workItem from="1635385884460" duration="7960000" />
      </task>
      <task id="LOCAL-00001" summary="//init">
      <created>1635129169298</created>
      <option name="number" value="00001" />
      <option name="presentableId" value="LOCAL-00001" />
      <option name="project" value="LOCAL" />
      <updated>1635129169298</updated>
      </task>
      <task id="LOCAL-00002" summary="//init">
      <created>1635750659260</created>
      <option name="number" value="00002" />
      <option name="presentableId" value="LOCAL-00002" />
      <option name="project" value="LOCAL" />
      <updated>1635750659260</updated>
      </task>
      <option name="localTasksCounter" value="3" />
      <servers />
      </component>
      <component name="TypeScriptGeneratedFilesManager">
      <option name="version" value="3" />
      </component>
      <component name="VcsManagerConfiguration">
      <MESSAGE value="//init" />
      <option name="LAST_COMMIT_MESSAGE" value="//init" />
      </component>
      <component name="XDebuggerManager">
      <breakpoint-manager>
      <breakpoints>
      <line-breakpoint enabled="true" type="java-line">
      <url>file://$PROJECT_DIR$/runscore-api/src/main/java/me/zohar/runscore/merchant/service/MerchantOrderService.java</url>
      <line>226</line>
      <option name="timeStamp" value="3" />
      </line-breakpoint>
      <line-breakpoint enabled="true" type="java-line">
      <url>file://$PROJECT_DIR$/runscore-api/src/main/java/me/zohar/runscore/merchant/service/MerchantOrderService.java</url>
      <line>261</line>
      <option name="timeStamp" value="4" />
      </line-breakpoint>
      </breakpoints>
      </breakpoint-manager>
      </component>
      </project>
      \ No newline at end of file
      README.md
      浏览文件 @ 4b7950a7
      ## 声明
      源码只供学习使用，如用于商业活动与本人无关，请勿将系统用于非法业务
      ## 在线体验
      演示地址：
      h5端：http://47.101.49.12:8080 账号/密码： 普通会员：test/123 代理账号：agent2/123
      商户端：http://47.101.49.12:8089 账号/密码：tencent/123
      后台管理：http://47.101.49.12:8088 账号/密码：admin/123
      测试账号密码会定期更改，如不对请联系客服发新的账号密码
      ## 修整BUG
      修复自动创建视图表出错的BUG。
      修复了上传二维码图片出错的BUG。
      修复了数据库线程池的问题，其它版本故意删除线程池让用户不能正常运营。
      ## 福利
      推荐使用阿里云主机 下面链接购买有优惠
      https://www.aliyun.com/minisite/goods?userCode=a5ncv0ej
      开源版本免费使用，系统采用JAVA语言开发，会java的技术人员可以自行二次开发
      如需要最新完整商业版本 可加QQ获取完整版：2825670967
      ## 截图
      | 统计分析 | 总监控 | 商户订单 |
      | :------: | :------: | :------: |
      | ![统计分析](/实施输出/截图//20191020211928.png) | ![总监控](/实施输出/截图/20191020212020.png) | ![商户订单](/实施输出/截图/20191021112252.png)
      | 排行榜 | 我的主页 | 收款码 |
      | :------: | :------: | :------: |
      | ![排行榜](/实施输出/截图//1.png) | ![我的主页](/实施输出/截图/2.png) | ![收款码](/实施输出/截图/3.png) |
      | 接单 | 切换收款码 | 审核 |
      | :------: | :------: | :------: |
      | ![接单](/实施输出/截图/4.png) | ![切换收款码](/实施输出/截图/5.png) | ![审核](/实施输出/截图/6.png) |
      | 接单情况 | 代理中心 | 下级开户 |
      | :------: | :------: | :------: |
      | ![接单情况](/实施输出/截图/7.png) | ![代理中心](/实施输出/截图/8.png) | ![下级开户](/实施输出/截图/9.png) |
      | 下级账号管理 | app账号密钥 | app监控通知 |
      | :------: | :------: | :------: |
      | ![下级账号管理](/实施输出/截图/10.png) | ![app账号密钥](/实施输出/截图/11.png) | ![app监控通知](/实施输出/截图/12.png) |
      > 由于程序不断优化，界面细节可能有所变化，请以实际页面为准
      http://103.204.78.42:8088/login  银商(卡商)后台  test/123
      http://103.204.78.42:8082/login   商户后台  tencent/123
      http://103.204.78.42:8081/          总后台      admin/123
      \ No newline at end of file
      实施输出/runscore.sql
      浏览文件 @ 4b7950a7
      差异被折叠。
      账号密码.txt
      浏览文件 @ 4b7950a7
      h5端：http://45.83.237.27:8084 账号/密码： 普通会员：huiyuan1/123 代理账号：agent2/123
      商户端：http://45.83.237.27:8082 账号/密码：tencent/123
      后台管理：http://45.83.237.27:8081 账号/密码：zohar001/123
      http://103.204.78.42:8088/login  银商(卡商)后台  test/123
      http://103.204.78.42:8082/login   商户后台  tencent/123
      http://103.204.78.42:8081/          总后台      admin/123
      \ No newline at end of file
      Markdown 格式
      0% 或
      您添加了 0 人 到此讨论。请谨慎行事。
      请先完成此评论的编辑！
      请 注册 或者 后发表评论