Augcl
/
massage-admin
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

1、更换技术参数

master
Aug 1 month ago
parent
f619475d7c
commit
fa0f2897c5
4 changed files with 58 additions and 52 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +47
    -41
      .idea/workspace.xml
  2. +1
    -1
      admin-hanhai-vue/.env.development
  3. +1
    -1
      admin-hanhai-vue/.env.production
  4. +9
    -9
      jeecg-boot-module-system/src/main/resources/application-dev.yml

+ 47
- 41
.idea/workspace.xml View File

@ -3,13 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="8b88b979-c3fa-4858-8fa6-d3a5d334cf69" name="Default Changelist" comment="优惠券列表接口调整">
<change afterPath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiUtils/CommonUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env.development" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env.development" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env.production" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env.production" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/OrderController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/application-dev.yml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -78,7 +73,7 @@
<recent name="org.jeecg.modules.apiService.impl" />
</key>
</component>
<component name="RunManager" selected="Application.CommonUtils">
<component name="RunManager" selected="Spring Boot.JeecgSystemApplication">
<configuration name="CommonUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="ALTERNATIVE_JRE_PATH" value="1.8" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
@ -195,7 +190,8 @@
<updated>1741573014101</updated>
<workItem from="1741573016746" duration="4323000" />
<workItem from="1741580646045" duration="5038000" />
<workItem from="1741852577555" duration="71519000" />
<workItem from="1741852577555" duration="74613000" />
<workItem from="1744268260382" duration="6123000" />
</task>
<task id="LOCAL-00001" summary="1、项目初始化">
<created>1741919155045</created>
@ -281,7 +277,14 @@
<option name="project" value="LOCAL" />
<updated>1742868065298</updated>
</task>
<option name="localTasksCounter" value="13" />
<task id="LOCAL-00013" summary="1、订单模块修改">
<created>1743674700893</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1743674700893</updated>
</task>
<option name="localTasksCounter" value="14" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -292,7 +295,9 @@
<map>
<entry key="MAIN">
<value>
<State />
<State>
<option name="COLUMN_ORDER" />
</State>
</value>
</entry>
</map>
@ -312,7 +317,8 @@
<MESSAGE value="订单模块：&#10;1.创建订单&#10;2.订单" />
<MESSAGE value="优惠券列表接口调整" />
<MESSAGE value="1、用户表新增字段：是否商家" />
<option name="LAST_COMMIT_MESSAGE" value="1、用户表新增字段：是否商家" />
<MESSAGE value="1、订单模块修改" />
<option name="LAST_COMMIT_MESSAGE" value="1、订单模块修改" />
</component>
<component name="WindowStateProjectService">
<state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1743581020633">
@ -331,74 +337,74 @@
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="1010" y="449" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1741587414527" />
<state x="679" y="297" key="CommitChangelistDialog2" timestamp="1742868064612">
<state x="679" y="297" key="CommitChangelistDialog2" timestamp="1743674700028">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="679" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1742868064612" />
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog" timestamp="1743043766719">
<state x="679" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1743674700028" />
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog" timestamp="1743674688479">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1743043766719" />
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1743674688479" />
<state x="1060" y="458" key="FileChooserDialogImpl" timestamp="1743043710794">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="1060" y="458" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1743043710794" />
<state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1743671333588">
<state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1745658342152">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="388" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1743671333588" />
<state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1743671333588">
<state width="2517" height="388" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342152" />
<state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1745658342152">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="388" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1743671333588" />
<state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1743671333588">
<state width="2517" height="388" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342152" />
<state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1745658342152">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="388" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1743671333588" />
<state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1743671333588">
<state width="2517" height="388" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342152" />
<state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1745658342152">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="388" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1743671333588" />
<state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1743671145005">
<state width="2517" height="388" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342152" />
<state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1745658342071">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="388" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1743671145005" />
<state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1743671145005">
<state width="2517" height="388" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342071" />
<state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1745658342071">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="388" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1743671145005" />
<state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1743671145005">
<state width="2517" height="388" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342071" />
<state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1745658342071">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="388" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1743671145005" />
<state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1743671145005">
<state width="2517" height="388" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342071" />
<state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1745658342071">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="388" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1743671145005" />
<state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1743671009635">
<state width="2517" height="388" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342071" />
<state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1743674795181">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="388" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1743671009635" />
<state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1743671009635">
<state width="2517" height="388" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1743674795181" />
<state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1743674795181">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="388" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1743671009635" />
<state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1743671009635">
<state width="2517" height="388" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1743674795181" />
<state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1743674795181">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="388" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1743671009635" />
<state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1743671009635">
<state width="2517" height="388" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1743674795181" />
<state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1743674795181">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="388" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1743671009635" />
<state width="2517" height="388" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1743674795181" />
<state x="783" y="345" key="SettingsEditor" timestamp="1741573035388">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="783" y="345" key="SettingsEditor/0.0.2560.1400@0.0.2560.1400" timestamp="1741573035388" />
<state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1742868068294">
<state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1743674705512">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1742868068294" />
<state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1743674705512" />
<state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1741580728988">
<screen x="0" y="0" width="2560" height="1400" />
</state>


