diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 2f39d5e..35494ac 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -54,12 +54,12 @@ spring: use-global-data-source-stat: true data: mongodb: - uri: mongodb://smartcity:smartcity@192.168.0.151:27017/smartcity + uri: mongodb://smartcity:smartcity@192.168.0.156:27017/smartcity redis: database: 6 - host: 192.168.0.151 + host: 192.168.0.156 port: 6379 - password: root + # password: root timeout: 3000ms jedis: pool: @@ -111,7 +111,7 @@ file: use-min-io: true # 与use-min-io配套使用 min-io: - endpoint: http://192.168.0.151:9900 + endpoint: http://192.168.0.156:19000 access-key: smartcity secret-key: smartcity diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 556746d..18b6cf5 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,7 +1,7 @@ server: port: 7011 - ip: 10.25.242.190 - url: http://${server.ip}:7011/usercenter + ip: 1.24.238.149 + url: http://${server.ip}:37210/usercenter system-title: 统一用户管理系统 system-sub-title: 智慧城市 default-index-page: route/custom/index @@ -59,7 +59,7 @@ spring: database: 6 host: 192.168.158.20 port: 6012 - password: 666 + password: TSkj@0471.REDIS timeout: 3000ms jedis: pool: @@ -67,6 +67,27 @@ spring: max-wait: 1ms max-idle: 8 min-idle: 0 + kafka: + bootstrap-servers: 192.168.158.14:9092 + producer: + # 写入失败时,重试次数。当leader节点失效,一个repli节点会替代成为leader节点,此时可能出现写入失败, + # 当retris为0时,produce不会重复。retirs重发,此时repli节点完全成为leader节点,不会产生消息丢失。 + retries: 0 + #procedure要求leader在考虑完成请求之前收到的确认数,用于控制发送记录在服务端的持久化,其值可以为如下: + #acks = 0 如果设置为零,则生产者将不会等待来自服务器的任何确认,该记录将立即添加到套接字缓冲区并视为已发送。在这种情况下,无法保证服务器已收到记录,并且重试配置将不会生效(因为客户端通常不会知道任何故障),为每条记录返回的偏移量始终设置为-1。 + #acks = 1 这意味着leader会将记录写入其本地日志,但无需等待所有副本服务器的完全确认即可做出回应,在这种情况下,如果leader在确认记录后立即失败,但在将数据复制到所有的副本服务器之前,则记录将会丢失。 + #acks = all 这意味着leader将等待完整的同步副本集以确认记录,这保证了只要至少一个同步副本服务器仍然存活,记录就不会丢失,这是最强有力的保证,这相当于acks = -1的设置。 + #可以设置的值为:all, -1, 0, 1 + acks: 1 + consumer: + group-id: SmartCity + # smallest和largest才有效,如果smallest重新0开始读取,如果是largest从logfile的offset读取。一般情况下我们都是设置smallest + auto-offset-reset: earliest + # 设置自动提交offset + enable-auto-commit: true + # 如果'enable.auto.commit'为true,则消费者偏移自动提交给Kafka的频率(以毫秒为单位),默认值为5000。 + auto-commit-interval: 100 + max-poll-records: 5 mybatis: config-location: classpath:mybatis/mybatis-config.xml diff --git a/src/main/resources/static/assets/custom/index/css/reset.css b/src/main/resources/static/assets/custom/index/css/reset.css new file mode 100644 index 0000000..210501e --- /dev/null +++ b/src/main/resources/static/assets/custom/index/css/reset.css @@ -0,0 +1 @@ +@charset "utf-8";a,body,dd,div,dl,dt,em,form,h1,h2,h3,h4,h5,h6,img,input,li,ol,option,p,select,span,strong,table,td,textarea,th,ul,var{margin:0;padding:0}body,html{font:400 100% "微软雅黑",Arail,Tabhoma;text-align:left;color:#535353;-webkit-font-smoothing:antialiased;line-height:normal}ol,ul{list-style:none}img{border:0;vertical-align:top}input,select,textarea{outline:0}textarea{resize:none}table{border-collapse:collapse;border-spacing:0}em,strong,th,var{font-weight:400;font-style:normal}a{text-decoration:none;color:#555}a,input{-webkit-tap-highlight-color:transparent}[v-cloak]{display: none} \ No newline at end of file diff --git a/src/main/resources/static/assets/custom/index/css/style.css b/src/main/resources/static/assets/custom/index/css/style.css new file mode 100644 index 0000000..7c71464 --- /dev/null +++ b/src/main/resources/static/assets/custom/index/css/style.css @@ -0,0 +1,15 @@ +.container{position:absolute;top:0;left:0;bottom:0;right:0;background:url(../images/bg.png) no-repeat;background-size:100% 100%;padding:.35rem .5rem;font-size:0} +.top{overflow:hidden} +.logo{float:left} +.logo a{font-size:.3rem;color:#00f5ff;text-shadow:0 0 5px #fff} +.btn{float:right} +.btn a{font-size:.2rem;color:#00f5ff;text-shadow:0 0 5px #fff;display:inline-block;margin-right:.2rem} +.main{margin:1rem auto;width:95%;overflow:hidden} +.main-container{width:105%;height:6.5rem;overflow-y:auto} +.main-container:after{content:'';display:block;clear:both} +.guide-box{display:block;float:left;width:3.5rem;height:2.75rem;position:relative;background:url(../images/box-bg.png) no-repeat center;background-size:100% 100%;margin-right:1rem;margin-bottom:.5rem} +.guide-box:nth-child(4n){margin-right:0} +.guide-text{max-width: 100%;padding: 0 .15rem;box-sizing:border-box;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);text-align:center} +.guide-text img{width:1.4rem;height:1.5rem;margin-bottom:.3rem} +.guide-text p{font-size:.22rem;color:#00f5ff;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} +.close{position:absolute;top:0;right:0;width:.35rem;height:.35rem;padding:.1rem;cursor:pointer} diff --git a/src/main/resources/static/assets/custom/index/images/bg.png b/src/main/resources/static/assets/custom/index/images/bg.png new file mode 100644 index 0000000..79ea446 Binary files /dev/null and b/src/main/resources/static/assets/custom/index/images/bg.png differ diff --git a/src/main/resources/static/assets/custom/index/images/box-bg.png b/src/main/resources/static/assets/custom/index/images/box-bg.png new file mode 100644 index 0000000..d03f19f Binary files /dev/null and b/src/main/resources/static/assets/custom/index/images/box-bg.png differ diff --git a/src/main/resources/static/assets/custom/index/images/close.png b/src/main/resources/static/assets/custom/index/images/close.png new file mode 100644 index 0000000..ef26508 Binary files /dev/null and b/src/main/resources/static/assets/custom/index/images/close.png differ diff --git a/src/main/resources/static/assets/custom/index/images/icon.png b/src/main/resources/static/assets/custom/index/images/icon.png new file mode 100644 index 0000000..7a15d49 Binary files /dev/null and b/src/main/resources/static/assets/custom/index/images/icon.png differ diff --git a/src/main/resources/static/assets/custom/index/images/icon2.png b/src/main/resources/static/assets/custom/index/images/icon2.png new file mode 100644 index 0000000..e483706 Binary files /dev/null and b/src/main/resources/static/assets/custom/index/images/icon2.png differ diff --git a/src/main/resources/static/assets/custom/index/images/icon3.png b/src/main/resources/static/assets/custom/index/images/icon3.png new file mode 100644 index 0000000..1ad1f3c Binary files /dev/null and b/src/main/resources/static/assets/custom/index/images/icon3.png differ diff --git a/src/main/resources/static/assets/custom/index/js/rem.js b/src/main/resources/static/assets/custom/index/js/rem.js new file mode 100644 index 0000000..5bca32a --- /dev/null +++ b/src/main/resources/static/assets/custom/index/js/rem.js @@ -0,0 +1,12 @@ +function setPage() { + var html = document.getElementsByTagName('html')[0]; + var deviceWidth = document.documentElement.clientWidth; + var scale = deviceWidth / 1920;//psd图上的宽度 + html.style.fontSize = scale * 100 + 'px'; +} + +setPage(); + +window.onresize = function () { + setPage(); +} diff --git a/src/main/resources/templates/index/index.html b/src/main/resources/templates/index/index.html index 1138241..b530664 100644 --- a/src/main/resources/templates/index/index.html +++ b/src/main/resources/templates/index/index.html @@ -4,81 +4,31 @@ - - - + + + -
-
-
-
- - -

-
+
+
+ + +
+ -
-
-
-
- - - - \ No newline at end of file