Merge branch 'main' of E:\workspace-nice\system-partybuilding with conflicts.

src/main/resources/application-prod.yml

@@ -0,0 +1,152 @@
+server:
+  port: 8085
+  url: http://192.168.0.111:8085/partybuilding
+  title: 包头党建
+  servlet:
+    context-path: /partybuilding
+
+spring:
+  thymeleaf:
+    prefix: classpath:/templates/
+    suffix: .html
+    mode: HTML5
+    encoding: UTF-8
+    cache: false
+  main:
+    allow-bean-definition-overriding: true
+  servlet:
+    multipart:
+      max-file-size: 1GB
+      max-request-size: 1GB
+  datasource:
+    druid:
+      url: jdbc:mysql://127.0.0.1:3306/db_party?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+      db-type: mysql
+      driver-class-name: com.mysql.jdbc.Driver
+      username: root
+      password: 123456
+      initial-size: 2
+      min-idle: 2
+      max-active: 5
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      validation-query: SELECT 1 FROM DUAL
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      pool-prepared-statements: true
+      max-pool-prepared-statement-per-connection-size: 10
+      filter:
+        commons-log:
+          connection-logger-name: stat,wall,log4j
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 2000
+      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      use-global-data-source-stat: true
+
+# 数据库
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+  mapper-locations: classpath*:mybatis/mapper/**/*.xml
+
+# 文档
+swagger:
+  title: 接口文档
+  description: 文化活动管理系统接口文档
+  service-url: https://baidu.com/
+  version: 1.0
+  swagger-base-package: com.cm
+
+# 文件
+file:
+  uploadPath: /Users/wenc/Desktop/filetest
+  imageTypes: png,jpg,jpeg,gif,blob
+  videoTypes: mp4,rmvb
+  audioTypes: mp3,wmv
+  fileTypes: doc,docx,xls,xlsx,ppt,pptx,txt,zip,rar,apk,pdf
+  maxFileCount: 6
+
+# 安全
+security:
+  oauth2:
+    oauth-server: http://49.233.36.36:8868/usercenter
+    oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
+    client:
+      client-id: bdbc8252b02d48abb42a800774e02ef8
+      client-secret: ZUl5bjJ5enNJSk9zMEVxSFRGYkttTzd4aWs3eDVDRVpvYjJ4VC9Rem1Gc21ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
+      user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize
+      access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token
+      grant-type: authorization_code
+    resource:
+      jwt:
+        key-uri: ${security.oauth2.oauth-server}/oauth_client/token_key
+      token-info-uri: ${security.oauth2.oauth-server}/oauth_client/check_token
+      user-info-uri: ${security.oauth2.oauth-server}/user
+    authorization:
+      check-token-access: ${security.oauth2.oauth-server}/oauth_client/token_key
+
+api-path:
+  user-center: ${security.oauth2.oauth-server}
+
+# 访问控制
+access-control:
+  pass-paths:
+    - /index.html
+    - /logout.html
+    - /default.html
+    - /assets/**
+    - /route/file/downloadfile/**
+  save-paths:
+    - /**/save*/**
+    - /**/add*/**
+  delete-paths:
+    - /**/delete*/**
+    - /**/remove*/**
+  update-paths:
+    - /**/update*/**
+    - /**/edit*/**
+  query-paths:
+    - /**/get*/**
+    - /**/query*/**
+    - /**/find*/**
+    - /**/list*/**
+    - /**/count*/**
+
+# 日志
+logging:
+  level:
+    root: error
+    com.cm: debug
+
+
+sms:  # default, tencent
+  type: default
+  default-sms:
+    account: xzrkz
+    password: xzrkz123
+    sign: 【日喀则文化馆】
+    template:
+      verification-code: '{sign} 您的验证码为 {content}, 有效时间为120秒，若非本人操作，请忽略。'
+#
+#socket:
+#  central-control:
+#    # 是否激活
+#    active: true
+#    client:
+#      client-id: 0bb6776b-b795-450c-9d33-f9fb0d42ccf5
+#      client-secret: HoC9QbN5iqyx6C49tyFenLXkFDMR+LqrzKRTza7JYmWSqDpkOp4JD59Q7RRjPHly
+#      host: 49.233.36.36
+#      port: 8888
+#      # 最大重连次数
+#      max-reconnect-count: 20
+#      # 重连时间差
+#      reconnect-time-step: 1
+#      # 心跳时间
+#      delay-ping-seconds: 3
+#      # 开启上报服务器数据
+#      send-client-info-active: false
+#      # 上报服务器数据时间
+#      send-client-info-second: 30
+

src/main/resources/application-test.yml

@@ -0,0 +1,152 @@
+server:
+  port: 8085
+  url: http://192.168.0.111:8085/partybuilding
+  title: 包头党建
+  servlet:
+    context-path: /partybuilding
+
+spring:
+  thymeleaf:
+    prefix: classpath:/templates/
+    suffix: .html
+    mode: HTML5
+    encoding: UTF-8
+    cache: false
+  main:
+    allow-bean-definition-overriding: true
+  servlet:
+    multipart:
+      max-file-size: 1GB
+      max-request-size: 1GB
+  datasource:
+    druid:
+      url: jdbc:mysql://127.0.0.1:3306/db_party?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+      db-type: mysql
+      driver-class-name: com.mysql.jdbc.Driver
+      username: root
+      password: 123456
+      initial-size: 2
+      min-idle: 2
+      max-active: 5
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      validation-query: SELECT 1 FROM DUAL
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      pool-prepared-statements: true
+      max-pool-prepared-statement-per-connection-size: 10
+      filter:
+        commons-log:
+          connection-logger-name: stat,wall,log4j
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 2000
+      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      use-global-data-source-stat: true
+
+# 数据库
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+  mapper-locations: classpath*:mybatis/mapper/**/*.xml
+
+# 文档
+swagger:
+  title: 接口文档
+  description: 文化活动管理系统接口文档
+  service-url: https://baidu.com/
+  version: 1.0
+  swagger-base-package: com.cm
+
+# 文件
+file:
+  uploadPath: /Users/wenc/Desktop/filetest
+  imageTypes: png,jpg,jpeg,gif,blob
+  videoTypes: mp4,rmvb
+  audioTypes: mp3,wmv
+  fileTypes: doc,docx,xls,xlsx,ppt,pptx,txt,zip,rar,apk,pdf
+  maxFileCount: 6
+
+# 安全
+security:
+  oauth2:
+    oauth-server: http://49.233.36.36:8868/usercenter
+    oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
+    client:
+      client-id: bdbc8252b02d48abb42a800774e02ef8
+      client-secret: ZUl5bjJ5enNJSk9zMEVxSFRGYkttTzd4aWs3eDVDRVpvYjJ4VC9Rem1Gc21ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
+      user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize
+      access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token
+      grant-type: authorization_code
+    resource:
+      jwt:
+        key-uri: ${security.oauth2.oauth-server}/oauth_client/token_key
+      token-info-uri: ${security.oauth2.oauth-server}/oauth_client/check_token
+      user-info-uri: ${security.oauth2.oauth-server}/user
+    authorization:
+      check-token-access: ${security.oauth2.oauth-server}/oauth_client/token_key
+
+api-path:
+  user-center: ${security.oauth2.oauth-server}
+
+# 访问控制
+access-control:
+  pass-paths:
+    - /index.html
+    - /logout.html
+    - /default.html
+    - /assets/**
+    - /route/file/downloadfile/**
+  save-paths:
+    - /**/save*/**
+    - /**/add*/**
+  delete-paths:
+    - /**/delete*/**
+    - /**/remove*/**
+  update-paths:
+    - /**/update*/**
+    - /**/edit*/**
+  query-paths:
+    - /**/get*/**
+    - /**/query*/**
+    - /**/find*/**
+    - /**/list*/**
+    - /**/count*/**
+
+# 日志
+logging:
+  level:
+    root: error
+    com.cm: debug
+
+
+sms:  # default, tencent
+  type: default
+  default-sms:
+    account: xzrkz
+    password: xzrkz123
+    sign: 【日喀则文化馆】
+    template:
+      verification-code: '{sign} 您的验证码为 {content}, 有效时间为120秒，若非本人操作，请忽略。'
+#
+#socket:
+#  central-control:
+#    # 是否激活
+#    active: true
+#    client:
+#      client-id: 0bb6776b-b795-450c-9d33-f9fb0d42ccf5
+#      client-secret: HoC9QbN5iqyx6C49tyFenLXkFDMR+LqrzKRTza7JYmWSqDpkOp4JD59Q7RRjPHly
+#      host: 49.233.36.36
+#      port: 8888
+#      # 最大重连次数
+#      max-reconnect-count: 20
+#      # 重连时间差
+#      reconnect-time-step: 1
+#      # 心跳时间
+#      delay-ping-seconds: 3
+#      # 开启上报服务器数据
+#      send-client-info-active: false
+#      # 上报服务器数据时间
+#      send-client-info-second: 30
+

src/main/resources/static/route/partymemberorganize/list-partymemberorganize.html

@@ -15,7 +15,7 @@
     <div class="layui-row">
         <div class="layui-col-md12">
             <div class="layui-card">
-                <div class="layui-card-body">
+                <div class="layui-card-body" id="dataTableBox">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
                             <input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
@@ -72,6 +72,8 @@
         var common = layui.common;
         var resizeTimeout = null;
         var tableUrl = 'api/partymemberorganize/listpagepartymemberorganize';
+        var viewer = new Viewer(document.getElementById("dataTableBox"), {navbar: false});
+        var initImageTimeout;
 
         // 初始化表格
         function initTable() {
@@ -91,21 +93,20 @@
                 cols: [[
                     {type:'checkbox', fixed: 'left'},
                     {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
-                    {field: 'photo', width: 150, title: '照片', align:'center',
+                    {field: 'photo', width: 150, title: '照片', align:'center', event: 'photo',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
                                 return '-';
                             }
-                            var downloadFile = '';
+                            var img = '<img id="' + rowData + '" src="route/file/downloadfile/false/' + rowData  + '" align="加载失败" lay-event="photoEvent">';
-                            var datas = rowData.split(',');
+                            if(initImageTimeout) {
-                            for(var i = 0, item = datas[i]; item = datas[i++];) {
+                                clearTimeout(initImageTimeout);
-                                if(downloadFile.length > 0) {
-                                    downloadFile += ' | ';
-                                }
-                                downloadFile += '<a href="route/file/downloadfile/false/'+ item +'" target="_blank">点击下载</a>'
                             }
-                            return downloadFile;
+                            initImageTimeout = setTimeout(function() {
+                                viewer.update();
+                            }, 500);
+                            return img;
                         }
                     },
                     {field: 'belongPartyOrganizeName', width: 150, title: '所属党组织', align:'center',
@@ -247,6 +248,7 @@
                 }
             });
         }
+
         // 重载表格
         function reloadTable(currentPage) {
             top.dialog.dialogData.toNow = '';