+ 1
- 1
admin-hanhai-vue/.env.development View File

@ -1,5 +1,5 @@
NODE_ENV=development
VUE_APP_API_BASE_URL=https://adminmassage.augcl.com/massage-admin/
VUE_APP_API_BASE_URL=https://www.yurangongfang.com/massage-admin/
//VUE_APP_API_BASE_URL=http://localhost:8000/massage-admin/
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview


+ 1
- 1
admin-hanhai-vue/.env.production View File

@ -1,5 +1,5 @@
NODE_ENV=production
VUE_APP_API_BASE_URL=https://adminmassage.augcl.com/massage-admin/
VUE_APP_API_BASE_URL=https://www.yurangongfang.com/massage-admin/
//VUE_APP_API_BASE_URL=http://localhost:8000/massage-admin/
VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

+ 9
- 9
jeecg-boot-module-system/src/main/resources/application-dev.yml View File

@ -134,9 +134,9 @@ spring:
# connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
url: jdbc:mysql://8.138.162.67:3306/massage?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
url: jdbc:mysql://124.223.100.7:3306/massage?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
username: root
password: Fk4q*h@V
password: Abc.123456
driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
#multi-datasource1:
@ -147,7 +147,7 @@ spring:
#redis 配置
redis:
database: 0
host: 8.138.162.67
host: 124.223.100.7
lettuce:
pool:
max-active: -1 #最大连接数据库连接数,设 -1 为没有限制
@ -155,7 +155,7 @@ spring:
max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
min-idle: 0 #最小等待连接中的数量,设 0 为没有限制
shutdown-timeout: 1000ms
password: 'gmmGMM@2024'
password: 'Abc.123456'
port: 6379
#mybatis plus 设置
mybatis-plus:
@ -192,11 +192,11 @@ jeecg :
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
#阿里云oss存储和大鱼短信秘钥配置
oss:
accessKey: LTAI5tQSs47izVy8DLVdwUU9
secretKey: qHI7C3PaXYZySr84HTToviC71AYlFq
endpoint: oss-cn-shenzhen.aliyuncs.com
bucketName: hanhaiimage
staticDomain: https://image.hhlm1688.com/
accessKey: LTAI5tQj3DzgwcgF5DnKtXpy
secretKey: x8dqo1vIyXTLkPSnIC3E8evWzojjuD
endpoint: oss-cn-beijing.aliyuncs.com
bucketName: yurangongfang
staticDomain: https://img.yurangongfang.com
# ElasticSearch 6设置
elasticsearch:
cluster-name: jeecg-ES


Write Preview
Loading…
Cancel
Save