Commit Graph

482 Commits

Author SHA1 Message Date
dinggang 87ac346c28 删除无用代码,清除system.out代码,去除无用import 2022-06-09 20:40:56 +08:00
huangweixiong cb67a8ee60 Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform:
  硬编码改为配置文件
  编译异常
  删除无用代码,清除system.out代码,去除无用import
2022-06-09 16:41:32 +08:00
huangweixiong 43524dc5d9 申请单去重 2022-06-09 16:27:29 +08:00
wangliwen 17bc8f1442 硬编码改为配置文件 2022-06-09 15:29:06 +08:00
wangliwen f6a72a41db 编译异常 2022-06-08 17:35:13 +08:00
dinggang f52ebe6e99 删除无用代码,清除system.out代码,去除无用import 2022-06-08 16:08:51 +08:00
huangweixiong d64d2744d9 Merge branch 'master' of http://124.222.94.39:3000/wangliwen/share-platform
* 'master' of http://124.222.94.39:3000/wangliwen/share-platform:
  定时任务集群关闭
  dev 配置文件关闭亚微单点登录
  编目修改字段,修改属性表对应字段的值
  ...
  ...
  不要阻塞程序启动!!!
  ...
2022-06-08 14:31:00 +08:00
wangliwen 9ba72dbd48 定时任务集群关闭 2022-06-07 17:36:50 +08:00
wangliwen 4af58b0572 dev 配置文件关闭亚微单点登录 2022-06-07 09:11:50 +08:00
dinggang 1c20988f72 编目修改字段,修改属性表对应字段的值 2022-06-06 18:16:37 +08:00
wangliwen c56ba6400e ... 2022-06-06 15:59:45 +08:00
wangliwen 615130451e ... 2022-06-04 18:01:10 +08:00
huangweixiong c283299fc8 【单点登录】未找到用户处理 2022-06-03 18:05:06 +08:00
wangliwen ddc3417007 不要阻塞程序启动!!! 2022-06-03 16:36:30 +08:00
wangliwen cd082d34d2 ... 2022-06-03 16:21:08 +08:00
huangweixiong 95e59c82f4 Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform:
  ...
  fix bug
  selectDTOById 查出多条数据
  申购车不需要出attr
  ...
  一些优化
  ...
  ...
  屮...
  查询能力列表去除infoList 统一门户及其他页面查询能力条件 新增知识库对接 ...

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Filter.java
#	renren-admin/src/main/resources/application.yml
2022-06-03 14:41:12 +08:00
huangweixiong a64bdb60ce 【单点登录】支持配置文件是否启用单点逻辑 2022-06-03 14:27:12 +08:00
wangliwen 5c693de554 ... 2022-06-03 14:06:21 +08:00
wangliwen 21dae97a3e fix bug 2022-06-03 10:55:59 +08:00
wangliwen fb9bb36175 selectDTOById 查出多条数据 2022-06-03 10:39:21 +08:00
wangliwen df2890cf4e 申购车不需要出attr 2022-06-03 10:02:39 +08:00
wangliwen 4534c3d090 Merge remote-tracking branch 'origin/master' 2022-06-02 17:43:38 +08:00
wangliwen 834150846a ... 2022-06-02 17:43:04 +08:00
dinggang e2801315c6 一些优化 2022-06-02 17:42:57 +08:00
wangliwen 628337e97d ... 2022-06-02 17:10:42 +08:00
wangliwen 70af116d5f ... 2022-06-02 17:09:12 +08:00
wangliwen 54b395580b Merge remote-tracking branch 'origin/master' 2022-06-02 16:56:43 +08:00
wangliwen 37229a1743 屮... 2022-06-02 16:56:22 +08:00
dinggang 02d108d0d3 查询能力列表去除infoList
统一门户及其他页面查询能力条件
新增知识库对接
...
2022-06-02 16:55:00 +08:00
huangweixiong 3555b6ca05 Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform:
  需求评论通知
  ...
  跨域 屮·
  大数据部门负责人的通知
  通知重放的事件类型区分处理
  文案调整
  ...
2022-06-02 15:47:17 +08:00
wangliwen 2a21a57ede 需求评论通知 2022-06-02 15:39:18 +08:00
huangweixiong d6f61c9fcc 【单点登录】临时处理跨域名情况下没有session问题 2022-06-02 15:07:36 +08:00
huangweixiong e7b1b1cfd6 【单点登录】不清楚之前怎么处理跨域,先自己加上跨域 2022-06-02 15:05:45 +08:00
wangliwen 91b6e7ff8f ... 2022-06-02 14:15:14 +08:00
wangliwen 641e6ea2d8 跨域 屮· 2022-06-02 13:53:40 +08:00
wangliwen 5a41ac20c7 大数据部门负责人的通知 2022-06-02 11:17:40 +08:00
wangliwen 331cfbe3fc 通知重放的事件类型区分处理 2022-06-02 11:03:14 +08:00
wangliwen 823008f348 文案调整 2022-06-02 10:42:20 +08:00
wangliwen 1431dbbb47 Merge branch 'master' into wangliwen
# Conflicts:
#	lib/yawei-pso-2.0.2.jar
#	renren-admin/src/main/java/io/renren/AdminApplication.java
#	renren-admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Filter.java
2022-06-01 19:16:09 +08:00
wangliwen 3734453796 ... 2022-06-01 19:12:31 +08:00
wangliwen 7d69521fa4 2022-06-01 18:26:21 +08:00
wangliwen 7f8a4f9d43 javaCV排除无用依赖 2022-06-01 18:19:08 +08:00
wangliwen 83bfde121d 根配置文件不要随便改!!!! 2022-06-01 17:41:58 +08:00
wangliwen 7924c095ce Merge branch 'wangliwen' 2022-06-01 17:13:38 +08:00
wangliwen a88d8abe1c Merge remote-tracking branch 'origin/monitor' 2022-06-01 17:13:30 +08:00
huangweixiong 01f6af921a Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform:
  节点流转通知与文案调整
2022-06-01 16:54:54 +08:00
huangweixiong a69cc1d6e5 【视频监控,创城合并】迁移pom依赖包 2022-06-01 16:52:51 +08:00
wangliwen 20f3f1077d ... 2022-06-01 16:30:15 +08:00
wangliwen 5ded243ea9 Merge branch 'wangliwen' 2022-06-01 16:14:20 +08:00
wangliwen bf824e6643 节点流转通知与文案调整 2022-06-01 16:13:44 +08:00