Skip to content

向汉 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit a9e7295a a9e7295a70057b492c07ffcef4832bb504a2cdb6 by xianghan@topdraw.cn
Options

Merge branch 'release/1.0.2'

2 parents 9db5a924 d9758ce3
Inline Side-by-side
Showing 8 changed files with 74 additions and 3 deletions
1 1 ./target/
2 member-service-api.iml
......
1 <?xml version="1.0" encoding="UTF-8"?>
2 <module version="4">
3 <component name="FacetManager">
4 <facet type="JRebel" name="JRebel">
5 <configuration>
6 <option name="ideModuleStorage">
7 <map>
8 <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
9 <entry key="jrebelEnabled" value="true" />
10 <entry key="lastExternalPluginCheckTime" value="1636770952724" />
11 </map>
12 </option>
13 <option name="version" value="5" />
14 </configuration>
15 </facet>
16 </component>
17 </module>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2
3 <!--
4 This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
5 Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
6 -->
7 <application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
8
9 <id>member-service-api</id>
10
11 <classpath>
12 <dir name="C:/Users/lenovo/Documents/workspace/member-service/member-service-api/target/classes">
13 </dir>
14 </classpath>
15
16 </application>
1 1
2 /logs/ 2 /logs/
3 member-service-impl.iml
4 /src/main/resources/rebel.xml
...\ No newline at end of file ...\ No newline at end of file
......
1 <?xml version="1.0" encoding="UTF-8"?>
2 <module version="4">
3 <component name="FacetManager">
4 <facet type="JRebel" name="JRebel">
5 <configuration>
6 <option name="ideModuleStorage">
7 <map>
8 <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
9 <entry key="jrebelEnabled" value="true" />
10 <entry key="lastExternalPluginCheckTime" value="1636770952726" />
11 </map>
12 </option>
13 <option name="version" value="5" />
14 </configuration>
15 </facet>
16 </component>
17 </module>
...\ No newline at end of file ...\ No newline at end of file
...@@ -119,7 +119,7 @@ public class Member implements Serializable { ...@@ -119,7 +119,7 @@ public class Member implements Serializable {
119 @Column(name = "update_time") 119 @Column(name = "update_time")
120 private Timestamp updateTime; 120 private Timestamp updateTime;
121 121
122 // 是否在黑名单 1：是；0否 122 // 是否在黑名单 1：是；0否
123 @Column(name = "black_status") 123 @Column(name = "black_status")
124 private Integer blackStatus; 124 private Integer blackStatus;
125 125
......
...@@ -82,10 +82,12 @@ public class ExpOperationServiceImpl implements ExpOperationService { ...@@ -82,10 +82,12 @@ public class ExpOperationServiceImpl implements ExpOperationService {
82 long originExp = this.getExpByMemberId(tempExp); 82 long originExp = this.getExpByMemberId(tempExp);
83 // 总积分 83 // 总积分
84 long totalExp = this.calculateTotalExp(originExp, tempExp); 84 long totalExp = this.calculateTotalExp(originExp, tempExp);
85
85 // 1.添加成长值记录 86 // 1.添加成长值记录
86 this.threadPoolTaskExecutor.execute(()->this.doInsertExpDetail(tempExp, originExp, totalExp)); 87 this.threadPoolTaskExecutor.execute(() -> this.doInsertExpDetail(tempExp, originExp, totalExp));
87 // 2.更新成长值与等级 88 // 2.更新成长值与等级
88 this.refreshMemberExpAndLevel(tempExp); 89 this.refreshMemberExpAndLevel(tempExp);
90
89 } catch (Exception e) { 91 } catch (Exception e) {
90 e.printStackTrace(); 92 e.printStackTrace();
91 throw e; 93 throw e;
......
1 <?xml version="1.0" encoding="UTF-8"?>
2
3 <!--
4 This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
5 Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
6 -->
7 <application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
8
9 <id>member-service-impl</id>
10
11 <classpath>
12 <dir name="C:/Users/lenovo/Documents/workspace/member-service/member-service-impl/target/classes">
13 </dir>
14 </classpath>
15
16 </application>