Skip to content
This repository has been archived by the owner on Apr 10, 2022. It is now read-only.

提交 yangxc-branch 分支 #17

Open
wants to merge 8 commits into
base: 1.2.0
Choose a base branch
from
Open

提交 yangxc-branch 分支 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3f6426c
Revert "repaired oss init error"
sunyl527 Aug 28, 2019
60fefb1
Update doc.
sunyl527 Aug 28, 2019
e00b170
Merge pull request #10 from xtTech/1.1.1
zoeminghong Aug 29, 2019
60b9d9e
📝 更新ReadMe iOS客户端介绍
birdmichael Mar 20, 2020
6253c64
Merge pull request #13 from birdmichael/master
zoeminghong Mar 21, 2020
8c802ee
optimize doc
zoeminghong Mar 21, 2020
25b47d9
optimize doc
zoeminghong Jun 1, 2020
e64d151
提交 yangxc-branch 分支
yangxiaochengithub Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,23 @@ link:src/main/asciidoc/_chapter/docker-manual.adoc[Docker 使用手册]
image::show1.png[]
image::show2.png[]


=== 合作项目

==== iOS 前端Swift一键使用

image::https://raw.githubusercontent.com/birdmichael/app-version-swift/master/show.png[]

* 一键配置
* 全截面自定义
* 自动版本比较
* 自动限制最低版本
* 自动维护每次弹出，弹出一次逻辑
* 配置文本框最大高度（默认不可滚动，不显示滚动条）

项目地址：https://github.com/birdmichael/app-version-swift


=== 答疑帮助

* 链接地址对的，但是请求返回 <没有权限访问该地址，请先登录> 提示信息？
Expand All @@ -68,6 +85,10 @@ image::show2.png[]

3、数据库表没有成功初始化

* OSS 跨域问题

https://help.aliyun.com/video_detail/39695.html?spm=5176.10695662.1996646101.searchclickresult.791c4a496p15UY

NOTE: 有时候邮件回复的不是那么及时，推荐微信。

微信: zoeminghong （备注：APP 管理系统）
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# responsity
responsity
253 changes: 231 additions & 22 deletions modules/app-version-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,57 +3,266 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.tairanchina.csp.avm</groupId>
<artifactId>app-version-common</artifactId>
<name>app-version-common</name>
<version>1.0.0-RC-SNAPSHOT</version>
<packaging>jar</packaging>
<description>app-version-common</description>

<parent>
<groupId>com.tairanchina.csp.avm</groupId>
<artifactId>app-version</artifactId>
<version>1.1.0-RC</version>
<relativePath>../../pom.xml</relativePath>
<groupId>com.tairanchina.csp.avm</groupId>
<artifactId>app-version</artifactId>
<version>1.0.0-RC-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>app-version-common</artifactId>
<packaging>jar</packaging>

<properties>
<maven.install.skip>false</maven.install.skip>
<maven.deploy.skip>false</maven.deploy.skip>
<commons-lang.version>2.6</commons-lang.version>
<swagger2.version>2.8.0</swagger2.version>
<knife4j.version>2.0.2</knife4j.version>
<!--Java openSource Common Utils -start -->
<guava.version>18.0</guava.version>
<hutool.version>5.0.6</hutool.version>
<!--Java openSource Common Utils -end -->
<!-- 本地依赖包 -->

<mybatisplus.spring.boot.starter.version>1.0.2</mybatisplus.spring.boot.starter.version>
<jsonwebtoken.jjwt.version>0.10.5</jsonwebtoken.jjwt.version>
<docker.image.prefix>app</docker.image.prefix>
</properties>

