From b47f55f9b63f1ab8fd03e3ad5196ebd096ad20fd Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Tue, 6 Sep 2022 11:54:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 26 ---- src/main/resources/application-btyj.yml | 128 ++++++++++++++++++ src/main/resources/application-prod.yml | 60 +------- src/main/resources/application-test.yml | 107 +-------------- .../route/system/user/save-department.html | 3 - 5 files changed, 136 insertions(+), 188 deletions(-) create mode 100644 src/main/resources/application-btyj.yml diff --git a/pom.xml b/pom.xml index c4518a1..b5306ac 100644 --- a/pom.xml +++ b/pom.xml @@ -95,24 +95,6 @@ provided - - - - - - - - - - - - - - - - - - org.apache.xmlbeans xmlbeans @@ -120,14 +102,6 @@ compile - - - - - - - - diff --git a/src/main/resources/application-btyj.yml b/src/main/resources/application-btyj.yml new file mode 100644 index 0000000..eee4388 --- /dev/null +++ b/src/main/resources/application-btyj.yml @@ -0,0 +1,128 @@ +server: + port: 7011 + url: http://1.180.60.42:8084/usercenter + ws: ws://1.180.60.42:8084/usercenter/ws + title: 统一用户管理平台 + login-page-name: 统一用户管理平台 + servlet: + context-path: /usercenter + +spring: + login-url: /oauth/login + login-failure: /oauth/login?error + login-process: /userlogin + assets-matchers: /assets/** + thymeleaf: + prefix: classpath:/templates/ + suffix: .html + mode: HTML5 + encoding: UTF-8 + cache: false + main: + allow-bean-definition-overriding: true + application: + name: sso-server + servlet: + multipart: + max-file-size: 1GB + max-request-size: 1GB + datasource: + druid: + url: jdbc:mysql://127.0.0.1:3306/db_cloud_usercenter_v2?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC + db-type: mysql + driver-class-name: com.mysql.cj.jdbc.Driver + username: root + password: TSkj@0471.123 + initial-size: 2 + min-idle: 2 + max-active: 100 + # 配置获取连接等待超时的时间 + 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 + # 打开PSCache，并且指定每个连接上PSCache的大小 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 10 + # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 + filter: + commons-log: + connection-logger-name: stat,wall,log4j + stat: + log-slow-sql: true + slow-sql-millis: 2000 + # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 + connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 + # 合并多个DruidDataSource的监控数据 + use-global-data-source-stat: true + +mybatis: + config-location: classpath:mybatis/mybatis-config.xml + mapper-locations: classpath*:mybatis/mapper/**/*.xml + +management: + endpoints: + web: + exposure: + include: '*' + enabled-by-default: true + endpoint: + health: + show-details: always + +oauthClient: + clientId: 4995b2989c274e76917a8c6144d4ab3b + clientSecret: ektSeDMwekFDZzl0WnpFQ0ZKZGo1T3NHZkpwODNsdHpmbGU0KzVheHVTQW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg== + +swagger: + title: 接口文档 + description: 用户相关接口文档 + service-url: http://www.wgink.ink + version: 1.0 + swagger-base-package: com.cm + +file: + uploadPath: /root/projects/uploadFiles/ + 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 + +# 访问控制 +access-control: + pass-paths: + - /index.html + - /logout.html + - /default.html + - /assets/** + - /api/oauthclient/listoauthclient + - /api/oauthclient/countoauthclient + - /api/user/countuser + - /api/file/uploadfile + save-paths: + - /save*/** + - /add*/** + delete-paths: + - /delete*/** + - /remove*/** + update-paths: + - /update*/** + - /edit*/** + query-paths: + - /get*/** + - /query*/** + - /find*/** + - /list*/** + - /count*/** + +logging: + file: /root/projects/logs/usercenter/serviceuser-v2-logs.log + level: + root: error + com.cm: debug diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 7305aa6..793832c 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,16 +1,10 @@ server: -# port: 8081 - port: 8868 -# url: http://58.18.22.25:8081/usercenter - url: http://49.233.36.36:8868/usercenter + port: 7001 + url: http://8.130.18.79:7001/usercenter title: 统一用户管理平台 login-page-name: 统一用户管理平台 servlet: context-path: /usercenter -# tomcat: -# remote-ip-header: X-Forwarded-For -# protocol-header: X-Forwarded-Proto -# protocol-header-https-value: https spring: login-url: /oauth/login @@ -33,11 +27,11 @@ spring: max-request-size: 1GB datasource: druid: - url: jdbc:mysql://127.0.0.1:6688/db_cloud_v2?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC + url: jdbc:mysql://127.0.0.1:3306/db_cloud_usercenter?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC db-type: mysql driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: WenG>)#!^)).12#$ + username: usercenter + password: usercenter initial-size: 2 min-idle: 2 max-active: 10 @@ -92,8 +86,7 @@ swagger: swagger-base-package: com.cm file: -# uploadPath: D:\projects\uploadFiles\ - uploadPath: /root/develop/projects/uploadFiles/ + uploadPath: D:\projects\uploadFiles\ imageTypes: png,jpg,jpeg,gif,blob videoTypes: mp4,rmvb audioTypes: mp3,wmv @@ -128,46 +121,7 @@ access-control: - /count*/** logging: -# file: D:\projects\logs\usercenter\serviceuser-logs.log - file: /root/develop/projects/logs/usercenter/serviceuser-logs.log + file: D:\projects\logs\usercenter-logs.log level: root: error com.cm: debug - -# 短信服务 -sms: - active: true - type: default - default-sms: - account: xd001382 - password: xd001382136 - sign: 【腾狮科技】 - template: - verification-code: '{sign} 您的验证码为 {content}, 有效时间为120秒，若非本人操作，请忽略。' - -# 邮件服务 -email: - active: true - smtp: smtp.qq.com - port: 587 - sender-email: 450292408@qq.com - sender-password: pezxpunlxzqgbhhd - cc-persons: - - 450292408@qq.com - - 76158045@qq.com - -socket: - central-control: - active: true - server: - port: 8888 - # 最大连接数 - so-backlog: 1024 - # 服务端超时断连（秒） - read-idle-time-second: 10 - # 离线通知时间（分钟），默认10分钟 - offline-notice-minute: 10 - # 离线通知次数 - offline-notice-count: 3 - # 异常通知最大值 - exception-notice-count: 10 \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 61d454a..453bf3a 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -31,13 +31,10 @@ spring: port: 6379 datasource: druid: -# url: jdbc:mysql://49.233.36.36:6688/db_cloud?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC - url: jdbc:mysql://127.0.0.1:3306/db_jnhb_usercenter?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC + url: jdbc:mysql://127.0.0.1:3306/db_btyjj_usercenter?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC db-type: mysql driver-class-name: com.mysql.cj.jdbc.Driver -# username: wanggeng username: root -# password: WenG>2132997 password: root initial-size: 2 min-idle: 2 @@ -141,105 +138,3 @@ logging: level: root: error com.cm: debug - -# 短信服务 -sms: - active: false - type: default - default-sms: - account: xd001382 - password: xd001382136 - sign: 【日喀则文化馆】 - template: - verification-code: '{sign} 您的验证码为 {content}, 有效时间为120秒，若非本人操作，请忽略。' - -open-platform: - # 钉钉 - dingding: - # 扫码登陆，通过扫码拿到用户unionid，通过access_token获取个人信息，需要设置钉钉通讯录权限，设置访问白名单 - scan-code-login: - app-id: dingoaorwac5cel8rt57rz - app-secret: j5n_xRR5eiWGWdNSr3z1UNtGnSRxb1sLp2aKHofwiUuxT8cnJRc46bXTCDBe2t_x - userinfo-url: https://oapi.dingtalk.com/sns/getuserinfo_bycode - # 必须有一个APP来辅助钉钉扫码登陆 - app: - active: false - agent-id: 295981340 - app-key: dingxz2jzohb7dft9iw7 - app-secret: MWjSN1PUML-tCjgiSCOUR62Fs_-bdJSaHcorWhLZsd6pKTw6YL-USdsW87QWLxd6 - token-url: https://oapi.dingtalk.com/gettoken - userid-by-unionid-url: https://oapi.dingtalk.com/user/getUseridByUnionid - userinfo-by-id-url: https://oapi.dingtalk.com/user/get - # 微信 - wechat: - mini-app: - # 激活状态 - active: false - authorizeUrl: https://api.weixin.qq.com/sns/jscode2session - # 绑定用户连接，指向统一用户，可以内网 - bindUserUrl: http://127.0.0.1:7001/usercenter/wxminiapp/sign/logincheckusername - grantType: authorization_code -# appKey: wxe17874894f7ff27b -# appSecret: 9ab6a87ccedf6555809f1a42e3820f12 -# appKey: wx953da91650b16128 -# appSecret: 69ba0f0223da28e1472a9fe33b4c34d7 - appKey: wxc529578602bca580 - appSecret: fb752f8eed90ed449e7194c82756bb7f - # 公众号 - official-account: - # 开启跨域 - apiCrossOrigin: false - activate: false - authorize: - authorize-url: https://open.weixin.qq.com/connect/oauth2/authorize - access-token-url: https://api.weixin.qq.com/sns/oauth2/access_token - access-token-refresh-url: https://api.weixin.qq.com/sns/oauth2/refresh_token - userinfo-url: https://api.weixin.qq.com/sns/userinfo - response-type: code - scope: snsapi_userinfo - state: wechatRedirectUrl - grant-type: authorization_code - access-token-url: https://api.weixin.qq.com/cgi-bin/token - bind-user-url: http://192.168.0.113:7001/usercenter/wechat/sign/login - app-id: wx583634d14c596fd7 - app-secret: 1158dcddd267c6f42b99bda62f842893 - grant-type: client_credential - config-token: WenG - -# 邮件服务 -email: - active: false - smtp: smtp.163.com - port: 25 - sender-email: dpdbd001@163.com - sender-password: WAASUQNNVITVXDJS - cc-persons: - - 450292408@qq.com - - 76158045@qq.com - -socket: - central-control: - active: false - server: - port: 8888 - # 最大连接数 - so-backlog: 1024 - # 服务端超时断连（秒） - read-idle-time-second: 10 - # 离线通知时间（分钟），默认10分钟 - offline-notice-minute: 1 - # 离线通知次数 - offline-notice-count: 3 - # 异常通知最大值 - exception-notice-count: 10 - client: - client-id: 317dce24-79cb-41c4-9d59-8b7eaa146eb1 - client-secret: DpLh+yC8k6JwVEqsf+DCelvvIKlYd6HO60EH8hUdiWuANOlRunYMCMoUsGr0Gqh3 - host: 49.233.36.36 - port: 8888 - max-reconnect-count: 20 - reconnect-time-step: 1 - delay-ping-seconds: 3 - send-client-info-active: true - # 上报服务器数据时间 - send-client-info-second: 30 diff --git a/src/main/resources/static/route/system/user/save-department.html b/src/main/resources/static/route/system/user/save-department.html index 61bc817..a82d20d 100644 --- a/src/main/resources/static/route/system/user/save-department.html +++ b/src/main/resources/static/route/system/user/save-department.html @@ -137,9 +137,6 @@ if(/(^\_)|(\__)|(\_+$)/.test(value)){ return '用户名首尾不能出现下划线\'_\''; } - if(/^\d+\d+\d$/.test(value)){ - return '用户名不能全为数字'; - } } });