1

pom.xml

@@ -89,6 +89,42 @@
         </dependency>
 
         <dependency>
+<<<<<<< HEAD
+            <groupId>com.cm</groupId>
+            <artifactId>cloud-manager-sms</artifactId>
+            <version>1.0.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.cm</groupId>
+            <artifactId>cloud-common-websocket</artifactId>
+            <version>1.0.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.cm</groupId>
+            <artifactId>cloud-common-wechat</artifactId>
+            <version>1.0.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.cm</groupId>
+            <artifactId>cloud-common-dingding</artifactId>
+            <version>1.0.2-SNAPSHOT</version>
+<<<<<<< HEAD
+        </dependency>
+
+        <dependency>
+            <groupId>com.cm</groupId>
+            <artifactId>cloud-common-msbh5</artifactId>
+            <version>1.0.2-SNAPSHOT</version>
+=======
+>>>>>>> 3b7be9426296e4bc64e2e6664f96b4ba2a081573
+        </dependency>
+
+        <dependency>
+=======
+>>>>>>> b47f55f9b63f1ab8fd03e3ad5196ebd096ad20fd
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.16</version>
@@ -102,6 +138,25 @@
             <scope>compile</scope>
         </dependency>
 
+<<<<<<< HEAD
+
+        <!-- 作为客户端使用 -->
+<<<<<<< HEAD
+<!--        <dependency>-->
+<!--            <groupId>com.cm</groupId>-->
+<!--            <artifactId>cloud-central-control-client</artifactId>-->
+<!--            <version>1.0.2-SNAPSHOT</version>-->
+<!--        </dependency>-->
+=======
+        <dependency>
+            <groupId>com.cm</groupId>
+            <artifactId>cloud-central-control-client</artifactId>
+            <version>1.0.2-SNAPSHOT</version>
+        </dependency>
+>>>>>>> 3b7be9426296e4bc64e2e6664f96b4ba2a081573
+
+=======
+>>>>>>> b47f55f9b63f1ab8fd03e3ad5196ebd096ad20fd
     </dependencies>
 
     <build>

src/main/java/com/cm/serviceusercenter/ServiceUserCenterApplication.java

@@ -3,6 +3,7 @@ package com.cm.serviceusercenter;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.ComponentScan;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
@@ -13,6 +14,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @SpringBootApplication
 @ComponentScan("com.cm")
 @MapperScan({"com.cm.**.dao"})
+@ServletComponentScan(basePackages = "com.cm")
 public class ServiceUserCenterApplication {
 
     public static void main(String[] args) {

src/main/java/com/cm/serviceusercenter/config/WebSecurityConfig.java

@@ -66,7 +66,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                         "/route/file/**",
                         "/api/sms/getverificationcode/*",
                         "/api/user/getsignintype/**",
-                        "/ws")
+                        "/ws",
+                        "/inspur/**")
                 .permitAll()
                 .and()
                 .authorizeRequests()

src/main/resources/application-btgxq.yml

@@ -0,0 +1,167 @@
+server:
+  port: 7021
+  url: http://127.0.0.1:7021/usercenter
+  ws: ws://127.0.0.1:7021/usercenter/ws
+  title: 统一用户管理平台
+  login-page-name: 统一用户管理平台
+  default-home-page: index-gxq
+  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://192.168.0.151:3306/db_btgxq_city?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: root
+      initial-size: 2
+      min-idle: 2
+      max-active: 10
+      # 配置获取连接等待超时的时间
+      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: C:\Users\TS-QD1\Desktop\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: C:\Users\TS-QD1\Desktop\UploadFiles\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: false
+    server:
+      port: 8888
+      # 最大连接数
+      so-backlog: 1024
+      # 服务端超时断连（秒）
+      read-idle-time-second: 10
+      # 离线通知时间（分钟），默认10分钟
+      offline-notice-minute: 10
+      # 离线通知次数
+      offline-notice-count: 3
+      # 异常通知最大值
+      exception-notice-count: 10

src/main/resources/application-nmyx.yml

@@ -0,0 +1,239 @@
+server:
+  port: 7001
+  url: http://49.233.36.36:58090/usercenter
+#  ws: ws://192.168.0.103:7001/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_evaluation_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: root
+      initial-size: 2
+      min-idle: 2
+      max-active: 10
+      # 配置获取连接等待超时的时间
+      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:
+      enabled: true
+      exposure:
+        include: '*'
+      base-path: /manage
+    enabled-by-default: true
+  endpoint:
+    env:
+      enabled: true
+    health:
+      show-details: always
+
+# 用户，非必填
+user:
+  # 默认密码
+  default-password: 88888888
+
+oauthClient:
+  clientId: 4995b2989c274e76917a8c6144d4ab3b
+  clientSecret: ektSeDMwekFDZzl0WnpFQ0ZKZGo1T3NHZkpwODNsdHpmbGU0KzVheHVTQW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
+
+swagger:
+  title: 接口文档
+  description: 用户相关接口文档
+  service-url: https://baidu.com/
+  version: 1.0
+  swagger-base-package: com.cm
+
+file:
+  uploadPath: C:\Users\wenc0\Desktop\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/**
+    - /web/**
+    - /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:
+  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

src/main/resources/application-test.yml

@@ -1,6 +1,10 @@
 server:
   port: 7001
+<<<<<<< HEAD
   url: http://192.168.0.103:7001/usercenter
+=======
+  url: http://49.233.36.36:58090/usercenter
+>>>>>>> 3b7be9426296e4bc64e2e6664f96b4ba2a081573
 #  ws: ws://192.168.0.103:7001/usercenter/ws
   title: 统一用户管理平台
   login-page-name: 统一用户管理平台
@@ -138,3 +142,113 @@ logging:
   level:
     root: error
     com.cm: debug
+<<<<<<< HEAD
+
+# 蒙速办对接H5应用配置 
+inspur-auth:
+  appId: 102cf5ab-8359-4ee2-ba8a-f3752fa3b16f
+  redirectUri: http://dlho.cn:9003/signup/inspur/index
+
+# 短信服务
+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
+=======
+>>>>>>> b47f55f9b63f1ab8fd03e3ad5196ebd096ad20fd

src/main/resources/templates/inspur-index.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <base href="/usercenter/">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="icon" type="image/ico" href="assets/favicon.ico"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <link rel="stylesheet" href="assets/css/supersized.css">
+    <link rel="stylesheet" href="assets/layuiadmin/style/login.css?t=2" media="all">
+</head>
+<body>
+<div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login">
+    <div class="layui-card">
+        <div class="layui-card-header">蒙速办-首页</div>
+        <div class="layui-card-body">
+            该页面用于对接测试
+            <br>
+            正式环境需替换为实际应用首页
+        </div>
+    </div>
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index'], function () {
+        var $ = layui.$;
+
+    });
+</script>
+</body>
+</html>