<dependencies>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatisplus-spring-boot-starter</artifactId>
<version>${mybatisplus.spring.boot.starter.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>6.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.47</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
<version>${jsonwebtoken.jjwt.version}</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
<version>${jsonwebtoken.jjwt.version}</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
<version>${jsonwebtoken.jjwt.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.12</version>
</dependency>
<!--UA解析-->
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>1.21</version>
</dependency>

<!--<dependency>-->
<!--<groupId>org.aspectj</groupId>-->
<!--<artifactId>aspectjweaver</artifactId>-->
<!--</dependency>-->
<dependency>
<groupId>com.tairanchina.csp.dew</groupId>
<artifactId>boot-starter</artifactId>
<version>1.5.0-RC</version>
<!-- 移除嵌入式tomcat插件 -->
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tairanchina.csp.dew</groupId>
<artifactId>cluster-spi-redis</artifactId>
<version>1.5.0-RC</version>
</dependency>

<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger2.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger2.version}</version>
</dependency>

<!-- 引用 https://doc.xiaominfo.com/knife4j/ ui -->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-ui</artifactId>
<version>${knife4j.version}</version>
</dependency>

<!--<dependency>-->
<!--<groupId>com.github.xiaoymin</groupId>-->
<!--<artifactId>knife4j-spring-boot-starter</artifactId>-->
<!--&lt;!&ndash;在引用时请在maven中央仓库搜索最新版本号&ndash;&gt;-->
<!--<version>${knife4j.version}</version>-->
<!--</dependency>-->

<!--Java openSource Common Utils -start -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>${hutool.version}</version>
</dependency>
<!--Java openSource Common Utils -end -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>6.1.0.Final</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>3.0.1-b11</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<version>6.1.0.Final</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>


<!-- spring 相关jar -start -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<!-- 移除嵌入式tomcat插件 -->
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<!-- 引入AOP依赖start-->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
</dependency>

<dependency>
<groupId>com.tairanchina.csp.dew</groupId>
<artifactId>boot-starter</artifactId>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>com.tairanchina.csp.dew</groupId>
<artifactId>cluster-spi-redis</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
</dependency>
<!--引入JDBC依赖-->
<!--配置元数据 -start -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<!--配置元数据 -end -->

<!-- spring webSocket -start -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!-- spring webSocket -end -->

<!-- spring redis -start -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>

<!-- Freemarker 支持 -start -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<!-- Freemarker 支持 -end -->

<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatisplus-spring-boot-starter</artifactId>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>

<!-- spring 相关jar -end -->
<!-- JUnit Test -start -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!-- JUnit Test -end -->




</dependencies>
</project>
6 changes: 6 additions & 0 deletions ...ersion-common/src/main/java/com/tairanchina/csp/avm/constants/ServiceResultConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@ public class ServiceResultConstants {
public static final ServiceResult RESOURCE_NOT_BELONG_APP = ServiceResult.failed(1005, "所操作的资源不属于该应用");
public static final ServiceResult USER_NOT_FOUND = ServiceResult.failed(1006, "找不到该用户");
public static final ServiceResult WRONG_PHONE_PASSWORD = ServiceResult.failed(1007, "手机号或者密码错误");
public static final ServiceResult WRONG_USER_DISABLE = ServiceResult.failed(1007, "用户被禁用");
public static final ServiceResult WRONG_USER_DEL = ServiceResult.failed(1007, "用户已删除");

public static final ServiceResult JWT_ERROR = ServiceResult.failed(1008, "令牌不合法，请重新登录");


/**
* 注册错误
*/
Expand Down Expand Up @@ -60,6 +64,7 @@ public class ServiceResultConstants {
public static final ServiceResult CUSTOM_API_NOT_EXISTS = ServiceResult.failed(20019, "该自定义接口不存在");
public static final ServiceResult OPERATION_LOG_NOT_EXISTS = ServiceResult.failed(20020, "该操作记录不存在");
public static final ServiceResult APK_EXISTS = ServiceResult.failed(20021, "APK包已经存在");
public static final ServiceResult APK_EXISTS_WITH_CHANNEL = ServiceResult.failed(20221, "APK包已经关联渠道码");
public static final ServiceResult WHITE_LIST_BATCH_EXISTS = ServiceResult.failed(20022, "该白名单组的名称已存在");
public static final ServiceResult WHITE_LIST_BATCH_ERROR = ServiceResult.failed(20023, "白名单组对应的名称存在多个");
public static final ServiceResult WHITE_LIST_NOT_EXISITS = ServiceResult.failed(20024, "白名单（组）不存在");
Expand All @@ -86,6 +91,7 @@ public class ServiceResultConstants {
*/
public static final ServiceResult PLATFORM_ERROR = ServiceResult.failed(30001, "请指定查询的版本iOS还是Andorid版本");
public static final ServiceResult NO_NEW_VERSION = ServiceResult.failed(30002, "查询不到新版本或者新版本未上架，没有更新的版本");
public static final ServiceResult NO_EXISTS_VERSION = ServiceResult.failed(30009, "版本号不存在");
public static final ServiceResult CHANNEL_STATUS_2 = ServiceResult.failed(30003, "当前渠道已经被废弃，请联系管理员");
public static final ServiceResult CHANNEL_STATUS_3 = ServiceResult.failed(30004, "当前渠道已经被停用，请联系管理员");
public static final ServiceResult APK_NOT_EXISTS_EXT = ServiceResult.failed(30005, "该渠道还没有上传APK包，请联系管理员");
Expand Down
5 changes: 3 additions & 2 deletions modules/app-version-common/src/main/java/com/tairanchina/csp/avm/dto/JWTSubject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.tairanchina.csp.avm.dto;

import com.ecfront.dew.common.$;

import cn.hutool.json.JSONUtil;

/**
* Created by hzlizx on 2019/2/21
Expand All @@ -19,6 +20,6 @@ public void setUserId(String userId) {

@Override
public String toString() {
return $.json.toJsonString(this);
return JSONUtil.toJsonStr(this);
}
}