代表联系选民

常委会联系选民

pom.xml

@@ -66,6 +66,12 @@
             <version>${hutool.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.6</version>
+        </dependency>
+
         <!--swagger-->
         <dependency>
             <groupId>com.github.xiaoymin</groupId>

src/main/java/com/ydool/boot/api/controller/ApiUploadController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.ydool.boot.common.result.Ret;
 import com.ydool.boot.core.web.BaseController;
 import com.ydool.boot.modules.sys.service.FileService;
+import com.ydool.boot.modules.sys.util.FileUploadUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
@@ -42,7 +43,15 @@ public class ApiUploadController extends BaseController {
             if (Pattern.matches(reg, file.getOriginalFilename())) {
                 render(Ret.fail("不能上传后缀为" + suffix + "的文件"));
             }
-            String str = fileService.uploadFile(file);
+
+//            String str = fileService.uploadFile(file);
+            String str = null;
+            try {
+                str = FileUploadUtils.uploadToMinio(file);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+
             if (StrUtil.isNotBlank(str)) {
                 pathList.add(str);
             }

src/main/resources/application.properties

@@ -1,19 +1,20 @@
 #online
-#db.user = ydool_rd
+db.user = root
-#db.pass = MfaSPabGrDmPtET@123
+db.pass = zhujg@1985
-#db.url = jdbc:mysql://122.112.138.17:3306/ydool_rd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8
+db.url = jdbc:mysql://10.74.41.76:3306/ydool_rd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8
-#db.driver = com.mysql.cj.jdbc.Driver
+db.driver = com.mysql.cj.jdbc.Driver
 
 #local
-db.user = root
+#db.user = root
-db.pass = Wang09211108
+#db.pass = Wang09211108
-db.url = jdbc:mysql://127.0.0.1:3306/ydool_rd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8
+#db.url = jdbc:mysql://127.0.0.1:3306/ydool_rd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8
-db.driver = com.mysql.cj.jdbc.Driver
+#db.driver = com.mysql.cj.jdbc.Driver
 
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB
 
-spring.redis.host=127.0.0.1
+#spring.redis.host=127.0.0.1
+spring.redis.host=10.74.41.76
 
 ydool.path=/admin
 ydool.homeUrl=/page
@@ -23,5 +24,6 @@ ydool.skipAuthUrls[0] = /admin/static/**
 
 sys.dingding.appId=xsxrd-9Co165el68GX05Hue4rYBnai
 sys.dingding.appSecret=LG7h696OCtuyjUeoBg1m2QANtBi546WpYs58TcGd
+sys.fileUploadUrl=http://10.74.41.76:9999/usr/local/upload/upload
 
 refer=localhost

src/main/resources/logback-spring.xml

@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--        log4j提供了4种日志级别和2个日志开关。-->
+
+<!--        DEBUG：输出调试信息；指出细粒度信息事件对调试应用程序是非常有帮助的。-->
+<!--        INFO： 输出提示信息；消息在粗粒度级别上突出强调应用程序的运行过程。-->
+<!--        WARN： 输出警告信息；表明会出现潜在错误的情形。-->
+<!--        ERROR：输出错误信息；指出虽然发生错误事件，但仍然不影响系统的继续运行。-->
+<!--        FATAL： 输出致命错误；指出每个严重的错误事件将会导致应用程序的退出。-->
+<!--        ALL level：打开所有日志记录开关；是最低等级的，用于打开所有日志记录。-->
+<!--        OFF level：关闭所有日志记录开关；是最高等级的，用于关闭所有日志记录。-->
+
+<!--        按照范围从小到大排序：OFF level > FATAL > ERROR > WARN > INFO > DEBUG > ALL level；范围大的会包含范围小的，例如日志设置为INFO级别的话则FATAL、ERROR、WARN、INFO的日志开关都是打开的，而DEBUG的日志开关将是关闭的。-->
+
+<!--        Log4j建议只使用四个级别，优先级从高到低分别是 ERROR、WARN、INFO、DEBUG。-->
+
 <!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，比如: 如果设置为WARN，则低于WARN的信息都不会输出 -->
 <!-- scan:当此属性设置为true时，配置文档如果发生改变，将会被重新加载，默认值为true -->
 <!-- scanPeriod:设置监测配置文档是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
@@ -207,7 +221,7 @@
             <appender-ref ref="ERROR_FILE" />
             <appender-ref ref="ALL_FILE" />
         </root>
-        <logger name="com.xusanduo.demo" level="debug"/> <!-- 开发环境, 指定某包日志为debug级 -->
+                <logger name="com.ydool.boot" level="debug"/> <!-- 开发环境, 指定某包日志为debug级 -->
     </springProfile>
 
     <springProfile name="test">
@@ -222,9 +236,10 @@
                 <logger name="com.ydool.boot" level="info"/> <!-- 测试环境, 指定某包日志为info级 -->
     </springProfile>
 
-    <springProfile name="pro">
+    <springProfile name="prod">
         <root level="info">
             <!-- 生产环境最好不配置console写文件 -->
+            <appender-ref ref="CONSOLE" />
             <appender-ref ref="DEBUG_FILE" />
             <appender-ref ref="INFO_FILE" />
             <appender-ref ref="WARN_FILE" />
@@ -236,3 +251,4 @@
     </springProfile>
 
 </configuration>
+

src/main/resources/views/dist/css/chunk-0371e800.1ca32a04.css

@@ -1 +0,0 @@
-.van-pagination[data-v-8eef6996]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.van-tag[data-v-8eef6996]{margin-right:.42667rem}.box[data-v-8eef6996]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .imgaddBtn[data-v-8eef6996]{position:fixed;bottom:26%;right:0}.box .imgaddBtn .imgdiv[data-v-8eef6996]{height:2.4rem;margin-top:.26667rem;z-index:50;opacity:.9}.box .imgaddBtn .imgdiv .add[data-v-8eef6996]{width:2.72rem;z-index:999}.box .imgaddBtn .imgtext[data-v-8eef6996]{font-size:.42667rem;text-align:center}.box[data-v-8eef6996] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-8eef6996]{padding:.32rem}.box .tab-contain .van-cell[data-v-8eef6996]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-8eef6996]{font-size:.42667rem}.box .tab-contain .van-cell .van-icon[data-v-8eef6996]{color:#333}

src/main/resources/views/dist/css/chunk-0e5ae20e.25aac624.css

@@ -1 +0,0 @@
-.news[data-v-1ee7323f]{margin:0 .42667rem;border-bottom:.02667rem solid #f3f3f3}.news[data-v-1ee7323f]:last-of-type{border-bottom:none}.news .newList2[data-v-1ee7323f]{padding:.42667rem 0}.news .newList2 .top[data-v-1ee7323f]{font-size:.37333rem;color:#333;line-height:.58667rem;font-weight:700}.news .newList2 .imgarr[data-v-1ee7323f]{display:flex;margin-top:.21333rem}.news .newList2 .imgarr img[data-v-1ee7323f]{width:30%;margin-right:3%;height:auto;-o-object-fit:cover;object-fit:cover}.news .newList2 .newdate[data-v-1ee7323f]{font-size:.32rem;color:#999;line-height:.45333rem;margin-top:.21333rem}.news .newList[data-v-1ee7323f]{display:flex;justify-content:space-between;padding:.42667rem 0}.news .newList .newleft[data-v-1ee7323f]{display:flex;flex-direction:column;justify-content:space-between}.news .newList .newleft .newtitle[data-v-1ee7323f]{font-size:.37333rem;color:#333;line-height:.58667rem;font-weight:700}.news .newList .newleft .newdate[data-v-1ee7323f]{font-size:.32rem;color:#999;line-height:.45333rem;margin-top:.10667rem}.news .newList .newimg[data-v-1ee7323f]{margin-left:.26667rem;width:3.33333rem;height:2.24rem;-o-object-fit:cover;object-fit:cover}.muloverellipse[data-v-1ee7323f]{word-break:break-all;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden}.notice[data-v-1ee7323f]{min-height:100%;background-color:#fff;display:flex;flex-direction:column;overflow:auto}.list[data-v-1ee7323f]{flex:1}.list .item[data-v-1ee7323f]{position:relative;padding:.53333rem .42667rem;display:flex;align-items:center}.list .item[data-v-1ee7323f]:not(:last-child):after{content:"";position:absolute;bottom:0;left:.42667rem;right:.42667rem;height:.02667rem;background-color:#f3f3f3}.list .item .tag[data-v-1ee7323f]{margin-right:.10667rem;border-radius:.21333rem;font-size:.26667rem;vertical-align:middle}.list .item .title[data-v-1ee7323f]{flex:1;font-size:.37333rem;color:#333;line-height:.53333rem;font-weight:700}.list .item .icon[data-v-1ee7323f]{margin-left:.8rem;font-size:.32rem}.imgaddBtn[data-v-1ee7323f]{position:fixed;bottom:26%;right:0}.imgaddBtn .imgdiv[data-v-1ee7323f]{height:2.4rem;margin-top:.26667rem;z-index:50;opacity:.9}.imgaddBtn .imgdiv .add[data-v-1ee7323f]{width:2.72rem;z-index:999}.imgaddBtn .imgtext[data-v-1ee7323f]{font-size:.42667rem;text-align:center}

src/main/resources/views/dist/css/chunk-1492a2b3.00ad376c.css

@@ -1 +0,0 @@
-.van-pagination[data-v-519dec04]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.van-tag[data-v-519dec04]{margin-right:.42667rem}.box[data-v-519dec04]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .add[data-v-519dec04]{width:2.13333rem;height:2.13333rem;position:fixed;right:.32rem;bottom:20%}.box[data-v-519dec04] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-519dec04]{padding:.32rem}.box .tab-contain .van-cell[data-v-519dec04]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-519dec04]{font-size:.42667rem}.box .tab-contain .van-cell .van-icon[data-v-519dec04]{color:#333}

src/main/resources/views/dist/css/chunk-4b1dd904.88a9ff25.css

@@ -0,0 +1 @@
+.van-pagination[data-v-2043240b]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.van-tag[data-v-2043240b]{margin-right:.42667rem}.box[data-v-2043240b]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .imgaddBtn[data-v-2043240b]{position:fixed;bottom:26%;right:0}.box .imgaddBtn .imgdiv[data-v-2043240b]{height:2.4rem;margin-top:.26667rem;z-index:50;opacity:.9}.box .imgaddBtn .imgdiv .add[data-v-2043240b]{width:2.72rem;z-index:999}.box .imgaddBtn .imgtext[data-v-2043240b]{font-size:.42667rem;text-align:center}.box[data-v-2043240b] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-2043240b]{padding:.32rem}.box .tab-contain .van-cell[data-v-2043240b]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-2043240b]{font-size:.42667rem}.box .tab-contain .van-cell .van-icon[data-v-2043240b]{color:#333}.box .dan_delete[data-v-2043240b]{margin-left:.21333rem}

src/main/resources/views/dist/css/chunk-4b2225ec.fdc43385.css

@@ -0,0 +1 @@
+.van-pagination[data-v-eaf97e24]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.van-tag[data-v-eaf97e24]{margin-right:.42667rem}.box[data-v-eaf97e24]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .imgaddBtn[data-v-eaf97e24]{position:fixed;bottom:26%;right:0}.box .imgaddBtn .imgdiv[data-v-eaf97e24]{height:2.4rem;margin-top:.26667rem;z-index:50;opacity:.9}.box .imgaddBtn .imgdiv .add[data-v-eaf97e24]{width:2.72rem;z-index:999}.box .imgaddBtn .imgtext[data-v-eaf97e24]{font-size:.42667rem;text-align:center}.box[data-v-eaf97e24] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-eaf97e24]{padding:.32rem}.box .tab-contain .van-cell[data-v-eaf97e24]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-eaf97e24]{font-size:.42667rem}.box .tab-contain .van-cell .van-icon[data-v-eaf97e24]{color:#333}.dan_delete[data-v-eaf97e24]{margin-left:.21333rem}

src/main/resources/views/dist/css/chunk-4e3c9e06.ffe179ff.css

@@ -0,0 +1 @@
+.van-pagination[data-v-6d677464]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.van-tag[data-v-6d677464]{margin-right:.42667rem}.box[data-v-6d677464]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .imgaddBtn[data-v-6d677464]{position:fixed;bottom:26%;right:0}.box .imgaddBtn .imgdiv[data-v-6d677464]{height:2.4rem;margin-top:.26667rem;z-index:50;opacity:.9}.box .imgaddBtn .imgdiv .add[data-v-6d677464]{width:2.72rem;z-index:999}.box .imgaddBtn .imgtext[data-v-6d677464]{font-size:.42667rem;text-align:center}.box[data-v-6d677464] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-6d677464]{padding:.32rem}.box .tab-contain .van-cell[data-v-6d677464]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-6d677464]{font-size:.42667rem}.box .tab-contain .van-cell .van-icon[data-v-6d677464]{color:#333}

src/main/resources/views/dist/css/chunk-5d8ba327.f44700c4.css

@@ -1 +0,0 @@
-.van-pagination[data-v-71f39b4a]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.van-tag[data-v-71f39b4a]{margin-right:.42667rem}.box[data-v-71f39b4a]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .imgaddBtn[data-v-71f39b4a]{position:fixed;bottom:26%;right:0}.box .imgaddBtn .imgdiv[data-v-71f39b4a]{height:2.4rem;margin-top:.26667rem;z-index:50;opacity:.9}.box .imgaddBtn .imgdiv .add[data-v-71f39b4a]{width:2.72rem;z-index:999}.box .imgaddBtn .imgtext[data-v-71f39b4a]{font-size:.42667rem;text-align:center}.box[data-v-71f39b4a] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-71f39b4a]{padding:.32rem}.box .tab-contain .van-cell[data-v-71f39b4a]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-71f39b4a]{font-size:.42667rem}.box .tab-contain .van-cell .van-icon[data-v-71f39b4a]{color:#333}

src/main/resources/views/dist/css/chunk-cb0a5e72.9c34d952.css

@@ -0,0 +1 @@
+.news[data-v-22a2a772]{margin:0 .42667rem;border-bottom:.02667rem solid #f3f3f3}.news[data-v-22a2a772]:last-of-type{border-bottom:none}.news .newList2[data-v-22a2a772]{padding:.42667rem 0}.news .newList2 .top[data-v-22a2a772]{font-size:.37333rem;color:#333;line-height:.58667rem;font-weight:700}.news .newList2 .imgarr[data-v-22a2a772]{display:flex;margin-top:.21333rem}.news .newList2 .imgarr img[data-v-22a2a772]{width:30%;margin-right:3%;height:auto;-o-object-fit:cover;object-fit:cover}.news .newList2 .newdate[data-v-22a2a772]{font-size:.32rem;color:#999;line-height:.45333rem;margin-top:.21333rem}.news .newList[data-v-22a2a772]{display:flex;justify-content:space-between;padding:.42667rem 0}.news .newList .newleft[data-v-22a2a772]{display:flex;flex-direction:column;justify-content:space-between}.news .newList .newleft .newtitle[data-v-22a2a772]{font-size:.37333rem;color:#333;line-height:.58667rem;font-weight:700}.news .newList .newleft .newdate[data-v-22a2a772]{font-size:.32rem;color:#999;line-height:.45333rem;margin-top:.10667rem}.news .newList .newimg[data-v-22a2a772]{margin-left:.26667rem;width:3.33333rem;height:2.24rem;-o-object-fit:cover;object-fit:cover}.muloverellipse[data-v-22a2a772]{word-break:break-all;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden}.notice[data-v-22a2a772]{min-height:100%;background-color:#fff;display:flex;flex-direction:column;overflow:auto}.list[data-v-22a2a772]{flex:1}.list .item[data-v-22a2a772]{position:relative;padding:.53333rem .42667rem;display:flex;align-items:center}.list .item[data-v-22a2a772]:not(:last-child):after{content:"";position:absolute;bottom:0;left:.42667rem;right:.42667rem;height:.02667rem;background-color:#f3f3f3}.list .item .tag[data-v-22a2a772]{margin-right:.10667rem;border-radius:.21333rem;font-size:.26667rem;vertical-align:middle}.list .item .title[data-v-22a2a772]{flex:1;font-size:.37333rem;color:#333;line-height:.53333rem;font-weight:700}.list .item .icon[data-v-22a2a772]{margin-left:.8rem;font-size:.32rem}.imgaddBtn[data-v-22a2a772]{position:fixed;bottom:26%;right:0}.imgaddBtn .imgdiv[data-v-22a2a772]{height:2.4rem;margin-top:.26667rem;z-index:50;opacity:.9}.imgaddBtn .imgdiv .add[data-v-22a2a772]{width:2.72rem;z-index:999}.imgaddBtn .imgtext[data-v-22a2a772]{font-size:.42667rem;text-align:center}

src/main/resources/views/dist/js/chunk-cb0a5e72.5752d4ce.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-cb0a5e72"],{"0be8":function(t,a,e){},"6f8e":function(t,a,e){t.exports=e.p+"img/icon_add.dae54178.png"},a074:function(t,a,e){"use strict";var i=e("0be8"),s=e.n(i);s.a},ab43:function(t,a,e){"use strict";e.r(a);var i=function(){var t=this,a=t.$createElement,i=t._self._c||a;return i("div",{staticClass:"notice"},[i("nav-bar",{attrs:{"left-arrow":"",title:t.navtitle}}),i("van-tabs",{on:{change:t.changeTab},model:{value:t.active,callback:function(a){t.active=a},expression:"active"}},[i("van-tab",{attrs:{title:"通知"}}),i("van-tab",{attrs:{title:"公告"}})],1),i("div",{staticClass:"list"},t._l(t.list,(function(a){return i("div",{key:a.id,staticClass:"item",on:{click:function(e){return t.to("/notice/detail?id="+a.id+"&diff="+t.diff)}}},[i("div",{staticClass:"title"},[a.top?i("van-tag",{staticClass:"tag",attrs:{color:"#D03A29",plain:"",type:"primary"}},[t._v("置顶")]):t._e(),t._v(" "+t._s(a.title)+" ")],1),i("van-icon",{staticClass:"icon",attrs:{name:"arrow"}})],1)})),0),0!=t.list.length&&"1"==this.diff?i("van-pagination",{attrs:{"total-items":t.total,"items-per-page":t.pageSize,mode:"simple"},on:{change:t.getzwlist},model:{value:t.pageNo,callback:function(a){t.pageNo=a},expression:"pageNo"}}):t._e(),0==t.list.length||this.diff?t._e():i("van-pagination",{attrs:{"total-items":t.total,"items-per-page":t.pageSize,mode:"simple"},on:{change:t.getData},model:{value:t.pageNo,callback:function(a){t.pageNo=a},expression:"pageNo"}}),"admin"==t.usertype||"township"==t.usertype?i("div",{staticClass:"imgaddBtn"},[i("div",{staticClass:"imgdiv"},[i("img",{staticClass:"add",attrs:{src:e("6f8e"),alt:""},on:{click:function(a){return t.to("/notice/add?type="+(t.active,"tz"))}}})]),0==this.active?i("div",{staticClass:"imgtext"},[t._v("新增通知")]):t._e(),0!=this.active?i("div",{staticClass:"imgtext"},[t._v("新增公告")]):t._e()]):t._e()],1)},s=[],n=e("0c6d"),o={data(){return{usertype:localStorage.getItem("usertype"),list:[],pageNo:1,pageSize:10,total:0,diff:this.$route.query.diff||"",navtitle:"",loading:!1,finished:!1,active:1}},created(){this.usertype=localStorage.getItem("usertype"),this.navtitle="通知公告",this.getData()},methods:{to(t){this.$router.push(t)},getData(){this.$toast.loading({message:"正在加载...",duration:0,forbidClick:!0}),Object(n["Y"])({pageNo:this.pageNo,pageSize:this.pageSize,platform:localStorage.getItem("usertype"),type:0==this.active?"tz":"gg"}).then(t=>{1==t.data.state?(this.$toast.clear(),this.list=t.data.data,this.total=t.data.count):this.$toast.fail(t.data.msg)}).catch(()=>{this.$toast.fail("加载失败")})},changeTab(){this.getData()}}},c=o,l=(e("a074"),e("ad43"),e("2877")),r=Object(l["a"])(c,i,s,!1,null,"22a2a772",null);a["default"]=r.exports},ad43:function(t,a,e){"use strict";var i=e("ecdb"),s=e.n(i);s.a},ecdb:function(t,a,e){}}]);