xthyg
/
minAPP-hyg-background
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/l' into l

Browse Source
l
862857010@qq.com 2 years ago
parent 0ad9263fc8 fd842e8ff5
commit 290cc86921
8 changed files with 325 additions and 92 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 28
      src/main/java/com/cjy/back/ybsjScenicInfo/dao/YbsjScenicInfoMapper.xml
  2. 9
      src/main/java/com/cjy/back/ybsjScenicInfo/entity/YbsjScenicInfo.java
  3. 211
      src/main/resources/application-haiyangguan.properties
  4. 106
      src/main/resources/application.properties
  5. 1
      src/main/webapp/html/back/scenicBasic/scenicBasicInfoAdd.js
  6. 12
      src/main/webapp/html/back/ybsjMap/js/config.js
  7. 32
      src/main/webapp/html/common/js/initParam.js
  8. 18
      src/main/webapp/html/common/ueditor1_4_3_3/jsp/config.json

28
src/main/java/com/cjy/back/ybsjScenicInfo/dao/YbsjScenicInfoMapper.xml
Unescape View File

@ -43,7 +43,7 @@
<result column="userkey" property="userkey" jdbcType="VARCHAR" />
<result column="threshold" property="threshold" jdbcType="INTEGER" />
<result column="is_subscribe" property="isSubscribe" jdbcType="VARCHAR" />
<result column="max_person" property="maxPerson" javaType="INTEGER"/>
@ -65,7 +65,7 @@
tips, reservation_note, 720url,
ssort,
isrecommend, createtime,
updatetime
updatetime,max_person
</sql>
<sql id="Base_Column_List2">
guid, sname, saddress, lat, lng, slogo
@ -84,7 +84,7 @@
s.isrecommend, s.createtime,
s.updatetime, sysor.MC, a.dicname dicname,s.simages,
s.orgname,s.sfunc,s.charac,s.near,s.remark,s.stype stype,s.slevel slevel,s.soundpath soundpath,s.videopath videopath,s.linkDaoLanId linkDaoLanId
,s.threshold,s.is_subscribe,s.external_id as externalId
,s.threshold,s.is_subscribe,s.external_id as externalId,s.max_person
from ybsj_scenic_info s
LEFT
JOIN
@ -116,7 +116,7 @@
tips, reservation_note, 720url,
ssort,
isrecommend, createtime,
updatetime,createuserid,superuserid,userkey)
updatetime,createuserid,superuserid,userkey,max_person)
values (#{guid,jdbcType=INTEGER},
#{sname,jdbcType=VARCHAR},
#{saddress,jdbcType=VARCHAR},
@ -135,7 +135,7 @@
#{ssort,jdbcType=INTEGER},
#{isrecommend,jdbcType=VARCHAR},
#{createtime,jdbcType=TIMESTAMP},
#{updatetime,jdbcType=BIGINT},#{createuserid,jdbcType=INTEGER},#{superuserid,jdbcType=INTEGER},#{userkey})
#{updatetime,jdbcType=BIGINT},#{createuserid,jdbcType=INTEGER},#{superuserid,jdbcType=INTEGER},#{userkey},#{maxPerson})
</insert>
<insert id="insertSelective" parameterType="com.cjy.back.ybsjScenicInfo.entity.YbsjScenicInfo">
@ -260,6 +260,9 @@
<if test="externalId != null and externalId!=''" >
external_id,
</if>
<if test="maxPerson !=null">
max_person,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="guid != null">
@ -375,7 +378,10 @@
#{isSubscribe},
</if>
<if test="externalId != null and externalId!=''" >
#{externalId}
#{externalId},
</if>
<if test="maxPerson != null">
#{maxPerson},
</if>
</trim>
</insert>
@ -492,8 +498,11 @@
is_subscribe=#{isSubscribe},
</if>
<if test="externalId != null" >
external_id=#{externalId}
external_id=#{externalId},
</if>
<if test="maxPerson !=null">
max_person =#{maxPerson},
</if>
</set>
where guid = #{guid,jdbcType=INTEGER}
</update>
@ -536,7 +545,8 @@
#{createtime,jdbcType=TIMESTAMP},
updatetime =
#{updatetime,jdbcType=BIGINT}
max_person =
#{maxPerson,jdbcType=INTEGER}
@ -695,7 +705,7 @@
s.tips, s.reservation_note, s.720url,
s.ssort,
s.isrecommend, s.createtime,
s.updatetime, sysor.MC, a.dicname dicname,s.simages,
s.updatetime, sysor.MC, a.dicname dicname,s.simages,s.max_person,
s.orgname,s.sfunc,s.charac,s.near,s.remark,a.dicname slevel,s.sfunc sfunc,s.userkey userkey,s.soundpath soundpath,s.videopath videopath,s.linkDaoLanId linkDaoLanId
from ybsj_scenic_info s
LEFT

9
src/main/java/com/cjy/back/ybsjScenicInfo/entity/YbsjScenicInfo.java
Unescape View File

@ -183,6 +183,7 @@ public class YbsjScenicInfo {
private String isdel; //是否假删除
private Integer maxPerson; // 景区最大承载量
/**
* 在开通管理员时生成的管理员uuid
*/
@ -593,4 +594,12 @@ public class YbsjScenicInfo {
public void setIsdel(String isdel) {
this.isdel = isdel;
}
public Integer getMaxPerson() {
return maxPerson;
}
public void setMaxPerson(Integer maxPerson) {
this.maxPerson = maxPerson;
}
}

211
src/main/resources/application-haiyangguan.properties
Unescape View File

@ -0,0 +1,211 @@
server.port=8083
server.tomcat.uri-encoding=UTF-8
#jsp\uFF0Cservlet\u4FEE\u6539\u540E\u65E0\u9700\u91CD\u65B0\u53D1\u5E03
server.jsp-servlet.init-parameters.development=true
server.session.cookie.name=ybsj-session
server.session.timeout=7200
## \u6570\u636E\u6E90
spring.datasource.driverClassName=com.mysql.jdbc.Driver
spring.datasource.url=jdbc:mysql://192.168.130.16:3306/phone_tour_haiyang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&useSSL=false
#spring.datasource.url=jdbc:mysql://47.92.156.48:13306/phone_tour?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true
spring.datasource.username=root
spring.datasource.password=Cjy@1303
## JSP\u914D\u7F6E
## \u9875\u9762\u9ED8\u8BA4\u524D\u7F00
spring.mvc.view.prefix=/html/back/
# \u54CD\u5E94\u9875\u9762\u9ED8\u8BA4\u540E\u7F00
spring.mvc.view.suffix=.html
##thymeleaf\u6A21\u677F\u8BBE\u7F6E(html)
##\u9875\u9762\u9ED8\u8BA4\u524D\u7F00
spring.thymeleaf.prefix=classpath:/html/back/
##\u9875\u9762\u9ED8\u8BA4\u540E\u7F00
spring.thymeleaf.suffix=.html
##\u4F7F\u7528\u4E0D\u662F\u7279\u522B\u4E25\u683C\u7684html\u8BED\u6CD5
spring.thymeleaf.mode=LEGACYHTML5
##\u5173\u95ED\u7F13\u5B58
spring.thymeleaf.cache=false
spring.aop.proxy-target-class=true
## Mybatis \u914D\u7F6E
# \u914D\u7F6E \u6307\u5411\u5B9E\u4F53\u7C7B\u5305\u8DEF\u5F84\u3002
mybatis.type-aliases-package = com.cjy.*.entity,com.cjy.*.*.entity,com.cjy.*.*.*.entity
# \u914D\u7F6E\u4E3A classpath \u8DEF\u5F84\u4E0B mapper \u5305\u4E0B\uFF0C* \u4EE3\u8868\u4F1A\u626B\u63CF\u6240\u6709 xml \u6587\u4EF6\u3002
mybatis.mapper-locations = classpath*:com/cjy/*/dao/*Mapper.xml,classpath*:com/cjy/*/*/dao/*Mapper.xml,classpath*:com/cjy/*/*/*/dao/*Mapper.xml
mybatis.config-location = classpath:mybatis-config.xml
#\u65E5\u5FD7
logging.config=classpath:logback.xml
#\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F
spring.http.multipart.maxFileSize=500Mb
spring.http.multipart.maxRequestSize=500Mb
#mysql-lycyjcpt
driverClassName_lycyjcpt=com.mysql.jdbc.Driver
url_lycyjcpt=jdbc\:mysql\://211.90.37.65\:33301/hb_lycyjcpt?useUnicode\=true&characterEncoding\=utf8&zeroDateTimeBehavior\=convertToNull&transformedBitIsBoolean\=true
userName_lycyjcpt=root
password_lycyjcpt=#@$3cJ?*=&981+--.$%^bnoZT12QfK
#mysql-\u4ECE\u6570\u636E\u5E93
spring.datasource.names=slave
spring.datasource.slave.driverClassName=com.mysql.jdbc.Driver
spring.datasource.slave.url=jdbc:mysql://192.168.130.16:3306/phone_tour_haiyang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
#spring.datasource.slave.url=jdbc:mysql://47.92.156.48:13306/phone_tour?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
spring.datasource.slave.username=root
spring.datasource.slave.password=Cjy@1303
#\u6570\u636E\u6E90\u7684\u66F4\u591A\u914D\u7F6E
db.maximumConnectionCount=50
db.minimumConnectionCount=2
db.addnumConnectionCount=5
db.maximum-pool-size=100
db.max-idle=10
db.max-wait=10000
db.min-idle=5
db.initial-size=5
db.validation-query=SELECT 1
db.test-on-borrow=false
db.test-while-idle=true
db.time-between-eviction-runs-millis=18800
#MQ\u914D\u7F6E
spring.rabbitmq.host=127.0.0.1
spring.rabbitmq.port=5672
spring.rabbitmq.username=guest
spring.rabbitmq.password=guest
# \u5F00\u542F\u53D1\u9001\u786E\u8BA4
spring.rabbitmq.publisher-confirms=true
# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE
spring.rabbitmq.publisher-returns=true
spring.rabbitmq.template.mandatory=true
# \u5F00\u542FACK
spring.rabbitmq.listener.direct.acknowledge-mode=manual
spring.rabbitmq.listener.simple.acknowledge-mode=manual
#\u662F\u5426\u652F\u6301\u91CD\u8BD5
spring.rabbitmq.listener.simple.retry.enabled=true
#\u5E76\u53D1\u91CF\u7684\u914D\u7F6E
spring.rabbitmq.listener.simple.concurrency=10
spring.rabbitmq.listener.simple.max-concurrency=20
spring.rabbitmq.listener.simple.prefetch=5
#\u667A\u80FD\u673A\u5668\u4EBA\u5B57\u5178\u8868-\u7236\u7EA7\u6807\u53F7
db.dicpcode=33
#\u63A5\u53E3 \u9644\u8FD1\u7684\u4E94\u9879\u8D44\u6E90\uFF0C \u8BBF\u95EE\u8303\u56F4 km
near=2000000000
lng=114.719986
lat=41.158987
#appId=wx7a886bbfc2b3bb15
#secret=980fb3d10905746ca362515a6cb148ac
#\u6CB3\u5317
appId=wx43b4de0f13b9a916
secret=a369f9770e54abfecd386f4bba218937
# 7*24*60*60*1000
wechat_timeout=604800000
#\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84 \u4F8B\u5B50\uFF1AFILEPATH+"/2018/10/23/filename.jpg"
filepath= D:/xingtaihaiyangguan/appImage
#\u8F6E\u64AD\u56FE\u4E0A\u4F20\u8DEF\u5F84
image_filepath=/upload/image
video_filepath= /upload/video
app_filepath= /upload/app
other_filepath= /upload/other
codeUrl_filepath= /upload/code
#\u8D44\u6E90\u6620\u5C04\u8DEF\u5F84\u4E3A/image/**\uFF0C\u4F7F\u7528url\u8BBF\u95EE\u7684\u8BF7\u6C42\u8DEF\u5F84
#spring.mvc.static-path-pattern=/image/**
#\u8D44\u6E90\u7EDD\u5BF9\u8DEF\u5F84\u4E3Afile:D://data/pic/\uFF0C\u56FE\u7247\u5B58\u653E\u7684\u771F\u5B9E\u8DEF\u5F84
#spring.resources.static-locations=file:D://image/
spring.redis.host=127.0.0.1
spring.redis.password= Cjy@1303
spring.redis.port=6379
spring.redis.database=9
#
#spring.redis.host=192.168.110.158
#spring.redis.password= 123
#spring.redis.port=6379
#spring.redis.database=2
#spring.redis.timeout= 10
#\u5B57\u6BB5\u7ED1\u5B9A\u67E5\u8BE2\u4E0D\u663E\u793A\u7684\u5B57\u6BB5
message.field=guid,type,browsenum,upnum,sendtime,createtime,createuserid,superuserid,userkey,subtype,specialtyfoodid,activityid,foodid,sort,isrecommend,isdel
message.default.field=sort,isrecommend,isdel
message.mysql_ku=phone_tour
#\u9152\u5E97 \u7C7B\u578B/\u661F\u7EA7/\u8BBE\u65BD/\u670D\u52A1 \u5B57\u5178\u7236\u7EA7\u7F16\u53F7
hotel.type=18
hotel.xingji=22
hotel.sheshi=11
hotel.fuwu=10
#\u5168\u57DF\u666F\u533A\u7EA7\u522B/\u7C7B\u578B/\u6570\u636E\u7C7B\u578B
map.scenicLevel=35
map.scenicType=36
map.dataType=37
#\u666F\u533A\u7C7B\u578B/\u7EA7\u522B
scenic.type=01
scenic.level=25
#\u7EBF\u8DEF\u7C7B\u578B
line.type=24
#\u6D88\u606F\u7C7B\u578B
message.messageCode=29
#\u529F\u80FD\u6A21\u5757\u7236\u7EA7\u540D\u79F0
module.parentName1=\u7CFB\u7EDF\u8BBE\u7F6E
module.parentName2=\u5185\u5BB9\u7BA1\u7406
#\u6B64\u529F\u80FD\u6A21\u5757\u4E0D\u590D\u5236
module.parentName3=\u5730\u5E02\u7BA1\u7406
#\u9ED8\u8BA4\u503C
default.pageSize=10
#host=http://39.105.17.128:8083
#host=http://127.0.0.1:8083
host=https://www.lbgjtoa.com
#\u767B\u5F55\u9519\u8BEF\u6B21\u6570redis\u8FC7\u671F\u65F6\u95F4 \u5355\u4F4D \u79D2
loginDisableTime=600
#\u767B\u5F55\u9519\u8BEF\u6B21\u6570
loginErrorNum=5
#google\u9A8C\u8BC1\u5668\u8FC7\u671F\u65F6\u95F4 1\u4E3A30\u79D2 2\u4E3A1\u5206\u949F
googleSize=2
#\u76D1\u63A7\u8C03\u7528\u6D77\u5EB7
#\u4EE3\u7406API\u7F51\u5173nginx\u670D\u52A1\u5668ip\u7AEF\u53E3
HKApiNginxIp=221.192.134.208:81
#\u79D8\u94A5appkey
HKappkey=25620685
#\u79D8\u94A5appSecret
HKappSecret=Acvnz7SPTq4wPRSSg7az
#\u534F\u8BAE
HKxieyi=http://
turnstile.url =http://127.0.0.1:33309
turnstile.addAccessRight = /access/addAccessRight
turnstile.addVisitor = /access/addVisitor
turnstile.updateQRCodev = /access/updateQRCode
turnstile.clearSingleVisitor = /access/clearSingleVisitor
turnstile.extractRecords = /access/extractRecords
allowed.ip.list=192.168.110.158
allowed.method.methodList= /appointmentSetting/writeOff
jqzhgk.organCode=123
jqzhgk.synchronousDataUrl=http://127.0.0.1:8096/reservationdata/appointmentrecord/synchronousData
jqzhgk.synchronousWriteOffDataUrl=http://127.0.0.1:8096/reservationdata/appointmentrecord/synchronousWriteOffData
jqzhgk.synchronousCancelDataUrl=http://127.0.0.1:8096/reservationdata/appointmentrecord/synchronousCancelData
jqzhgk.complanit=http://127.0.0.1:8096/marketingData/complaint/synchronous
encryptionRule=Xt9saen8xKY3eSmb

106
src/main/resources/application.properties
Unescape View File

@ -1,44 +1,44 @@
server.port=8083
server.tomcat.uri-encoding=UTF-8
#jsp，servlet修改后无需重新发布
#jsp\uFF0Cservlet\u4FEE\u6539\u540E\u65E0\u9700\u91CD\u65B0\u53D1\u5E03
server.jsp-servlet.init-parameters.development=true
server.session.cookie.name=ybsj-session
server.session.timeout=7200
## 数据源
## \u6570\u636E\u6E90
spring.datasource.driverClassName=com.mysql.jdbc.Driver
spring.datasource.url=jdbc:mysql://39.105.17.128:33074/phone_tour?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&useSSL=false
#spring.datasource.url=jdbc:mysql://47.92.156.48:13306/phone_tour?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true
spring.datasource.username=root
spring.datasource.password=Mysql@1303
## JSP配置
## 页面默认前缀
## JSP\u914D\u7F6E
## \u9875\u9762\u9ED8\u8BA4\u524D\u7F00
spring.mvc.view.prefix=/html/back/
# 响应页面默认后缀
# \u54CD\u5E94\u9875\u9762\u9ED8\u8BA4\u540E\u7F00
spring.mvc.view.suffix=.html
##thymeleaf模板设置(html)
##页面默认前缀
##thymeleaf\u6A21\u677F\u8BBE\u7F6E(html)
##\u9875\u9762\u9ED8\u8BA4\u524D\u7F00
spring.thymeleaf.prefix=classpath:/html/back/
##页面默认后缀
##\u9875\u9762\u9ED8\u8BA4\u540E\u7F00
spring.thymeleaf.suffix=.html
##使用不是特别严格的html语法
##\u4F7F\u7528\u4E0D\u662F\u7279\u522B\u4E25\u683C\u7684html\u8BED\u6CD5
spring.thymeleaf.mode=LEGACYHTML5
##关闭缓存
##\u5173\u95ED\u7F13\u5B58
spring.thymeleaf.cache=false
spring.aop.proxy-target-class=true
## Mybatis 配置
# 配置 指向实体类包路径。
## Mybatis \u914D\u7F6E
# \u914D\u7F6E \u6307\u5411\u5B9E\u4F53\u7C7B\u5305\u8DEF\u5F84\u3002
mybatis.type-aliases-package = com.cjy.*.entity,com.cjy.*.*.entity,com.cjy.*.*.*.entity
# 配置为 classpath 路径下 mapper 包下，* 代表会扫描所有 xml 文件。
# \u914D\u7F6E\u4E3A classpath \u8DEF\u5F84\u4E0B mapper \u5305\u4E0B\uFF0C* \u4EE3\u8868\u4F1A\u626B\u63CF\u6240\u6709 xml \u6587\u4EF6\u3002
mybatis.mapper-locations = classpath*:com/cjy/*/dao/*Mapper.xml,classpath*:com/cjy/*/*/dao/*Mapper.xml,classpath*:com/cjy/*/*/*/dao/*Mapper.xml
mybatis.config-location = classpath:mybatis-config.xml
#日志
#\u65E5\u5FD7
logging.config=classpath:logback.xml
#上传文件大小
#\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F
spring.http.multipart.maxFileSize=500Mb
spring.http.multipart.maxRequestSize=500Mb
@ -48,7 +48,7 @@ url_lycyjcpt=jdbc\:mysql\://211.90.37.65\:33301/hb_lycyjcpt?useUnicode\=true&cha
userName_lycyjcpt=root
password_lycyjcpt=#@$3cJ?*=&981+--.$%^bnoZT12QfK
#mysql-从数据库
#mysql-\u4ECE\u6570\u636E\u5E93
spring.datasource.names=slave
spring.datasource.slave.driverClassName=com.mysql.jdbc.Driver
spring.datasource.slave.url=jdbc:mysql://39.105.17.128:33074/phone_tour?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
@ -56,7 +56,7 @@ spring.datasource.slave.url=jdbc:mysql://39.105.17.128:33074/phone_tour?useUnico
spring.datasource.slave.username=root
spring.datasource.slave.password=Mysql@1303
#数据源的更多配置
#\u6570\u636E\u6E90\u7684\u66F4\u591A\u914D\u7F6E
db.maximumConnectionCount=50
db.minimumConnectionCount=2
db.addnumConnectionCount=5
@ -69,7 +69,7 @@ db.validation-query=SELECT 1
db.test-on-borrow=false
db.test-while-idle=true
db.time-between-eviction-runs-millis=18800
#MQ配置
#MQ\u914D\u7F6E
spring.rabbitmq.host=127.0.0.1
spring.rabbitmq.port=5672
spring.rabbitmq.username=guest
@ -77,26 +77,26 @@ spring.rabbitmq.password=guest
# 开启发送确认
# \u5F00\u542F\u53D1\u9001\u786E\u8BA4
spring.rabbitmq.publisher-confirms=true
# 开启发送失败退回
# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE
spring.rabbitmq.publisher-returns=true
spring.rabbitmq.template.mandatory=true
# 开启ACK
# \u5F00\u542FACK
spring.rabbitmq.listener.direct.acknowledge-mode=manual
spring.rabbitmq.listener.simple.acknowledge-mode=manual
#是否支持重试
#\u662F\u5426\u652F\u6301\u91CD\u8BD5
spring.rabbitmq.listener.simple.retry.enabled=true
#并发量的配置
#\u5E76\u53D1\u91CF\u7684\u914D\u7F6E
spring.rabbitmq.listener.simple.concurrency=10
spring.rabbitmq.listener.simple.max-concurrency=20
spring.rabbitmq.listener.simple.prefetch=5
#智能机器人字典表-父级标号
#\u667A\u80FD\u673A\u5668\u4EBA\u5B57\u5178\u8868-\u7236\u7EA7\u6807\u53F7
db.dicpcode=33
#接口 附近的五项资源， 访问范围 km
#\u63A5\u53E3 \u9644\u8FD1\u7684\u4E94\u9879\u8D44\u6E90\uFF0C \u8BBF\u95EE\u8303\u56F4 km
near=2000000000
lng=114.719986
@ -104,15 +104,15 @@ lat=41.158987
#appId=wx7a886bbfc2b3bb15
#secret=980fb3d10905746ca362515a6cb148ac
#河北
#\u6CB3\u5317
appId=wx43b4de0f13b9a916
secret=a369f9770e54abfecd386f4bba218937
# 7*24*60*60*1000
wechat_timeout=604800000
#文件上传路径 例子：FILEPATH+"/2018/10/23/filename.jpg"
#\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84 \u4F8B\u5B50\uFF1AFILEPATH+"/2018/10/23/filename.jpg"
filepath= /Users/tuzki/code/chuangjuyuan/onePhoneTour
#轮播图上传路径
#\u8F6E\u64AD\u56FE\u4E0A\u4F20\u8DEF\u5F84
image_filepath=/upload/image
video_filepath= /upload/video
app_filepath= /upload/app
@ -120,9 +120,9 @@ other_filepath= /upload/other
codeUrl_filepath= /upload/code
#资源映射路径为/image/**，使用url访问的请求路径
#\u8D44\u6E90\u6620\u5C04\u8DEF\u5F84\u4E3A/image/**\uFF0C\u4F7F\u7528url\u8BBF\u95EE\u7684\u8BF7\u6C42\u8DEF\u5F84
#spring.mvc.static-path-pattern=/image/**
#资源绝对路径为file:D://data/pic/，图片存放的真实路径
#\u8D44\u6E90\u7EDD\u5BF9\u8DEF\u5F84\u4E3Afile:D://data/pic/\uFF0C\u56FE\u7247\u5B58\u653E\u7684\u771F\u5B9E\u8DEF\u5F84
#spring.resources.static-locations=file:D://image/
spring.redis.host=39.105.17.128
@ -137,56 +137,56 @@ spring.redis.database=2
#spring.redis.timeout= 10
#字段绑定查询不显示的字段
#\u5B57\u6BB5\u7ED1\u5B9A\u67E5\u8BE2\u4E0D\u663E\u793A\u7684\u5B57\u6BB5
message.field=guid,type,browsenum,upnum,sendtime,createtime,createuserid,superuserid,userkey,subtype,specialtyfoodid,activityid,foodid,sort,isrecommend,isdel
message.default.field=sort,isrecommend,isdel
message.mysql_ku=phone_tour
#酒店 类型/星级/设施/服务 字典父级编号
#\u9152\u5E97 \u7C7B\u578B/\u661F\u7EA7/\u8BBE\u65BD/\u670D\u52A1 \u5B57\u5178\u7236\u7EA7\u7F16\u53F7
hotel.type=18
hotel.xingji=22
hotel.sheshi=11
hotel.fuwu=10
#全域景区级别/类型/数据类型
#\u5168\u57DF\u666F\u533A\u7EA7\u522B/\u7C7B\u578B/\u6570\u636E\u7C7B\u578B
map.scenicLevel=35
map.scenicType=36
map.dataType=37
#景区类型/级别
#\u666F\u533A\u7C7B\u578B/\u7EA7\u522B
scenic.type=01
scenic.level=25
#线路类型
#\u7EBF\u8DEF\u7C7B\u578B
line.type=24
#消息类型
#\u6D88\u606F\u7C7B\u578B
message.messageCode=29
#功能模块父级名称
#\u529F\u80FD\u6A21\u5757\u7236\u7EA7\u540D\u79F0
module.parentName1=\u7CFB\u7EDF\u8BBE\u7F6E
module.parentName2=\u5185\u5BB9\u7BA1\u7406
#此功能模块不复制
#\u6B64\u529F\u80FD\u6A21\u5757\u4E0D\u590D\u5236
module.parentName3=\u5730\u5E02\u7BA1\u7406
#默认值
#\u9ED8\u8BA4\u503C
default.pageSize=10
#host=http://39.105.17.128:8083
#host=http://127.0.0.1:8083
host=http://192.168.130.109:8083
host=http://192.168.130.155:8083
#登录错误次数redis过期时间 单位 秒
#\u767B\u5F55\u9519\u8BEF\u6B21\u6570redis\u8FC7\u671F\u65F6\u95F4 \u5355\u4F4D \u79D2
loginDisableTime=600
#登录错误次数
#\u767B\u5F55\u9519\u8BEF\u6B21\u6570
loginErrorNum=5
#google验证器过期时间 1为30秒 2为1分钟
#google\u9A8C\u8BC1\u5668\u8FC7\u671F\u65F6\u95F4 1\u4E3A30\u79D2 2\u4E3A1\u5206\u949F
googleSize=2
#监控调用海康
#代理API网关nginx服务器ip端口
#\u76D1\u63A7\u8C03\u7528\u6D77\u5EB7
#\u4EE3\u7406API\u7F51\u5173nginx\u670D\u52A1\u5668ip\u7AEF\u53E3
HKApiNginxIp=221.192.134.208:81
#秘钥appkey
#\u79D8\u94A5appkey
HKappkey=25620685
#秘钥appSecret
#\u79D8\u94A5appSecret
HKappSecret=Acvnz7SPTq4wPRSSg7az
#协议
#\u534F\u8BAE
HKxieyi=http://
@ -202,8 +202,10 @@ turnstile.extractRecords = /access/extractRecords
allowed.ip.list=192.168.110.158
allowed.method.methodList= /appointmentSetting/writeOff
jqzhgk.organCode=123
jqzhgk.synchronousDataUrl=http://192.168.110.158:8080/reservationdata/appointmentrecord/synchronousData
jqzhgk.synchronousWriteOffDataUrl=http://192.168.110.158:8080/reservationdata/appointmentrecord/synchronousWriteOffData
jqzhgk.synchronousCancelDataUrl=http://192.168.110.158:8080/reservationdata/appointmentrecord/synchronousCancelData
jqzhgk.organCode=123
jqzhgk.synchronousDataUrl=http://127.0.0.1:8096/reservationdata/appointmentrecord/synchronousData
jqzhgk.synchronousWriteOffDataUrl=http://127.0.0.1:8096/reservationdata/appointmentrecord/synchronousWriteOffData
jqzhgk.synchronousCancelDataUrl=http://127.0.0.1:8096/reservationdata/appointmentrecord/synchronousCancelData
jqzhgk.complanit=http://127.0.0.1:8096/marketingData/complaint/synchronous
encryptionRule=Xt9saen8xKY3eSmb

1
src/main/webapp/html/back/scenicBasic/scenicBasicInfoAdd.js
Unescape View File

@ -51,6 +51,7 @@ $(function() {
$("#businesstime").val(json.businesstime);
$("#playtime").val(json.playtime);
$("#sprice").val(json.sprice);
$("#maxPerson").val(json.maxPerson);
$("#stype").val(json.stype);
$("#orgname").val(json.orgname);
$("#sfunc").val(json.sfunc);

12
src/main/webapp/html/back/ybsjMap/js/config.js
Unescape View File

@ -5,16 +5,16 @@
//var yjyhost = "http://144.7.116.46:10001/";
var a = window.location.href;
if(a.search("https://app.xawl.gov.cn/") != -1){
host="https://app.xawl.gov.cn/";
yjyhost="https://app.xawl.gov.cn/";
if(a.search("https://www.lbgjtoa.com/") != -1){
host="https://www.lbgjtoa.com/";
yjyhost="https://www.lbgjtoa.com/";
}else if(a.search("http://144.7.116.46:10001/") != -1){
host="http://144.7.116.46:10001/";
yjyhost="http://144.7.116.46:10001/";
}else if (a.search("http://192.168.130.109:8083/"!=-1)){
host="http://192.168.130.109:8083/";
yjyhost="http://192.168.130.109:8083/";
}else if (a.search("http://192.168.130.155:8083/"!=-1)){
host="http://192.168.130.155:8083/";
yjyhost="http://192.168.130.155:8083/";
}

32
src/main/webapp/html/common/js/initParam.js
Unescape View File

@ -7,9 +7,9 @@ document.title = "衡水老白干景区管理平台";
//内网ip
var ctx = "http://192.168.130.109:8083/";
var frontctx = "http://192.168.130.109:8083/";
var filectx = "http://192.168.130.109:8083/";
var ctx = "https://www.lbgjtoa.com/";
var frontctx = "https://www.lbgjtoa.com/";
var filectx = "https://www.lbgjtoa.com/";
//
@ -18,16 +18,16 @@ var filectx = "http://192.168.130.109:8083/";
// var filectx = "http://39.105.17.128:8083/";
//部署的话打开
//var a = window.location.href;
//var ctx;
//var frontctx;
//var filectx;
//if(a.search("https://app.xawl.gov.cn/") != -1){
// ctx="https://app.xawl.gov.cn/";
// frontctx="https://app.xawl.gov.cn/";
// filectx="https://app.xawl.gov.cn/";
//}else if(a.search("http://144.7.116.46:10001/") != -1){
// ctx="http://144.7.116.46:10001/";
// frontctx="http://144.7.116.46:10001/";
// filectx="http://144.7.116.46:10001/";
//}
var a = window.location.href;
var ctx;
var frontctx;
var filectx;
if(a.search("https://www.lbgjtoa.com/") != -1){
ctx="https://www.lbgjtoa.com/";
frontctx="https://www.lbgjtoa.com/";
filectx="https://www.lbgjtoa.com/";
}else if(a.search("http://192.168.130.155:8083/") != -1){
ctx="http://192.168.130.155:8083/";
frontctx="http://192.168.130.155:8083/";
filectx="http://192.168.130.155:8083/";
}

18
src/main/webapp/html/common/ueditor1_4_3_3/jsp/config.json
Unescape View File

@ -8,13 +8,13 @@
"imageCompressEnable": true, /* 是否压缩图片,默认是true */
"imageCompressBorder": 1600, /* 图片压缩最长边限制 */
"imageInsertAlign": "none", /* 插入的图片浮动方式 */
"imageUrlPrefix": "http://39.100.37.87:10001/", /* 图片访问路径前缀 */
"imageUrlPrefix": "https://www.lbgjtoa.com/", /* 图片访问路径前缀 */
"imagePathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
/* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
/* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
/* {time} 会替换成时间戳 */
/* {yyyy} 会替换成四位年份 */
/* {yy} 会替换成两位年份 */
/* {yy} 会替换成两位年份 *现在
/* {mm} 会替换成两位月份 */
/* {dd} 会替换成两位日期 */
/* {hh} 会替换成两位小时 */
@ -28,13 +28,13 @@
"scrawlFieldName": "upfile", /* 提交的图片表单名称 */
"scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
"scrawlMaxSize": 2048000, /* 上传大小限制，单位B */
"scrawlUrlPrefix": "http://39.100.37.87:10001/", /* 图片访问路径前缀 */
"scrawlUrlPrefix": "https://www.lbgjtoa.com/", /* 图片访问路径前缀 */
"scrawlInsertAlign": "none",
/* 截图工具上传 */
"snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
"snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
"snapscreenUrlPrefix": "http://39.100.37.87:10001/", /* 图片访问路径前缀 */
"snapscreenUrlPrefix": "https://www.lbgjtoa.com/", /* 图片访问路径前缀 */
"snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */
/* 抓取远程图片配置 */
@ -42,7 +42,7 @@
"catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
"catcherFieldName": "source", /* 提交的图片列表表单名称 */
"catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
"catcherUrlPrefix": "http://39.100.37.87:10001/", /* 图片访问路径前缀 */
"catcherUrlPrefix": "https://www.lbgjtoa.com/", /* 图片访问路径前缀 */
"catcherMaxSize": 2048000, /* 上传大小限制，单位B */
"catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */
@ -50,7 +50,7 @@
"videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
"videoFieldName": "upfile", /* 提交的视频表单名称 */
"videoPathFormat": "/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
"videoUrlPrefix": "http://39.100.37.87:10001/", /* 视频访问路径前缀 */
"videoUrlPrefix": "https://www.lbgjtoa.com/", /* 视频访问路径前缀 */
"videoMaxSize": 102400000, /* 上传大小限制，单位B，默认100MB */
"videoAllowFiles": [
".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
@ -60,7 +60,7 @@
"fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
"fileFieldName": "upfile", /* 提交的文件表单名称 */
"filePathFormat": "/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
"fileUrlPrefix": "http://39.100.37.87:10001/", /* 文件访问路径前缀 */
"fileUrlPrefix": "https://www.lbgjtoa.com/", /* 文件访问路径前缀 */
"fileMaxSize": 51200000, /* 上传大小限制，单位B，默认50MB */
"fileAllowFiles": [
".png", ".jpg", ".jpeg", ".gif", ".bmp",
@ -74,14 +74,14 @@
"imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
"imageManagerListPath": "/ueditor/jsp/upload/image/", /* 指定要列出图片的目录 */
"imageManagerListSize": 20, /* 每次列出文件数量 */
"imageManagerUrlPrefix": "http://39.100.37.87:10001/", /* 图片访问路径前缀 */
"imageManagerUrlPrefix": "https://www.lbgjtoa.com/", /* 图片访问路径前缀 */
"imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */
"imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */
/* 列出指定目录下的文件 */
"fileManagerActionName": "listfile", /* 执行文件管理的action名称 */
"fileManagerListPath": "/ueditor/jsp/upload/file/", /* 指定要列出文件的目录 */
"fileManagerUrlPrefix": "http://39.100.37.87:10001/", /* 文件访问路径前缀 */
"fileManagerUrlPrefix": "https://www.lbgjtoa.com/", /* 文件访问路径前缀 */
"fileManagerListSize": 20, /* 每次列出文件数量 */
"fileManagerAllowFiles": [
".png", ".jpg", ".jpeg", ".gif", ".bmp",

Write Preview
Loading…
Cancel
Save