Merge branch 'dev' into dev-simple-flow

# Conflicts:
#	src/main/java/platform/config/SwaggerConfig.java
#	src/main/java/platform/modules/build/entity/Company.java
#	src/main/java/platform/modules/home/request/FindRequest.java
#	src/main/resources/application-aliyun.yml
#	src/main/resources/application-prodin.yml
#	src/main/resources/application-prodout.yml
#	src/main/resources/application-test.yml

src/main/java/platform/modules/build/entity/Company.java

@@ -66,7 +66,8 @@ public class Company extends BaseEntity {
 
     private String password;//注册密码
     @Transient
-    private String confirm_password;// 确认密码
+    private String confirm_password;//注册密码
+
     private Integer is_register;//0,未通过，1.已通过
 
     @Transient

src/main/java/platform/modules/home/request/FindRequest.java

@@ -17,8 +17,8 @@ public class FindRequest {
     // 页索引
     private int page_no = 1;
     // 页大小
-    private int pageSize = 10;
-    private Integer page_size;
+    private int page_size = 10;
+    private Integer pageSize = 10;
 
     private Integer company_id;
     private Integer street_id;
@@ -60,4 +60,8 @@ public class FindRequest {
     public int getStart() {
         return ((this.getPage_number() - 1) * this.getPageSize());
     }
+
+    public int getPage_size() {
+        return this.page_size > 0? this.page_size: this.getPageSize();
+    }
 }

src/main/java/platform/modules/sys/shiro/AuthenticationRealm.java

@@ -85,7 +85,7 @@ public class AuthenticationRealm extends AuthorizingRealm {
                 throw new UnknownAccountException();
             }
         }
-        //外网（super，政府，不能外网登录）
+        ///content/list外网（super，政府，不能外网登录）
         else if (environment.getProperty("spring.profiles").equals(Constant.Environment.PROD_OUT)) {
             /*if (record.getUser_type().equals(Constant.UserType.SUPER)) {
                 throw new UnknownAccountException();

src/main/resources/application-aliyun.yml

@@ -224,3 +224,4 @@ referer:
     - 47.105.241.108
     - escloud.wisdom-eye.cn
     - static.bshare.cn
+    - kcb.ideatob.com

src/main/resources/application-prodin.yml

@@ -224,4 +224,6 @@ referer:
     - www.szetc.gov.cn
     - www.snd.gov.cn
     - escloud.wisdom-eye.cn
-    - 10.44.104.41
+    - 10.44.104.41
+    - kcb.ideatob.com
+    - itgp-is.snd.gov

src/main/resources/application-prodout.yml

@@ -229,3 +229,4 @@ referer:
     - 10.44.104.41
     - escloud.wisdom-eye.cn
     - static.bshare.cn
+    - kcb.ideatob.com

src/main/resources/application-test.yml

@@ -219,4 +219,5 @@ referer:
     - credit.snd.gov.cn
     - www.szetc.gov.cn
     - www.snd.gov.cn
-    - static.bshare.cn
+    - static.bshare.cn
+    - kcb.ideatob.com

src/main/resources/static/js/company/project_application/apply_list.js

@@ -3,15 +3,19 @@ $(function () {
     var year=new Date().getFullYear(); //获取当前年份
 
     var sel = document.getElementById ('project_year');//获取select下拉列表
-    for ( var i = 2018; i < year+3; i++)//循环添加2006到当前年份加3年的每个年份依次添加到下拉列表
-    {
-        var option = document.createElement ('option');
-        option.value = i;
-        var txt = document.createTextNode (i);
-        option.appendChild (txt);
-        sel.appendChild (option);
+    if (sel) {
+        for ( var i = 2018; i < year+3; i++)//循环添加2006到当前年份加3年的每个年份依次添加到下拉列表
+        {
+            var option = document.createElement ('option');
+            option.value = i;
+            var txt = document.createTextNode (i);
+            option.appendChild (txt);
+            sel.appendChild (option);
+        }
     }
 
+
+
     var selectYear = $("#project_year_date").val();
     console.log(selectYear);
     if (selectYear){

src/main/resources/static/js/government/content/content_add.js

@@ -1,4 +1,24 @@
 $(function () {
+       var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        var isOpera = userAgent.indexOf("Opera") > -1;
+        console.log(3);
+        if (userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1 && !isOpera) {
+            console.log(1);
+            debugger
+            $("#create_time").remove();
+        } else {
+            console.log(2);
+            $("#create_timeIE").remove();
+            var startDate = laydate.render({
+                elem: '#create_time',
+                type: 'datetime',
+                done: function (value, date) {
+                    setTimeout(function () {
+                        $("#form-content-edit").validate().element($("#create_time"));
+                    }, 100)
+                }
+            });
+        }
     $("#form-content-add").validate({
         errorPlacement: function(error, element) {
             // Append error within linked label

src/main/resources/static/js/government/content/content_edit.js

@@ -1,4 +1,24 @@
 $(function () {
+       var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        var isOpera = userAgent.indexOf("Opera") > -1;
+        console.log(3);
+        if (userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1 && !isOpera) {
+            console.log(1);
+            debugger
+            $("#create_time").remove();
+        } else {
+            console.log(2);
+            $("#create_timeIE").remove();
+            var startDate = laydate.render({
+                elem: '#create_time',
+                type: 'datetime',
+                done: function (value, date) {
+                    setTimeout(function () {
+                        $("#form-content-edit").validate().element($("#create_time"));
+                    }, 100)
+                }
+            });
+        }
     $("#form-content-edit").validate({
         
         rules: {

src/main/resources/templates/admin/government/content_add.html

@@ -122,7 +122,16 @@
 			        </table>
 	        </div>
         </div>
-
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>发布时间：</label>
+            <div class="formControls col-xs-4 col-sm-1">
+                <input class="Wdate input-text" type="text" th:id="create_timeIE" th:name="create_timeIE"
+                       style="float:left; width: 150px;"
+                       onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'#F{$dp.$D(\'create_timeIE\')}',isShowClear:true,readOnly:true})"/>
+                <input type="text" class="input-text" th:id="create_time" th:name="create_time"
+                       style="float:left; width: 150px;"/>
+            </div>
+        </div>
         <div class="row cl">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                 <button class="btn btn-primary radius" type="submit"><i class="Hui-iconfont">&#xe632;</i> 发布</button>

src/main/resources/templates/admin/government/content_edit.html

@@ -115,7 +115,16 @@
 			        </table>
 	        </div>
         </div>
-
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>发布时间：</label>
+            <div class="formControls col-xs-4 col-sm-1">
+                <input class="Wdate input-text" type="text" th:id="create_timeIE" th:name="create_timeIE"
+                       style="float:left; width: 150px;"
+                       onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'#F{$dp.$D(\'create_timeIE\')}',isShowClear:true,readOnly:true})"/>
+                <input type="text" class="input-text" th:id="create_time" th:name="create_time" th:value="${content.create_time}"
+                       style="float:left; width: 150px;"/>
+            </div>
+        </div>
         <div class="row cl">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                 <button class="btn btn-primary radius" type="submit"><i class="Hui-iconfont">&#xe632;</i> 发布</button>